Merge pull request #64 from BrickPi/credits-rename

Refactor Credits -> CreditsMenu
OpenVicProject · Mar 12, 2023 · a25c7c7 · a25c7c7
2 parents 1810d1f + 1958420
commit a25c7c7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/game/src/Credits/Credits.gd → game/src/CreditsMenu/CreditsMenu.gd b/game/src/Credits/Credits.gd → game/src/CreditsMenu/CreditsMenu.gd
@@ -17,8 +17,6 @@ signal back_button_pressed
 @export_file("*.csv")
 var core_credits_path : String
 
-# TODO: implement for theme instead
-# waiting for https://github.com/OpenVic2Project/OpenVic2/pull/48
 @export_group("Label Variants", "label_variants_")
 @export
 var label_variants_project : StringName

diff --git a/game/src/Credits/Credits.tscn → game/src/CreditsMenu/CreditsMenu.tscn b/game/src/Credits/Credits.tscn → game/src/CreditsMenu/CreditsMenu.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=2 format=3 uid="uid://c8knthxkwj1uj"]
 
-[ext_resource type="Script" path="res://src/Credits/Credits.gd" id="1_csd7i"]
+[ext_resource type="Script" path="res://src/CreditsMenu/CreditsMenu.gd" id="1_csd7i"]
 
-[node name="Credits" type="Control" node_paths=PackedStringArray("credits_list")]
+[node name="CreditsMenu" type="Control" node_paths=PackedStringArray("credits_list")]
 editor_description = "UI-34"
 layout_mode = 3
 anchors_preset = 15

diff --git a/game/src/GameMenu.gd b/game/src/GameMenu.gd
@@ -28,12 +28,12 @@ func _on_lobby_menu_back_button_pressed():
 
 
 func _on_credits_back_button_pressed():
-	$Credits.hide()
+	$CreditsMenu.hide()
 	$MainMenu.show()
 
 
 func _on_main_menu_credits_button_pressed():
-	$Credits.show()
+	$CreditsMenu.show()
 	$MainMenu.hide()
 
 

diff --git a/game/src/GameMenu.tscn b/game/src/GameMenu.tscn
@@ -4,7 +4,7 @@
 [ext_resource type="Theme" uid="uid://cr4lh0vraucx7" path="res://default_theme.tres" id="1_q3b4c"]
 [ext_resource type="PackedScene" uid="uid://dvoin538iby54" path="res://src/MainMenu/MainMenu.tscn" id="2_2jbkh"]
 [ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/OptionMenu/OptionsMenu.tscn" id="3_111lv"]
-[ext_resource type="PackedScene" uid="uid://c8knthxkwj1uj" path="res://src/Credits/Credits.tscn" id="4_n0hoo"]
+[ext_resource type="PackedScene" uid="uid://c8knthxkwj1uj" path="res://src/CreditsMenu/CreditsMenu.tscn" id="4_n0hoo"]
 [ext_resource type="PackedScene" uid="uid://crhkgngfnxf4y" path="res://src/LobbyMenu/LobbyMenu.tscn" id="4_nofk1"]
 [ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/MusicConductor/MusicPlayer.tscn" id="6_lts1m"]
 
@@ -30,7 +30,7 @@ layout_mode = 1
 visible = false
 layout_mode = 1
 
-[node name="Credits" parent="." instance=ExtResource("4_n0hoo")]
+[node name="CreditsMenu" parent="." instance=ExtResource("4_n0hoo")]
 visible = false
 layout_mode = 1
 
@@ -49,4 +49,4 @@ grow_horizontal = 0
 [connection signal="options_button_pressed" from="MainMenu" to="." method="_on_main_menu_options_button_pressed"]
 [connection signal="back_button_pressed" from="OptionsMenu" to="." method="_on_options_menu_back_button_pressed"]
 [connection signal="back_button_pressed" from="LobbyMenu" to="." method="_on_lobby_menu_back_button_pressed"]
-[connection signal="back_button_pressed" from="Credits" to="." method="_on_credits_back_button_pressed"]
+[connection signal="back_button_pressed" from="CreditsMenu" to="." method="_on_credits_back_button_pressed"]