Horizontal offsets

Resources/RogueliteMaps/Rg1.tres

@@ -0,0 +1,17 @@
+[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=6 format=3 uid="uid://liqpx3cabklu"]
+
+[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="1_l4wqv"]
+[ext_resource type="Resource" uid="uid://cqfyuurvqb8m6" path="res://Resources/Enemies/Base_Fairy_Special.tres" id="2_021oh"]
+[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="3_h5gy3"]
+[ext_resource type="Resource" uid="uid://cfdvg162u65sr" path="res://Resources/Enemies/Thermathron.tres" id="4_66sgc"]
+[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="5_y84rx"]
+
+[resource]
+script = ExtResource("5_y84rx")
+RoomName = &"Test"
+Type = 1
+ScenePath = &"uid://da7hmajaaiohm"
+Size = Vector2i(1, 1)
+DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)])
+SpawnableEnemies = Array[Object]([ExtResource("1_l4wqv"), ExtResource("2_021oh"), ExtResource("3_h5gy3"), ExtResource("4_66sgc")])
+metadata/_custom_type_script = "uid://bl2ne8w12e3a"

Resources/RogueliteMaps/TestRGMapLong.tres

@@ -0,0 +1,17 @@
+[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=6 format=3 uid="uid://ryfk7g1wqypk"]
+
+[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="1_qpcgt"]
+[ext_resource type="Resource" uid="uid://cqfyuurvqb8m6" path="res://Resources/Enemies/Base_Fairy_Special.tres" id="2_3a551"]
+[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="3_v7kc3"]
+[ext_resource type="Resource" uid="uid://cfdvg162u65sr" path="res://Resources/Enemies/Thermathron.tres" id="4_fwmn4"]
+[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="5_ygk48"]
+
+[resource]
+script = ExtResource("5_ygk48")
+RoomName = &"Test"
+Type = 1
+ScenePath = &"uid://hmu4dw62c10t"
+Size = Vector2i(1, 2)
+DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)])
+SpawnableEnemies = Array[Object]([ExtResource("1_qpcgt"), ExtResource("2_3a551"), ExtResource("3_v7kc3"), ExtResource("4_fwmn4")])
+metadata/_custom_type_script = "uid://bl2ne8w12e3a"

