From abf34d7d9eafadbe2366a5b445549a890360ea82 Mon Sep 17 00:00:00 2001
From: Zenny <zenayi@gmail.com>
Date: Tue, 30 Sep 2025 18:20:55 -0700
Subject: [PATCH] Small adjustment to map loading stuff

---
 .../DungeonFloorLayoutNode.cs                     |   2 +-
 .../{icon_door.png => icon.png}                   | Bin
 .../{icon_door.png.import => icon.png.import}     |   6 +++---
 .../SpecialFloorLayoutNode.cs                     |   2 +-
 .../addons/special_floor_layout_node/icon.png     | Bin 0 -> 158 bytes
 .../{icon_door.png.import => icon.png.import}     |   8 ++++----
 .../special_floor_layout_node/icon_door.png       | Bin 161 -> 0 bytes
 Zennysoft.Game.Ma/src/map/Map.cs                  |   9 ++++-----
 Zennysoft.Game.Ma/src/map/Map.tscn                |  14 ++++++++------
 9 files changed, 21 insertions(+), 20 deletions(-)
 rename Zennysoft.Game.Ma/addons/dungeon_floor_layout/{icon_door.png => icon.png} (100%)
 rename Zennysoft.Game.Ma/addons/dungeon_floor_layout/{icon_door.png.import => icon.png.import} (70%)
 create mode 100644 Zennysoft.Game.Ma/addons/special_floor_layout_node/icon.png
 rename Zennysoft.Game.Ma/addons/special_floor_layout_node/{icon_door.png.import => icon.png.import} (66%)
 delete mode 100644 Zennysoft.Game.Ma/addons/special_floor_layout_node/icon_door.png

diff --git a/Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayoutNode.cs b/Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayoutNode.cs
index 16d4aec6..82849e80 100644
--- a/Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayoutNode.cs
+++ b/Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayoutNode.cs
@@ -9,7 +9,7 @@ public partial class DungeonFloorLayoutNode : EditorPlugin
   {
     // Initialization of the plugin goes here.
     var script = GD.Load<Script>("res://addons/dungeon_floor_layout/DungeonFloorLayout.cs");
-    var texture = GD.Load<Texture2D>("res://addons/dungeon_floor_layout/icon_door.png");
+    var texture = GD.Load<Texture2D>("res://addons/dungeon_floor_layout/icon.png");
     AddCustomType(nameof(DungeonFloorLayout), nameof(LayoutType), script, texture);
   }
 
diff --git a/Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon_door.png b/Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon.png
similarity index 100%
rename from Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon_door.png
rename to Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon.png
diff --git a/Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon_door.png.import b/Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon.png.import
similarity index 70%
rename from Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon_door.png.import
rename to Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon.png.import
index 4d229d64..869c4c81 100644
--- a/Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon_door.png.import
+++ b/Zennysoft.Game.Ma/addons/dungeon_floor_layout/icon.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cgd2d4fusp4pg"
-path="res://.godot/imported/icon_door.png-437da3e7d1cb55961e6afceef56e9ea2.ctex"
+path="res://.godot/imported/icon.png-f075641bee242eff6dcbc69a1dabede8.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dungeon_floor_layout/icon_door.png"
-dest_files=["res://.godot/imported/icon_door.png-437da3e7d1cb55961e6afceef56e9ea2.ctex"]
+source_file="res://addons/dungeon_floor_layout/icon.png"
+dest_files=["res://.godot/imported/icon.png-f075641bee242eff6dcbc69a1dabede8.ctex"]
 
 [params]
 
diff --git a/Zennysoft.Game.Ma/addons/special_floor_layout_node/SpecialFloorLayoutNode.cs b/Zennysoft.Game.Ma/addons/special_floor_layout_node/SpecialFloorLayoutNode.cs
index c02232c8..3cff44db 100644
--- a/Zennysoft.Game.Ma/addons/special_floor_layout_node/SpecialFloorLayoutNode.cs
+++ b/Zennysoft.Game.Ma/addons/special_floor_layout_node/SpecialFloorLayoutNode.cs
@@ -10,7 +10,7 @@ public partial class SpecialFloorLayoutNode : EditorPlugin
   {
     // Initialization of the plugin goes here.
     var script = GD.Load<Script>("res://addons/special_floor_layout_node/SpecialFloorLayout.cs");
-    var texture = GD.Load<Texture2D>("res://addons/special_floor_layout_node/icon_door.png");
+    var texture = GD.Load<Texture2D>("res://addons/special_floor_layout_node/icon.png");
     AddCustomType(nameof(SpecialFloorLayout), nameof(LayoutType), script, texture);
   }
 
diff --git a/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon.png b/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..44fda7ac46417392b16a4aedc4522472f3e86abe
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|B0OCjLo9le
zQw}i7*;IUxpSga)f&(4CvSE%TXMgY<6gaR{a=N01jMJ=*l1%9Wt0nIWxD}ZwOCR!B
zmnM<0$i+C6;b^1BMsW?ZhE@sJ6P)aKS2Mq7?c!x%c+04~W1Zu}|3Et!JYD@<);T3K
F0RY1uG2;LL

literal 0
HcmV?d00001

diff --git a/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon_door.png.import b/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon.png.import
similarity index 66%
rename from Zennysoft.Game.Ma/addons/special_floor_layout_node/icon_door.png.import
rename to Zennysoft.Game.Ma/addons/special_floor_layout_node/icon.png.import
index 7c50875b..df6ee08d 100644
--- a/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon_door.png.import
+++ b/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://pxevsja7e3s0"
-path="res://.godot/imported/icon_door.png-d7e4ac87b8cdfac1c9f03b9aff4c7e79.ctex"
+uid="uid://dkj2u56olatdq"
+path="res://.godot/imported/icon.png-f3d3329191ced87c3dfb24631add3cb6.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/special_floor_layout_node/icon_door.png"
-dest_files=["res://.godot/imported/icon_door.png-d7e4ac87b8cdfac1c9f03b9aff4c7e79.ctex"]
+source_file="res://addons/special_floor_layout_node/icon.png"
+dest_files=["res://.godot/imported/icon.png-f3d3329191ced87c3dfb24631add3cb6.ctex"]
 
 [params]
 
