From e2f9f75c4f0ab38a335217c31d4d45636ce9ff4a Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Fri, 26 Dec 2025 16:12:46 +0300 Subject: [PATCH] Some code organization --- game/entities/world/game.gd | 5 ++-- game/entities/world/game.tscn | 6 ++--- .../{ingame => game_over}/game_over_screen.gd | 0 .../game_over_screen.gd.uid | 0 .../game_over_screen.tscn | 2 +- .../{ingame => game_over}/victory_screen.gd | 0 .../victory_screen.gd.uid | 0 .../{ingame => game_over}/victory_screen.tscn | 2 +- game/menu/{common => main}/credits.gd | 0 game/menu/{common => main}/credits.gd.uid | 0 game/menu/{common => main}/credits.tscn | 2 +- game/menu/main/title_screen.tscn | 4 ++-- game/{area_map => menu/map}/area_map.gd | 24 +++++++++---------- game/{area_map => menu/map}/area_map.gd.uid | 0 game/{area_map => menu/map}/area_map.tscn | 6 ++--- game/menu/map/map.gd | 1 + game/menu/map/map.gd.uid | 1 + game/menu/map/map.tscn | 6 +++++ .../absctact_passage_indicator.gd | 0 .../absctact_passage_indicator.gd.uid | 0 .../absctact_passage_indicator.tscn | 2 +- .../abstract_sector_indicator.gd | 0 .../abstract_sector_indicator.gd.uid | 0 .../abstract_sector_indicator.tscn | 2 +- .../current_sector_indicator.gd | 0 .../current_sector_indicator.gd.uid | 0 .../current_sector_indicator.tscn | 2 +- .../minus_26_grad_passage_indicator.tscn | 2 +- .../minus_45_grad_passage_indicator.tscn | 2 +- .../plus_26_grad_passage_indicator.tscn | 2 +- .../plus_45_grad_passage_indicator.tscn | 2 +- .../passages/zero_grad_passage_indicator.tscn | 2 +- .../sectors/boss_sector_indicator.tscn | 2 +- .../sectors/debris_sector_indicator.tscn | 2 +- .../sectors/repair_sector_indicator.tscn | 2 +- .../sectors/shop_sector_indicator.tscn | 2 +- .../sectors/start_sector_indicator.tscn | 2 +- .../selected_sector_indicator.gd | 0 .../selected_sector_indicator.gd.uid | 0 .../selected_sector_indicator.tscn | 2 +- game/menu/{common => options}/options.gd | 0 game/menu/{common => options}/options.gd.uid | 0 game/menu/{common => options}/options.tscn | 2 +- game/menu/{ingame => pause}/pause_menu.gd | 0 game/menu/{ingame => pause}/pause_menu.gd.uid | 0 game/menu/{ingame => pause}/pause_menu.tscn | 2 +- game/menu/{ingame => pause}/pause_screen.gd | 0 .../{ingame => pause}/pause_screen.gd.uid | 0 game/menu/{ingame => pause}/pause_screen.tscn | 6 ++--- .../weapon_selection_screen.gd | 2 +- .../weapon_selection_screen.gd.uid | 0 .../weapon_selection_screen.tscn | 2 +- .../weapon_selector.gd | 0 .../weapon_selector.gd.uid | 0 .../weapon_selector.tscn | 2 +- 55 files changed, 56 insertions(+), 47 deletions(-) rename game/menu/{ingame => game_over}/game_over_screen.gd (100%) rename game/menu/{ingame => game_over}/game_over_screen.gd.uid (100%) rename game/menu/{ingame => game_over}/game_over_screen.tscn (96%) rename game/menu/{ingame => game_over}/victory_screen.gd (100%) rename game/menu/{ingame => game_over}/victory_screen.gd.uid (100%) rename game/menu/{ingame => game_over}/victory_screen.tscn (96%) rename game/menu/{common => main}/credits.gd (100%) rename game/menu/{common => main}/credits.gd.uid (100%) rename game/menu/{common => main}/credits.tscn (97%) rename game/{area_map => menu/map}/area_map.gd (89%) rename game/{area_map => menu/map}/area_map.gd.uid (100%) rename game/{area_map => menu/map}/area_map.tscn (82%) create mode 100644 game/menu/map/map.gd create mode 100644 game/menu/map/map.gd.uid create mode 100644 game/menu/map/map.tscn rename game/{area_map/indicators => menu/map_indicators}/absctact_passage_indicator.gd (100%) rename game/{area_map/indicators => menu/map_indicators}/absctact_passage_indicator.gd.uid (100%) rename game/{area_map/indicators => menu/map_indicators}/absctact_passage_indicator.tscn (83%) rename game/{area_map/indicators => menu/map_indicators}/abstract_sector_indicator.gd (100%) rename game/{area_map/indicators => menu/map_indicators}/abstract_sector_indicator.gd.uid (100%) rename game/{area_map/indicators => menu/map_indicators}/abstract_sector_indicator.tscn (83%) rename game/{area_map/indicators => menu/map_indicators}/current_sector_indicator.gd (100%) rename game/{area_map/indicators => menu/map_indicators}/current_sector_indicator.gd.uid (100%) rename game/{area_map/indicators => menu/map_indicators}/current_sector_indicator.tscn (97%) rename game/{area_map/indicators => menu/map_indicators}/passages/minus_26_grad_passage_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/passages/minus_45_grad_passage_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/passages/plus_26_grad_passage_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/passages/plus_45_grad_passage_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/passages/zero_grad_passage_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/sectors/boss_sector_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/sectors/debris_sector_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/sectors/repair_sector_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/sectors/shop_sector_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/sectors/start_sector_indicator.tscn (92%) rename game/{area_map/indicators => menu/map_indicators}/selected_sector_indicator.gd (100%) rename game/{area_map/indicators => menu/map_indicators}/selected_sector_indicator.gd.uid (100%) rename game/{area_map/indicators => menu/map_indicators}/selected_sector_indicator.tscn (97%) rename game/menu/{common => options}/options.gd (100%) rename game/menu/{common => options}/options.gd.uid (100%) rename game/menu/{common => options}/options.tscn (99%) rename game/menu/{ingame => pause}/pause_menu.gd (100%) rename game/menu/{ingame => pause}/pause_menu.gd.uid (100%) rename game/menu/{ingame => pause}/pause_menu.tscn (97%) rename game/menu/{ingame => pause}/pause_screen.gd (100%) rename game/menu/{ingame => pause}/pause_screen.gd.uid (100%) rename game/menu/{ingame => pause}/pause_screen.tscn (87%) rename game/menu/{ingame => weapon_selection}/weapon_selection_screen.gd (94%) rename game/menu/{ingame => weapon_selection}/weapon_selection_screen.gd.uid (100%) rename game/menu/{ingame => weapon_selection}/weapon_selection_screen.tscn (94%) rename game/menu/{ingame => weapon_selection}/weapon_selector.gd (100%) rename game/menu/{ingame => weapon_selection}/weapon_selector.gd.uid (100%) rename game/menu/{ingame => weapon_selection}/weapon_selector.tscn (96%) diff --git a/game/entities/world/game.gd b/game/entities/world/game.gd index 03021db..cc80441 100644 --- a/game/entities/world/game.gd +++ b/game/entities/world/game.gd @@ -3,8 +3,9 @@ extends Node const PASSAGE = preload("res://game/entities/world/passage.tscn") -const AREA_MAP = preload("res://game/area_map/area_map.tscn") -const WEAPON_SELECTION_SCREEN = preload("res://game/menu/ingame/weapon_selection_screen.tscn") +const AREA_MAP = preload("res://game/menu/map/area_map.tscn") +const WEAPON_SELECTION_SCREEN = \ + preload("res://game/menu/weapon_selection/weapon_selection_screen.tscn") var world_data : WorldData diff --git a/game/entities/world/game.tscn b/game/entities/world/game.tscn index ba0bd02..ee84ce3 100644 --- a/game/entities/world/game.tscn +++ b/game/entities/world/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/entities/world/game.gd" id="1_l1rk1"] -[ext_resource type="PackedScene" uid="uid://d34nh3lc1gpb" path="res://game/menu/ingame/pause_screen.tscn" id="2_h7iqs"] -[ext_resource type="PackedScene" uid="uid://duxm8n62j2qt6" path="res://game/menu/ingame/game_over_screen.tscn" id="4_4fuuu"] -[ext_resource type="PackedScene" uid="uid://bdcs2ff85qjs4" path="res://game/menu/ingame/victory_screen.tscn" id="4_dxrkv"] +[ext_resource type="PackedScene" uid="uid://d34nh3lc1gpb" path="res://game/menu/pause/pause_screen.tscn" id="2_h7iqs"] +[ext_resource type="PackedScene" uid="uid://duxm8n62j2qt6" path="res://game/menu/game_over/game_over_screen.tscn" id="4_4fuuu"] +[ext_resource type="PackedScene" uid="uid://bdcs2ff85qjs4" path="res://game/menu/game_over/victory_screen.tscn" id="4_dxrkv"] [ext_resource type="PackedScene" uid="uid://ggf76ayl53bb" path="res://game/generators/world_generator.tscn" id="5_dxrkv"] [node name="Game" type="Node2D"] diff --git a/game/menu/ingame/game_over_screen.gd b/game/menu/game_over/game_over_screen.gd similarity index 100% rename from game/menu/ingame/game_over_screen.gd rename to game/menu/game_over/game_over_screen.gd diff --git a/game/menu/ingame/game_over_screen.gd.uid b/game/menu/game_over/game_over_screen.gd.uid similarity index 100% rename from game/menu/ingame/game_over_screen.gd.uid rename to game/menu/game_over/game_over_screen.gd.uid diff --git a/game/menu/ingame/game_over_screen.tscn b/game/menu/game_over/game_over_screen.tscn similarity index 96% rename from game/menu/ingame/game_over_screen.tscn rename to game/menu/game_over/game_over_screen.tscn index 195ab3b..c27e289 100644 --- a/game/menu/ingame/game_over_screen.tscn +++ b/game/menu/game_over/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://game/menu/ingame/game_over_screen.gd" id="1_rkkr6"] +[ext_resource type="Script" uid="uid://bkj8s7588e1ho" path="res://game/menu/game_over/game_over_screen.gd" id="1_rkkr6"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_uh3ar"] [node name="GameOverScreen" type="Control"] diff --git a/game/menu/ingame/victory_screen.gd b/game/menu/game_over/victory_screen.gd similarity index 100% rename from game/menu/ingame/victory_screen.gd rename to game/menu/game_over/victory_screen.gd diff --git a/game/menu/ingame/victory_screen.gd.uid b/game/menu/game_over/victory_screen.gd.uid similarity index 100% rename from game/menu/ingame/victory_screen.gd.uid rename to game/menu/game_over/victory_screen.gd.uid diff --git a/game/menu/ingame/victory_screen.tscn b/game/menu/game_over/victory_screen.tscn similarity index 96% rename from game/menu/ingame/victory_screen.tscn rename to game/menu/game_over/victory_screen.tscn index 0a70082..3a7d48a 100644 --- a/game/menu/ingame/victory_screen.tscn +++ b/game/menu/game_over/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://game/menu/ingame/victory_screen.gd" id="1_asigk"] +[ext_resource type="Script" uid="uid://b0p1ewlw18ijg" path="res://game/menu/game_over/victory_screen.gd" id="1_asigk"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_wb4d8"] [node name="VictoryScreen" type="Control"] diff --git a/game/menu/common/credits.gd b/game/menu/main/credits.gd similarity index 100% rename from game/menu/common/credits.gd rename to game/menu/main/credits.gd diff --git a/game/menu/common/credits.gd.uid b/game/menu/main/credits.gd.uid similarity index 100% rename from game/menu/common/credits.gd.uid rename to game/menu/main/credits.gd.uid diff --git a/game/menu/common/credits.tscn b/game/menu/main/credits.tscn similarity index 97% rename from game/menu/common/credits.tscn rename to game/menu/main/credits.tscn index 6872905..3a6f396 100644 --- a/game/menu/common/credits.tscn +++ b/game/menu/main/credits.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://c3q3g2647qc27"] -[ext_resource type="Script" uid="uid://dclkpithyykju" path="res://game/menu/common/credits.gd" id="1_wp78b"] +[ext_resource type="Script" uid="uid://dclkpithyykju" path="res://game/menu/main/credits.gd" id="1_wp78b"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_nidem"] [sub_resource type="InputEventAction" id="InputEventAction_wp78b"] diff --git a/game/menu/main/title_screen.tscn b/game/menu/main/title_screen.tscn index 1a97412..7530924 100644 --- a/game/menu/main/title_screen.tscn +++ b/game/menu/main/title_screen.tscn @@ -3,8 +3,8 @@ [ext_resource type="Script" uid="uid://bqnepsuk13qo8" path="res://game/menu/main/title_screen.gd" id="1_lxdol"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_4xt7k"] [ext_resource type="PackedScene" uid="uid://bxlccevt52y70" path="res://game/menu/main/main_menu.tscn" id="2_o0rbc"] -[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/common/options.tscn" id="3_88gnj"] -[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://game/menu/common/credits.tscn" id="4_w1y3c"] +[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/options/options.tscn" id="3_88gnj"] +[ext_resource type="PackedScene" uid="uid://c3q3g2647qc27" path="res://game/menu/main/credits.tscn" id="4_w1y3c"] [ext_resource type="PackedScene" uid="uid://chdrjc7c6bdpb" path="res://game/entities/world/background.tscn" id="5_88gnj"] [ext_resource type="PackedScene" uid="uid://c36n317rhv8k7" path="res://game/menu/main/seed_selection_menu.tscn" id="5_w1y3c"] diff --git a/game/area_map/area_map.gd b/game/menu/map/area_map.gd similarity index 89% rename from game/area_map/area_map.gd rename to game/menu/map/area_map.gd index 3a92d03..89b36d8 100644 --- a/game/area_map/area_map.gd +++ b/game/menu/map/area_map.gd @@ -29,33 +29,33 @@ const CURRENT_SECTOR_INDICATOR_OFFSET = Vector2(0, 16) const SECTOR_SCENES : Dictionary[SectorData.SectorType, PackedScene] = { SectorData.SectorType.ShopSector: - preload("res://game/area_map/indicators/sectors/shop_sector_indicator.tscn"), + preload("res://game/menu/map_indicators/sectors/shop_sector_indicator.tscn"), SectorData.SectorType.RepairSector: - preload("res://game/area_map/indicators/sectors/repair_sector_indicator.tscn"), + preload("res://game/menu/map_indicators/sectors/repair_sector_indicator.tscn"), SectorData.SectorType.DebrisSector: - preload("res://game/area_map/indicators/sectors/debris_sector_indicator.tscn"), + preload("res://game/menu/map_indicators/sectors/debris_sector_indicator.tscn"), SectorData.SectorType.StartSector: - preload("res://game/area_map/indicators/sectors/start_sector_indicator.tscn"), + preload("res://game/menu/map_indicators/sectors/start_sector_indicator.tscn"), SectorData.SectorType.BossSector: - preload("res://game/area_map/indicators/sectors/boss_sector_indicator.tscn"), + preload("res://game/menu/map_indicators/sectors/boss_sector_indicator.tscn"), } const PASSAGE_SCENES : Dictionary[PassageData.PassageType, PackedScene] = { PassageData.PassageType.Minus45Grad: - preload("res://game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn"), + preload("res://game/menu/map_indicators/passages/minus_45_grad_passage_indicator.tscn"), PassageData.PassageType.Minus26Grad: - preload("res://game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn"), + preload("res://game/menu/map_indicators/passages/minus_26_grad_passage_indicator.tscn"), PassageData.PassageType.ZeroGrad: - preload("res://game/area_map/indicators/passages/zero_grad_passage_indicator.tscn"), + preload("res://game/menu/map_indicators/passages/zero_grad_passage_indicator.tscn"), PassageData.PassageType.Plus26Grad: - preload("res://game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn"), + preload("res://game/menu/map_indicators/passages/plus_26_grad_passage_indicator.tscn"), PassageData.PassageType.Plus45Grad: - preload("res://game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn"), + preload("res://game/menu/map_indicators/passages/plus_45_grad_passage_indicator.tscn"), } const CURRENT_SECTOR_INDICATOR = \ - preload("res://game/area_map/indicators/current_sector_indicator.tscn") + preload("res://game/menu/map_indicators/current_sector_indicator.tscn") const SELECTED_SECTOR_INDICATOR = \ - preload("res://game/area_map/indicators/selected_sector_indicator.tscn") + preload("res://game/menu/map_indicators/selected_sector_indicator.tscn") var area_data : AreaData = null: diff --git a/game/area_map/area_map.gd.uid b/game/menu/map/area_map.gd.uid similarity index 100% rename from game/area_map/area_map.gd.uid rename to game/menu/map/area_map.gd.uid diff --git a/game/area_map/area_map.tscn b/game/menu/map/area_map.tscn similarity index 82% rename from game/area_map/area_map.tscn rename to game/menu/map/area_map.tscn index 92b1e57..998e465 100644 --- a/game/area_map/area_map.tscn +++ b/game/menu/map/area_map.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://dqkp7nlhnb7sh"] -[ext_resource type="Script" uid="uid://bk8qn34w5cqmj" path="res://game/area_map/area_map.gd" id="1_hkcry"] -[ext_resource type="PackedScene" uid="uid://b8qwok6v44la" path="res://game/area_map/indicators/current_sector_indicator.tscn" id="2_fx4fd"] -[ext_resource type="PackedScene" uid="uid://bwru7i7xetjth" path="res://game/area_map/indicators/selected_sector_indicator.tscn" id="3_oxnrh"] +[ext_resource type="Script" uid="uid://bk8qn34w5cqmj" path="res://game/menu/map/area_map.gd" id="1_hkcry"] +[ext_resource type="PackedScene" uid="uid://b8qwok6v44la" path="res://game/menu/map_indicators/current_sector_indicator.tscn" id="2_fx4fd"] +[ext_resource type="PackedScene" uid="uid://bwru7i7xetjth" path="res://game/menu/map_indicators/selected_sector_indicator.tscn" id="3_oxnrh"] [ext_resource type="PackedScene" uid="uid://chdrjc7c6bdpb" path="res://game/entities/world/background.tscn" id="4_fx4fd"] [node name="AreaMap" type="Node2D"] diff --git a/game/menu/map/map.gd b/game/menu/map/map.gd new file mode 100644 index 0000000..61510e1 --- /dev/null +++ b/game/menu/map/map.gd @@ -0,0 +1 @@ +extends Node diff --git a/game/menu/map/map.gd.uid b/game/menu/map/map.gd.uid new file mode 100644 index 0000000..b460d74 --- /dev/null +++ b/game/menu/map/map.gd.uid @@ -0,0 +1 @@ +uid://bittd8vdqbd8r diff --git a/game/menu/map/map.tscn b/game/menu/map/map.tscn new file mode 100644 index 0000000..0f4f075 --- /dev/null +++ b/game/menu/map/map.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3 uid="uid://ceto4kvp5mr1r"] + +[ext_resource type="Script" uid="uid://bittd8vdqbd8r" path="res://game/menu/map/map.gd" id="1_cjemo"] + +[node name="Map" type="Node"] +script = ExtResource("1_cjemo") diff --git a/game/area_map/indicators/absctact_passage_indicator.gd b/game/menu/map_indicators/absctact_passage_indicator.gd similarity index 100% rename from game/area_map/indicators/absctact_passage_indicator.gd rename to game/menu/map_indicators/absctact_passage_indicator.gd diff --git a/game/area_map/indicators/absctact_passage_indicator.gd.uid b/game/menu/map_indicators/absctact_passage_indicator.gd.uid similarity index 100% rename from game/area_map/indicators/absctact_passage_indicator.gd.uid rename to game/menu/map_indicators/absctact_passage_indicator.gd.uid diff --git a/game/area_map/indicators/absctact_passage_indicator.tscn b/game/menu/map_indicators/absctact_passage_indicator.tscn similarity index 83% rename from game/area_map/indicators/absctact_passage_indicator.tscn rename to game/menu/map_indicators/absctact_passage_indicator.tscn index 8a1c40e..626c0bd 100644 --- a/game/area_map/indicators/absctact_passage_indicator.tscn +++ b/game/menu/map_indicators/absctact_passage_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://b03vje74ld8ms"] -[ext_resource type="Script" uid="uid://d1043b8skqr0j" path="res://game/area_map/indicators/absctact_passage_indicator.gd" id="1_c886g"] +[ext_resource type="Script" uid="uid://d1043b8skqr0j" path="res://game/menu/map_indicators/absctact_passage_indicator.gd" id="1_c886g"] [node name="AbsctactPassageIndicator" type="Node2D"] script = ExtResource("1_c886g") diff --git a/game/area_map/indicators/abstract_sector_indicator.gd b/game/menu/map_indicators/abstract_sector_indicator.gd similarity index 100% rename from game/area_map/indicators/abstract_sector_indicator.gd rename to game/menu/map_indicators/abstract_sector_indicator.gd diff --git a/game/area_map/indicators/abstract_sector_indicator.gd.uid b/game/menu/map_indicators/abstract_sector_indicator.gd.uid similarity index 100% rename from game/area_map/indicators/abstract_sector_indicator.gd.uid rename to game/menu/map_indicators/abstract_sector_indicator.gd.uid diff --git a/game/area_map/indicators/abstract_sector_indicator.tscn b/game/menu/map_indicators/abstract_sector_indicator.tscn similarity index 83% rename from game/area_map/indicators/abstract_sector_indicator.tscn rename to game/menu/map_indicators/abstract_sector_indicator.tscn index c38bb16..6b988dc 100644 --- a/game/area_map/indicators/abstract_sector_indicator.tscn +++ b/game/menu/map_indicators/abstract_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bofxdki5oelxe"] -[ext_resource type="Script" uid="uid://br68v5vl7vyd6" path="res://game/area_map/indicators/abstract_sector_indicator.gd" id="1_mp2r3"] +[ext_resource type="Script" uid="uid://br68v5vl7vyd6" path="res://game/menu/map_indicators/abstract_sector_indicator.gd" id="1_mp2r3"] [node name="AbstractSectorIndicator" type="Node2D"] script = ExtResource("1_mp2r3") diff --git a/game/area_map/indicators/current_sector_indicator.gd b/game/menu/map_indicators/current_sector_indicator.gd similarity index 100% rename from game/area_map/indicators/current_sector_indicator.gd rename to game/menu/map_indicators/current_sector_indicator.gd diff --git a/game/area_map/indicators/current_sector_indicator.gd.uid b/game/menu/map_indicators/current_sector_indicator.gd.uid similarity index 100% rename from game/area_map/indicators/current_sector_indicator.gd.uid rename to game/menu/map_indicators/current_sector_indicator.gd.uid diff --git a/game/area_map/indicators/current_sector_indicator.tscn b/game/menu/map_indicators/current_sector_indicator.tscn similarity index 97% rename from game/area_map/indicators/current_sector_indicator.tscn rename to game/menu/map_indicators/current_sector_indicator.tscn index cd45171..a6b6af8 100644 --- a/game/area_map/indicators/current_sector_indicator.tscn +++ b/game/menu/map_indicators/current_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=12 format=3 uid="uid://b8qwok6v44la"] -[ext_resource type="Script" uid="uid://yf2bef674enx" path="res://game/area_map/indicators/current_sector_indicator.gd" id="1_7irmv"] +[ext_resource type="Script" uid="uid://yf2bef674enx" path="res://game/menu/map_indicators/current_sector_indicator.gd" id="1_7irmv"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_l75qw"] [sub_resource type="AtlasTexture" id="AtlasTexture_uvh02"] diff --git a/game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn b/game/menu/map_indicators/passages/minus_26_grad_passage_indicator.tscn similarity index 92% rename from game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn rename to game/menu/map_indicators/passages/minus_26_grad_passage_indicator.tscn index acb845f..ed98b9b 100644 --- a/game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn +++ b/game/menu/map_indicators/passages/minus_26_grad_passage_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://befadmr5b8mij"] -[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_6yx0l"] +[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/menu/map_indicators/absctact_passage_indicator.tscn" id="1_6yx0l"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_ihw22"] [sub_resource type="AtlasTexture" id="AtlasTexture_dencp"] diff --git a/game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn b/game/menu/map_indicators/passages/minus_45_grad_passage_indicator.tscn similarity index 92% rename from game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn rename to game/menu/map_indicators/passages/minus_45_grad_passage_indicator.tscn index ccb5129..854890f 100644 --- a/game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn +++ b/game/menu/map_indicators/passages/minus_45_grad_passage_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://6wh5paopwa6m"] -[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_ejr0u"] +[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/menu/map_indicators/absctact_passage_indicator.tscn" id="1_ejr0u"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_o52wh"] [sub_resource type="AtlasTexture" id="AtlasTexture_auxhg"] diff --git a/game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn b/game/menu/map_indicators/passages/plus_26_grad_passage_indicator.tscn similarity index 92% rename from game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn rename to game/menu/map_indicators/passages/plus_26_grad_passage_indicator.tscn index cb09df4..6a77849 100644 --- a/game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn +++ b/game/menu/map_indicators/passages/plus_26_grad_passage_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://chtid8advqc7c"] -[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_ke7h2"] +[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/menu/map_indicators/absctact_passage_indicator.tscn" id="1_ke7h2"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_ugcaf"] [sub_resource type="AtlasTexture" id="AtlasTexture_o7a4k"] diff --git a/game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn b/game/menu/map_indicators/passages/plus_45_grad_passage_indicator.tscn similarity index 92% rename from game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn rename to game/menu/map_indicators/passages/plus_45_grad_passage_indicator.tscn index d02ea15..d859dfa 100644 --- a/game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn +++ b/game/menu/map_indicators/passages/plus_45_grad_passage_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://dv68sytyj5bd3"] -[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_nk4h4"] +[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/menu/map_indicators/absctact_passage_indicator.tscn" id="1_nk4h4"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_qtofm"] [sub_resource type="AtlasTexture" id="AtlasTexture_1wcf5"] diff --git a/game/area_map/indicators/passages/zero_grad_passage_indicator.tscn b/game/menu/map_indicators/passages/zero_grad_passage_indicator.tscn similarity index 92% rename from game/area_map/indicators/passages/zero_grad_passage_indicator.tscn rename to game/menu/map_indicators/passages/zero_grad_passage_indicator.tscn index 8881ab7..2e1734e 100644 --- a/game/area_map/indicators/passages/zero_grad_passage_indicator.tscn +++ b/game/menu/map_indicators/passages/zero_grad_passage_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://d24hqpbq2yqfn"] -[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_q65pt"] +[ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/menu/map_indicators/absctact_passage_indicator.tscn" id="1_q65pt"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_4t74o"] [sub_resource type="AtlasTexture" id="AtlasTexture_f73ej"] diff --git a/game/area_map/indicators/sectors/boss_sector_indicator.tscn b/game/menu/map_indicators/sectors/boss_sector_indicator.tscn similarity index 92% rename from game/area_map/indicators/sectors/boss_sector_indicator.tscn rename to game/menu/map_indicators/sectors/boss_sector_indicator.tscn index cb828a5..ac4be32 100644 --- a/game/area_map/indicators/sectors/boss_sector_indicator.tscn +++ b/game/menu/map_indicators/sectors/boss_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://cf5487fdaju3h"] -[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_qx624"] +[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/menu/map_indicators/abstract_sector_indicator.tscn" id="1_qx624"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_t7m7p"] [sub_resource type="AtlasTexture" id="AtlasTexture_qx624"] diff --git a/game/area_map/indicators/sectors/debris_sector_indicator.tscn b/game/menu/map_indicators/sectors/debris_sector_indicator.tscn similarity index 92% rename from game/area_map/indicators/sectors/debris_sector_indicator.tscn rename to game/menu/map_indicators/sectors/debris_sector_indicator.tscn index 5a2ee04..3480f71 100644 --- a/game/area_map/indicators/sectors/debris_sector_indicator.tscn +++ b/game/menu/map_indicators/sectors/debris_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://dysw7f3fxxdgg"] -[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_1il3o"] +[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/menu/map_indicators/abstract_sector_indicator.tscn" id="1_1il3o"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_yiddm"] [sub_resource type="AtlasTexture" id="AtlasTexture_1il3o"] diff --git a/game/area_map/indicators/sectors/repair_sector_indicator.tscn b/game/menu/map_indicators/sectors/repair_sector_indicator.tscn similarity index 92% rename from game/area_map/indicators/sectors/repair_sector_indicator.tscn rename to game/menu/map_indicators/sectors/repair_sector_indicator.tscn index e0fd8aa..af6b3c5 100644 --- a/game/area_map/indicators/sectors/repair_sector_indicator.tscn +++ b/game/menu/map_indicators/sectors/repair_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://c7d6jylti6bea"] -[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_5phms"] +[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/menu/map_indicators/abstract_sector_indicator.tscn" id="1_5phms"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_e1mcs"] [sub_resource type="AtlasTexture" id="AtlasTexture_5phms"] diff --git a/game/area_map/indicators/sectors/shop_sector_indicator.tscn b/game/menu/map_indicators/sectors/shop_sector_indicator.tscn similarity index 92% rename from game/area_map/indicators/sectors/shop_sector_indicator.tscn rename to game/menu/map_indicators/sectors/shop_sector_indicator.tscn index 5d9e668..13d799d 100644 --- a/game/area_map/indicators/sectors/shop_sector_indicator.tscn +++ b/game/menu/map_indicators/sectors/shop_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://webm7iahkjgh"] -[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_4uu3o"] +[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/menu/map_indicators/abstract_sector_indicator.tscn" id="1_4uu3o"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_j10ah"] [sub_resource type="AtlasTexture" id="AtlasTexture_4uu3o"] diff --git a/game/area_map/indicators/sectors/start_sector_indicator.tscn b/game/menu/map_indicators/sectors/start_sector_indicator.tscn similarity index 92% rename from game/area_map/indicators/sectors/start_sector_indicator.tscn rename to game/menu/map_indicators/sectors/start_sector_indicator.tscn index e28a599..0c045bb 100644 --- a/game/area_map/indicators/sectors/start_sector_indicator.tscn +++ b/game/menu/map_indicators/sectors/start_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://g05q5dxwktr8"] -[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_glpdm"] +[ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/menu/map_indicators/abstract_sector_indicator.tscn" id="1_glpdm"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_37krw"] [sub_resource type="AtlasTexture" id="AtlasTexture_glpdm"] diff --git a/game/area_map/indicators/selected_sector_indicator.gd b/game/menu/map_indicators/selected_sector_indicator.gd similarity index 100% rename from game/area_map/indicators/selected_sector_indicator.gd rename to game/menu/map_indicators/selected_sector_indicator.gd diff --git a/game/area_map/indicators/selected_sector_indicator.gd.uid b/game/menu/map_indicators/selected_sector_indicator.gd.uid similarity index 100% rename from game/area_map/indicators/selected_sector_indicator.gd.uid rename to game/menu/map_indicators/selected_sector_indicator.gd.uid diff --git a/game/area_map/indicators/selected_sector_indicator.tscn b/game/menu/map_indicators/selected_sector_indicator.tscn similarity index 97% rename from game/area_map/indicators/selected_sector_indicator.tscn rename to game/menu/map_indicators/selected_sector_indicator.tscn index ac2afbb..e605786 100644 --- a/game/area_map/indicators/selected_sector_indicator.tscn +++ b/game/menu/map_indicators/selected_sector_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=13 format=3 uid="uid://bwru7i7xetjth"] -[ext_resource type="Script" uid="uid://d3eqb5341h7y0" path="res://game/area_map/indicators/selected_sector_indicator.gd" id="1_06a3o"] +[ext_resource type="Script" uid="uid://d3eqb5341h7y0" path="res://game/menu/map_indicators/selected_sector_indicator.gd" id="1_06a3o"] [ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_485wc"] [sub_resource type="AtlasTexture" id="AtlasTexture_eud2k"] diff --git a/game/menu/common/options.gd b/game/menu/options/options.gd similarity index 100% rename from game/menu/common/options.gd rename to game/menu/options/options.gd diff --git a/game/menu/common/options.gd.uid b/game/menu/options/options.gd.uid similarity index 100% rename from game/menu/common/options.gd.uid rename to game/menu/options/options.gd.uid diff --git a/game/menu/common/options.tscn b/game/menu/options/options.tscn similarity index 99% rename from game/menu/common/options.tscn rename to game/menu/options/options.tscn index 3a05826..33a9f55 100644 --- a/game/menu/common/options.tscn +++ b/game/menu/options/options.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://btr60idiit4y7"] -[ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://game/menu/common/options.gd" id="1_61pji"] +[ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://game/menu/options/options.gd" id="1_61pji"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_1tdpy"] [sub_resource type="ButtonGroup" id="ButtonGroup_6ueaa"] diff --git a/game/menu/ingame/pause_menu.gd b/game/menu/pause/pause_menu.gd similarity index 100% rename from game/menu/ingame/pause_menu.gd rename to game/menu/pause/pause_menu.gd diff --git a/game/menu/ingame/pause_menu.gd.uid b/game/menu/pause/pause_menu.gd.uid similarity index 100% rename from game/menu/ingame/pause_menu.gd.uid rename to game/menu/pause/pause_menu.gd.uid diff --git a/game/menu/ingame/pause_menu.tscn b/game/menu/pause/pause_menu.tscn similarity index 97% rename from game/menu/ingame/pause_menu.tscn rename to game/menu/pause/pause_menu.tscn index 98927f4..27a788e 100644 --- a/game/menu/ingame/pause_menu.tscn +++ b/game/menu/pause/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://game/menu/ingame/pause_menu.gd" id="1_inj1j"] +[ext_resource type="Script" uid="uid://npqs2m5g5bd6" path="res://game/menu/pause/pause_menu.gd" id="1_inj1j"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_vy7sn"] [sub_resource type="Shortcut" id="Shortcut_lgp46"] diff --git a/game/menu/ingame/pause_screen.gd b/game/menu/pause/pause_screen.gd similarity index 100% rename from game/menu/ingame/pause_screen.gd rename to game/menu/pause/pause_screen.gd diff --git a/game/menu/ingame/pause_screen.gd.uid b/game/menu/pause/pause_screen.gd.uid similarity index 100% rename from game/menu/ingame/pause_screen.gd.uid rename to game/menu/pause/pause_screen.gd.uid diff --git a/game/menu/ingame/pause_screen.tscn b/game/menu/pause/pause_screen.tscn similarity index 87% rename from game/menu/ingame/pause_screen.tscn rename to game/menu/pause/pause_screen.tscn index 6a038db..b57b345 100644 --- a/game/menu/ingame/pause_screen.tscn +++ b/game/menu/pause/pause_screen.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://d34nh3lc1gpb"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="1_cked2"] -[ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://game/menu/ingame/pause_screen.gd" id="1_fe1q8"] -[ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://game/menu/ingame/pause_menu.tscn" id="2_4r6ly"] -[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/common/options.tscn" id="3_3gwb3"] +[ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://game/menu/pause/pause_screen.gd" id="1_fe1q8"] +[ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://game/menu/pause/pause_menu.tscn" id="2_4r6ly"] +[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/options/options.tscn" id="3_3gwb3"] [node name="PauseScreen" type="MarginContainer"] offset_right = 640.0 diff --git a/game/menu/ingame/weapon_selection_screen.gd b/game/menu/weapon_selection/weapon_selection_screen.gd similarity index 94% rename from game/menu/ingame/weapon_selection_screen.gd rename to game/menu/weapon_selection/weapon_selection_screen.gd index 8492d11..113dcfa 100644 --- a/game/menu/ingame/weapon_selection_screen.gd +++ b/game/menu/weapon_selection/weapon_selection_screen.gd @@ -5,7 +5,7 @@ extends Control signal weapon_selected(weapon_data: WeaponData) -const WEAPON_SELECTOR = preload("res://game/menu/ingame/weapon_selector.tscn") +const WEAPON_SELECTOR = preload("res://game/menu/weapon_selection/weapon_selector.tscn") @export var world_data : WorldData: diff --git a/game/menu/ingame/weapon_selection_screen.gd.uid b/game/menu/weapon_selection/weapon_selection_screen.gd.uid similarity index 100% rename from game/menu/ingame/weapon_selection_screen.gd.uid rename to game/menu/weapon_selection/weapon_selection_screen.gd.uid diff --git a/game/menu/ingame/weapon_selection_screen.tscn b/game/menu/weapon_selection/weapon_selection_screen.tscn similarity index 94% rename from game/menu/ingame/weapon_selection_screen.tscn rename to game/menu/weapon_selection/weapon_selection_screen.tscn index 57aae40..c62c91a 100644 --- a/game/menu/ingame/weapon_selection_screen.tscn +++ b/game/menu/weapon_selection/weapon_selection_screen.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://cv122gw47cnun"] -[ext_resource type="Script" uid="uid://6isk1tmc2ik1" path="res://game/menu/ingame/weapon_selection_screen.gd" id="1_hl2ql"] +[ext_resource type="Script" uid="uid://6isk1tmc2ik1" path="res://game/menu/weapon_selection/weapon_selection_screen.gd" id="1_hl2ql"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_mi7cn"] [node name="WeaponSelectionScreen" type="Control"] diff --git a/game/menu/ingame/weapon_selector.gd b/game/menu/weapon_selection/weapon_selector.gd similarity index 100% rename from game/menu/ingame/weapon_selector.gd rename to game/menu/weapon_selection/weapon_selector.gd diff --git a/game/menu/ingame/weapon_selector.gd.uid b/game/menu/weapon_selection/weapon_selector.gd.uid similarity index 100% rename from game/menu/ingame/weapon_selector.gd.uid rename to game/menu/weapon_selection/weapon_selector.gd.uid diff --git a/game/menu/ingame/weapon_selector.tscn b/game/menu/weapon_selection/weapon_selector.tscn similarity index 96% rename from game/menu/ingame/weapon_selector.tscn rename to game/menu/weapon_selection/weapon_selector.tscn index 2023e7e..1c8a9c6 100644 --- a/game/menu/ingame/weapon_selector.tscn +++ b/game/menu/weapon_selection/weapon_selector.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://1o3idp54lil2"] -[ext_resource type="Script" uid="uid://beiydi6w6gqqc" path="res://game/menu/ingame/weapon_selector.gd" id="1_4acia"] +[ext_resource type="Script" uid="uid://beiydi6w6gqqc" path="res://game/menu/weapon_selection/weapon_selector.gd" id="1_4acia"] [ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="2_g83h6"] [ext_resource type="Theme" uid="uid://bqqtjq710luul" path="res://styles/label_theme.tres" id="3_dsio1"]