Non working procedural generation

Scenes/Maps/Roguelike.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://bf1kqr3o6r6d4"]
+[gd_scene load_steps=16 format=3 uid="uid://bf1kqr3o6r6d4"]
 
 [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_wbqvu"]
 [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_3fyis"]
@@ -16,13 +16,6 @@
 [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="12_eoca5"]
 [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="13_4n7t6"]
 
-[sub_resource type="NavigationPolygon" id="NavigationPolygon_jtlua"]
-vertices = PackedVector2Array(-69.1094, 193.477, -146.813, 182.609, -132, 117.898, -69.8906, 117.117)
-polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
-outlines = Array[PackedVector2Array]([PackedVector2Array(-159, 191, -140, 108, -60, 107, -59, 205)])
-parsed_collision_mask = 353
-source_geometry_mode = 1
-
 [node name="GameScene" type="Node2D" node_paths=PackedStringArray("NavigationRegion")]
 process_mode = 3
 script = ExtResource("1_wbqvu")
@@ -31,7 +24,7 @@ PlayerTemplate = ExtResource("2_3fyis")
 SpawnMarkers = Dictionary[int, NodePath]({
 0: NodePath("PlayerStartPosition")
 })
-NavigationRegion = NodePath("NavigationRegion2D")
+NavigationRegion = NodePath("")
 
 [node name="Maps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]]
 process_mode = 1
@@ -72,7 +65,4 @@ script = ExtResource("12_eoca5")
 process_mode = 3
 autoplay = true
 
-[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."]
-navigation_polygon = SubResource("NavigationPolygon_jtlua")
-
 [connection signal="ManagerReady" from="." to="Maps" method="InitSpawning"]

Scenes/Maps/RogueliteMaps/Boss1.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=7 format=4 uid="uid://brytwc48xpj78"]
+[gd_scene load_steps=8 format=4 uid="uid://brytwc48xpj78"]
 
 [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_vm1u7"]
 [ext_resource type="Resource" uid="uid://cgac12krx7vbf" path="res://Resources/RogueliteMaps/Boss1.tres" id="2_vm1u7"]
 [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_vo7cb"]
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_wmvx8"]
+[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_5nx6x"]
 [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="4_vo7cb"]
 [ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="5_xjj1f"]
 
@@ -12,6 +13,7 @@ process_mode = 1
 script = ExtResource("1_vm1u7")
 RoomResource = ExtResource("2_vm1u7")
 DoorPrefab = ExtResource("3_vo7cb")
+WallPrefab = ExtResource("4_5nx6x")
 
 [node name="Floor" type="TileMapLayer" parent="." node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
 tile_map_data = PackedByteArray("AAAAAAIAAAACAAAAAAAAAAMAAAACAAAAAAAAAAQAAAACAAAAAAAAAAUAAAACAAAAAAAAAAYAAAACAAAAAAAAAAcAAAACAAAAAAAAAAgAAAACAAAAAAAAAAkAAAACAAAAAAABAAIAAAACAAAAAAABAAMAAAACAAAAAAABAAQAAAACAAAAAAABAAUAAAACAAAAAAABAAYAAAACAAAAAAABAAcAAAACAAAAAAABAAgAAAACAAAAAAABAAkAAAACAAAAAAACAAIAAAACAAAAAAACAAMAAAACAAAAAAACAAQAAAAFAAIAAAACAAUAAAAFAAIAAAACAAYAAAAFAAIAAAACAAcAAAAFAAIAAAACAAgAAAAFAAIAAAACAAkAAAACAAAAAAADAAIAAAACAAAAAAADAAMAAAACAAAAAAADAAQAAAAFAAIAAAADAAUAAAACAAAAAAADAAYAAAAFAAIAAAADAAcAAAACAAAAAAADAAgAAAAFAAIAAAADAAkAAAACAAAAAAAEAAIAAAACAAAAAAAEAAMAAAACAAAAAAAEAAQAAAACAAAAAAAEAAUAAAAFAAIAAAAEAAYAAAACAAAAAAAEAAcAAAAFAAIAAAAEAAgAAAACAAAAAAAEAAkAAAACAAAAAAAFAAIAAAACAAAAAAAFAAMAAAACAAAAAAAFAAQAAAACAAAAAAAFAAUAAAACAAAAAAAFAAYAAAACAAAAAAAFAAcAAAACAAAAAAAFAAgAAAACAAAAAAAFAAkAAAACAAAAAAAGAAIAAAACAAAAAAAGAAMAAAACAAAAAAAGAAQAAAAFAAIAAAAGAAUAAAAFAAIAAAAGAAYAAAAFAAIAAAAGAAcAAAAFAAIAAAAGAAgAAAAFAAIAAAAGAAkAAAACAAAAAAAHAAIAAAACAAAAAAAHAAMAAAACAAAAAAAHAAQAAAAFAAIAAAAHAAUAAAACAAAAAAAHAAYAAAACAAAAAAAHAAcAAAACAAAAAAAHAAgAAAAFAAIAAAAHAAkAAAACAAAAAAAIAAIAAAACAAAAAAAIAAMAAAACAAAAAAAIAAQAAAAFAAIAAAAIAAUAAAAFAAIAAAAIAAYAAAAFAAIAAAAIAAcAAAAFAAIAAAAIAAgAAAAFAAIAAAAIAAkAAAACAAAAAAAJAAIAAAACAAAAAAAJAAMAAAACAAAAAAAJAAQAAAACAAAAAAAJAAUAAAACAAAAAAAJAAYAAAACAAAAAAAJAAcAAAACAAAAAAAJAAgAAAACAAAAAAAJAAkAAAACAAAAAAAKAAIAAAACAAAAAAAKAAMAAAACAAAAAAAKAAQAAAAFAAIAAAAKAAUAAAAFAAIAAAAKAAYAAAAFAAIAAAAKAAcAAAACAAAAAAAKAAgAAAAFAAIAAAAKAAkAAAACAAAAAAALAAIAAAACAAAAAAALAAUAAAACAAAAAAALAAYAAAAFAAIAAAALAAcAAAACAAAAAAALAAgAAAAFAAIAAAALAAkAAAACAAAAAAAMAAIAAAACAAAAAAAMAAUAAAACAAAAAAAMAAYAAAAFAAIAAAAMAAcAAAAFAAIAAAAMAAgAAAAFAAIAAAAMAAkAAAACAAAAAAANAAIAAAACAAAAAAANAAMAAAACAAAAAAANAAQAAAACAAAAAAANAAUAAAACAAAAAAANAAYAAAACAAAAAAANAAcAAAACAAAAAAANAAgAAAACAAAAAAANAAkAAAACAAAAAAAOAAIAAAACAAAAAAAOAAMAAAACAAAAAAAOAAQAAAAFAAIAAAAOAAUAAAAFAAIAAAAOAAYAAAAFAAIAAAAOAAcAAAACAAAAAAAOAAgAAAAFAAIAAAAOAAkAAAACAAAAAAAPAAIAAAACAAAAAAAPAAMAAAACAAAAAAAPAAQAAAAFAAIAAAAPAAUAAAACAAAAAAAPAAYAAAAFAAIAAAAPAAcAAAACAAAAAAAPAAgAAAAFAAIAAAAPAAkAAAACAAAAAAAQAAIAAAACAAAAAAAQAAMAAAACAAAAAAAQAAQAAAAFAAIAAAAQAAUAAAACAAAAAAAQAAYAAAAFAAIAAAAQAAcAAAAFAAIAAAAQAAgAAAAFAAIAAAAQAAkAAAACAAAAAAARAAIAAAACAAAAAAARAAMAAAACAAAAAAARAAQAAAACAAAAAAARAAUAAAACAAAAAAARAAYAAAACAAAAAAARAAcAAAACAAAAAAARAAgAAAACAAAAAAARAAkAAAACAAAAAAASAAIAAAACAAAAAAASAAMAAAACAAAAAAASAAQAAAACAAAAAAASAAUAAAACAAAAAAASAAYAAAACAAAAAAASAAcAAAACAAAAAAASAAgAAAACAAAAAAASAAkAAAACAAAAAAATAAIAAAACAAAAAAATAAMAAAACAAAAAAATAAQAAAACAAAAAAATAAUAAAACAAAAAAATAAYAAAACAAAAAAATAAcAAAACAAAAAAATAAgAAAACAAAAAAATAAkAAAACAAAAAAAAAAAAAAACAAAAAAAAAAEAAAACAAAAAAABAAAAAAACAAAAAAABAAEAAAACAAAAAAACAAAAAAACAAAAAAACAAEAAAACAAAAAAADAAAAAAACAAAAAAADAAEAAAACAAAAAAAEAAAAAAACAAAAAAAEAAEAAAACAAAAAAAFAAAAAAACAAAAAAAFAAEAAAACAAAAAAAGAAAAAAACAAAAAAAGAAEAAAACAAAAAAAHAAAAAAACAAAAAAAHAAEAAAACAAAAAAAIAAAAAAACAAAAAAAIAAEAAAACAAAAAAAJAAAAAAACAAAAAAAJAAEAAAACAAAAAAAKAAAAAAACAAAAAAAKAAEAAAACAAAAAAALAAAAAAACAAAAAAALAAEAAAACAAAAAAALAAMAAAACAAAAAAALAAQAAAAFAAIAAAAMAAAAAAACAAAAAAAMAAEAAAACAAAAAAAMAAMAAAACAAAAAAAMAAQAAAAFAAIAAAANAAAAAAACAAAAAAANAAEAAAACAAAAAAAOAAAAAAACAAAAAAAOAAEAAAACAAAAAAAPAAAAAAACAAAAAAAPAAEAAAACAAAAAAAQAAAAAAACAAAAAAAQAAEAAAACAAAAAAARAAAAAAACAAAAAAARAAEAAAACAAAAAAASAAAAAAACAAAAAAASAAEAAAACAAAAAAATAAAAAAACAAAAAAATAAEAAAACAAAAAAA=")

Scenes/Maps/RogueliteMaps/Rg1.tscn

@@ -1,19 +1,30 @@
-[gd_scene load_steps=7 format=4 uid="uid://da7hmajaaiohm"]
+[gd_scene load_steps=9 format=4 uid="uid://da7hmajaaiohm"]
 
 [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_dm6kf"]
 [ext_resource type="Resource" uid="uid://b5x83li01qrav" path="res://Resources/RogueliteMaps/TestRGMap.tres" id="2_5s4nm"]
 [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_sid7o"]
+[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_rlq0q"]
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_q5p8k"]
 [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_81nvh"]
 [ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="6_b5lqw"]
 
-[node name="Tilemaps" type="Node2D"]
+[sub_resource type="NavigationPolygon" id="NavigationPolygon_rlq0q"]
+vertices = PackedVector2Array(166, 58, 294, 58, 294, 134, 166, 134, 166, 150, 154, 150, 154, 134, 154, 58, 26, 134, 26, 58, 166, 10, 154, 10)
+polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(3, 4, 5, 6), PackedInt32Array(0, 3, 6, 7), PackedInt32Array(6, 8, 9, 7), PackedInt32Array(10, 0, 7, 11)])
+outlines = Array[PackedVector2Array]([PackedVector2Array(17, 36, 14, 12, 47, 15, 49, 34)])
+parsed_collision_mask = 353
+source_geometry_mode = 1
+
+[node name="Map" type="Node2D"]
 process_mode = 1
 script = ExtResource("1_dm6kf")
 RoomResource = ExtResource("2_5s4nm")
 DoorPrefab = ExtResource("3_sid7o")
+WallPrefab = ExtResource("4_rlq0q")
 
-[node name="Floor" type="TileMapLayer" parent="." node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
+[node name="Tilemaps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]]
+
+[node name="Floor" type="TileMapLayer" parent="Tilemaps" node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
 tile_map_data = PackedByteArray("AAAAAAIAAAAEAAIAAAAAAAMAAAAEAAIAAAAAAAQAAAAEAAIAAAAAAAUAAAAEAAIAAAAAAAYAAAAEAAIAAAAAAAcAAAAEAAIAAAAAAAgAAAAEAAIAAAAAAAkAAAAEAAIAAAABAAIAAAAEAAIAAAABAAMAAAAEAAIAAAABAAQAAAAEAAIAAAABAAUAAAAEAAIAAAABAAYAAAAEAAIAAAABAAcAAAAEAAIAAAABAAgAAAAEAAIAAAABAAkAAAAEAAIAAAACAAIAAAAEAAIAAAACAAMAAAAEAAIAAAACAAQAAAAEAAIAAAACAAUAAAAEAAIAAAACAAYAAAAEAAIAAAACAAcAAAAEAAIAAAACAAgAAAAEAAIAAAACAAkAAAAEAAIAAAADAAIAAAAEAAIAAAADAAMAAAAEAAIAAAADAAQAAAAEAAIAAAADAAUAAAAEAAIAAAADAAYAAAAEAAIAAAADAAcAAAAEAAIAAAADAAgAAAAEAAIAAAADAAkAAAAEAAIAAAAEAAIAAAAEAAIAAAAEAAMAAAAEAAIAAAAEAAQAAAAEAAIAAAAEAAUAAAAEAAIAAAAEAAYAAAAEAAIAAAAEAAcAAAAEAAIAAAAEAAgAAAAEAAIAAAAEAAkAAAAEAAIAAAAFAAIAAAAEAAIAAAAFAAMAAAAEAAIAAAAFAAQAAAAEAAIAAAAFAAUAAAAEAAIAAAAFAAYAAAAEAAIAAAAFAAcAAAAEAAIAAAAFAAgAAAAEAAIAAAAFAAkAAAAEAAIAAAAGAAIAAAAEAAIAAAAGAAMAAAAEAAIAAAAGAAQAAAAEAAIAAAAGAAUAAAAEAAIAAAAGAAYAAAAEAAIAAAAGAAcAAAAEAAIAAAAGAAgAAAAEAAIAAAAGAAkAAAAEAAIAAAAHAAIAAAAEAAIAAAAHAAMAAAAEAAIAAAAHAAQAAAAEAAIAAAAHAAUAAAAEAAIAAAAHAAYAAAAEAAIAAAAHAAcAAAAEAAIAAAAHAAgAAAAEAAIAAAAHAAkAAAAEAAIAAAAIAAIAAAAEAAIAAAAIAAMAAAAEAAIAAAAIAAQAAAAEAAIAAAAIAAUAAAAEAAIAAAAIAAYAAAAEAAIAAAAIAAcAAAAEAAIAAAAIAAgAAAAEAAIAAAAIAAkAAAAEAAIAAAAJAAIAAAAEAAIAAAAJAAMAAAAEAAIAAAAJAAQAAAAEAAIAAAAJAAUAAAAEAAIAAAAJAAYAAAAEAAIAAAAJAAcAAAAEAAIAAAAJAAgAAAAEAAIAAAAJAAkAAAAEAAIAAAAKAAIAAAAEAAIAAAAKAAMAAAAEAAIAAAAKAAQAAAAEAAIAAAAKAAUAAAAEAAIAAAAKAAYAAAAEAAIAAAAKAAcAAAAEAAIAAAAKAAgAAAAEAAIAAAAKAAkAAAAEAAIAAAALAAIAAAAEAAIAAAALAAUAAAAEAAIAAAALAAYAAAAEAAIAAAALAAcAAAAEAAIAAAALAAgAAAAEAAIAAAALAAkAAAAEAAIAAAAMAAIAAAAEAAIAAAAMAAUAAAAEAAIAAAAMAAYAAAAEAAIAAAAMAAcAAAAEAAIAAAAMAAgAAAAEAAIAAAAMAAkAAAAEAAIAAAANAAIAAAAEAAIAAAANAAMAAAAEAAIAAAANAAQAAAAEAAIAAAANAAUAAAAEAAIAAAANAAYAAAAEAAIAAAANAAcAAAAEAAIAAAANAAgAAAAEAAIAAAANAAkAAAAEAAIAAAAOAAIAAAAEAAIAAAAOAAMAAAAEAAIAAAAOAAQAAAAEAAIAAAAOAAUAAAAEAAIAAAAOAAYAAAAEAAIAAAAOAAcAAAAEAAIAAAAOAAgAAAAEAAIAAAAOAAkAAAAEAAIAAAAPAAIAAAAEAAIAAAAPAAMAAAAEAAIAAAAPAAQAAAAEAAIAAAAPAAUAAAAEAAIAAAAPAAYAAAAEAAIAAAAPAAcAAAAEAAIAAAAPAAgAAAAEAAIAAAAPAAkAAAAEAAIAAAAQAAIAAAAEAAIAAAAQAAMAAAAEAAIAAAAQAAQAAAAEAAIAAAAQAAUAAAAEAAIAAAAQAAYAAAAEAAIAAAAQAAcAAAAEAAIAAAAQAAgAAAAEAAIAAAAQAAkAAAAEAAIAAAARAAIAAAAEAAIAAAARAAMAAAAEAAIAAAARAAQAAAAEAAIAAAARAAUAAAAEAAIAAAARAAYAAAAEAAIAAAARAAcAAAAEAAIAAAARAAgAAAAEAAIAAAARAAkAAAAEAAIAAAASAAIAAAAEAAIAAAASAAMAAAAEAAIAAAASAAQAAAAEAAIAAAASAAUAAAAEAAIAAAASAAYAAAAEAAIAAAASAAcAAAAEAAIAAAASAAgAAAAEAAIAAAASAAkAAAAEAAIAAAATAAIAAAAEAAIAAAATAAMAAAAEAAIAAAATAAQAAAAEAAIAAAATAAUAAAAEAAIAAAATAAYAAAAEAAIAAAATAAcAAAAEAAIAAAATAAgAAAAEAAIAAAATAAkAAAAEAAIAAAAAAAAAAAAEAAIAAAAAAAEAAAAEAAIAAAABAAAAAAAEAAIAAAABAAEAAAAEAAIAAAACAAAAAAAEAAIAAAACAAEAAAAEAAIAAAADAAAAAAAEAAIAAAADAAEAAAAEAAIAAAAEAAAAAAAEAAIAAAAEAAEAAAAEAAIAAAAFAAAAAAAEAAIAAAAFAAEAAAAEAAIAAAAGAAAAAAAEAAIAAAAGAAEAAAAEAAIAAAAHAAAAAAAEAAIAAAAHAAEAAAAEAAIAAAAIAAAAAAAEAAIAAAAIAAEAAAAEAAIAAAAJAAAAAAAEAAIAAAAJAAEAAAAEAAIAAAAKAAAAAAAEAAIAAAAKAAEAAAAEAAIAAAALAAAAAAAEAAIAAAALAAEAAAAEAAIAAAALAAMAAAAEAAIAAAALAAQAAAAEAAIAAAAMAAAAAAAEAAIAAAAMAAEAAAAEAAIAAAAMAAMAAAAEAAIAAAAMAAQAAAAEAAIAAAANAAAAAAAEAAIAAAANAAEAAAAEAAIAAAAOAAAAAAAEAAIAAAAOAAEAAAAEAAIAAAAPAAAAAAAEAAIAAAAPAAEAAAAEAAIAAAAQAAAAAAAEAAIAAAAQAAEAAAAEAAIAAAARAAAAAAAEAAIAAAARAAEAAAAEAAIAAAASAAAAAAAEAAIAAAASAAEAAAAEAAIAAAATAAAAAAAEAAIAAAATAAEAAAAEAAIAAAA=")
 tile_set = ExtResource("5_q5p8k")
 navigation_enabled = false
@@ -21,18 +32,18 @@ script = ExtResource("6_81nvh")
 _solidLayers = [NodePath("../Solid"), NodePath("../Props")]
 metadata/_edit_lock_ = true
 
-[node name="Solid" type="TileMapLayer" parent="." groups=["Solid"]]
+[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]]
 tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAKAAgAAAATAAQAAAAKAAkAAAALAAEAAAAKAAgAAAALAAIAAAAKAAkAAAAMAAEAAAAKAAgAAAAMAAIAAAAKAAkAAAANAAEAAAAKAAgAAAANAAIAAAAKAAkAAAAOAAEAAAAKAAgAAAAOAAIAAAAKAAkAAAAPAAEAAAAKAAgAAAAPAAIAAAAKAAkAAAAQAAEAAAAKAAgAAAAQAAIAAAAKAAkAAAARAAEAAAAKAAgAAAARAAIAAAAKAAkAAAASAAEAAAAKAAgAAAASAAIAAAAKAAkAAAABAAEAAAAKAAgAAAABAAIAAAAKAAkAAAACAAEAAAAKAAgAAAACAAIAAAAKAAkAAAADAAEAAAAKAAgAAAADAAIAAAAKAAkAAAAEAAEAAAAKAAgAAAAEAAIAAAAKAAkAAAAFAAEAAAAKAAgAAAAFAAIAAAAKAAkAAAAGAAEAAAAKAAgAAAAGAAIAAAAKAAkAAAAHAAEAAAAKAAgAAAAHAAIAAAAKAAkAAAAIAAEAAAAKAAgAAAAIAAIAAAAKAAkAAAAAAAMAAAAKAAgAAAAAAAQAAAAKAAkAAAA=")
 tile_set = ExtResource("5_q5p8k")
 navigation_enabled = false
 metadata/_edit_lock_ = true
 
-[node name="Props" type="TileMapLayer" parent="." groups=["Solid"]]
+[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]]
 tile_set = ExtResource("5_q5p8k")
 navigation_enabled = false
 metadata/_edit_lock_ = true
 
-[node name="Actors" type="Node2D" parent="."]
+[node name="Actors" type="Node2D" parent="Tilemaps"]
 metadata/_edit_lock_ = true
 
 [node name="EnemySpawners" type="Node2D" parent="."]
@@ -66,3 +77,6 @@ Direction = 2
 position = Vector2(8.1806, 87.7693)
 script = ExtResource("6_b5lqw")
 Direction = 3
+
+[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."]
+navigation_polygon = SubResource("NavigationPolygon_rlq0q")

Scenes/Maps/RogueliteMaps/Rg2.tscn

@@ -1,19 +1,30 @@
-[gd_scene load_steps=7 format=4 uid="uid://dcxrdhq1yw5c7"]
+[gd_scene load_steps=9 format=4 uid="uid://dcxrdhq1yw5c7"]
 
 [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_cak6m"]
 [ext_resource type="Resource" uid="uid://ly8l7asedjpx" path="res://Resources/RogueliteMaps/TestRGMap2.tres" id="2_cak6m"]
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_f7qjl"]
 [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_wtdf1"]
+[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_hgeju"]
 [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="4_wtdf1"]
 [ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="5_2djm0"]
 
-[node name="Tilemaps" type="Node2D"]
+[sub_resource type="NavigationPolygon" id="NavigationPolygon_f7qjl"]
+vertices = PackedVector2Array(186, 122, 186, 58, 294, 58, 294, 134, 166, 134, 134, 122, 166, 150, 154, 150, 154, 134, 26, 134, 26, 58, 134, 58, 166, 54, 154, 54, 154, 10, 166, 10)
+polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(0, 3, 4, 5), PackedInt32Array(4, 6, 7, 8), PackedInt32Array(5, 4, 8), PackedInt32Array(5, 8, 9, 10), PackedInt32Array(11, 5, 10), PackedInt32Array(12, 13, 14, 15)])
+outlines = Array[PackedVector2Array]([PackedVector2Array(17, 36, 14, 12, 47, 15, 49, 34)])
+parsed_collision_mask = 353
+source_geometry_mode = 1
+
+[node name="Map" type="Node2D"]
 process_mode = 1
 script = ExtResource("1_cak6m")
 RoomResource = ExtResource("2_cak6m")
 DoorPrefab = ExtResource("3_wtdf1")
+WallPrefab = ExtResource("4_hgeju")
 
-[node name="Floor" type="TileMapLayer" parent="." node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
+[node name="Tilemaps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]]
+
+[node name="Floor" type="TileMapLayer" parent="Tilemaps" node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
 tile_map_data = PackedByteArray("AAAAAAIAAAAFAAAAAAAAAAMAAAAFAAAAAAAAAAQAAAAFAAAAAAAAAAUAAAAFAAAAAAAAAAYAAAAFAAAAAAAAAAcAAAAFAAAAAAAAAAgAAAAFAAAAAAAAAAkAAAAFAAAAAAABAAIAAAAFAAAAAAABAAMAAAAFAAAAAAABAAQAAAAFAAAAAAABAAUAAAAFAAAAAAABAAYAAAAFAAAAAAABAAcAAAAFAAAAAAABAAgAAAAFAAAAAAABAAkAAAAFAAAAAAACAAIAAAAFAAAAAAACAAMAAAAFAAAAAAACAAQAAAAFAAAAAAACAAUAAAAFAAAAAAACAAYAAAAFAAAAAAACAAcAAAAFAAAAAAACAAgAAAAFAAAAAAACAAkAAAAFAAAAAAADAAIAAAAFAAAAAAADAAMAAAAFAAAAAAADAAQAAAAFAAAAAAADAAUAAAAFAAAAAAADAAYAAAAFAAAAAAADAAcAAAAFAAAAAAADAAgAAAAFAAAAAAADAAkAAAAFAAAAAAAEAAIAAAAFAAAAAAAEAAMAAAAFAAAAAAAEAAQAAAAFAAAAAAAEAAUAAAAFAAAAAAAEAAYAAAAFAAAAAAAEAAcAAAAFAAAAAAAEAAgAAAAFAAAAAAAEAAkAAAAFAAAAAAAFAAIAAAAFAAAAAAAFAAMAAAAFAAAAAAAFAAQAAAAFAAAAAAAFAAUAAAAFAAAAAAAFAAYAAAAFAAAAAAAFAAcAAAAFAAAAAAAFAAgAAAAFAAAAAAAFAAkAAAAFAAAAAAAGAAIAAAAFAAAAAAAGAAMAAAAFAAAAAAAGAAQAAAAFAAAAAAAGAAUAAAAFAAAAAAAGAAYAAAAFAAAAAAAGAAcAAAAFAAAAAAAGAAgAAAAFAAAAAAAGAAkAAAAFAAAAAAAHAAIAAAAFAAAAAAAHAAMAAAAFAAAAAAAHAAQAAAAFAAAAAAAHAAUAAAAFAAAAAAAHAAYAAAAFAAAAAAAHAAcAAAAFAAAAAAAHAAgAAAAFAAAAAAAHAAkAAAAFAAAAAAAIAAIAAAAFAAAAAAAIAAMAAAAFAAAAAAAIAAQAAAAFAAAAAAAIAAUAAAAFAAAAAAAIAAYAAAAFAAAAAAAIAAcAAAAFAAAAAAAIAAgAAAAFAAAAAAAIAAkAAAAFAAAAAAAJAAIAAAAFAAAAAAAJAAMAAAAFAAAAAAAJAAQAAAAFAAAAAAAJAAgAAAAFAAAAAAAJAAkAAAAFAAAAAAAKAAIAAAAFAAAAAAAKAAMAAAAFAAAAAAAKAAQAAAAFAAAAAAAKAAgAAAAFAAAAAAAKAAkAAAAFAAAAAAALAAIAAAAFAAAAAAALAAUAAAAFAAAAAAALAAYAAAAFAAAAAAALAAcAAAAFAAAAAAALAAgAAAAFAAAAAAALAAkAAAAFAAAAAAAMAAIAAAAFAAAAAAAMAAUAAAAFAAAAAAAMAAYAAAAFAAAAAAAMAAcAAAAFAAAAAAAMAAgAAAAFAAAAAAAMAAkAAAAFAAAAAAANAAIAAAAFAAAAAAANAAMAAAAFAAAAAAANAAQAAAAFAAAAAAANAAUAAAAFAAAAAAANAAYAAAAFAAAAAAANAAcAAAAFAAAAAAANAAgAAAAFAAAAAAANAAkAAAAFAAAAAAAOAAIAAAAFAAAAAAAOAAMAAAAFAAAAAAAOAAQAAAAFAAAAAAAOAAUAAAAFAAAAAAAOAAYAAAAFAAAAAAAOAAcAAAAFAAAAAAAOAAgAAAAFAAAAAAAOAAkAAAAFAAAAAAAPAAIAAAAFAAAAAAAPAAMAAAAFAAAAAAAPAAQAAAAFAAAAAAAPAAUAAAAFAAAAAAAPAAYAAAAFAAAAAAAPAAcAAAAFAAAAAAAPAAgAAAAFAAAAAAAPAAkAAAAFAAAAAAAQAAIAAAAFAAAAAAAQAAMAAAAFAAAAAAAQAAQAAAAFAAAAAAAQAAUAAAAFAAAAAAAQAAYAAAAFAAAAAAAQAAcAAAAFAAAAAAAQAAgAAAAFAAAAAAAQAAkAAAAFAAAAAAARAAIAAAAFAAAAAAARAAMAAAAFAAAAAAARAAQAAAAFAAAAAAARAAUAAAAFAAAAAAARAAYAAAAFAAAAAAARAAcAAAAFAAAAAAARAAgAAAAFAAAAAAARAAkAAAAFAAAAAAASAAIAAAAFAAAAAAASAAMAAAAFAAAAAAASAAQAAAAFAAAAAAASAAUAAAAFAAAAAAASAAYAAAAFAAAAAAASAAcAAAAFAAAAAAASAAgAAAAFAAAAAAASAAkAAAAFAAAAAAATAAIAAAAFAAAAAAATAAMAAAAFAAAAAAATAAQAAAAFAAAAAAATAAUAAAAFAAAAAAATAAYAAAAFAAAAAAATAAcAAAAFAAAAAAATAAgAAAAFAAAAAAATAAkAAAAFAAAAAAAAAAAAAAAFAAAAAAAAAAEAAAAFAAAAAAABAAAAAAAFAAAAAAABAAEAAAAFAAAAAAACAAAAAAAFAAAAAAACAAEAAAAFAAAAAAADAAAAAAAFAAAAAAADAAEAAAAFAAAAAAAEAAAAAAAFAAAAAAAEAAEAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAEAAAAFAAAAAAAGAAAAAAAFAAAAAAAGAAEAAAAFAAAAAAAHAAAAAAAFAAAAAAAHAAEAAAAFAAAAAAAIAAAAAAAFAAAAAAAIAAEAAAAFAAAAAAAJAAAAAAAFAAAAAAAJAAEAAAAFAAAAAAAKAAAAAAAFAAAAAAAKAAEAAAAFAAAAAAALAAAAAAAFAAAAAAALAAEAAAAFAAAAAAALAAMAAAAFAAAAAAALAAQAAAAFAAAAAAAMAAAAAAAFAAAAAAAMAAEAAAAFAAAAAAAMAAMAAAAFAAAAAAAMAAQAAAAFAAAAAAANAAAAAAAFAAAAAAANAAEAAAAFAAAAAAAOAAAAAAAFAAAAAAAOAAEAAAAFAAAAAAAPAAAAAAAFAAAAAAAPAAEAAAAFAAAAAAAQAAAAAAAFAAAAAAAQAAEAAAAFAAAAAAARAAAAAAAFAAAAAAARAAEAAAAFAAAAAAASAAAAAAAFAAAAAAASAAEAAAAFAAAAAAATAAAAAAAFAAAAAAATAAEAAAAFAAAAAAAJAAUAAAAFAAAAAAAJAAYAAAAFAAAAAAAJAAcAAAAFAAAAAAAKAAUAAAAFAAAAAAAKAAYAAAAFAAAAAAAKAAcAAAAFAAAAAAA=")
 tile_set = ExtResource("3_f7qjl")
 navigation_enabled = false
@@ -21,19 +32,19 @@ script = ExtResource("4_wtdf1")
 _solidLayers = [NodePath("../Solid"), NodePath("../Props")]
 metadata/_edit_lock_ = true
 
-[node name="Solid" type="TileMapLayer" parent="." groups=["Solid"]]
+[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]]
 tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAMAAAAAAATAAQAAAAMAAEAAAALAAEAAAAMAAAAAAALAAIAAAAMAAEAAAAMAAEAAAAMAAAAAAAMAAIAAAAMAAEAAAANAAEAAAAMAAAAAAANAAIAAAAMAAEAAAAOAAEAAAAMAAAAAAAOAAIAAAAMAAEAAAAPAAEAAAAMAAAAAAAPAAIAAAAMAAEAAAAQAAEAAAAMAAAAAAAQAAIAAAAMAAEAAAARAAEAAAAMAAAAAAARAAIAAAAMAAEAAAASAAEAAAAMAAAAAAASAAIAAAAMAAEAAAABAAEAAAAMAAAAAAABAAIAAAAMAAEAAAACAAEAAAAMAAAAAAACAAIAAAAMAAEAAAADAAEAAAAMAAAAAAADAAIAAAAMAAEAAAAEAAEAAAAMAAAAAAAEAAIAAAAMAAEAAAAFAAEAAAAMAAAAAAAFAAIAAAAMAAEAAAAGAAEAAAAMAAAAAAAGAAIAAAAMAAEAAAAHAAEAAAAMAAAAAAAHAAIAAAAMAAEAAAAIAAEAAAAMAAAAAAAIAAIAAAAMAAEAAAAAAAMAAAAMAAAAAAAAAAQAAAAMAAEAAAAJAAUAAAAMAAAAAAAJAAYAAAAMAAEAAAAKAAUAAAAMAAAAAAAKAAYAAAAMAAEAAAAJAAQAAAACAAQAAAAKAAQAAAADAAQAAAA=")
 tile_set = ExtResource("3_f7qjl")
 navigation_enabled = false
 metadata/_edit_lock_ = true
 
-[node name="Props" type="TileMapLayer" parent="." groups=["Solid"]]
+[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]]
 tile_map_data = PackedByteArray("AAAJAAUAAAAJAAwAAAAJAAYAAAAJAA0AAAAKAAUAAAAKAAwAAAAKAAYAAAAKAA0AAAAAAAMAAAAKAAwAAAAAAAQAAAAKAA0AAAAIAAEAAAAKAAwAAAAIAAIAAAAKAA0AAAALAAEAAAAJAAwAAAALAAIAAAAJAA0AAAATAAMAAAAJAAwAAAATAAQAAAAJAA0AAAA=")
 tile_set = ExtResource("3_f7qjl")
 navigation_enabled = false
 metadata/_edit_lock_ = true
 
-[node name="Actors" type="Node2D" parent="."]
+[node name="Actors" type="Node2D" parent="Tilemaps"]
 metadata/_edit_lock_ = true
 
 [node name="EnemySpawners" type="Node2D" parent="."]
@@ -67,3 +78,6 @@ Direction = 2
 position = Vector2(8.1806, 87.7693)
 script = ExtResource("5_2djm0")
 Direction = 3
+
+[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."]
+navigation_polygon = SubResource("NavigationPolygon_f7qjl")

Scenes/test.tscn

@@ -1232,7 +1232,7 @@ position = Vector2(-2000, -736)
 [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")]
 position = Vector2(-2027, -735)
 Targets = [NodePath("../HorizontalForceField")]
-Requirements = [ExtResource("84_ma1ta")]
+Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")])
 
 [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
 position = Vector2(-872, -220)

Scripts/Controllers/RogueliteRoom.cs

@@ -10,29 +10,30 @@ namespace Cirno.Scripts.Controllers;
 public partial class RogueliteRoom : Node2D
 {
     [Export] public RogueliteRoomResource RoomResource { get; set; }
-    
+
     public Vector2I GridPosition { get; set; } // Set by dungeon manager
-    
+
     [Export] public PackedScene DoorPrefab { get; private set; }
-    
+    [Export] public PackedScene WallPrefab { get; private set; } 
+
     private static readonly Dictionary<string, Vector2I> DirectionMap = new()
     {
         { "North", new Vector2I(0, -1) },
         { "South", new Vector2I(0, 1) },
-        { "East",  new Vector2I(1, 0) },
+        { "East", new Vector2I(1, 0) },
-        { "West",  new Vector2I(-1, 0) },
+        { "West", new Vector2I(-1, 0) },
     };
 
-    private Array<EnemyResource> SpawnableEnemies => RoomResource.SpawnableEnemies; 
+    private Array<EnemyResource> SpawnableEnemies => RoomResource.SpawnableEnemies;
 
-    public RogueliteRoom Spawn(Func<Vector2I, bool> connectionChecker)
+    public RogueliteRoom Spawn()
     {
         SpawnEnemies();
-        HandleDoors(connectionChecker);
+        //HandleDoors(connectionChecker);
         return this;
     }
-    
+
-    private void HandleDoors(Func<Vector2I, bool> connectionChecker)
+    public void HandleDoors(Func<Vector2I, bool> connectionChecker)
     {
         if (!HasNode("Doors")) return;
         var doorsNode = GetNode("Doors");
@@ -40,7 +41,7 @@ public partial class RogueliteRoom : Node2D
         foreach (Node child in doorsNode.GetChildren())
         {
             if (child is not DoorMarker marker) continue;
-            
+
             var baseDir = marker.GetWorldDirection();
 
             // WallIndex determines the offset *along* the edge of the room
@@ -57,11 +58,16 @@ public partial class RogueliteRoom : Node2D
 
             bool connected = connectionChecker.Invoke(neighborPos);
             
-            if (!connected) continue;
+            if (connected)
+            {
+                var door = this.CreateChild<Door>(DoorPrefab, marker.GlobalPosition);
 
-            var door = this.CreateChild<Door>(DoorPrefab, marker.GlobalPosition);
+                door.State = DoorState.Open;
-
+            }
-            door.State = DoorState.Open;
+            else
+            {
+                var wall = this.CreateChild<Node2D>(WallPrefab, marker.GlobalPosition);
+            }
 
             // PackedScene prefab = hasConnection
             //     ? GD.Load<PackedScene>("res://Prefabs/Door.tscn")
@@ -77,16 +83,15 @@ public partial class RogueliteRoom : Node2D
     private void SpawnEnemies()
     {
         if (SpawnableEnemies is null || !SpawnableEnemies.Any()) return;
-        
+
         var enemySpawners = this.GetNode("EnemySpawners").GetChildren().Cast<Marker2D>();
 
         foreach (var spawner in enemySpawners)
         {
-
             var index = GD.RandRange(0, SpawnableEnemies.Count - 1);
-            
+
             var e = SpawnableEnemies[index];
-            
+
             var enemyScene = GD.Load<PackedScene>(e.PrefabPath);
             var spawnedEnemy = spawner.CreateChild<Node2D>(enemyScene);
         }

Scripts/Controllers/RogueliteRoomManager.cs

@@ -10,10 +10,18 @@ namespace Cirno.Scripts.Controllers;
 public partial class RogueliteRoomManager : Node2D
 {
     [Export] public Array<RogueliteRoomResource> Rooms { get; set; }
-    
+
     [Export] public Node2D SceneContainer { get; set; }
-    
+
-    private Godot.Collections.Dictionary<Vector2I, RogueliteRoomResource> _grid = new();
+    //private Godot.Collections.Dictionary<Vector2I, RogueliteRoomResource> _grid = new();
+    private Godot.Collections.Dictionary<Vector2I, RogueliteRoom> _roomGrid = new();
+
+    [Export] public Vector2I SpawnOrigin { get; private set; } = Vector2I.Zero;
+
+    [Export] public int DungeonLength { get; set; } = 10;
+    [Export] public int MaxBranches { get; set; } = 3;
+    [Export] public int MaxBranchLength { get; set; } = 3;
+
     [Export] public int DungeonWidth = 10;
     [Export] public int DungeonHeight = 10;
     [Export] public int MaxRooms = 12;
@@ -21,25 +29,24 @@ public partial class RogueliteRoomManager : Node2D
 
     [Export] public Vector2I TileSize { get; set; } = new Vector2I(16, 16);
     [Export] public Vector2I RoomSizeInTiles { get; set; } = new Vector2I(20, 10);
-    
+
     public override void _Ready()
     {
         // Spawn first room
-
     }
 
     public void InitSpawning()
     {
-        SpawnRoomsBinaryTree();
+        GenerateDungeon();
     }
-    
+
     private void SpawnRoomsGrid()
     {
         //var firstRoom = Rooms.FirstOrDefault();
 
         var origin = Vector2.Zero;
         var tileSize = new Vector2(16, 16);
-        
+
         for (int i = 0; i < 10; i++)
         {
             for (int j = 0; j < 10; j++)
@@ -53,63 +60,184 @@ public partial class RogueliteRoomManager : Node2D
         //CallDeferred(MethodName.RebakeNavigationDeferred);
     }
 
-    private void SpawnRoomsBinaryTree()
+    private IEnumerable<RogueliteRoomResource> StarterRooms => Rooms.Where(x => x.Type is RoomType.Starter);
+    private IEnumerable<RogueliteRoomResource> RegularRooms => Rooms.Where(x => x.Type is RoomType.Regular);
+    private IEnumerable<RogueliteRoomResource> BossRooms => Rooms.Where(x => x.Type is RoomType.Boss);
+
+    private List<Vector2I> _mainPath = new();
+    private List<RoomConnection> _connections = new();
+
+    private void GenerateDungeon()
     {
-        var directions = new List<Vector2I>
+        Vector2I origin = Vector2I.Zero;
-        {
+        var starterRoom = Rooms.Where(r => r.Type == RoomType.Starter).PickRandom();
-            new Vector2I(0, -1), // North
+        SpawnRoom(starterRoom, origin);
-            new Vector2I(0, 1),  // South
+        _mainPath.Add(origin);
-            new Vector2I(1, 0),  // East
-            new Vector2I(-1, 0), // West
-        };
-        
-        var origin = Vector2I.Zero;
-        var tileSize = new Vector2(16, 16);
-        var gridRoomSizeInTiles = new Vector2(20, 10);
 
-        var starterRooms = Rooms.Where(x => x.Type is RoomType.Starter).ToList();
+        var currentPos = origin;
-        var regularRooms = Rooms.Where(x => x.Type == RoomType.Regular).ToList();
 
-        var starterRoom = starterRooms[GD.RandRange(0, starterRooms.Count - 1)];
+        // 🔐 Reserve boss room position
-        
+        var bossRoom = BossRooms.FirstOrDefault();
-        var spawnedStartRoom = SpawnRoom(starterRoom, origin);
+        Vector2I? bossTargetPos = FindValidBossRoomLocation(currentPos);
-        MarkRoom(origin, starterRoom.Size, starterRoom);
+
-        
+        if (bossRoom == null || bossTargetPos == null)
-        Queue<(Vector2I Position, RogueliteRoomResource Room)> queue = new();
-        queue.Enqueue((origin, starterRoom));
-        
-        int spawnedRoomCount = 1;
-        
-        while (spawnedRoomCount < MaxRooms && queue.Count > 0)
         {
-            var (currentPos, currentRoom) = queue.Dequeue();
+            GD.PrintErr("Failed to place boss room!");
+            return;
+        }
+
+        // Generate path to boss room
+        while (currentPos != bossTargetPos.Value)
+        {
+            var nextPos = GetNextPosition(currentPos, bossTargetPos.Value);
+            if (!SpawnRoom(Rooms.Where(x => x.Type == RoomType.Regular).PickRandom(), nextPos)) break;
+
+            _mainPath.Add(nextPos);
+            _connections.Add(new RoomConnection(currentPos, nextPos));
+            currentPos = nextPos;
+        }
+
+        // Place the boss room
+        if (SpawnRoom(bossRoom, bossTargetPos.Value))
+        {
+            _mainPath.Add(bossTargetPos.Value);
+            _connections.Add(new RoomConnection(currentPos, bossTargetPos.Value));
+        }
+    }
+    
+    // private void SpawnRoomsBinaryTree()
+    // {
+    //     var directions = new List<Vector2I>
+    //     {
+    //         new Vector2I(0, -1), // North
+    //         new Vector2I(0, 1), // South
+    //         new Vector2I(1, 0), // East
+    //         new Vector2I(-1, 0), // West
+    //     };
+    //
+    //     //var origin = Vector2I.Zero;
+    //     var tileSize = new Vector2(16, 16);
+    //     var gridRoomSizeInTiles = new Vector2(20, 10);
+    //
+    //     var starterRooms = StarterRooms.ToList();
+    //     var regularRooms = RegularRooms.ToList();
+    //     var bossRooms = BossRooms.ToList();
+    //     var starterRoom = starterRooms[GD.RandRange(0, starterRooms.Count - 1)];
+    //
+    //     var spawnedStartRoom = SpawnRoom(starterRoom, SpawnOrigin);
+    //
+    //     Vector2I currentPos = SpawnOrigin;
+    //
+    //     //MarkRoom(SpawnOrigin, starterRoom.Size, starterRoom);
+    //
+    //     for (int i = 0; i < DungeonLength - 2; i++)
+    //     {
+    //         var nextPos = GetNextPosition(currentPos);
+    //         if (nextPos == currentPos) break;
+    //
+    //         var room = regularRooms[GD.RandRange(0, regularRooms.Count - 1)];
+    //         if (!SpawnRoom(room, nextPos)) break; // Skip on overlap
+    //         
+    //         _mainPath.Add(nextPos);
+    //         _connections.Add(new RoomConnection(currentPos, nextPos));
+    //         currentPos = nextPos;
+    //     }
+    //
+    //     // Place Boss Room
+    //
+    //     var bossRoom = bossRooms[GD.RandRange(0, bossRooms.Count - 1)];
+    //     var bossPos = GetNextPosition(currentPos);
+    //     if (!SpawnRoom(bossRoom, bossPos)) break; // Skip on overlap
+    //     SpawnRoom(bossRoom, bossPos);
+    //     _mainPath.Add(bossPos);
+    //     _connections.Add(new RoomConnection(currentPos, bossPos));
+    //
+    //     // Place Shop and Secret Rooms
+    //     //PlaceSpecialRoom(RoomType.Shop);
+    //     //PlaceSpecialRoom(RoomType.Secret);
+    //
+    //     // Optionally, add branches
+    //     for (int i = 0; i < MaxBranches; i++)
+    //     {
+    //         var branchStart = _mainPath[GD.RandRange(0, _mainPath.Count -1)];
+    //         var branchLength = GD.RandRange(1, MaxBranchLength);
+    //         //_random.Next(1, MaxBranchLength + 1);
+    //         var branchPos = branchStart;
+    //
+    //         for (int j = 0; j < branchLength; j++)
+    //         {
+    //             var nextPos = GetNextPosition(branchPos);
+    //             if (_roomGrid.ContainsKey(nextPos)) break;
+    //
+    //             var room = regularRooms[GD.RandRange(0,regularRooms.Count -1)];
+    //             
+    //             SpawnRoom(room, nextPos);
+    //             _connections.Add(new RoomConnection(branchPos, nextPos));
+    //             branchPos = nextPos;
+    //         }
+    //     }
+    //
+    //     // Spawn doors and walls
+    //     foreach (var roomEntry in _roomGrid)
+    //     {
+    //         var room = roomEntry.Value;
+    //         room.HandleDoors(pos =>
+    //         {
+    //             var neighborPos = room.GridPosition + pos;
+    //             return _roomGrid.ContainsKey(neighborPos);
+    //         });
+    //     }
+    // }
+    
+    private Vector2I? FindValidBossRoomLocation(Vector2I from, int maxSteps = 10)
+    {
+        var directions = new List<Vector2I> { Vector2I.Right, Vector2I.Left, Vector2I.Up, Vector2I.Down };
+
+        for (int step = 0; step < maxSteps; step++)
+        {
+            directions = directions.OrderBy(_ => GD.Randi()).ToList();
 
             foreach (var dir in directions)
             {
-                var offsetPos = currentPos + dir;
+                var pos = from + dir;
+                var bossRoom = Rooms.FirstOrDefault(r => r.Type == RoomType.Boss);
+                if (bossRoom != null && CanPlaceRoom(pos, bossRoom.Size))
+                    return pos;
 
-                // Avoid placing rooms in occupied space
+                from += dir;
-                if (_grid.ContainsKey(offsetPos)) continue;
-
-                var nextRoom = regularRooms[GD.RandRange(0, regularRooms.Count - 1)];
-                var roomSize = nextRoom.Size;
-
-                // Multi-tile room placement validation
-                if (!CanPlaceRoom(offsetPos, roomSize)) continue;
-
-                SpawnRoom(nextRoom, offsetPos);
-                MarkRoom(offsetPos, roomSize, nextRoom);
-                queue.Enqueue((offsetPos, nextRoom));
-                spawnedRoomCount++;
-
-                if (spawnedRoomCount >= MaxRooms)
-                    break;
             }
         }
 
-        //SpawnSpecialRooms(rng);
+        return null;
-        
+    }
-        
+
+    private Vector2I GetNextPosition(Vector2I current, Vector2I target)
+    {
+        var possibleDirs = new List<Vector2I>();
+
+        if (target.X > current.X)
+            possibleDirs.Add(Vector2I.Right);
+        else if (target.X < current.X)
+            possibleDirs.Add(Vector2I.Left);
+
+        if (target.Y > current.Y)
+            possibleDirs.Add(Vector2I.Down);
+        else if (target.Y < current.Y)
+            possibleDirs.Add(Vector2I.Up);
+
+        // Add random noise to allow slightly winding paths
+        possibleDirs.AddRange(new[] { Vector2I.Right, Vector2I.Left, Vector2I.Up, Vector2I.Down });
+
+        possibleDirs = possibleDirs.Distinct().OrderBy(_ => GD.Randi()).ToList();
+
+        foreach (var dir in possibleDirs)
+        {
+            var nextPos = current + dir;
+            if (!_roomGrid.ContainsKey(nextPos))
+                return nextPos;
+        }
+
+        return current; // No valid next position found
     }
 
     private void RebakeNavigationDeferred()
@@ -117,24 +245,30 @@ public partial class RogueliteRoomManager : Node2D
         GameManager.Instance.RebakeNavigation();
     }
 
-    private RogueliteRoom SpawnRoom(RogueliteRoomResource room, Vector2I gridPos)
+    private bool SpawnRoom(RogueliteRoomResource room, Vector2I gridPos)
     {
-        var position = gridPos * TileSize * RoomSizeInTiles;
+        if (!CanPlaceRoom(gridPos, room.Size))
+            return false;
         
+        var position = gridPos * TileSize * RoomSizeInTiles;
+
         var roomScene = GD.Load<PackedScene>(room.ScenePath);
         var spawnedScene = this.CreateChild<RogueliteRoom>(roomScene, position);
-        
+
+        spawnedScene.GridPosition = gridPos;
+
         // for reference
         //SpawnRoom(room, origin + (room.Size * new Vector2(i, j) * tileSize));
-        
+        spawnedScene.Spawn();
-        return spawnedScene.Spawn(CheckConnection);
+        MarkRoom(SpawnOrigin, room.Size, spawnedScene);
+        return true;
     }
-    
+
-    private bool CheckConnection(Vector2I pos)
+    // private bool CheckConnection(Vector2I pos)
-    {
+    // {
-        return _grid.ContainsKey(pos); // <- this is your dungeon grid dictionary
+    //     return _grid.ContainsKey(pos); // <- this is your dungeon grid dictionary
-    }
+    // }
-    
+    //
     private bool CanPlaceRoom(Vector2I origin, Vector2I size)
     {
         for (int x = 0; x < size.X; x++)
@@ -142,21 +276,38 @@ public partial class RogueliteRoomManager : Node2D
             for (int y = 0; y < size.Y; y++)
             {
                 var pos = origin + new Vector2I(x, y);
-                if (_grid.ContainsKey(pos)) return false;
+                if (_roomGrid.ContainsKey(pos)) return false;
             }
         }
+    
         return true;
     }
 
-    private void MarkRoom(Vector2I origin, Vector2I size, RogueliteRoomResource room)
+    private void MarkRoom(Vector2I origin, Vector2I size, RogueliteRoom room)
     {
         for (int x = 0; x < size.X; x++)
         {
             for (int y = 0; y < size.Y; y++)
             {
                 var pos = origin + new Vector2I(x, y);
-                _grid[pos] = room;
+                _roomGrid[pos] = room;
             }
         }
     }
+}
+
+public class RoomConnection
+{
+    public Vector2I From;
+    public Vector2I To;
+    public bool IsLocked;
+    public bool IsSecret;
+
+    public RoomConnection(Vector2I from, Vector2I to, bool isLocked = false, bool isSecret = false)
+    {
+        From = from;
+        To = to;
+        IsLocked = isLocked;
+        IsSecret = isSecret;
+    }
 }

Scripts/Enums/DoorDirections.cs.uid

@@ -0,0 +1 @@
+uid://dps60d5h7rill

Scripts/Tools.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Godot;
 
 namespace Cirno.Scripts;
@@ -101,4 +104,10 @@ public static class Tools
 			return new Vector2(0, Mathf.Sign(input.Y)); // Up or Down
 		}
 	}
+	
+	public static T PickRandom<T>(this IEnumerable<T> list)
+	{
+		var arr = list.ToArray();
+		return arr[GD.RandRange(0, arr.Length -1)];
+	}
 }