Some code organization

This commit is contained in:
2025-12-26 16:12:46 +03:00
parent 099cda6368
commit e2f9f75c4f
55 changed files with 56 additions and 47 deletions
+3 -2
View File
@@ -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
+3 -3
View File
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
+2 -2
View File
@@ -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"]
@@ -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:
@@ -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"]
+1
View File
@@ -0,0 +1 @@
extends Node
+1
View File
@@ -0,0 +1 @@
uid://bittd8vdqbd8r
+6
View File
@@ -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")
@@ -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")
@@ -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")
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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"]
@@ -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
@@ -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:
@@ -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"]
@@ -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"]