Scenes/Maps/Roguelike.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=17 format=3 uid="uid://bf1kqr3o6r6d4"]
+[gd_scene load_steps=19 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"]
 [ext_resource type="Resource" uid="uid://6ek4lmtuij4t" path="res://Resources/Maps/Roguelite.tres" id="2_k5t51"]
 [ext_resource type="Script" uid="uid://bt2qjgnf1wc2r" path="res://Scripts/Controllers/RogueliteRoomManager.cs" id="4_jtlua"]
-[ext_resource type="Resource" uid="uid://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="5_pfafs"]
+[ext_resource type="Resource" uid="uid://b5x83li01qrav" path="res://Resources/RogueliteMaps/TestRGMap.tres" id="5_gwtv6"]
+[ext_resource type="Resource" uid="uid://ryfk7g1wqypk" path="res://Resources/RogueliteMaps/TestRGMapLong.tres" id="5_pfafs"]
 [ext_resource type="Resource" uid="uid://ly8l7asedjpx" path="res://Resources/RogueliteMaps/TestRGMap2.tres" id="6_gwtv6"]
 [ext_resource type="Resource" uid="uid://dn3ai56rrxfnk" path="res://Resources/RogueliteMaps/Beginner1.tres" id="7_wbqvu"]
 [ext_resource type="Resource" uid="uid://cgac12krx7vbf" path="res://Resources/RogueliteMaps/Boss1.tres" id="8_3fyis"]
@@ -13,6 +14,7 @@
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="9_vhvs2"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="10_6gk3e"]
 [ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="11_4gy5m"]
+[ext_resource type="Resource" uid="uid://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="11_68lig"]
 [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"]
 [ext_resource type="Script" uid="uid://3v6q0p5krqn7" path="res://Scripts/UI/Minimap.cs" id="16_pfafs"]
@@ -29,8 +31,8 @@ SpawnMarkers = Dictionary[int, NodePath]({
 [node name="Maps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]]
 process_mode = 1
 script = ExtResource("4_jtlua")
-Rooms = Array[Object]([ExtResource("5_pfafs"), ExtResource("6_gwtv6"), ExtResource("7_wbqvu"), ExtResource("8_3fyis"), ExtResource("9_go1yg"), ExtResource("5_pfafs")])
+Rooms = Array[Object]([ExtResource("5_gwtv6"), ExtResource("6_gwtv6"), ExtResource("7_wbqvu"), ExtResource("8_3fyis"), ExtResource("9_go1yg"), ExtResource("5_pfafs"), ExtResource("11_68lig")])
-DungeonLength = 4
+DungeonLength = 8
 
 [node name="CameraController" type="Camera2D" parent="."]
 process_mode = 1

Scenes/Maps/RogueliteMaps/Rg1.tscn

@@ -1,7 +1,7 @@
 [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://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="2_rlq0q"]
+[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"]
@@ -18,7 +18,7 @@ source_geometry_mode = 1
 [node name="Map" type="Node2D"]
 process_mode = 1
 script = ExtResource("1_dm6kf")
-RoomResource = ExtResource("2_rlq0q")
+RoomResource = ExtResource("2_5s4nm")
 DoorPrefab = ExtResource("3_sid7o")
 WallPrefab = ExtResource("4_rlq0q")
 

Scripts/Controllers/RogueliteRoomManager.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Cirno.Scripts.Enums;
 using Cirno.Scripts.Resources.Roguelite;
@@ -92,18 +93,40 @@ public partial class RogueliteRoomManager : Node2D
 
             //var roomToSpawn = Rooms.Where(x => x.Type == RoomType.Regular).PickRandom();
             var roomToSpawn = randomRoomsList[i];
-            
-            if (!SpawnRoom(roomToSpawn, nextPos)) break;
 
-            _mainPath.Add(nextPos);
+            var offset = 0;
+            
+            // Place it at a random X position
+            if (roomToSpawn.Size.X > 1)
+            {
+                offset -= GD.RandRange(0, roomToSpawn.Size.X - 1);
+            }
+
+            var posWithOffset = new Vector2I(offset, nextPos.Y);
+            
+            if (!SpawnRoom(roomToSpawn, posWithOffset))
+            {
+                GD.PrintErr("Could not spawn room");
+                break;
+            };
+
+            _mainPath.Add(posWithOffset);
             
             if (roomToSpawn.Size.Y > 1)
             {
                 nextPos += new Vector2I(0, roomToSpawn.Size.Y - 1); 
             }
             
+            // Pick a random exit to continue
+            var exit = Math.Min(0, GD.RandRange(0, roomToSpawn.Size.X - 1)); 
+            
+            nextPos += new Vector2I(0, exit);
+            
             _connections.Add(new RoomConnection(currentPos, nextPos));
             
+            // Reset X offset
+            //nextPos = new Vector2I(0, nextPos.Y);
+            
             currentPos = nextPos;
         }
         
@@ -122,6 +145,10 @@ public partial class RogueliteRoomManager : Node2D
             
             _connections.Add(new RoomConnection(currentPos, nextPos));
         }
+        else
+        {
+            GD.PrintErr("Could not spawn boss room");
+        }
         
         foreach (var roomEntry in _roomGrid)
         {

Scripts/Utils/ShuffleExtensions.cs

@@ -19,7 +19,7 @@ public static class ShuffleExtensions
         if (originalCount == 0) yield break;
 
         // Repeat elements to meet the desired length
-        if (desiredLength.HasValue && desiredLength > originalCount)
+        if (desiredLength > originalCount)
         {
             int countToAdd = desiredLength.Value - originalCount;
             for (int i = 0; i < countToAdd; i++)