diff --git a/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon_door.png b/Zennysoft.Game.Ma/addons/special_floor_layout_node/icon_door.png
deleted file mode 100644
index d5436b8c9c0104b158815e75c03495c94e587ab1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|qCH(4Lo9mV
zPI44t5aeMo|2^r?|Ip9Eepe)%3PYZ$EQ#jZ=+C6^Qug@W-q%rU4tS)f8+hw9m0nq~
zURYzr#eelI)72O{&oAbeI+%0i#aiJv&p6i!n5^Ct^;js)DEN|P$?Tqa2|#NYJYD@<
J);T3K0RV_|IbHw&

diff --git a/Zennysoft.Game.Ma/src/map/Map.cs b/Zennysoft.Game.Ma/src/map/Map.cs
index 25b52ca4..1c39ac1f 100644
--- a/Zennysoft.Game.Ma/src/map/Map.cs
+++ b/Zennysoft.Game.Ma/src/map/Map.cs
@@ -23,6 +23,9 @@ public partial class Map : Node3D, IMap
   [Dependency]
   public IPlayer Player => this.DependOn<IPlayer>();
 
+  [Node]
+  public Node MapOrder { get; set; } = default!;
+
   #region Save
   public ISaveChunk<MapInfo> MapChunk { get; set; } = default!;
 
@@ -35,9 +38,6 @@ public partial class Map : Node3D, IMap
   public ISaveChunk<GameData> GameChunk => this.DependOn<ISaveChunk<GameData>>();
   #endregion
 
-  [Export]
-  private Array<LayoutType> Floors { get; set; } = default!;
-
   public IDungeonFloor CurrentFloor { get; private set; }
 
   public AutoProp<int> CurrentFloorNumber { get; private set; } = new AutoProp<int>(0);
@@ -69,7 +69,7 @@ public partial class Map : Node3D, IMap
 
   public async Task LoadFloor()
   {
-    var floor = GetChildren().OfType<LayoutType>().ElementAt(CurrentFloorNumber.Value);
+    var floor = MapOrder.GetChildren().OfType<LayoutType>().ElementAt(CurrentFloorNumber.Value);
     var sceneToLoad = LayoutToScenePathConverter.Convert(floor);
     await LoadFloor(sceneToLoad);
     if (CurrentFloor is DungeonFloor dungeonFloor && floor is DungeonFloorLayout dungeonFloorLayout)
@@ -108,7 +108,6 @@ public partial class Map : Node3D, IMap
   private void ClearCurrentMap()
   {
     CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
-    Floors.Remove(Floors.First());
   }
 
   private void SetupDungeonFloor()
diff --git a/Zennysoft.Game.Ma/src/map/Map.tscn b/Zennysoft.Game.Ma/src/map/Map.tscn
index 780f9da2..09a9cea4 100644
--- a/Zennysoft.Game.Ma/src/map/Map.tscn
+++ b/Zennysoft.Game.Ma/src/map/Map.tscn
@@ -56,9 +56,8 @@ _data = {
 &"fade_out": SubResource("Animation_v14r0")
 }
 
-[node name="Map" type="Node3D" node_paths=PackedStringArray("Floors")]
+[node name="Map" type="Node3D"]
 script = ExtResource("1_bw70o")
-Floors = [3, 2, 0, 4, 1, 5, 6]
 
 [node name="ColorRect" type="ColorRect" parent="."]
 anchors_preset = 15
@@ -74,16 +73,19 @@ libraries = {
 &"": SubResource("AnimationLibrary_00xd7")
 }
 
-[node name="Overworld (Add SpecialFloorLayout node for special floors and pick the FloorName from the list)" type="Node" parent="."]
+[node name="MapOrder" type="Node" parent="."]
+unique_name_in_owner = true
+
+[node name="Overworld (Add SpecialFloorLayout node for special floors and pick the FloorName from the list)" type="Node" parent="MapOrder"]
 script = ExtResource("2_00xd7")
 metadata/_custom_type_script = "uid://cabvj6s31iucg"
 
-[node name="Altar (Arrange order of nodes to change default load order)" type="Node" parent="."]
+[node name="Altar (Arrange order of nodes to change default load order)" type="Node" parent="MapOrder"]
 script = ExtResource("2_00xd7")
 FloorName = 1
 metadata/_custom_type_script = "uid://cabvj6s31iucg"
 
-[node name="Floor01 (Press Populate Map Data Button to load floor from SetAFloors folder)" type="Node" parent="."]
+[node name="Floor01 (Press Populate Map Data Button to load floor from SetAFloors folder)" type="Node" parent="MapOrder"]
 script = ExtResource("3_v14r0")
 LayoutWithSpawnRate = Dictionary[String, float]({})
 EnemySpawnRates = {
@@ -91,7 +93,7 @@ EnemySpawnRates = {
 }
 metadata/_custom_type_script = "uid://ci7o3nn4mdo8o"
 
-[node name="Floor02 (Add DungeonFloorLayout node for regular dungeon floors)" type="Node" parent="."]
+[node name="Floor02 (Add DungeonFloorLayout node for regular dungeon floors)" type="Node" parent="MapOrder"]
 script = ExtResource("3_v14r0")
 LayoutWithSpawnRate = Dictionary[String, float]({})
 EnemySpawnRates = {