From bbdba6ae6dbb9199a75d90bb4a7f0a91fae2fa75 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 15 Apr 2025 16:22:30 +0200 Subject: [PATCH] Horizontal offsets --- Resources/RogueliteMaps/Rg1.tres | 17 ++++ Resources/RogueliteMaps/TestRGMapLong.tres | 17 ++++ Scenes/Maps/Roguelike.tscn | 10 ++- Scenes/Maps/RogueliteMaps/Rg1.tscn | 4 +- Scenes/Maps/RogueliteMaps/RgLong.tscn | 95 +++++++++++++++++++++ Scripts/Controllers/RogueliteRoomManager.cs | 35 +++++++- Scripts/Utils/ShuffleExtensions.cs | 2 +- 7 files changed, 169 insertions(+), 11 deletions(-) create mode 100644 Resources/RogueliteMaps/Rg1.tres create mode 100644 Resources/RogueliteMaps/TestRGMapLong.tres create mode 100644 Scenes/Maps/RogueliteMaps/RgLong.tscn diff --git a/Resources/RogueliteMaps/Rg1.tres b/Resources/RogueliteMaps/Rg1.tres new file mode 100644 index 00000000..5ecfc16d --- /dev/null +++ b/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" diff --git a/Resources/RogueliteMaps/TestRGMapLong.tres b/Resources/RogueliteMaps/TestRGMapLong.tres new file mode 100644 index 00000000..8c54a05a --- /dev/null +++ b/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" diff --git a/Scenes/Maps/Roguelike.tscn b/Scenes/Maps/Roguelike.tscn index 6e3e93ca..4fc21045 100644 --- a/Scenes/Maps/Roguelike.tscn +++ b/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")]) -DungeonLength = 4 +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 = 8 [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 diff --git a/Scenes/Maps/RogueliteMaps/Rg1.tscn b/Scenes/Maps/RogueliteMaps/Rg1.tscn index 2e529733..7375a344 100644 --- a/Scenes/Maps/RogueliteMaps/Rg1.tscn +++ b/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") diff --git a/Scenes/Maps/RogueliteMaps/RgLong.tscn b/Scenes/Maps/RogueliteMaps/RgLong.tscn new file mode 100644 index 00000000..a9d956fe --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/RgLong.tscn @@ -0,0 +1,95 @@ +[gd_scene load_steps=9 format=4 uid="uid://hmu4dw62c10t"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_4lag8"] +[ext_resource type="Resource" uid="uid://ryfk7g1wqypk" path="res://Resources/RogueliteMaps/TestRGMapLong.tres" id="2_4lag8"] +[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_112g0"] +[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_wcv20"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_upf1e"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_kwstq"] +[ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="7_f6crt"] + +[sub_resource type="NavigationPolygon" id="NavigationPolygon_rlq0q"] +vertices = PackedVector2Array(166, 58, 294, 58, 294, 294, 166, 294, 166, 310, 154, 310, 154, 294, 154, 58, 26, 294, 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_4lag8") +RoomResource = ExtResource("2_4lag8") +DoorPrefab = ExtResource("3_112g0") +WallPrefab = ExtResource("4_wcv20") + +[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("AAAAAAIAAAAMAAcAAAAAAAMAAAAMAAcAAAAAAAQAAAAMAAcAAAAAAAUAAAAMAAcAAAAAAAYAAAAMAAcAAAAAAAcAAAAMAAcAAAAAAAgAAAAMAAcAAAAAAAkAAAAMAAcAAAABAAIAAAAMAAcAAAABAAMAAAAMAAcAAAABAAQAAAAMAAcAAAABAAUAAAAMAAcAAAABAAYAAAAMAAcAAAABAAcAAAAMAAcAAAABAAgAAAAMAAcAAAABAAkAAAAMAAcAAAACAAIAAAAMAAcAAAACAAMAAAAMAAcAAAACAAQAAAAMAAcAAAACAAUAAAAMAAcAAAACAAYAAAAMAAcAAAACAAcAAAAMAAcAAAACAAgAAAAMAAcAAAACAAkAAAAMAAcAAAADAAIAAAAMAAcAAAADAAMAAAAMAAcAAAADAAQAAAAMAAcAAAADAAUAAAAMAAcAAAADAAYAAAAMAAcAAAADAAcAAAAMAAcAAAADAAgAAAAMAAcAAAADAAkAAAAMAAcAAAAEAAIAAAAMAAcAAAAEAAMAAAAMAAcAAAAEAAQAAAAMAAcAAAAEAAUAAAAMAAcAAAAEAAYAAAAMAAcAAAAEAAcAAAAMAAcAAAAEAAgAAAAMAAcAAAAEAAkAAAAMAAcAAAAFAAIAAAAMAAcAAAAFAAMAAAAMAAcAAAAFAAQAAAAMAAcAAAAFAAUAAAAMAAcAAAAFAAYAAAAMAAcAAAAFAAcAAAAMAAcAAAAFAAgAAAAMAAcAAAAFAAkAAAAMAAcAAAAGAAIAAAAMAAcAAAAGAAMAAAAMAAcAAAAGAAQAAAAMAAcAAAAGAAUAAAAMAAcAAAAGAAYAAAAMAAcAAAAGAAcAAAAMAAcAAAAGAAgAAAAMAAcAAAAGAAkAAAAMAAcAAAAHAAIAAAAMAAcAAAAHAAMAAAAMAAcAAAAHAAQAAAAMAAcAAAAHAAUAAAAMAAcAAAAHAAYAAAAMAAcAAAAHAAcAAAAMAAcAAAAHAAgAAAAMAAcAAAAHAAkAAAAMAAcAAAAIAAIAAAAMAAcAAAAIAAMAAAAMAAcAAAAIAAQAAAAMAAcAAAAIAAUAAAAMAAcAAAAIAAYAAAAMAAcAAAAIAAcAAAAMAAcAAAAIAAgAAAAMAAcAAAAIAAkAAAAMAAcAAAAJAAIAAAAMAAcAAAAJAAMAAAAMAAcAAAAJAAQAAAAMAAcAAAAJAAUAAAAMAAcAAAAJAAYAAAAMAAcAAAAJAAcAAAAMAAcAAAAJAAgAAAAMAAcAAAAJAAkAAAAMAAcAAAAKAAIAAAAMAAcAAAAKAAMAAAAMAAcAAAAKAAQAAAAMAAcAAAAKAAUAAAAMAAcAAAAKAAYAAAAMAAcAAAAKAAcAAAAMAAcAAAAKAAgAAAAMAAcAAAAKAAkAAAAMAAcAAAALAAIAAAAMAAcAAAALAAUAAAAMAAcAAAALAAYAAAAMAAcAAAALAAcAAAAMAAcAAAALAAgAAAAMAAcAAAALAAkAAAAMAAcAAAAMAAIAAAAMAAcAAAAMAAUAAAAMAAcAAAAMAAYAAAAMAAcAAAAMAAcAAAAMAAcAAAAMAAgAAAAMAAcAAAAMAAkAAAAMAAcAAAANAAIAAAAMAAcAAAANAAMAAAAMAAcAAAANAAQAAAAMAAcAAAANAAUAAAAMAAcAAAANAAYAAAAMAAcAAAANAAcAAAAMAAcAAAANAAgAAAAMAAcAAAANAAkAAAAMAAcAAAAOAAIAAAAMAAcAAAAOAAMAAAAMAAcAAAAOAAQAAAAMAAcAAAAOAAUAAAAMAAcAAAAOAAYAAAAMAAcAAAAOAAcAAAAMAAcAAAAOAAgAAAAMAAcAAAAOAAkAAAAMAAcAAAAPAAIAAAAMAAcAAAAPAAMAAAAMAAcAAAAPAAQAAAAMAAcAAAAPAAUAAAAMAAcAAAAPAAYAAAAMAAcAAAAPAAcAAAAMAAcAAAAPAAgAAAAMAAcAAAAPAAkAAAAMAAcAAAAQAAIAAAAMAAcAAAAQAAMAAAAMAAcAAAAQAAQAAAAMAAcAAAAQAAUAAAAMAAcAAAAQAAYAAAAMAAcAAAAQAAcAAAAMAAcAAAAQAAgAAAAMAAcAAAAQAAkAAAAMAAcAAAARAAIAAAAMAAcAAAARAAMAAAAMAAcAAAARAAQAAAAMAAcAAAARAAUAAAAMAAcAAAARAAYAAAAMAAcAAAARAAcAAAAMAAcAAAARAAgAAAAMAAcAAAARAAkAAAAMAAcAAAASAAIAAAAMAAcAAAASAAMAAAAMAAcAAAASAAQAAAAMAAcAAAASAAUAAAAMAAcAAAASAAYAAAAMAAcAAAASAAcAAAAMAAcAAAASAAgAAAAMAAcAAAASAAkAAAAMAAcAAAATAAIAAAAMAAcAAAATAAMAAAAMAAcAAAATAAQAAAAMAAcAAAATAAUAAAAMAAcAAAATAAYAAAAMAAcAAAATAAcAAAAMAAcAAAATAAgAAAAMAAcAAAATAAkAAAAMAAcAAAAAAAAAAAAMAAcAAAAAAAEAAAAMAAcAAAABAAAAAAAMAAcAAAABAAEAAAAMAAcAAAACAAAAAAAMAAcAAAACAAEAAAAMAAcAAAADAAAAAAAMAAcAAAADAAEAAAAMAAcAAAAEAAAAAAAMAAcAAAAEAAEAAAAMAAcAAAAFAAAAAAAMAAcAAAAFAAEAAAAMAAcAAAAGAAAAAAAMAAcAAAAGAAEAAAAMAAcAAAAHAAAAAAAMAAcAAAAHAAEAAAAMAAcAAAAIAAAAAAAMAAcAAAAIAAEAAAAMAAcAAAAJAAAAAAAMAAcAAAAJAAEAAAAMAAcAAAAKAAAAAAAMAAcAAAAKAAEAAAAMAAcAAAALAAAAAAAMAAcAAAALAAEAAAAMAAcAAAALAAMAAAAMAAcAAAALAAQAAAAMAAcAAAAMAAAAAAAMAAcAAAAMAAEAAAAMAAcAAAAMAAMAAAAMAAcAAAAMAAQAAAAMAAcAAAANAAAAAAAMAAcAAAANAAEAAAAMAAcAAAAOAAAAAAAMAAcAAAAOAAEAAAAMAAcAAAAPAAAAAAAMAAcAAAAPAAEAAAAMAAcAAAAQAAAAAAAMAAcAAAAQAAEAAAAMAAcAAAARAAAAAAAMAAcAAAARAAEAAAAMAAcAAAASAAAAAAAMAAcAAAASAAEAAAAMAAcAAAATAAAAAAAMAAcAAAATAAEAAAAMAAcAAAAAAAoAAAAMAAcAAAAAAAsAAAAMAAcAAAABAAoAAAAMAAcAAAABAAsAAAAMAAcAAAACAAoAAAAMAAcAAAACAAsAAAAMAAcAAAADAAoAAAAMAAcAAAADAAsAAAAMAAcAAAAEAAoAAAAMAAcAAAAEAAsAAAAMAAcAAAAAAAwAAAAMAAcAAAAAAA0AAAAMAAcAAAAAAA4AAAAMAAcAAAAAAA8AAAAMAAcAAAABAAwAAAAMAAcAAAABAA0AAAAMAAcAAAABAA4AAAAMAAcAAAABAA8AAAAMAAcAAAACAAwAAAAMAAcAAAACAA0AAAAMAAcAAAACAA4AAAAMAAcAAAACAA8AAAAMAAcAAAADAAwAAAAMAAcAAAADAA0AAAAMAAcAAAADAA4AAAAMAAcAAAADAA8AAAAMAAcAAAAEAAwAAAAMAAcAAAAEAA0AAAAMAAcAAAAEAA4AAAAMAAcAAAAEAA8AAAAMAAcAAAAAABAAAAAMAAcAAAAAABEAAAAMAAcAAAAAABIAAAAMAAcAAAAAABMAAAAMAAcAAAABABAAAAAMAAcAAAABABEAAAAMAAcAAAABABIAAAAMAAcAAAABABMAAAAMAAcAAAACABAAAAAMAAcAAAACABEAAAAMAAcAAAACABIAAAAMAAcAAAACABMAAAAMAAcAAAADABAAAAAMAAcAAAADABEAAAAMAAcAAAADABIAAAAMAAcAAAADABMAAAAMAAcAAAAEABAAAAAMAAcAAAAEABEAAAAMAAcAAAAEABIAAAAMAAcAAAAEABMAAAAMAAcAAAAFAAoAAAAMAAcAAAAFAAsAAAAMAAcAAAAGAAoAAAAMAAcAAAAGAAsAAAAMAAcAAAAHAAoAAAAMAAcAAAAHAAsAAAAMAAcAAAAIAAoAAAAMAAcAAAAIAAsAAAAMAAcAAAAJAAoAAAAMAAcAAAAJAAsAAAAMAAcAAAAKAAoAAAAMAAcAAAAKAAsAAAAMAAcAAAALAAoAAAAMAAcAAAALAAsAAAAMAAcAAAAMAAoAAAAMAAcAAAAMAAsAAAAMAAcAAAANAAoAAAAMAAcAAAANAAsAAAAMAAcAAAAOAAoAAAAMAAcAAAAOAAsAAAAMAAcAAAAPAAoAAAAMAAcAAAAPAAsAAAAMAAcAAAAQAAoAAAAMAAcAAAAQAAsAAAAMAAcAAAARAAoAAAAMAAcAAAARAAsAAAAMAAcAAAASAAoAAAAMAAcAAAASAAsAAAAMAAcAAAATAAoAAAAMAAcAAAATAAsAAAAMAAcAAAAFAAwAAAAMAAcAAAAFAA0AAAAMAAcAAAAFAA4AAAAMAAcAAAAFAA8AAAAMAAcAAAAGAAwAAAAMAAcAAAAGAA0AAAAMAAcAAAAGAA4AAAAMAAcAAAAGAA8AAAAMAAcAAAAHAAwAAAAMAAcAAAAHAA0AAAAMAAcAAAAHAA4AAAAMAAcAAAAHAA8AAAAMAAcAAAAIAAwAAAAMAAcAAAAIAA0AAAAMAAcAAAAIAA4AAAAMAAcAAAAIAA8AAAAMAAcAAAAJAAwAAAAMAAcAAAAJAA0AAAAMAAcAAAAJAA4AAAAMAAcAAAAJAA8AAAAMAAcAAAAKAAwAAAAMAAcAAAAKAA0AAAAMAAcAAAAKAA4AAAAMAAcAAAAKAA8AAAAMAAcAAAALAAwAAAAMAAcAAAALAA0AAAAMAAcAAAALAA4AAAAMAAcAAAALAA8AAAAMAAcAAAAMAAwAAAAMAAcAAAAMAA0AAAAMAAcAAAAMAA4AAAAMAAcAAAAMAA8AAAAMAAcAAAANAAwAAAAMAAcAAAANAA0AAAAMAAcAAAANAA4AAAAMAAcAAAANAA8AAAAMAAcAAAAOAAwAAAAMAAcAAAAOAA0AAAAMAAcAAAAOAA4AAAAMAAcAAAAOAA8AAAAMAAcAAAAPAAwAAAAMAAcAAAAPAA0AAAAMAAcAAAAPAA4AAAAMAAcAAAAPAA8AAAAMAAcAAAAQAAwAAAAMAAcAAAAQAA0AAAAMAAcAAAAQAA4AAAAMAAcAAAAQAA8AAAAMAAcAAAARAAwAAAAMAAcAAAARAA0AAAAMAAcAAAARAA4AAAAMAAcAAAARAA8AAAAMAAcAAAASAAwAAAAMAAcAAAASAA0AAAAMAAcAAAASAA4AAAAMAAcAAAASAA8AAAAMAAcAAAATAAwAAAAMAAcAAAATAA0AAAAMAAcAAAATAA4AAAAMAAcAAAATAA8AAAAMAAcAAAAFABAAAAAMAAcAAAAFABEAAAAMAAcAAAAFABIAAAAMAAcAAAAFABMAAAAMAAcAAAAGABAAAAAMAAcAAAAGABEAAAAMAAcAAAAGABIAAAAMAAcAAAAGABMAAAAMAAcAAAAHABAAAAAMAAcAAAAHABEAAAAMAAcAAAAHABIAAAAMAAcAAAAHABMAAAAMAAcAAAAIABAAAAAMAAcAAAAIABEAAAAMAAcAAAAIABIAAAAMAAcAAAAIABMAAAAMAAcAAAAJABAAAAAMAAcAAAAJABEAAAAMAAcAAAAJABIAAAAMAAcAAAAJABMAAAAMAAcAAAAKABAAAAAMAAcAAAAKABEAAAAMAAcAAAAKABIAAAAMAAcAAAAKABMAAAAMAAcAAAALABAAAAAMAAcAAAALABEAAAAMAAcAAAALABIAAAAMAAcAAAALABMAAAAMAAcAAAAMABAAAAAMAAcAAAAMABEAAAAMAAcAAAAMABIAAAAMAAcAAAAMABMAAAAMAAcAAAANABAAAAAMAAcAAAANABEAAAAMAAcAAAANABIAAAAMAAcAAAANABMAAAAMAAcAAAAOABAAAAAMAAcAAAAOABEAAAAMAAcAAAAOABIAAAAMAAcAAAAOABMAAAAMAAcAAAAPABAAAAAMAAcAAAAPABEAAAAMAAcAAAAPABIAAAAMAAcAAAAPABMAAAAMAAcAAAAQABAAAAAMAAcAAAAQABEAAAAMAAcAAAAQABIAAAAMAAcAAAAQABMAAAAMAAcAAAARABAAAAAMAAcAAAARABEAAAAMAAcAAAARABIAAAAMAAcAAAARABMAAAAMAAcAAAASABAAAAAMAAcAAAASABEAAAAMAAcAAAASABIAAAAMAAcAAAASABMAAAAMAAcAAAATABAAAAAMAAcAAAATABEAAAAMAAcAAAATABIAAAAMAAcAAAATABMAAAAMAAcAAAA=") +tile_set = ExtResource("5_upf1e") +navigation_enabled = false +script = ExtResource("6_kwstq") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAEAAQAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAAEAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAKAAgAAAATAAQAAAAKAAkAAAALAAEAAAAKAAgAAAALAAIAAAAKAAkAAAAMAAEAAAAKAAgAAAAMAAIAAAAKAAkAAAANAAEAAAAKAAgAAAANAAIAAAAKAAkAAAAOAAEAAAAKAAgAAAAOAAIAAAAKAAkAAAAPAAEAAAAKAAgAAAAPAAIAAAAKAAkAAAAQAAEAAAAKAAgAAAAQAAIAAAAKAAkAAAARAAEAAAAKAAgAAAARAAIAAAAKAAkAAAASAAEAAAAKAAgAAAASAAIAAAAKAAkAAAABAAEAAAAKAAgAAAABAAIAAAAKAAkAAAACAAEAAAAKAAgAAAACAAIAAAAKAAkAAAADAAEAAAAKAAgAAAADAAIAAAAKAAkAAAAEAAEAAAAKAAgAAAAEAAIAAAAKAAkAAAAFAAEAAAAKAAgAAAAFAAIAAAAKAAkAAAAGAAEAAAAKAAgAAAAGAAIAAAAKAAkAAAAHAAEAAAAKAAgAAAAHAAIAAAAKAAkAAAAIAAEAAAAKAAgAAAAIAAIAAAAKAAkAAAAAAAMAAAAKAAgAAAAAAAQAAAAKAAkAAAAAAAoAAAAFAAQAAAAAAAsAAAAAAAQAAAAAAAwAAAAEAAQAAAAAAA0AAAAKAAgAAAAAAA4AAAAKAAkAAAAAABAAAAAFAAQAAAAAABEAAAAAAAQAAAAAABIAAAAAAAQAAAAAABMAAAAAAAwAAAABABMAAAABAAQAAAACABMAAAABAAQAAAADABMAAAABAAQAAAAEABMAAAABAAQAAAAFABMAAAABAAQAAAAGABMAAAABAAQAAAAHABMAAAABAAQAAAAIABMAAAADAAQAAAALABMAAAACAAQAAAAMABMAAAABAAQAAAANABMAAAABAAQAAAAOABMAAAABAAQAAAAPABMAAAABAAQAAAAQABMAAAABAAQAAAARABMAAAABAAQAAAASABMAAAABAAQAAAATAAoAAAAFAAQAAAATAAsAAAAAAAQAAAATAAwAAAAEAAQAAAATAA0AAAAKAAgAAAATAA4AAAAKAAkAAAATABAAAAAFAAQAAAATABEAAAAAAAQAAAATABIAAAAAAAQAAAATABMAAAABAAwAAAA=") +tile_set = ExtResource("5_upf1e") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_set = ExtResource("5_upf1e") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Actors" type="Node2D" parent="Tilemaps"] +metadata/_edit_lock_ = true + +[node name="EnemySpawners" type="Node2D" parent="."] + +[node name="RogueliteEnemySpawner" type="Marker2D" parent="EnemySpawners"] +position = Vector2(57, 67) + +[node name="RogueliteEnemySpawner2" type="Marker2D" parent="EnemySpawners"] +position = Vector2(82, 185) + +[node name="RogueliteEnemySpawner3" type="Marker2D" parent="EnemySpawners"] +position = Vector2(261, 248) + +[node name="Doors" type="Node2D" parent="."] + +[node name="North" type="Marker2D" parent="Doors"] +position = Vector2(159, 23) +script = ExtResource("7_f6crt") + +[node name="South" type="Marker2D" parent="Doors"] +position = Vector2(158.671, 315.53) +script = ExtResource("7_f6crt") +Direction = 1 + +[node name="East" type="Marker2D" parent="Doors"] +position = Vector2(312, 87) +script = ExtResource("7_f6crt") +Direction = 2 + +[node name="East2" type="Marker2D" parent="Doors"] +position = Vector2(312.752, 247.02) +script = ExtResource("7_f6crt") +Direction = 2 +WallIndex = 1 + +[node name="West" type="Marker2D" parent="Doors"] +position = Vector2(8.1806, 87.7693) +script = ExtResource("7_f6crt") +Direction = 3 + +[node name="West2" type="Marker2D" parent="Doors"] +position = Vector2(9.12251, 246.487) +script = ExtResource("7_f6crt") +Direction = 3 +WallIndex = 1 + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +navigation_polygon = SubResource("NavigationPolygon_rlq0q") +use_edge_connections = false diff --git a/Scripts/Controllers/RogueliteRoomManager.cs b/Scripts/Controllers/RogueliteRoomManager.cs index 96619ecb..bce3332a 100644 --- a/Scripts/Controllers/RogueliteRoomManager.cs +++ b/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) { diff --git a/Scripts/Utils/ShuffleExtensions.cs b/Scripts/Utils/ShuffleExtensions.cs index 64c1868d..d5f1bd09 100644 --- a/Scripts/Utils/ShuffleExtensions.cs +++ b/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++)