diff --git a/Resources/RogueliteMaps/Boss1.tres b/Resources/RogueliteMaps/Boss1.tres index c123cea8..6e78c779 100644 --- a/Resources/RogueliteMaps/Boss1.tres +++ b/Resources/RogueliteMaps/Boss1.tres @@ -9,7 +9,7 @@ [resource] script = ExtResource("5_2u7yj") RoomName = &"Boss1" -Type = 4 +Type = 6 ScenePath = &"uid://brytwc48xpj78" Size = Vector2i(1, 1) DoorGridPositions = Array[Vector2i]([Vector2i(0, 1)]) diff --git a/Resources/RogueliteMaps/KeyRoom1.tres b/Resources/RogueliteMaps/KeyRoom1.tres new file mode 100644 index 00000000..1ccc8ae0 --- /dev/null +++ b/Resources/RogueliteMaps/KeyRoom1.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=2 format=3 uid="uid://bew4cuec4pbms"] + +[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="5_dr5c8"] + +[resource] +script = ExtResource("5_dr5c8") +RoomName = &"KeyRoom" +Type = 4 +ScenePath = &"uid://cadjkf73yep12" +Size = Vector2i(1, 1) +DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) +SpawnableEnemies = null +DoorDirections = 30 +metadata/_custom_type_script = "uid://bl2ne8w12e3a" diff --git a/Resources/RogueliteMaps/RGHorizontal1x1.tres b/Resources/RogueliteMaps/RGHorizontal1x1.tres index ab908d22..aeb8a81d 100644 --- a/Resources/RogueliteMaps/RGHorizontal1x1.tres +++ b/Resources/RogueliteMaps/RGHorizontal1x1.tres @@ -10,7 +10,7 @@ script = ExtResource("5_6i0i5") RoomName = &"TestMapSmall" Type = 1 -ScenePath = &"uid://da7hmajaaiohm" +ScenePath = &"uid://pym646ug0ha6" Size = Vector2i(1, 1) DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) SpawnableEnemies = Array[Object]([ExtResource("1_qpd3i"), ExtResource("2_wcax6"), ExtResource("3_jwk05"), ExtResource("4_n80ev")]) diff --git a/Resources/RogueliteMaps/SecretRoom1.tres b/Resources/RogueliteMaps/SecretRoom1.tres new file mode 100644 index 00000000..39818111 --- /dev/null +++ b/Resources/RogueliteMaps/SecretRoom1.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=2 format=3 uid="uid://bo4efv7rwowuh"] + +[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="1_8oy5x"] + +[resource] +script = ExtResource("1_8oy5x") +RoomName = &"SecretRoom" +Type = 2 +ScenePath = &"uid://r2j1wyglsnt5" +Size = Vector2i(1, 1) +DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) +SpawnableEnemies = null +DoorDirections = 30 +metadata/_custom_type_script = "uid://bl2ne8w12e3a" diff --git a/Resources/RogueliteMaps/ShopRoom1.tres b/Resources/RogueliteMaps/ShopRoom1.tres new file mode 100644 index 00000000..f65f1abd --- /dev/null +++ b/Resources/RogueliteMaps/ShopRoom1.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=2 format=3 uid="uid://cwtma7mxged8a"] + +[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="1_e5vsc"] + +[resource] +script = ExtResource("1_e5vsc") +RoomName = &"TestShopSmall" +Type = 3 +ScenePath = &"uid://cv1c7ymi8ab17" +Size = Vector2i(1, 1) +DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) +SpawnableEnemies = null +DoorDirections = 30 +metadata/_custom_type_script = "uid://bl2ne8w12e3a" diff --git a/Resources/RogueliteMaps/TreasureRoom1.tres b/Resources/RogueliteMaps/TreasureRoom1.tres new file mode 100644 index 00000000..e95565ff --- /dev/null +++ b/Resources/RogueliteMaps/TreasureRoom1.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" script_class="RogueliteRoomResource" load_steps=2 format=3 uid="uid://crqgvauqarfaq"] + +[ext_resource type="Script" uid="uid://bl2ne8w12e3a" path="res://Scripts/Resources/Roguelite/RogueliteRoomResource.cs" id="1_8imwp"] + +[resource] +script = ExtResource("1_8imwp") +RoomName = &"TestMapSmall" +Type = 5 +ScenePath = &"uid://j71ehkbbalh2" +Size = Vector2i(1, 1) +DoorGridPositions = Array[Vector2i]([Vector2i(0, -1), Vector2i(0, 1), Vector2i(1, 0), Vector2i(-1, 0)]) +SpawnableEnemies = null +DoorDirections = 30 +metadata/_custom_type_script = "uid://bl2ne8w12e3a" diff --git a/Scenes/Maps/Roguelike.tscn b/Scenes/Maps/Roguelike.tscn index 654c38ab..eb6aa84c 100644 --- a/Scenes/Maps/Roguelike.tscn +++ b/Scenes/Maps/Roguelike.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://bf1kqr3o6r6d4"] +[gd_scene load_steps=28 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"] @@ -23,6 +23,10 @@ [ext_resource type="Resource" uid="uid://cur433g6oevmd" path="res://Resources/RogueliteMaps/RGLongAcidWalk.tres" id="15_6gk3e"] [ext_resource type="Resource" uid="uid://cc53bb6th33hi" path="res://Resources/RogueliteMaps/RGHorizontal1x1.tres" id="16_4gy5m"] [ext_resource type="Script" uid="uid://3v6q0p5krqn7" path="res://Scripts/UI/Minimap.cs" id="16_pfafs"] +[ext_resource type="Resource" uid="uid://bew4cuec4pbms" path="res://Resources/RogueliteMaps/KeyRoom1.tres" id="17_td7hx"] +[ext_resource type="Resource" uid="uid://cwtma7mxged8a" path="res://Resources/RogueliteMaps/ShopRoom1.tres" id="18_2lxq3"] +[ext_resource type="Resource" uid="uid://crqgvauqarfaq" path="res://Resources/RogueliteMaps/TreasureRoom1.tres" id="19_6ahuq"] +[ext_resource type="Resource" uid="uid://bo4efv7rwowuh" path="res://Resources/RogueliteMaps/SecretRoom1.tres" id="20_xrp0h"] [node name="GameScene" type="Node2D"] process_mode = 3 @@ -37,8 +41,10 @@ SpawnMarkers = Dictionary[int, NodePath]({ process_mode = 1 y_sort_enabled = true script = ExtResource("4_jtlua") -Rooms = Array[Object]([ExtResource("5_gwtv6"), ExtResource("6_gwtv6"), ExtResource("7_wbqvu"), ExtResource("8_3fyis"), ExtResource("9_go1yg"), ExtResource("5_pfafs"), ExtResource("11_68lig"), ExtResource("12_83bvc"), ExtResource("13_y651a"), ExtResource("14_vhvs2"), ExtResource("15_6gk3e"), ExtResource("16_4gy5m")]) +Rooms = Array[Object]([ExtResource("5_gwtv6"), ExtResource("6_gwtv6"), ExtResource("7_wbqvu"), ExtResource("8_3fyis"), ExtResource("9_go1yg"), ExtResource("5_pfafs"), ExtResource("11_68lig"), ExtResource("12_83bvc"), ExtResource("13_y651a"), ExtResource("14_vhvs2"), ExtResource("15_6gk3e"), ExtResource("16_4gy5m"), ExtResource("17_td7hx"), ExtResource("18_2lxq3"), ExtResource("19_6ahuq"), ExtResource("20_xrp0h")]) DungeonLength = 6 +MaxBranchLength = 2 +Seed = 1 [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 diff --git a/Scenes/Maps/RogueliteMaps/Beginner1.tscn b/Scenes/Maps/RogueliteMaps/Beginner1.tscn index 721b70df..f6c66422 100644 --- a/Scenes/Maps/RogueliteMaps/Beginner1.tscn +++ b/Scenes/Maps/RogueliteMaps/Beginner1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=4 uid="uid://24wh7h2dbljf"] +[gd_scene load_steps=9 format=4 uid="uid://24wh7h2dbljf"] [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_vhsym"] [ext_resource type="Resource" uid="uid://dn3ai56rrxfnk" path="res://Resources/RogueliteMaps/Beginner1.tres" id="2_vhsym"] @@ -6,6 +6,7 @@ [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_u3c1h"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="4_pys6w"] [ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="5_mqiea"] +[ext_resource type="PackedScene" uid="uid://4q82gggqax87" path="res://Scenes/Items/Cheat_Gun_Pickup.tscn" id="6_pys6w"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_u3c1h"] size = Vector2(272, 85) @@ -39,6 +40,9 @@ metadata/_edit_lock_ = true [node name="Actors" type="Node2D" parent="."] metadata/_edit_lock_ = true +[node name="CheaetGun" parent="Actors" instance=ExtResource("6_pys6w")] +position = Vector2(119, 127) + [node name="EnemySpawners" type="Node2D" parent="."] [node name="Doors" type="Node2D" parent="."] @@ -63,6 +67,7 @@ script = ExtResource("5_mqiea") Direction = 3 [node name="PlayerEnterDetector" type="Area2D" parent="."] +visible = false collision_layer = 0 collision_mask = 2 diff --git a/Scenes/Maps/RogueliteMaps/KeyRoom1.tscn b/Scenes/Maps/RogueliteMaps/KeyRoom1.tscn new file mode 100644 index 00000000..b40e9ccf --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/KeyRoom1.tscn @@ -0,0 +1,88 @@ +[gd_scene load_steps=10 format=4 uid="uid://cadjkf73yep12"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_3j8r8"] +[ext_resource type="Resource" uid="uid://bew4cuec4pbms" path="res://Resources/RogueliteMaps/KeyRoom1.tres" id="2_3j8r8"] +[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_t6hxp"] +[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_hfso4"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_3o7os"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_sn1r1"] +[ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="7_ec7cq"] + +[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 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_rlq0q"] +size = Vector2(272, 85) + +[node name="Map" type="Node2D"] +process_mode = 1 +script = ExtResource("1_3j8r8") +RoomResource = ExtResource("2_3j8r8") +DoorPrefab = ExtResource("3_t6hxp") +WallPrefab = ExtResource("4_hfso4") + +[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("AAAAAAIAAAALAAUAAAAAAAMAAAALAAUAAAAAAAQAAAALAAUAAAAAAAUAAAALAAUAAAAAAAYAAAALAAUAAAAAAAcAAAALAAUAAAAAAAgAAAALAAUAAAAAAAkAAAALAAUAAAABAAIAAAALAAUAAAABAAMAAAALAAUAAAABAAQAAAALAAUAAAABAAUAAAALAAUAAAABAAYAAAALAAUAAAABAAcAAAALAAUAAAABAAgAAAALAAUAAAABAAkAAAALAAUAAAACAAIAAAALAAUAAAACAAMAAAALAAUAAAACAAQAAAALAAUAAAACAAUAAAALAAUAAAACAAYAAAALAAUAAAACAAcAAAALAAUAAAACAAgAAAALAAUAAAACAAkAAAALAAUAAAADAAIAAAALAAUAAAADAAMAAAALAAUAAAADAAQAAAALAAUAAAADAAUAAAALAAUAAAADAAYAAAALAAUAAAADAAcAAAALAAUAAAADAAgAAAALAAUAAAADAAkAAAALAAUAAAAEAAIAAAALAAUAAAAEAAMAAAALAAUAAAAEAAQAAAALAAUAAAAEAAUAAAALAAUAAAAEAAYAAAALAAUAAAAEAAcAAAALAAUAAAAEAAgAAAALAAUAAAAEAAkAAAALAAUAAAAFAAIAAAALAAUAAAAFAAMAAAALAAUAAAAFAAQAAAALAAUAAAAFAAUAAAALAAUAAAAFAAYAAAALAAUAAAAFAAcAAAALAAUAAAAFAAgAAAALAAUAAAAFAAkAAAALAAUAAAAGAAIAAAALAAUAAAAGAAMAAAALAAUAAAAGAAQAAAALAAUAAAAGAAUAAAALAAUAAAAGAAYAAAALAAUAAAAGAAcAAAALAAUAAAAGAAgAAAALAAUAAAAGAAkAAAALAAUAAAAHAAIAAAALAAUAAAAHAAMAAAALAAUAAAAHAAQAAAALAAUAAAAHAAUAAAALAAUAAAAHAAYAAAALAAUAAAAHAAcAAAALAAUAAAAHAAgAAAALAAUAAAAHAAkAAAALAAUAAAAIAAIAAAALAAUAAAAIAAMAAAALAAUAAAAIAAQAAAALAAUAAAAIAAUAAAALAAUAAAAIAAYAAAALAAUAAAAIAAcAAAALAAUAAAAIAAgAAAALAAUAAAAIAAkAAAALAAUAAAAJAAIAAAALAAUAAAAJAAMAAAALAAUAAAAJAAQAAAALAAUAAAAJAAUAAAALAAUAAAAJAAYAAAALAAUAAAAJAAcAAAALAAUAAAAJAAgAAAALAAUAAAAJAAkAAAALAAUAAAAKAAIAAAALAAUAAAAKAAMAAAALAAUAAAAKAAQAAAALAAUAAAAKAAUAAAALAAUAAAAKAAYAAAALAAUAAAAKAAcAAAALAAUAAAAKAAgAAAALAAUAAAAKAAkAAAALAAUAAAALAAIAAAALAAUAAAALAAUAAAALAAUAAAALAAYAAAALAAUAAAALAAcAAAALAAUAAAALAAgAAAALAAUAAAALAAkAAAALAAUAAAAMAAIAAAALAAUAAAAMAAUAAAALAAUAAAAMAAYAAAALAAUAAAAMAAcAAAALAAUAAAAMAAgAAAALAAUAAAAMAAkAAAALAAUAAAANAAIAAAALAAUAAAANAAMAAAALAAUAAAANAAQAAAALAAUAAAANAAUAAAALAAUAAAANAAYAAAALAAUAAAANAAcAAAALAAUAAAANAAgAAAALAAUAAAANAAkAAAALAAUAAAAOAAIAAAALAAUAAAAOAAMAAAALAAUAAAAOAAQAAAALAAUAAAAOAAUAAAALAAUAAAAOAAYAAAALAAUAAAAOAAcAAAALAAUAAAAOAAgAAAALAAUAAAAOAAkAAAALAAUAAAAPAAIAAAALAAUAAAAPAAMAAAALAAUAAAAPAAQAAAALAAUAAAAPAAUAAAALAAUAAAAPAAYAAAALAAUAAAAPAAcAAAALAAUAAAAPAAgAAAALAAUAAAAPAAkAAAALAAUAAAAQAAIAAAALAAUAAAAQAAMAAAALAAUAAAAQAAQAAAALAAUAAAAQAAUAAAALAAUAAAAQAAYAAAALAAUAAAAQAAcAAAALAAUAAAAQAAgAAAALAAUAAAAQAAkAAAALAAUAAAARAAIAAAALAAUAAAARAAMAAAALAAUAAAARAAQAAAALAAUAAAARAAUAAAALAAUAAAARAAYAAAALAAUAAAARAAcAAAALAAUAAAARAAgAAAALAAUAAAARAAkAAAALAAUAAAASAAIAAAALAAUAAAASAAMAAAALAAUAAAASAAQAAAALAAUAAAASAAUAAAALAAUAAAASAAYAAAALAAUAAAASAAcAAAALAAUAAAASAAgAAAALAAUAAAASAAkAAAALAAUAAAATAAIAAAALAAUAAAATAAMAAAALAAUAAAATAAQAAAALAAUAAAATAAUAAAALAAUAAAATAAYAAAALAAUAAAATAAcAAAALAAUAAAATAAgAAAALAAUAAAATAAkAAAALAAUAAAAAAAAAAAALAAUAAAAAAAEAAAALAAUAAAABAAAAAAALAAUAAAABAAEAAAALAAUAAAACAAAAAAALAAUAAAACAAEAAAALAAUAAAADAAAAAAALAAUAAAADAAEAAAALAAUAAAAEAAAAAAALAAUAAAAEAAEAAAALAAUAAAAFAAAAAAALAAUAAAAFAAEAAAALAAUAAAAGAAAAAAALAAUAAAAGAAEAAAALAAUAAAAHAAAAAAALAAUAAAAHAAEAAAALAAUAAAAIAAAAAAALAAUAAAAIAAEAAAALAAUAAAAJAAAAAAALAAUAAAAJAAEAAAALAAUAAAAKAAAAAAALAAUAAAAKAAEAAAALAAUAAAALAAAAAAALAAUAAAALAAEAAAALAAUAAAALAAMAAAALAAUAAAALAAQAAAALAAUAAAAMAAAAAAALAAUAAAAMAAEAAAALAAUAAAAMAAMAAAALAAUAAAAMAAQAAAALAAUAAAANAAAAAAALAAUAAAANAAEAAAALAAUAAAAOAAAAAAALAAUAAAAOAAEAAAALAAUAAAAPAAAAAAALAAUAAAAPAAEAAAALAAUAAAAQAAAAAAALAAUAAAAQAAEAAAALAAUAAAARAAAAAAALAAUAAAARAAEAAAALAAUAAAASAAAAAAALAAUAAAASAAEAAAALAAUAAAATAAAAAAALAAUAAAATAAEAAAALAAUAAAA=") +tile_set = ExtResource("5_3o7os") +navigation_enabled = false +script = ExtResource("6_sn1r1") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAMAAUAAAATAAQAAAAMAAYAAAALAAEAAAAOAAUAAAALAAIAAAAOAAYAAAAMAAEAAAAOAAUAAAAMAAIAAAAOAAYAAAANAAEAAAAMAAUAAAANAAIAAAAMAAYAAAAOAAEAAAAMAAUAAAAOAAIAAAAMAAYAAAAPAAEAAAANAAUAAAAPAAIAAAANAAYAAAAQAAEAAAANAAUAAAAQAAIAAAANAAYAAAARAAEAAAAMAAUAAAARAAIAAAAMAAYAAAASAAEAAAAMAAUAAAASAAIAAAAMAAYAAAABAAEAAAAMAAUAAAABAAIAAAAMAAYAAAACAAEAAAAMAAUAAAACAAIAAAAMAAYAAAADAAEAAAANAAUAAAADAAIAAAANAAYAAAAEAAEAAAANAAUAAAAEAAIAAAANAAYAAAAFAAEAAAAMAAUAAAAFAAIAAAAMAAYAAAAGAAEAAAAMAAUAAAAGAAIAAAAMAAYAAAAHAAEAAAAOAAUAAAAHAAIAAAAOAAYAAAAIAAEAAAAOAAUAAAAIAAIAAAAOAAYAAAAAAAMAAAAMAAUAAAAAAAQAAAAMAAYAAAA=") +tile_set = ExtResource("5_3o7os") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_set = ExtResource("5_3o7os") +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="Doors" type="Node2D" parent="."] + +[node name="North" type="Marker2D" parent="Doors"] +position = Vector2(159, 23) +script = ExtResource("7_ec7cq") + +[node name="South" type="Marker2D" parent="Doors"] +position = Vector2(159.196, 149.348) +script = ExtResource("7_ec7cq") +Direction = 1 + +[node name="East" type="Marker2D" parent="Doors"] +position = Vector2(312, 87) +script = ExtResource("7_ec7cq") +Direction = 2 + +[node name="West" type="Marker2D" parent="Doors"] +position = Vector2(8.1806, 87.7693) +script = ExtResource("7_ec7cq") +Direction = 3 + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +visible = false +navigation_polygon = SubResource("NavigationPolygon_rlq0q") + +[node name="PlayerEnterDetector" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerEnterDetector"] +position = Vector2(162, 94.5) +shape = SubResource("RectangleShape2D_rlq0q") + +[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"] diff --git a/Scenes/Maps/RogueliteMaps/SecretRoom1.tscn b/Scenes/Maps/RogueliteMaps/SecretRoom1.tscn new file mode 100644 index 00000000..eed75b35 --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/SecretRoom1.tscn @@ -0,0 +1,88 @@ +[gd_scene load_steps=10 format=4 uid="uid://r2j1wyglsnt5"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_h0a4q"] +[ext_resource type="Resource" uid="uid://bo4efv7rwowuh" path="res://Resources/RogueliteMaps/SecretRoom1.tres" id="2_h0a4q"] +[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_7u6pf"] +[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_ivf8o"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_4wkxe"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_smkbu"] +[ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="7_hbkqe"] + +[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 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_rlq0q"] +size = Vector2(272, 85) + +[node name="Map" type="Node2D"] +process_mode = 1 +script = ExtResource("1_h0a4q") +RoomResource = ExtResource("2_h0a4q") +DoorPrefab = ExtResource("3_7u6pf") +WallPrefab = ExtResource("4_ivf8o") + +[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("AAAAAAIAAAAHAAQAAAAAAAMAAAAHAAQAAAAAAAQAAAAHAAQAAAAAAAUAAAAHAAQAAAAAAAYAAAAHAAQAAAAAAAcAAAAHAAQAAAAAAAgAAAAHAAQAAAAAAAkAAAAHAAQAAAABAAIAAAAHAAQAAAABAAMAAAAHAAQAAAABAAQAAAAHAAQAAAABAAUAAAAHAAQAAAABAAYAAAAHAAQAAAABAAcAAAAHAAQAAAABAAgAAAAHAAQAAAABAAkAAAAHAAQAAAACAAIAAAAHAAQAAAACAAMAAAAHAAQAAAACAAQAAAAHAAQAAAACAAUAAAAHAAQAAAACAAYAAAAHAAQAAAACAAcAAAAHAAQAAAACAAgAAAAHAAQAAAACAAkAAAAHAAQAAAADAAIAAAAHAAQAAAADAAMAAAAHAAQAAAADAAQAAAAHAAQAAAADAAUAAAAHAAQAAAADAAYAAAAHAAQAAAADAAcAAAAHAAQAAAADAAgAAAAHAAQAAAADAAkAAAAHAAQAAAAEAAIAAAAHAAQAAAAEAAMAAAAHAAQAAAAEAAQAAAAHAAQAAAAEAAUAAAAHAAQAAAAEAAYAAAAHAAQAAAAEAAcAAAAHAAQAAAAEAAgAAAAHAAQAAAAEAAkAAAAHAAQAAAAFAAIAAAAHAAQAAAAFAAMAAAAHAAQAAAAFAAQAAAAHAAQAAAAFAAUAAAAHAAQAAAAFAAYAAAAHAAQAAAAFAAcAAAAHAAQAAAAFAAgAAAAHAAQAAAAFAAkAAAAHAAQAAAAGAAIAAAAHAAQAAAAGAAMAAAAHAAQAAAAGAAQAAAAHAAQAAAAGAAUAAAAHAAQAAAAGAAYAAAAHAAQAAAAGAAcAAAAHAAQAAAAGAAgAAAAHAAQAAAAGAAkAAAAHAAQAAAAHAAIAAAAHAAQAAAAHAAMAAAAHAAQAAAAHAAQAAAAHAAQAAAAHAAUAAAAHAAQAAAAHAAYAAAAHAAQAAAAHAAcAAAAHAAQAAAAHAAgAAAAHAAQAAAAHAAkAAAAHAAQAAAAIAAIAAAAHAAQAAAAIAAMAAAAHAAQAAAAIAAQAAAAHAAQAAAAIAAUAAAAHAAQAAAAIAAYAAAAHAAQAAAAIAAcAAAAHAAQAAAAIAAgAAAAHAAQAAAAIAAkAAAAHAAQAAAAJAAIAAAAHAAQAAAAJAAMAAAAHAAQAAAAJAAQAAAAHAAQAAAAJAAUAAAAHAAQAAAAJAAYAAAAHAAQAAAAJAAcAAAAHAAQAAAAJAAgAAAAHAAQAAAAJAAkAAAAHAAQAAAAKAAIAAAAHAAQAAAAKAAMAAAAHAAQAAAAKAAQAAAAHAAQAAAAKAAUAAAAHAAQAAAAKAAYAAAAHAAQAAAAKAAcAAAAHAAQAAAAKAAgAAAAHAAQAAAAKAAkAAAAHAAQAAAALAAIAAAAHAAQAAAALAAUAAAAHAAQAAAALAAYAAAAHAAQAAAALAAcAAAAHAAQAAAALAAgAAAAHAAQAAAALAAkAAAAHAAQAAAAMAAIAAAAHAAQAAAAMAAUAAAAHAAQAAAAMAAYAAAAHAAQAAAAMAAcAAAAHAAQAAAAMAAgAAAAHAAQAAAAMAAkAAAAHAAQAAAANAAIAAAAHAAQAAAANAAMAAAAHAAQAAAANAAQAAAAHAAQAAAANAAUAAAAHAAQAAAANAAYAAAAHAAQAAAANAAcAAAAHAAQAAAANAAgAAAAHAAQAAAANAAkAAAAHAAQAAAAOAAIAAAAHAAQAAAAOAAMAAAAHAAQAAAAOAAQAAAAHAAQAAAAOAAUAAAAHAAQAAAAOAAYAAAAHAAQAAAAOAAcAAAAHAAQAAAAOAAgAAAAHAAQAAAAOAAkAAAAHAAQAAAAPAAIAAAAHAAQAAAAPAAMAAAAHAAQAAAAPAAQAAAAHAAQAAAAPAAUAAAAHAAQAAAAPAAYAAAAHAAQAAAAPAAcAAAAHAAQAAAAPAAgAAAAHAAQAAAAPAAkAAAAHAAQAAAAQAAIAAAAHAAQAAAAQAAMAAAAHAAQAAAAQAAQAAAAHAAQAAAAQAAUAAAAHAAQAAAAQAAYAAAAHAAQAAAAQAAcAAAAHAAQAAAAQAAgAAAAHAAQAAAAQAAkAAAAHAAQAAAARAAIAAAAHAAQAAAARAAMAAAAHAAQAAAARAAQAAAAHAAQAAAARAAUAAAAHAAQAAAARAAYAAAAHAAQAAAARAAcAAAAHAAQAAAARAAgAAAAHAAQAAAARAAkAAAAHAAQAAAASAAIAAAAHAAQAAAASAAMAAAAHAAQAAAASAAQAAAAHAAQAAAASAAUAAAAHAAQAAAASAAYAAAAHAAQAAAASAAcAAAAHAAQAAAASAAgAAAAHAAQAAAASAAkAAAAHAAQAAAATAAIAAAAHAAQAAAATAAMAAAAHAAQAAAATAAQAAAAHAAQAAAATAAUAAAAHAAQAAAATAAYAAAAHAAQAAAATAAcAAAAHAAQAAAATAAgAAAAHAAQAAAATAAkAAAAHAAQAAAAAAAAAAAAHAAQAAAAAAAEAAAAHAAQAAAABAAAAAAAHAAQAAAABAAEAAAAHAAQAAAACAAAAAAAHAAQAAAACAAEAAAAHAAQAAAADAAAAAAAHAAQAAAADAAEAAAAHAAQAAAAEAAAAAAAHAAQAAAAEAAEAAAAHAAQAAAAFAAAAAAAHAAQAAAAFAAEAAAAHAAQAAAAGAAAAAAAHAAQAAAAGAAEAAAAHAAQAAAAHAAAAAAAHAAQAAAAHAAEAAAAHAAQAAAAIAAAAAAAHAAQAAAAIAAEAAAAHAAQAAAAJAAAAAAAHAAQAAAAJAAEAAAAHAAQAAAAKAAAAAAAHAAQAAAAKAAEAAAAHAAQAAAALAAAAAAAHAAQAAAALAAEAAAAHAAQAAAALAAMAAAAHAAQAAAALAAQAAAAHAAQAAAAMAAAAAAAHAAQAAAAMAAEAAAAHAAQAAAAMAAMAAAAHAAQAAAAMAAQAAAAHAAQAAAANAAAAAAAHAAQAAAANAAEAAAAHAAQAAAAOAAAAAAAHAAQAAAAOAAEAAAAHAAQAAAAPAAAAAAAHAAQAAAAPAAEAAAAHAAQAAAAQAAAAAAAHAAQAAAAQAAEAAAAHAAQAAAARAAAAAAAHAAQAAAARAAEAAAAHAAQAAAASAAAAAAAHAAQAAAASAAEAAAAHAAQAAAATAAAAAAAHAAQAAAATAAEAAAAHAAQAAAA=") +tile_set = ExtResource("5_4wkxe") +navigation_enabled = false +script = ExtResource("6_smkbu") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAMAAUAAAATAAQAAAAMAAYAAAALAAEAAAAOAAUAAAALAAIAAAAOAAYAAAAMAAEAAAAOAAUAAAAMAAIAAAAOAAYAAAANAAEAAAAMAAUAAAANAAIAAAAMAAYAAAAOAAEAAAAMAAUAAAAOAAIAAAAMAAYAAAAPAAEAAAANAAUAAAAPAAIAAAANAAYAAAAQAAEAAAANAAUAAAAQAAIAAAANAAYAAAARAAEAAAAMAAUAAAARAAIAAAAMAAYAAAASAAEAAAAMAAUAAAASAAIAAAAMAAYAAAABAAEAAAAMAAUAAAABAAIAAAAMAAYAAAACAAEAAAAMAAUAAAACAAIAAAAMAAYAAAADAAEAAAANAAUAAAADAAIAAAANAAYAAAAEAAEAAAANAAUAAAAEAAIAAAANAAYAAAAFAAEAAAAMAAUAAAAFAAIAAAAMAAYAAAAGAAEAAAAMAAUAAAAGAAIAAAAMAAYAAAAHAAEAAAAOAAUAAAAHAAIAAAAOAAYAAAAIAAEAAAAOAAUAAAAIAAIAAAAOAAYAAAAAAAMAAAAMAAUAAAAAAAQAAAAMAAYAAAA=") +tile_set = ExtResource("5_4wkxe") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_set = ExtResource("5_4wkxe") +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="Doors" type="Node2D" parent="."] + +[node name="North" type="Marker2D" parent="Doors"] +position = Vector2(159, 23) +script = ExtResource("7_hbkqe") + +[node name="South" type="Marker2D" parent="Doors"] +position = Vector2(159.196, 149.348) +script = ExtResource("7_hbkqe") +Direction = 1 + +[node name="East" type="Marker2D" parent="Doors"] +position = Vector2(312, 87) +script = ExtResource("7_hbkqe") +Direction = 2 + +[node name="West" type="Marker2D" parent="Doors"] +position = Vector2(8.1806, 87.7693) +script = ExtResource("7_hbkqe") +Direction = 3 + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +visible = false +navigation_polygon = SubResource("NavigationPolygon_rlq0q") + +[node name="PlayerEnterDetector" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerEnterDetector"] +position = Vector2(162, 94.5) +shape = SubResource("RectangleShape2D_rlq0q") + +[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"] diff --git a/Scenes/Maps/RogueliteMaps/ShopRoom1.tscn b/Scenes/Maps/RogueliteMaps/ShopRoom1.tscn new file mode 100644 index 00000000..27d49e60 --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/ShopRoom1.tscn @@ -0,0 +1,92 @@ +[gd_scene load_steps=11 format=4 uid="uid://cv1c7ymi8ab17"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_36sk4"] +[ext_resource type="Resource" uid="uid://cwtma7mxged8a" path="res://Resources/RogueliteMaps/ShopRoom1.tres" id="2_36sk4"] +[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_as6dh"] +[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_r367v"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_o7s04"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_l5c4m"] +[ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="7_dwts1"] +[ext_resource type="PackedScene" uid="uid://cnhgvn2salyxl" path="res://Scenes/Items/Icicle_Repeater.tscn" id="7_ii5ao"] + +[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 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_rlq0q"] +size = Vector2(272, 85) + +[node name="Map" type="Node2D"] +process_mode = 1 +script = ExtResource("1_36sk4") +RoomResource = ExtResource("2_36sk4") +DoorPrefab = ExtResource("3_as6dh") +WallPrefab = ExtResource("4_r367v") + +[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("AAAAAAIAAAAOAAQAAAAAAAMAAAAOAAQAAAAAAAQAAAAOAAQAAAAAAAUAAAAOAAQAAAAAAAYAAAAOAAQAAAAAAAcAAAAOAAQAAAAAAAgAAAAOAAQAAAAAAAkAAAAOAAQAAAABAAIAAAAOAAQAAAABAAMAAAAOAAQAAAABAAQAAAAOAAQAAAABAAUAAAAOAAQAAAABAAYAAAAOAAQAAAABAAcAAAAOAAQAAAABAAgAAAAOAAQAAAABAAkAAAAOAAQAAAACAAIAAAAOAAQAAAACAAMAAAAOAAQAAAACAAQAAAAOAAQAAAACAAUAAAAOAAQAAAACAAYAAAAOAAQAAAACAAcAAAAOAAQAAAACAAgAAAAOAAQAAAACAAkAAAAOAAQAAAADAAIAAAAOAAQAAAADAAMAAAAOAAQAAAADAAQAAAAOAAQAAAADAAUAAAAOAAQAAAADAAYAAAAOAAQAAAADAAcAAAAOAAQAAAADAAgAAAAOAAQAAAADAAkAAAAOAAQAAAAEAAIAAAAOAAQAAAAEAAMAAAAOAAQAAAAEAAQAAAAOAAQAAAAEAAUAAAAOAAQAAAAEAAYAAAAOAAQAAAAEAAcAAAAOAAQAAAAEAAgAAAAOAAQAAAAEAAkAAAAOAAQAAAAFAAIAAAAOAAQAAAAFAAMAAAAOAAQAAAAFAAQAAAAOAAQAAAAFAAUAAAAOAAQAAAAFAAYAAAAOAAQAAAAFAAcAAAAOAAQAAAAFAAgAAAAOAAQAAAAFAAkAAAAOAAQAAAAGAAIAAAAOAAQAAAAGAAMAAAAOAAQAAAAGAAQAAAAOAAQAAAAGAAUAAAAOAAQAAAAGAAYAAAAOAAQAAAAGAAcAAAAOAAQAAAAGAAgAAAAOAAQAAAAGAAkAAAAOAAQAAAAHAAIAAAAOAAQAAAAHAAMAAAAOAAQAAAAHAAQAAAAOAAQAAAAHAAUAAAAOAAQAAAAHAAYAAAAOAAQAAAAHAAcAAAAOAAQAAAAHAAgAAAAOAAQAAAAHAAkAAAAOAAQAAAAIAAIAAAAOAAQAAAAIAAMAAAAOAAQAAAAIAAQAAAAOAAQAAAAIAAUAAAAOAAQAAAAIAAYAAAAOAAQAAAAIAAcAAAAOAAQAAAAIAAgAAAAOAAQAAAAIAAkAAAAOAAQAAAAJAAIAAAAOAAQAAAAJAAMAAAAOAAQAAAAJAAQAAAAOAAQAAAAJAAUAAAAOAAQAAAAJAAYAAAAOAAQAAAAJAAcAAAAOAAQAAAAJAAgAAAAOAAQAAAAJAAkAAAAOAAQAAAAKAAIAAAAOAAQAAAAKAAMAAAAOAAQAAAAKAAQAAAAOAAQAAAAKAAUAAAAOAAQAAAAKAAYAAAAOAAQAAAAKAAcAAAAOAAQAAAAKAAgAAAAOAAQAAAAKAAkAAAAOAAQAAAALAAIAAAAOAAQAAAALAAUAAAAOAAQAAAALAAYAAAAOAAQAAAALAAcAAAAOAAQAAAALAAgAAAAOAAQAAAALAAkAAAAOAAQAAAAMAAIAAAAOAAQAAAAMAAUAAAAOAAQAAAAMAAYAAAAOAAQAAAAMAAcAAAAOAAQAAAAMAAgAAAAOAAQAAAAMAAkAAAAOAAQAAAANAAIAAAAOAAQAAAANAAMAAAAOAAQAAAANAAQAAAAOAAQAAAANAAUAAAAOAAQAAAANAAYAAAAOAAQAAAANAAcAAAAOAAQAAAANAAgAAAAOAAQAAAANAAkAAAAOAAQAAAAOAAIAAAAOAAQAAAAOAAMAAAAOAAQAAAAOAAQAAAAOAAQAAAAOAAUAAAAOAAQAAAAOAAYAAAAOAAQAAAAOAAcAAAAOAAQAAAAOAAgAAAAOAAQAAAAOAAkAAAAOAAQAAAAPAAIAAAAOAAQAAAAPAAMAAAAOAAQAAAAPAAQAAAAOAAQAAAAPAAUAAAAOAAQAAAAPAAYAAAAOAAQAAAAPAAcAAAAOAAQAAAAPAAgAAAAOAAQAAAAPAAkAAAAOAAQAAAAQAAIAAAAOAAQAAAAQAAMAAAAOAAQAAAAQAAQAAAAOAAQAAAAQAAUAAAAOAAQAAAAQAAYAAAAOAAQAAAAQAAcAAAAOAAQAAAAQAAgAAAAOAAQAAAAQAAkAAAAOAAQAAAARAAIAAAAOAAQAAAARAAMAAAAOAAQAAAARAAQAAAAOAAQAAAARAAUAAAAOAAQAAAARAAYAAAAOAAQAAAARAAcAAAAOAAQAAAARAAgAAAAOAAQAAAARAAkAAAAOAAQAAAASAAIAAAAOAAQAAAASAAMAAAAOAAQAAAASAAQAAAAOAAQAAAASAAUAAAAOAAQAAAASAAYAAAAOAAQAAAASAAcAAAAOAAQAAAASAAgAAAAOAAQAAAASAAkAAAAOAAQAAAATAAIAAAAOAAQAAAATAAMAAAAOAAQAAAATAAQAAAAOAAQAAAATAAUAAAAOAAQAAAATAAYAAAAOAAQAAAATAAcAAAAOAAQAAAATAAgAAAAOAAQAAAATAAkAAAAOAAQAAAAAAAAAAAAOAAQAAAAAAAEAAAAOAAQAAAABAAAAAAAOAAQAAAABAAEAAAAOAAQAAAACAAAAAAAOAAQAAAACAAEAAAAOAAQAAAADAAAAAAAOAAQAAAADAAEAAAAOAAQAAAAEAAAAAAAOAAQAAAAEAAEAAAAOAAQAAAAFAAAAAAAOAAQAAAAFAAEAAAAOAAQAAAAGAAAAAAAOAAQAAAAGAAEAAAAOAAQAAAAHAAAAAAAOAAQAAAAHAAEAAAAOAAQAAAAIAAAAAAAOAAQAAAAIAAEAAAAOAAQAAAAJAAAAAAAOAAQAAAAJAAEAAAAOAAQAAAAKAAAAAAAOAAQAAAAKAAEAAAAOAAQAAAALAAAAAAAOAAQAAAALAAEAAAAOAAQAAAALAAMAAAAOAAQAAAALAAQAAAAOAAQAAAAMAAAAAAAOAAQAAAAMAAEAAAAOAAQAAAAMAAMAAAAOAAQAAAAMAAQAAAAOAAQAAAANAAAAAAAOAAQAAAANAAEAAAAOAAQAAAAOAAAAAAAOAAQAAAAOAAEAAAAOAAQAAAAPAAAAAAAOAAQAAAAPAAEAAAAOAAQAAAAQAAAAAAAOAAQAAAAQAAEAAAAOAAQAAAARAAAAAAAOAAQAAAARAAEAAAAOAAQAAAASAAAAAAAOAAQAAAASAAEAAAAOAAQAAAATAAAAAAAOAAQAAAATAAEAAAAOAAQAAAA=") +tile_set = ExtResource("5_o7s04") +navigation_enabled = false +script = ExtResource("6_l5c4m") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAOAAIAAAATAAQAAAAOAAMAAAALAAEAAAAOAAIAAAALAAIAAAAOAAMAAAAMAAEAAAAOAAIAAAAMAAIAAAAOAAMAAAANAAEAAAAOAAIAAAANAAIAAAAOAAMAAAAOAAEAAAAOAAIAAAAOAAIAAAAOAAMAAAAPAAEAAAAOAAIAAAAPAAIAAAAOAAMAAAAQAAEAAAAOAAIAAAAQAAIAAAAOAAMAAAARAAEAAAAOAAIAAAARAAIAAAAOAAMAAAASAAEAAAAOAAIAAAASAAIAAAAOAAMAAAABAAEAAAAOAAIAAAABAAIAAAAOAAMAAAACAAEAAAAOAAIAAAACAAIAAAAOAAMAAAADAAEAAAAOAAIAAAADAAIAAAAOAAMAAAAEAAEAAAAOAAIAAAAEAAIAAAAOAAMAAAAFAAEAAAAOAAIAAAAFAAIAAAAOAAMAAAAGAAEAAAAOAAIAAAAGAAIAAAAOAAMAAAAHAAEAAAAOAAIAAAAHAAIAAAAOAAMAAAAIAAEAAAAOAAIAAAAIAAIAAAAOAAMAAAAAAAMAAAAOAAIAAAAAAAQAAAAOAAMAAAA=") +tile_set = ExtResource("5_o7s04") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_set = ExtResource("5_o7s04") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Actors" type="Node2D" parent="Tilemaps"] +metadata/_edit_lock_ = true + +[node name="IcicleRepeater" parent="Tilemaps/Actors" instance=ExtResource("7_ii5ao")] +position = Vector2(159, 91) + +[node name="EnemySpawners" type="Node2D" parent="."] + +[node name="Doors" type="Node2D" parent="."] + +[node name="North" type="Marker2D" parent="Doors"] +position = Vector2(159, 23) +script = ExtResource("7_dwts1") + +[node name="South" type="Marker2D" parent="Doors"] +position = Vector2(159.196, 149.348) +script = ExtResource("7_dwts1") +Direction = 1 + +[node name="East" type="Marker2D" parent="Doors"] +position = Vector2(312, 87) +script = ExtResource("7_dwts1") +Direction = 2 + +[node name="West" type="Marker2D" parent="Doors"] +position = Vector2(8.1806, 87.7693) +script = ExtResource("7_dwts1") +Direction = 3 + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +visible = false +navigation_polygon = SubResource("NavigationPolygon_rlq0q") + +[node name="PlayerEnterDetector" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerEnterDetector"] +position = Vector2(162, 94.5) +shape = SubResource("RectangleShape2D_rlq0q") + +[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"] diff --git a/Scenes/Maps/RogueliteMaps/TreasureRoom1.tscn b/Scenes/Maps/RogueliteMaps/TreasureRoom1.tscn new file mode 100644 index 00000000..11e3b265 --- /dev/null +++ b/Scenes/Maps/RogueliteMaps/TreasureRoom1.tscn @@ -0,0 +1,88 @@ +[gd_scene load_steps=10 format=4 uid="uid://j71ehkbbalh2"] + +[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_08gfs"] +[ext_resource type="Resource" uid="uid://crqgvauqarfaq" path="res://Resources/RogueliteMaps/TreasureRoom1.tres" id="2_08gfs"] +[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="3_aaiyo"] +[ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="4_ofpvy"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_ojht1"] +[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_jf212"] +[ext_resource type="Script" uid="uid://ddry5kjj3fr6c" path="res://Scripts/Controllers/DoorMarker.cs" id="7_3ba63"] + +[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 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_rlq0q"] +size = Vector2(272, 85) + +[node name="Map" type="Node2D"] +process_mode = 1 +script = ExtResource("1_08gfs") +RoomResource = ExtResource("2_08gfs") +DoorPrefab = ExtResource("3_aaiyo") +WallPrefab = ExtResource("4_ofpvy") + +[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("AAAAAAIAAAAIAAQAAAAAAAMAAAAIAAQAAAAAAAQAAAAIAAQAAAAAAAUAAAAIAAQAAAAAAAYAAAAIAAQAAAAAAAcAAAAIAAQAAAAAAAgAAAAIAAQAAAAAAAkAAAAIAAQAAAABAAIAAAAIAAQAAAABAAMAAAAIAAQAAAABAAQAAAAIAAQAAAABAAUAAAAIAAQAAAABAAYAAAAIAAQAAAABAAcAAAAIAAQAAAABAAgAAAAIAAQAAAABAAkAAAAIAAQAAAACAAIAAAAIAAQAAAACAAMAAAAIAAQAAAACAAQAAAAIAAQAAAACAAUAAAAIAAQAAAACAAYAAAAIAAQAAAACAAcAAAAIAAQAAAACAAgAAAAIAAQAAAACAAkAAAAIAAQAAAADAAIAAAAIAAQAAAADAAMAAAAIAAQAAAADAAQAAAAIAAQAAAADAAUAAAAIAAQAAAADAAYAAAAIAAQAAAADAAcAAAAIAAQAAAADAAgAAAAIAAQAAAADAAkAAAAIAAQAAAAEAAIAAAAIAAQAAAAEAAMAAAAIAAQAAAAEAAQAAAAIAAQAAAAEAAUAAAAIAAQAAAAEAAYAAAAIAAQAAAAEAAcAAAAIAAQAAAAEAAgAAAAIAAQAAAAEAAkAAAAIAAQAAAAFAAIAAAAIAAQAAAAFAAMAAAAIAAQAAAAFAAQAAAAIAAQAAAAFAAUAAAAIAAQAAAAFAAYAAAAIAAQAAAAFAAcAAAAIAAQAAAAFAAgAAAAIAAQAAAAFAAkAAAAIAAQAAAAGAAIAAAAIAAQAAAAGAAMAAAAIAAQAAAAGAAQAAAAIAAQAAAAGAAUAAAAIAAQAAAAGAAYAAAAIAAQAAAAGAAcAAAAIAAQAAAAGAAgAAAAIAAQAAAAGAAkAAAAIAAQAAAAHAAIAAAAIAAQAAAAHAAMAAAAIAAQAAAAHAAQAAAAIAAQAAAAHAAUAAAAIAAQAAAAHAAYAAAAIAAQAAAAHAAcAAAAIAAQAAAAHAAgAAAAIAAQAAAAHAAkAAAAIAAQAAAAIAAIAAAAIAAQAAAAIAAMAAAAIAAQAAAAIAAQAAAAIAAQAAAAIAAUAAAAIAAQAAAAIAAYAAAAIAAQAAAAIAAcAAAAIAAQAAAAIAAgAAAAIAAQAAAAIAAkAAAAIAAQAAAAJAAIAAAAIAAQAAAAJAAMAAAAIAAQAAAAJAAQAAAAIAAQAAAAJAAUAAAAIAAQAAAAJAAYAAAAIAAQAAAAJAAcAAAAIAAQAAAAJAAgAAAAIAAQAAAAJAAkAAAAIAAQAAAAKAAIAAAAIAAQAAAAKAAMAAAAIAAQAAAAKAAQAAAAIAAQAAAAKAAUAAAAIAAQAAAAKAAYAAAAIAAQAAAAKAAcAAAAIAAQAAAAKAAgAAAAIAAQAAAAKAAkAAAAIAAQAAAALAAIAAAAIAAQAAAALAAUAAAAIAAQAAAALAAYAAAAIAAQAAAALAAcAAAAIAAQAAAALAAgAAAAIAAQAAAALAAkAAAAIAAQAAAAMAAIAAAAIAAQAAAAMAAUAAAAIAAQAAAAMAAYAAAAIAAQAAAAMAAcAAAAIAAQAAAAMAAgAAAAIAAQAAAAMAAkAAAAIAAQAAAANAAIAAAAIAAQAAAANAAMAAAAIAAQAAAANAAQAAAAIAAQAAAANAAUAAAAIAAQAAAANAAYAAAAIAAQAAAANAAcAAAAIAAQAAAANAAgAAAAIAAQAAAANAAkAAAAIAAQAAAAOAAIAAAAIAAQAAAAOAAMAAAAIAAQAAAAOAAQAAAAIAAQAAAAOAAUAAAAIAAQAAAAOAAYAAAAIAAQAAAAOAAcAAAAIAAQAAAAOAAgAAAAIAAQAAAAOAAkAAAAIAAQAAAAPAAIAAAAIAAQAAAAPAAMAAAAIAAQAAAAPAAQAAAAIAAQAAAAPAAUAAAAIAAQAAAAPAAYAAAAIAAQAAAAPAAcAAAAIAAQAAAAPAAgAAAAIAAQAAAAPAAkAAAAIAAQAAAAQAAIAAAAIAAQAAAAQAAMAAAAIAAQAAAAQAAQAAAAIAAQAAAAQAAUAAAAIAAQAAAAQAAYAAAAIAAQAAAAQAAcAAAAIAAQAAAAQAAgAAAAIAAQAAAAQAAkAAAAIAAQAAAARAAIAAAAIAAQAAAARAAMAAAAIAAQAAAARAAQAAAAIAAQAAAARAAUAAAAIAAQAAAARAAYAAAAIAAQAAAARAAcAAAAIAAQAAAARAAgAAAAIAAQAAAARAAkAAAAIAAQAAAASAAIAAAAIAAQAAAASAAMAAAAIAAQAAAASAAQAAAAIAAQAAAASAAUAAAAIAAQAAAASAAYAAAAIAAQAAAASAAcAAAAIAAQAAAASAAgAAAAIAAQAAAASAAkAAAAIAAQAAAATAAIAAAAIAAQAAAATAAMAAAAIAAQAAAATAAQAAAAIAAQAAAATAAUAAAAIAAQAAAATAAYAAAAIAAQAAAATAAcAAAAIAAQAAAATAAgAAAAIAAQAAAATAAkAAAAIAAQAAAAAAAAAAAAIAAQAAAAAAAEAAAAIAAQAAAABAAAAAAAIAAQAAAABAAEAAAAIAAQAAAACAAAAAAAIAAQAAAACAAEAAAAIAAQAAAADAAAAAAAIAAQAAAADAAEAAAAIAAQAAAAEAAAAAAAIAAQAAAAEAAEAAAAIAAQAAAAFAAAAAAAIAAQAAAAFAAEAAAAIAAQAAAAGAAAAAAAIAAQAAAAGAAEAAAAIAAQAAAAHAAAAAAAIAAQAAAAHAAEAAAAIAAQAAAAIAAAAAAAIAAQAAAAIAAEAAAAIAAQAAAAJAAAAAAAIAAQAAAAJAAEAAAAIAAQAAAAKAAAAAAAIAAQAAAAKAAEAAAAIAAQAAAALAAAAAAAIAAQAAAALAAEAAAAIAAQAAAALAAMAAAAIAAQAAAALAAQAAAAIAAQAAAAMAAAAAAAIAAQAAAAMAAEAAAAIAAQAAAAMAAMAAAAIAAQAAAAMAAQAAAAIAAQAAAANAAAAAAAIAAQAAAANAAEAAAAIAAQAAAAOAAAAAAAIAAQAAAAOAAEAAAAIAAQAAAAPAAAAAAAIAAQAAAAPAAEAAAAIAAQAAAAQAAAAAAAIAAQAAAAQAAEAAAAIAAQAAAARAAAAAAAIAAQAAAARAAEAAAAIAAQAAAASAAAAAAAIAAQAAAASAAEAAAAIAAQAAAATAAAAAAAIAAQAAAATAAEAAAAIAAQAAAA=") +tile_set = ExtResource("5_ojht1") +navigation_enabled = false +script = ExtResource("6_jf212") +_solidLayers = [NodePath("../Solid"), NodePath("../Props")] +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAATAAAAAAABAAsAAAASAAAAAAABAAQAAAARAAAAAAABAAQAAAAQAAAAAAABAAQAAAAPAAAAAAABAAQAAAAOAAAAAAABAAQAAAANAAAAAAABAAQAAAAMAAAAAAABAAQAAAALAAAAAAACAAQAAAAIAAAAAAADAAQAAAAHAAAAAAABAAQAAAAGAAAAAAABAAQAAAAFAAAAAAABAAQAAAAEAAAAAAABAAQAAAADAAAAAAABAAQAAAACAAAAAAABAAQAAAABAAAAAAABAAQAAAAAAAAAAAAAAAsAAAATAAIAAAAEAAQAAAATAAEAAAAAAAQAAAAAAAIAAAAEAAQAAAAAAAEAAAAAAAQAAAAAAAkAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAcAAAAAAAQAAAAAAAYAAAAFAAQAAAATAAkAAAABAAwAAAASAAkAAAABAAQAAAARAAkAAAABAAQAAAAQAAkAAAABAAQAAAAPAAkAAAABAAQAAAAOAAkAAAABAAQAAAANAAkAAAABAAQAAAAMAAkAAAABAAQAAAALAAkAAAACAAQAAAAIAAkAAAADAAQAAAAHAAkAAAABAAQAAAAGAAkAAAABAAQAAAAFAAkAAAABAAQAAAAEAAkAAAABAAQAAAADAAkAAAABAAQAAAACAAkAAAABAAQAAAABAAkAAAABAAQAAAATAAgAAAAAAAQAAAATAAcAAAAAAAQAAAATAAYAAAAFAAQAAAATAAMAAAAMAAUAAAATAAQAAAAMAAYAAAALAAEAAAAOAAUAAAALAAIAAAAOAAYAAAAMAAEAAAAOAAUAAAAMAAIAAAAOAAYAAAANAAEAAAAMAAUAAAANAAIAAAAMAAYAAAAOAAEAAAAMAAUAAAAOAAIAAAAMAAYAAAAPAAEAAAANAAUAAAAPAAIAAAANAAYAAAAQAAEAAAANAAUAAAAQAAIAAAANAAYAAAARAAEAAAAMAAUAAAARAAIAAAAMAAYAAAASAAEAAAAMAAUAAAASAAIAAAAMAAYAAAABAAEAAAAMAAUAAAABAAIAAAAMAAYAAAACAAEAAAAMAAUAAAACAAIAAAAMAAYAAAADAAEAAAANAAUAAAADAAIAAAANAAYAAAAEAAEAAAANAAUAAAAEAAIAAAANAAYAAAAFAAEAAAAMAAUAAAAFAAIAAAAMAAYAAAAGAAEAAAAMAAUAAAAGAAIAAAAMAAYAAAAHAAEAAAAOAAUAAAAHAAIAAAAOAAYAAAAIAAEAAAAOAAUAAAAIAAIAAAAOAAYAAAAAAAMAAAAMAAUAAAAAAAQAAAAMAAYAAAA=") +tile_set = ExtResource("5_ojht1") +navigation_enabled = false +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_set = ExtResource("5_ojht1") +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="Doors" type="Node2D" parent="."] + +[node name="North" type="Marker2D" parent="Doors"] +position = Vector2(159, 23) +script = ExtResource("7_3ba63") + +[node name="South" type="Marker2D" parent="Doors"] +position = Vector2(159.196, 149.348) +script = ExtResource("7_3ba63") +Direction = 1 + +[node name="East" type="Marker2D" parent="Doors"] +position = Vector2(312, 87) +script = ExtResource("7_3ba63") +Direction = 2 + +[node name="West" type="Marker2D" parent="Doors"] +position = Vector2(8.1806, 87.7693) +script = ExtResource("7_3ba63") +Direction = 3 + +[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] +visible = false +navigation_polygon = SubResource("NavigationPolygon_rlq0q") + +[node name="PlayerEnterDetector" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerEnterDetector"] +position = Vector2(162, 94.5) +shape = SubResource("RectangleShape2D_rlq0q") + +[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"] diff --git a/Scripts/Controllers/RogueliteRoom.cs b/Scripts/Controllers/RogueliteRoom.cs index b1603098..2511612e 100644 --- a/Scripts/Controllers/RogueliteRoom.cs +++ b/Scripts/Controllers/RogueliteRoom.cs @@ -15,6 +15,10 @@ public partial class RogueliteRoom : Node2D public Vector2I GridPosition { get; set; } // Set by dungeon manager + public Vector2I BottomLeft => GridPosition + new Vector2I(0, RoomResource.Size.Y - 1); + + public Vector2I RandomBottomExit => BottomLeft - new Vector2I( GD.RandRange(0, RoomResource.Size.X - 1), 0); + [Export] public PackedScene DoorPrefab { get; private set; } [Export] public PackedScene WallPrefab { get; private set; } @@ -208,4 +212,9 @@ public partial class RogueliteRoom : Node2D { if (area is not InteractionController player) return; } + + public override string ToString() + { + return $"{GridPosition} {RoomResource}"; + } } \ No newline at end of file diff --git a/Scripts/Controllers/RogueliteRoomManager.cs b/Scripts/Controllers/RogueliteRoomManager.cs index 713c8910..f7332007 100644 --- a/Scripts/Controllers/RogueliteRoomManager.cs +++ b/Scripts/Controllers/RogueliteRoomManager.cs @@ -96,16 +96,17 @@ public partial class RogueliteRoomManager : Node2D var randomOffshootRoomsList = OffshootRooms.Shuffle(MaxBranchLength).ToList(); - var currentPos = origin; + var currentPos = spawnedBeginRoom.RandomBottomExit; _connections.Add(new RoomConnection(origin, currentPos + new Vector2I(0, 1))); Vector2I nextPos; - var offshoots = new List() + var offshoots = new List() { - OffshootType.Item, - OffshootType.Secret, - OffshootType.Shop, - OffshootType.Key + RoomType.Treasure, + RoomType.Secret, + RoomType.Shop, + RoomType.Key, + RoomType.Regular }; var shuffledOffshoots = offshoots.Shuffle().ToList(); @@ -113,10 +114,11 @@ public partial class RogueliteRoomManager : Node2D for (int i = 0; i < DungeonLength; i++) { + GD.Print($"Dungeon room {i}"); nextPos = currentPos + new Vector2I(0, 1); //var roomToSpawn = Rooms.Where(x => x.Type == RoomType.Regular).PickRandom(); - var roomToSpawn = randomRoomsList[i]; + var roomToSpawn = randomRoomsList[i % randomRoomsList.Count]; // We're already in the new room position, we do not care about previous anymore var offset = 0; @@ -131,39 +133,40 @@ public partial class RogueliteRoomManager : Node2D //var posWithOffset = nextPos + new Vector2I(offset, 0); + GD.Print($"Spawning room at {nextPos}"); if (!SpawnRoom(roomToSpawn, nextPos, out var spawnedRoom)) { - GD.PrintErr("Could not spawn room"); - break; + GD.PrintErr($"Could not spawn room {roomToSpawn} at {nextPos}"); + //DungeonLength += 1; + continue; } _mainPath.Add(nextPos); - // Place cursor at bottom of room - if (roomToSpawn.Size.Y > 1) - { - nextPos += new Vector2I(0, roomToSpawn.Size.Y - 1); - } - - // Pick a random exit to continue - var exit = GD.RandRange(0, roomToSpawn.Size.X - 1); - if (exit < 0) exit = 0; - - nextPos += new Vector2I(exit, 0); + nextPos = spawnedRoom.RandomBottomExit; + + GD.Print($"Next pos is now: {nextPos}"); + // nextPos is now the end of the room at the current exit _connections.Add(new RoomConnection(nextPos, nextPos + new Vector2I(0, 1))); + currentPos = nextPos; + // Spawn offshoot here - + var offshootTypeToSpawn = shuffledOffshoots[currentOffshoot % shuffledOffshoots.Count()]; + if (offshootTypeToSpawn is RoomType.Regular) + { + currentOffshoot++; + continue; + } + int roomsInOffshot = GD.RandRange(0, MaxBranchLength); var leftPosition = spawnedRoom.GridPosition; - - // Roll whether to go left or right, if direction is full go the other, if both are full do not spawn for (int j = 0; j < roomsInOffshot; j++) @@ -172,49 +175,49 @@ public partial class RogueliteRoomManager : Node2D foreach (var shuffledOffshoot in shuffledOffshootRoomsList) { - var offShootCoord = leftPosition - new Vector2I(shuffledOffshoot.Size.X, 0); + var offshootCoord = leftPosition - new Vector2I(shuffledOffshoot.Size.X, 0); + + GD.Print("Spawning side room"); + var spawned = SpawnRoom(shuffledOffshoot, offshootCoord, out var spawnedOffshoot); - if (!CanPlaceRoom(offShootCoord, shuffledOffshoot.Size)) + if (!spawned) { - GD.Print($"Could not place room {shuffledOffshoot.RoomName} {shuffledOffshoot.Size}"); + GD.Print($"Could not place room {shuffledOffshoot} at {offshootCoord}"); // Try next in list continue; } - - var offshootCoord = leftPosition - new Vector2I(shuffledOffshoot.Size.X, 0); - - SpawnRoom(shuffledOffshoot, offshootCoord, out var spawnedOffshoot); _connections.Add(new RoomConnection(leftPosition, offshootCoord + new Vector2I(shuffledOffshoot.Size.X -1, 0))); leftPosition = offshootCoord; // Stop because we spawned the room we needed to + currentOffshoot++; break; } - - - //var room = randomOffshootRoomsList.Shuffle().FirstOrDefault(); - // Get a random room with the required doors - - - //var leftToRightRooms = - - // Get a random door on right or left side - // spawn - // Add path - // Move cursor - // if last room generate final room - // Continue + // If it got here and couldn't spawn the offshoot, do not increase counter } // Offshoot over - currentPos = nextPos; + // Spawn final room + var finalRoomToSpawn = Rooms.Where(x => x.Type == offshootTypeToSpawn).PickRandom(); + + var finalRoomCoord = leftPosition - new Vector2I(finalRoomToSpawn.Size.X, 0); + + SpawnRoom(finalRoomToSpawn, finalRoomCoord, out var spawnedFinalRoom); + + _connections.Add(new RoomConnection(leftPosition, finalRoomCoord + new Vector2I(finalRoomToSpawn.Size.X -1, 0))); + + leftPosition = finalRoomCoord; + // Done with last offshoot room + + } nextPos = currentPos + new Vector2I(0, 1); + GD.Print($"Final nextpos is {nextPos}"); var bossRoom = BossRooms.PickRandom(); @@ -226,12 +229,12 @@ public partial class RogueliteRoomManager : Node2D { nextPos += new Vector2I(0, bossRoom.Size.Y - 1); } - + _connections.Add(new RoomConnection(currentPos, nextPos)); } else { - GD.PrintErr("Could not spawn boss room"); + GD.PrintErr($"Could not spawn boss room {bossRoom} at {nextPos}"); } foreach (var room in SpawnedRooms) @@ -289,6 +292,7 @@ public partial class RogueliteRoomManager : Node2D if (!CanPlaceRoom(gridPos, room.Size)) { spawnedRoom = null; + GD.Print($"{gridPos} size {room.Size} is occupied"); return false; } @@ -299,10 +303,12 @@ public partial class RogueliteRoomManager : Node2D spawnedScene.GridPosition = gridPos; - spawnedScene.Name = room.RoomName; + spawnedScene.Name = room.RoomName.ToString().Replace(" ", "_"); SpawnedRooms.Add(spawnedScene); + GD.Print($"Spawned room: {spawnedScene}"); + // for reference //SpawnRoom(room, origin + (room.Size * new Vector2(i, j) * tileSize)); spawnedScene.Spawn(); diff --git a/Scripts/Enums/RoomType.cs b/Scripts/Enums/RoomType.cs index 9ced044f..f4d68cb9 100644 --- a/Scripts/Enums/RoomType.cs +++ b/Scripts/Enums/RoomType.cs @@ -6,5 +6,7 @@ public enum RoomType Regular, Secret, Shop, + Key, + Treasure, Boss } \ No newline at end of file diff --git a/Scripts/Resources/Roguelite/RogueliteRoomResource.cs b/Scripts/Resources/Roguelite/RogueliteRoomResource.cs index 0f428df9..627e5253 100644 --- a/Scripts/Resources/Roguelite/RogueliteRoomResource.cs +++ b/Scripts/Resources/Roguelite/RogueliteRoomResource.cs @@ -19,4 +19,9 @@ public partial class RogueliteRoomResource : Resource [Export] public DoorDirections DoorDirections { get; set; } public bool HasDoors(DoorDirections required) => (DoorDirections & required) == required; + + public override string ToString() + { + return $"{RoomName} {Type} {Size.X}x{Size.Y}"; + } } \ No newline at end of file diff --git a/Scripts/UI/Minimap.cs b/Scripts/UI/Minimap.cs index 2d057c96..fe5bd46d 100644 --- a/Scripts/UI/Minimap.cs +++ b/Scripts/UI/Minimap.cs @@ -160,8 +160,11 @@ public partial class Minimap : CanvasLayer return type switch { RoomType.Boss => Colors.Red, - RoomType.Shop => Colors.Gold, + RoomType.Shop => Colors.DarkKhaki, RoomType.Regular => Colors.Blue, + RoomType.Key => Colors.Purple, + RoomType.Secret => Colors.Bisque, + RoomType.Treasure => Colors.Gold, RoomType.Starter => Colors.Green, _ => Colors.DimGray };