From 1943c11b1c21e713a356cbd17a0c9c465368126d Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Thu, 18 Dec 2025 11:41:26 +0300 Subject: [PATCH] Menus organized in dirs --- game/game.gd | 2 +- game/game.tscn | 6 +++--- menu/{ => common}/credits.gd | 0 menu/{ => common}/credits.gd.uid | 0 menu/{ => common}/credits.tscn | 2 +- menu/{ => common}/options.gd | 0 menu/{ => common}/options.gd.uid | 0 menu/{ => common}/options.tscn | 2 +- menu/{ => ingame}/game_over_screen.gd | 0 menu/{ => ingame}/game_over_screen.gd.uid | 0 menu/{ => ingame}/game_over_screen.tscn | 2 +- menu/{ => ingame}/pause_menu.gd | 0 menu/{ => ingame}/pause_menu.gd.uid | 0 menu/{ => ingame}/pause_menu.tscn | 2 +- menu/{ => ingame}/pause_screen.gd | 0 menu/{ => ingame}/pause_screen.gd.uid | 0 menu/{ => ingame}/pause_screen.tscn | 8 ++++---- menu/{ => ingame}/victory_screen.gd | 0 menu/{ => ingame}/victory_screen.gd.uid | 0 menu/{ => ingame}/victory_screen.tscn | 2 +- menu/{ => main}/main_menu.gd | 0 menu/{ => main}/main_menu.gd.uid | 0 menu/{ => main}/main_menu.tscn | 2 +- menu/{ => main}/seed_selection_menu.gd | 0 menu/{ => main}/seed_selection_menu.gd.uid | 0 menu/{ => main}/seed_selection_menu.tscn | 2 +- menu/{ => main}/title_screen.gd | 0 menu/{ => main}/title_screen.gd.uid | 0 menu/{ => main}/title_screen.tscn | 10 +++++----- 29 files changed, 20 insertions(+), 20 deletions(-) rename menu/{ => common}/credits.gd (100%) rename menu/{ => common}/credits.gd.uid (100%) rename menu/{ => common}/credits.tscn (97%) rename menu/{ => common}/options.gd (100%) rename menu/{ => common}/options.gd.uid (100%) rename menu/{ => common}/options.tscn (98%) rename menu/{ => ingame}/game_over_screen.gd (100%) rename menu/{ => ingame}/game_over_screen.gd.uid (100%) rename menu/{ => ingame}/game_over_screen.tscn (96%) rename menu/{ => ingame}/pause_menu.gd (100%) rename menu/{ => ingame}/pause_menu.gd.uid (100%) rename menu/{ => ingame}/pause_menu.tscn (97%) rename menu/{ => ingame}/pause_screen.gd (100%) rename menu/{ => ingame}/pause_screen.gd.uid (100%) rename menu/{ => ingame}/pause_screen.tscn (87%) rename menu/{ => ingame}/victory_screen.gd (100%) rename menu/{ => ingame}/victory_screen.gd.uid (100%) rename menu/{ => ingame}/victory_screen.tscn (96%) rename menu/{ => main}/main_menu.gd (100%) rename menu/{ => main}/main_menu.gd.uid (100%) rename menu/{ => main}/main_menu.tscn (97%) rename menu/{ => main}/seed_selection_menu.gd (100%) rename menu/{ => main}/seed_selection_menu.gd.uid (100%) rename menu/{ => main}/seed_selection_menu.tscn (98%) rename menu/{ => main}/title_screen.gd (100%) rename menu/{ => main}/title_screen.gd.uid (100%) rename menu/{ => main}/title_screen.tscn (88%) diff --git a/game/game.gd b/game/game.gd index 622359a..a68a760 100644 --- a/game/game.gd +++ b/game/game.gd @@ -134,7 +134,7 @@ func _show_main_menu() -> void: SaveManager.save() get_tree().paused = false - get_tree().change_scene_to_file("res://menu/title_screen.tscn") + get_tree().change_scene_to_file("res://menu/main/title_screen.tscn") func _on_passage_player_died() -> void: diff --git a/game/game.tscn b/game/game.tscn index 13ecbd7..392162c 100644 --- a/game/game.tscn +++ b/game/game.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://dl7m4rqyj8mck"] [ext_resource type="Script" uid="uid://1wfu4iuddo25" path="res://game/game.gd" id="1_l1rk1"] -[ext_resource type="PackedScene" uid="uid://d34nh3lc1gpb" path="res://menu/pause_screen.tscn" id="2_h7iqs"] -[ext_resource type="PackedScene" uid="uid://duxm8n62j2qt6" path="res://menu/game_over_screen.tscn" id="4_4fuuu"] -[ext_resource type="PackedScene" uid="uid://bdcs2ff85qjs4" path="res://menu/victory_screen.tscn" id="4_dxrkv"] +[ext_resource type="PackedScene" uid="uid://d34nh3lc1gpb" path="res://menu/ingame/pause_screen.tscn" id="2_h7iqs"] +[ext_resource type="PackedScene" uid="uid://duxm8n62j2qt6" path="res://menu/ingame/game_over_screen.tscn" id="4_4fuuu"] +[ext_resource type="PackedScene" uid="uid://bdcs2ff85qjs4" path="res://menu/ingame/victory_screen.tscn" id="4_dxrkv"] [ext_resource type="PackedScene" uid="uid://ggf76ayl53bb" path="res://game/world/generators/world_generator.tscn" id="5_dxrkv"] [node name="Game" type="Node2D"] diff --git a/menu/credits.gd b/menu/common/credits.gd similarity index 100% rename from menu/credits.gd rename to menu/common/credits.gd diff --git a/menu/credits.gd.uid b/menu/common/credits.gd.uid similarity index 100% rename from menu/credits.gd.uid rename to menu/common/credits.gd.uid diff --git a/menu/credits.tscn b/menu/common/credits.tscn similarity index 97% rename from menu/credits.tscn rename to menu/common/credits.tscn index 7a7dd56..a0fda20 100644 --- a/menu/credits.tscn +++ b/menu/common/credits.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://c3q3g2647qc27"] -[ext_resource type="Script" uid="uid://dclkpithyykju" path="res://menu/credits.gd" id="1_wp78b"] +[ext_resource type="Script" uid="uid://dclkpithyykju" path="res://menu/common/credits.gd" id="1_wp78b"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_nidem"] [ext_resource type="Theme" uid="uid://cigren10ijb75" path="res://images/label.tres" id="3_x2hwc"] diff --git a/menu/options.gd b/menu/common/options.gd similarity index 100% rename from menu/options.gd rename to menu/common/options.gd diff --git a/menu/options.gd.uid b/menu/common/options.gd.uid similarity index 100% rename from menu/options.gd.uid rename to menu/common/options.gd.uid diff --git a/menu/options.tscn b/menu/common/options.tscn similarity index 98% rename from menu/options.tscn rename to menu/common/options.tscn index 6c45924..52e660d 100644 --- a/menu/options.tscn +++ b/menu/common/options.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://btr60idiit4y7"] -[ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://menu/options.gd" id="1_61pji"] +[ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://menu/common/options.gd" id="1_61pji"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_1tdpy"] [sub_resource type="InputEventAction" id="InputEventAction_61pji"] diff --git a/menu/game_over_screen.gd b/menu/ingame/game_over_screen.gd similarity index 100% rename from menu/game_over_screen.gd rename to menu/ingame/game_over_screen.gd diff --git a/menu/game_over_screen.gd.uid b/menu/ingame/game_over_screen.gd.uid similarity index 100% rename from menu/game_over_screen.gd.uid rename to menu/ingame/game_over_screen.gd.uid diff --git a/menu/game_over_screen.tscn b/menu/ingame/game_over_screen.tscn similarity index 96% rename from menu/game_over_screen.tscn rename to menu/ingame/game_over_screen.tscn index 392fea7..477c8bb 100644 --- a/menu/game_over_screen.tscn +++ b/menu/ingame/game_over_screen.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://duxm8n62j2qt6"] -[ext_resource type="Script" uid="uid://bkj8s7588e1ho" path="res://menu/game_over_screen.gd" id="1_rkkr6"] +[ext_resource type="Script" uid="uid://bkj8s7588e1ho" path="res://menu/ingame/game_over_screen.gd" id="1_rkkr6"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_uh3ar"] [node name="GameOverScreen" type="Control"] diff --git a/menu/pause_menu.gd b/menu/ingame/pause_menu.gd similarity index 100% rename from menu/pause_menu.gd rename to menu/ingame/pause_menu.gd diff --git a/menu/pause_menu.gd.uid b/menu/ingame/pause_menu.gd.uid similarity index 100% rename from menu/pause_menu.gd.uid rename to menu/ingame/pause_menu.gd.uid diff --git a/menu/pause_menu.tscn b/menu/ingame/pause_menu.tscn similarity index 97% rename from menu/pause_menu.tscn rename to menu/ingame/pause_menu.tscn index a254399..e94c5cd 100644 --- a/menu/pause_menu.tscn +++ b/menu/ingame/pause_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://bclo2wl8ibrcg"] -[ext_resource type="Script" uid="uid://npqs2m5g5bd6" path="res://menu/pause_menu.gd" id="1_inj1j"] +[ext_resource type="Script" uid="uid://npqs2m5g5bd6" path="res://menu/ingame/pause_menu.gd" id="1_inj1j"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_vy7sn"] [sub_resource type="Shortcut" id="Shortcut_lgp46"] diff --git a/menu/pause_screen.gd b/menu/ingame/pause_screen.gd similarity index 100% rename from menu/pause_screen.gd rename to menu/ingame/pause_screen.gd diff --git a/menu/pause_screen.gd.uid b/menu/ingame/pause_screen.gd.uid similarity index 100% rename from menu/pause_screen.gd.uid rename to menu/ingame/pause_screen.gd.uid diff --git a/menu/pause_screen.tscn b/menu/ingame/pause_screen.tscn similarity index 87% rename from menu/pause_screen.tscn rename to menu/ingame/pause_screen.tscn index b07a464..d045ed2 100644 --- a/menu/pause_screen.tscn +++ b/menu/ingame/pause_screen.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://d34nh3lc1gpb"] -[ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://menu/pause_screen.gd" id="1_fe1q8"] -[ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://menu/pause_menu.tscn" id="2_4r6ly"] -[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://menu/options.tscn" id="3_3gwb3"] -[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://menu/credits.tscn" id="4_jph5s"] +[ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://menu/ingame/pause_screen.gd" id="1_fe1q8"] +[ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://menu/ingame/pause_menu.tscn" id="2_4r6ly"] +[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://menu/common/options.tscn" id="3_3gwb3"] +[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://menu/common/credits.tscn" id="4_jph5s"] [node name="PauseScreen" type="Control"] layout_mode = 3 diff --git a/menu/victory_screen.gd b/menu/ingame/victory_screen.gd similarity index 100% rename from menu/victory_screen.gd rename to menu/ingame/victory_screen.gd diff --git a/menu/victory_screen.gd.uid b/menu/ingame/victory_screen.gd.uid similarity index 100% rename from menu/victory_screen.gd.uid rename to menu/ingame/victory_screen.gd.uid diff --git a/menu/victory_screen.tscn b/menu/ingame/victory_screen.tscn similarity index 96% rename from menu/victory_screen.tscn rename to menu/ingame/victory_screen.tscn index b849ce0..5b2b7ba 100644 --- a/menu/victory_screen.tscn +++ b/menu/ingame/victory_screen.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bdcs2ff85qjs4"] -[ext_resource type="Script" uid="uid://b0p1ewlw18ijg" path="res://menu/victory_screen.gd" id="1_asigk"] +[ext_resource type="Script" uid="uid://b0p1ewlw18ijg" path="res://menu/ingame/victory_screen.gd" id="1_asigk"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_wb4d8"] [node name="VictoryScreen" type="Control"] diff --git a/menu/main_menu.gd b/menu/main/main_menu.gd similarity index 100% rename from menu/main_menu.gd rename to menu/main/main_menu.gd diff --git a/menu/main_menu.gd.uid b/menu/main/main_menu.gd.uid similarity index 100% rename from menu/main_menu.gd.uid rename to menu/main/main_menu.gd.uid diff --git a/menu/main_menu.tscn b/menu/main/main_menu.tscn similarity index 97% rename from menu/main_menu.tscn rename to menu/main/main_menu.tscn index 3cdd7fd..2eff162 100644 --- a/menu/main_menu.tscn +++ b/menu/main/main_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bxlccevt52y70"] -[ext_resource type="Script" uid="uid://dixdfabe2vfsj" path="res://menu/main_menu.gd" id="1_chmv6"] +[ext_resource type="Script" uid="uid://dixdfabe2vfsj" path="res://menu/main/main_menu.gd" id="1_chmv6"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_f5okj"] [node name="MainMenu" type="Control"] diff --git a/menu/seed_selection_menu.gd b/menu/main/seed_selection_menu.gd similarity index 100% rename from menu/seed_selection_menu.gd rename to menu/main/seed_selection_menu.gd diff --git a/menu/seed_selection_menu.gd.uid b/menu/main/seed_selection_menu.gd.uid similarity index 100% rename from menu/seed_selection_menu.gd.uid rename to menu/main/seed_selection_menu.gd.uid diff --git a/menu/seed_selection_menu.tscn b/menu/main/seed_selection_menu.tscn similarity index 98% rename from menu/seed_selection_menu.tscn rename to menu/main/seed_selection_menu.tscn index 56385de..cd7e2ee 100644 --- a/menu/seed_selection_menu.tscn +++ b/menu/main/seed_selection_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://c36n317rhv8k7"] -[ext_resource type="Script" uid="uid://dyynshvsgnepp" path="res://menu/seed_selection_menu.gd" id="1_g2smo"] +[ext_resource type="Script" uid="uid://dyynshvsgnepp" path="res://menu/main/seed_selection_menu.gd" id="1_g2smo"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_s4s14"] [sub_resource type="InputEventAction" id="InputEventAction_g2smo"] diff --git a/menu/title_screen.gd b/menu/main/title_screen.gd similarity index 100% rename from menu/title_screen.gd rename to menu/main/title_screen.gd diff --git a/menu/title_screen.gd.uid b/menu/main/title_screen.gd.uid similarity index 100% rename from menu/title_screen.gd.uid rename to menu/main/title_screen.gd.uid diff --git a/menu/title_screen.tscn b/menu/main/title_screen.tscn similarity index 88% rename from menu/title_screen.tscn rename to menu/main/title_screen.tscn index 092e495..7031db3 100644 --- a/menu/title_screen.tscn +++ b/menu/main/title_screen.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=7 format=3 uid="uid://2oavbr7oaihg"] -[ext_resource type="Script" uid="uid://bqnepsuk13qo8" path="res://menu/title_screen.gd" id="1_lxdol"] -[ext_resource type="PackedScene" uid="uid://bxlccevt52y70" path="res://menu/main_menu.tscn" id="2_o0rbc"] -[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://menu/options.tscn" id="3_88gnj"] -[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://menu/credits.tscn" id="4_w1y3c"] +[ext_resource type="Script" uid="uid://bqnepsuk13qo8" path="res://menu/main/title_screen.gd" id="1_lxdol"] +[ext_resource type="PackedScene" uid="uid://bxlccevt52y70" path="res://menu/main/main_menu.tscn" id="2_o0rbc"] +[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://menu/common/options.tscn" id="3_88gnj"] +[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://menu/common/credits.tscn" id="4_w1y3c"] [ext_resource type="PackedScene" uid="uid://chdrjc7c6bdpb" path="res://game/background.tscn" id="5_88gnj"] -[ext_resource type="PackedScene" uid="uid://c36n317rhv8k7" path="res://menu/seed_selection_menu.tscn" id="5_w1y3c"] +[ext_resource type="PackedScene" uid="uid://c36n317rhv8k7" path="res://menu/main/seed_selection_menu.tscn" id="5_w1y3c"] [node name="TitleScreen" type="Control"] layout_mode = 3