From 92d2c19fca0945c5d5e06135e2d9bd1c7d9aec7d Mon Sep 17 00:00:00 2001 From: Rmojarro1 <48000819+Rmojarro1@users.noreply.github.com> Date: Wed, 30 Apr 2025 12:00:15 -0700 Subject: [PATCH 1/4] Changed text for 'Quit' Button to 'Quit Game' Changed the line in the translation file to make it more clear that the user will be quitting the game. Also changed the translation entry to reflect this --- Globals/Translations/Translations.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv index fb7ac379..57f1fedb 100644 --- a/Globals/Translations/Translations.csv +++ b/Globals/Translations/Translations.csv @@ -22,7 +22,7 @@ CONTROLS_CHOOSE_TEXT_CONTROLLER,"Press Start to close","按下 Start 键关闭" CONTROLS_CHOOSE_INVALID,"System input, can't be used!",预留输入，无法重定向！ CONTROLS_CHOOSE_DUPLICATE,"Input already set, can't be used again!",输入冲突，无法继续！ ESCAPE_MENU_RESUME,Resume,继续 -ESCAPE_MENU_QUIT,Quit,退出 +ESCAPE_MENU_QUIT,Quit Game,ゲームをやめる ESCAPE_MENU_TITLE,Quit to Title,返回标题 INBETWEEN_CONTINUE,Continue,继续 CHEST_ROOM_REWARDS,Reward Selection!,奖励! From 7e584ac0a600a79f4c3682b0e14a9c01db83d516 Mon Sep 17 00:00:00 2001 From: Rmojarro1 <48000819+Rmojarro1@users.noreply.github.com> Date: Wed, 30 Apr 2025 12:07:51 -0700 Subject: [PATCH 2/4] Fixed typo Changed quit game translation from japanese to chinese simplified --- Globals/Translations/Translations.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv index 57f1fedb..042755e3 100644 --- a/Globals/Translations/Translations.csv +++ b/Globals/Translations/Translations.csv @@ -22,7 +22,7 @@ CONTROLS_CHOOSE_TEXT_CONTROLLER,"Press Start to close","按下 Start 键关闭" CONTROLS_CHOOSE_INVALID,"System input, can't be used!",预留输入，无法重定向！ CONTROLS_CHOOSE_DUPLICATE,"Input already set, can't be used again!",输入冲突，无法继续！ ESCAPE_MENU_RESUME,Resume,继续 -ESCAPE_MENU_QUIT,Quit Game,ゲームをやめる +ESCAPE_MENU_QUIT,Quit Game,退出游戏 ESCAPE_MENU_TITLE,Quit to Title,返回标题 INBETWEEN_CONTINUE,Continue,继续 CHEST_ROOM_REWARDS,Reward Selection!,奖励! From 17f2d4d406e6f989765550892da23b604953ba1c Mon Sep 17 00:00:00 2001 From: Rmojarro1 <48000819+Rmojarro1@users.noreply.github.com> Date: Wed, 30 Apr 2025 12:09:40 -0700 Subject: [PATCH 3/4] Reordered buttons Swapped position of quit game and quit to title --- Scenes/UI/Pause.tscn | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Scenes/UI/Pause.tscn b/Scenes/UI/Pause.tscn index aafcd686..c5bf0068 100644 --- a/Scenes/UI/Pause.tscn +++ b/Scenes/UI/Pause.tscn @@ -14,7 +14,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_6jc8n") -PauseButtons = [NodePath("MarginContainer/VBoxContainer/MarginContainer/ResumeButton"), NodePath("MarginContainer/VBoxContainer/MarginContainer4/OptionsButton"), NodePath("MarginContainer/VBoxContainer/MarginContainer2/QuitButton"), NodePath("MarginContainer/VBoxContainer/MarginContainer3/PlaceHolderButton")] +PauseButtons = [NodePath("MarginContainer/VBoxContainer/MarginContainer/ResumeButton"), NodePath("MarginContainer/VBoxContainer/MarginContainer4/OptionsButton"), NodePath("MarginContainer/VBoxContainer/MarginContainer3/QuitButton"), NodePath("MarginContainer/VBoxContainer/MarginContainer2/PlaceHolderButton")] [node name="Background" type="NinePatchRect" parent="."] self_modulate = Color(1, 1, 1, 0.75) @@ -62,7 +62,7 @@ theme_override_constants/margin_bottom = 20 [node name="ResumeButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer"] layout_mode = 2 -focus_neighbor_top = NodePath("../../MarginContainer3/PlaceHolderButton") +focus_neighbor_top = NodePath("../../MarginContainer2/PlaceHolderButton") focus_neighbor_bottom = NodePath("../../MarginContainer4/OptionsButton") theme = ExtResource("4_lw4m2") text = "ESCAPE_MENU_RESUME" @@ -78,7 +78,7 @@ theme_override_constants/margin_bottom = 20 [node name="OptionsButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer4"] layout_mode = 2 focus_neighbor_top = NodePath("../../MarginContainer/ResumeButton") -focus_neighbor_bottom = NodePath("../../MarginContainer2/QuitButton") +focus_neighbor_bottom = NodePath("../../MarginContainer3/QuitButton") theme = ExtResource("4_lw4m2") text = "TITLE_OPTIONS" @@ -90,12 +90,12 @@ theme_override_constants/margin_top = 20 theme_override_constants/margin_right = 20 theme_override_constants/margin_bottom = 20 -[node name="QuitButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer2"] +[node name="PlaceHolderButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer2"] layout_mode = 2 -focus_neighbor_top = NodePath("../../MarginContainer4/OptionsButton") -focus_neighbor_bottom = NodePath("../../MarginContainer3/PlaceHolderButton") +focus_neighbor_top = NodePath("../../MarginContainer3/QuitButton") +focus_neighbor_bottom = NodePath("../../MarginContainer/ResumeButton") theme = ExtResource("4_lw4m2") -text = "ESCAPE_MENU_QUIT" +text = "ESCAPE_MENU_TITLE" [node name="MarginContainer3" type="MarginContainer" parent="MarginContainer/VBoxContainer"] layout_mode = 2 @@ -105,9 +105,9 @@ theme_override_constants/margin_top = 20 theme_override_constants/margin_right = 20 theme_override_constants/margin_bottom = 20 -[node name="PlaceHolderButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer3"] +[node name="QuitButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer3"] layout_mode = 2 -focus_neighbor_top = NodePath("../../MarginContainer2/QuitButton") -focus_neighbor_bottom = NodePath("../../MarginContainer/ResumeButton") +focus_neighbor_top = NodePath("../../MarginContainer4/OptionsButton") +focus_neighbor_bottom = NodePath("../../MarginContainer2/PlaceHolderButton") theme = ExtResource("4_lw4m2") -text = "ESCAPE_MENU_TITLE" +text = "ESCAPE_MENU_QUIT" From 34d70f3b028178e037588c90e1db517bf9e90e1d Mon Sep 17 00:00:00 2001 From: LifeHckr Date: Wed, 30 Apr 2025 14:59:32 -0700 Subject: [PATCH 4/4] Update focus neighbors --- Scenes/UI/Pause.tscn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Scenes/UI/Pause.tscn b/Scenes/UI/Pause.tscn index c5bf0068..24f7b5d4 100644 --- a/Scenes/UI/Pause.tscn +++ b/Scenes/UI/Pause.tscn @@ -62,7 +62,7 @@ theme_override_constants/margin_bottom = 20 [node name="ResumeButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer"] layout_mode = 2 -focus_neighbor_top = NodePath("../../MarginContainer2/PlaceHolderButton") +focus_neighbor_top = NodePath("../../MarginContainer3/QuitButton") focus_neighbor_bottom = NodePath("../../MarginContainer4/OptionsButton") theme = ExtResource("4_lw4m2") text = "ESCAPE_MENU_RESUME" @@ -78,7 +78,7 @@ theme_override_constants/margin_bottom = 20 [node name="OptionsButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer4"] layout_mode = 2 focus_neighbor_top = NodePath("../../MarginContainer/ResumeButton") -focus_neighbor_bottom = NodePath("../../MarginContainer3/QuitButton") +focus_neighbor_bottom = NodePath("../../MarginContainer2/PlaceHolderButton") theme = ExtResource("4_lw4m2") text = "TITLE_OPTIONS" @@ -92,8 +92,8 @@ theme_override_constants/margin_bottom = 20 [node name="PlaceHolderButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer2"] layout_mode = 2 -focus_neighbor_top = NodePath("../../MarginContainer3/QuitButton") -focus_neighbor_bottom = NodePath("../../MarginContainer/ResumeButton") +focus_neighbor_top = NodePath("../../MarginContainer4/OptionsButton") +focus_neighbor_bottom = NodePath("../../MarginContainer3/QuitButton") theme = ExtResource("4_lw4m2") text = "ESCAPE_MENU_TITLE" @@ -107,7 +107,7 @@ theme_override_constants/margin_bottom = 20 [node name="QuitButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer3"] layout_mode = 2 -focus_neighbor_top = NodePath("../../MarginContainer4/OptionsButton") -focus_neighbor_bottom = NodePath("../../MarginContainer2/PlaceHolderButton") +focus_neighbor_top = NodePath("../../MarginContainer2/PlaceHolderButton") +focus_neighbor_bottom = NodePath("../../MarginContainer/ResumeButton") theme = ExtResource("4_lw4m2") text = "ESCAPE_MENU_QUIT"