mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-17 14:33:47 +00:00
Mapping and generation fixes
This commit is contained in:
Marco
parent
7482cfa496
commit
8c17738371
18 changed files with 628 additions and 53 deletions
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=15 format=4 uid="uid://24wh7h2dbljf"]
|
||||
[gd_scene load_steps=18 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"]
|
||||
|
|
@ -9,6 +9,8 @@
|
|||
[ext_resource type="PackedScene" uid="uid://djf0y08ix66fn" path="res://Scenes/Interactable/Chest.tscn" id="7_kublc"]
|
||||
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="8_dbn5e"]
|
||||
[ext_resource type="Resource" uid="uid://cltxhkrqp055v" path="res://Resources/Items/Money_Pickup.tres" id="9_5yebg"]
|
||||
[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="10_c0yr1"]
|
||||
[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="11_5rt6n"]
|
||||
[ext_resource type="Script" uid="uid://g6oraxgd87ij" path="res://Scripts/Actors/TeleporterMarker.cs" id="12_f3e1d"]
|
||||
[ext_resource type="Texture2D" uid="uid://d3e762pxublbt" path="res://Sprites/teleporter.png" id="13_c0yr1"]
|
||||
[ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="14_c0yr1"]
|
||||
|
|
@ -20,6 +22,10 @@ size = Vector2(272, 85)
|
|||
atlas = ExtResource("13_c0yr1")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_5yebg"]
|
||||
atlas = ExtResource("13_c0yr1")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[node name="Tilemaps" type="Node2D" node_paths=PackedStringArray("RoomClearActivation")]
|
||||
process_mode = 1
|
||||
script = ExtResource("1_vhsym")
|
||||
|
|
@ -61,6 +67,11 @@ LootTable = Array[ExtResource("8_dbn5e")]([ExtResource("9_5yebg"), ExtResource("
|
|||
|
||||
[node name="EnemySpawners" type="Node2D" parent="."]
|
||||
|
||||
[node name="RogueliteEnemySpawner3" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(293, 58)
|
||||
script = ExtResource("10_c0yr1")
|
||||
Enemy = ExtResource("11_5rt6n")
|
||||
|
||||
[node name="PlayerEnterDetector" type="Area2D" parent="."]
|
||||
visible = false
|
||||
collision_layer = 0
|
||||
|
|
@ -92,4 +103,19 @@ script = ExtResource("12_f3e1d")
|
|||
Type = 2
|
||||
MarkerTexture = SubResource("AtlasTexture_5rt6n")
|
||||
|
||||
[node name="Exit" type="Marker2D" parent="Features"]
|
||||
position = Vector2(40, 136)
|
||||
script = ExtResource("12_f3e1d")
|
||||
Type = 5
|
||||
MarkerTexture = SubResource("AtlasTexture_5yebg")
|
||||
|
||||
[node name="Label2" type="Label" parent="Features/Exit"]
|
||||
z_index = 1
|
||||
offset_left = -15.0
|
||||
offset_top = 12.0
|
||||
offset_right = 37.0
|
||||
offset_bottom = 35.0
|
||||
text = "Exit test"
|
||||
label_settings = ExtResource("14_c0yr1")
|
||||
|
||||
[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"]
|
||||
|
|
|
|||
|
|
@ -82,4 +82,10 @@ script = ExtResource("7_5nx6x")
|
|||
Type = 1
|
||||
MarkerTexture = SubResource("AtlasTexture_5nx6x")
|
||||
|
||||
[node name="Exit" type="Marker2D" parent="Features"]
|
||||
position = Vector2(161, 112)
|
||||
script = ExtResource("7_5nx6x")
|
||||
Type = 5
|
||||
MarkerTexture = SubResource("AtlasTexture_5nx6x")
|
||||
|
||||
[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"]
|
||||
|
|
|
|||
144
Scenes/Maps/RogueliteMaps/Corridor_3x2.tscn
Normal file
144
Scenes/Maps/RogueliteMaps/Corridor_3x2.tscn
Normal file
File diff suppressed because one or more lines are too long
117
Scenes/Maps/RogueliteMaps/Generic_3x2.tscn
Normal file
117
Scenes/Maps/RogueliteMaps/Generic_3x2.tscn
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=17 format=4 uid="uid://o2bbndsuqj28"]
|
||||
[gd_scene load_steps=16 format=4 uid="uid://o2bbndsuqj28"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_mfwx1"]
|
||||
[ext_resource type="Resource" uid="uid://fa7jvapga27y" path="res://Scenes/Maps/RogueliteMaps/LongSidePassage.tres" id="2_d1uiv"]
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="5_oxby7"]
|
||||
[ext_resource type="PackedScene" uid="uid://bc64lr3vlwchq" path="res://Scenes/Door_Vertical.tscn" id="5_w63wm"]
|
||||
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="6_570qx"]
|
||||
[ext_resource type="Resource" uid="uid://ysd6wl2gmdhn" path="res://Resources/Enemies/Turret360.tres" id="6_w63wm"]
|
||||
[ext_resource type="PackedScene" uid="uid://dcbcyp1qogcl0" path="res://Scenes/Props/BigTankHorizontal.tscn" id="7_570qx"]
|
||||
[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="10_kagm8"]
|
||||
[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="11_04mp4"]
|
||||
|
|
@ -75,11 +74,6 @@ position = Vector2(255, 224)
|
|||
|
||||
[node name="EnemySpawners" type="Node2D" parent="."]
|
||||
|
||||
[node name="RogueliteEnemySpawner6" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(174, 40)
|
||||
script = ExtResource("5_oxby7")
|
||||
Enemy = ExtResource("6_w63wm")
|
||||
|
||||
[node name="RogueliteEnemySpawner7" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(169, 288)
|
||||
script = ExtResource("5_oxby7")
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
[gd_scene load_steps=7 format=4 uid="uid://c36nvk7cw3emg"]
|
||||
[gd_scene load_steps=13 format=4 uid="uid://c36nvk7cw3emg"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_5bd7y"]
|
||||
[ext_resource type="Resource" uid="uid://cjtcksew0qy6d" path="res://Resources/RogueliteMaps/TestRGMapLarge.tres" id="2_5bd7y"]
|
||||
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2mndj"]
|
||||
[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="5_4pnhf"]
|
||||
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_1dlui"]
|
||||
[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="6_1w61p"]
|
||||
[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="7_2mndj"]
|
||||
[ext_resource type="Script" uid="uid://umyqgyxjiaig" path="res://Scripts/Actors/ChestMarker.cs" id="8_1dlui"]
|
||||
[ext_resource type="Texture2D" uid="uid://qeh4ai8h6sw5" path="res://Sprites/Chest.png" id="9_d57gj"]
|
||||
|
||||
[sub_resource type="NavigationPolygon" id="NavigationPolygon_rlq0q"]
|
||||
vertices = PackedVector2Array(474, 58, 474, 10, 486, 10, 486, 58, 794, 58, 794, 10, 806, 10, 806, 58, 934, 58, 934, 134, 806, 134, 794, 134, 806, 150, 794, 150, 486, 134, 474, 134, 486, 150, 474, 150, 166, 58, 166, 134, 166, 150, 154, 150, 154, 134, 154, 58, 26, 134, 26, 58, 166, 10, 154, 10)
|
||||
|
|
@ -15,6 +20,10 @@ source_geometry_mode = 1
|
|||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_5bd7y"]
|
||||
size = Vector2(909, 85)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_wvfe8"]
|
||||
atlas = ExtResource("9_d57gj")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[node name="Map" type="Node2D" node_paths=PackedStringArray("RoomClearActivation")]
|
||||
process_mode = 1
|
||||
script = ExtResource("1_5bd7y")
|
||||
|
|
@ -45,17 +54,6 @@ 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(373, 75)
|
||||
|
||||
[node name="RogueliteEnemySpawner3" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(739, 101)
|
||||
|
||||
[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."]
|
||||
visible = false
|
||||
navigation_polygon = SubResource("NavigationPolygon_rlq0q")
|
||||
|
|
@ -69,4 +67,52 @@ collision_mask = 2
|
|||
position = Vector2(480.5, 94.5)
|
||||
shape = SubResource("RectangleShape2D_5bd7y")
|
||||
|
||||
[node name="EnemySpawners" type="Node2D" parent="."]
|
||||
|
||||
[node name="RogueliteEnemySpawner6" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(281, 102)
|
||||
script = ExtResource("5_4pnhf")
|
||||
Enemy = ExtResource("6_1w61p")
|
||||
|
||||
[node name="RogueliteEnemySpawner7" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(362, 94)
|
||||
script = ExtResource("5_4pnhf")
|
||||
Enemy = ExtResource("7_2mndj")
|
||||
|
||||
[node name="RogueliteEnemySpawner8" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(437, 119)
|
||||
script = ExtResource("5_4pnhf")
|
||||
Enemy = ExtResource("6_1w61p")
|
||||
|
||||
[node name="RogueliteEnemySpawner9" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(232, 60)
|
||||
script = ExtResource("5_4pnhf")
|
||||
Enemy = ExtResource("7_2mndj")
|
||||
|
||||
[node name="Features" type="Node2D" parent="."]
|
||||
|
||||
[node name="Chest" type="Marker2D" parent="Features"]
|
||||
position = Vector2(171, 80)
|
||||
script = ExtResource("8_1dlui")
|
||||
MarkerTexture = SubResource("AtlasTexture_wvfe8")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[node name="Chest2" type="Marker2D" parent="Features"]
|
||||
position = Vector2(314, 84)
|
||||
script = ExtResource("8_1dlui")
|
||||
MarkerTexture = SubResource("AtlasTexture_wvfe8")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[node name="Chest4" type="Marker2D" parent="Features"]
|
||||
position = Vector2(118, 137)
|
||||
script = ExtResource("8_1dlui")
|
||||
MarkerTexture = SubResource("AtlasTexture_wvfe8")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[node name="Chest3" type="Marker2D" parent="Features"]
|
||||
position = Vector2(81, 83)
|
||||
script = ExtResource("8_1dlui")
|
||||
MarkerTexture = SubResource("AtlasTexture_wvfe8")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"]
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
[gd_scene load_steps=7 format=4 uid="uid://hmu4dw62c10t"]
|
||||
[gd_scene load_steps=12 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="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="5_ehmby"]
|
||||
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_upf1e"]
|
||||
[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="6_112g0"]
|
||||
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_kwstq"]
|
||||
[ext_resource type="Script" uid="uid://umyqgyxjiaig" path="res://Scripts/Actors/ChestMarker.cs" id="7_wcv20"]
|
||||
[ext_resource type="Texture2D" uid="uid://qeh4ai8h6sw5" path="res://Sprites/Chest.png" id="8_upf1e"]
|
||||
|
||||
[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)
|
||||
|
|
@ -15,10 +19,15 @@ source_geometry_mode = 1
|
|||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_4lag8"]
|
||||
size = Vector2(272, 247)
|
||||
|
||||
[node name="Map" type="Node2D"]
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_kwstq"]
|
||||
atlas = ExtResource("8_upf1e")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[node name="Map" type="Node2D" node_paths=PackedStringArray("RoomClearActivation")]
|
||||
process_mode = 1
|
||||
script = ExtResource("1_4lag8")
|
||||
RoomResource = ExtResource("2_4lag8")
|
||||
RoomClearActivation = []
|
||||
|
||||
[node name="Tilemaps" type="Node2D" parent="." groups=["navigation_polygon_source_geometry_group"]]
|
||||
|
||||
|
|
@ -46,14 +55,10 @@ 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="RogueliteEnemySpawner6" type="Marker2D" parent="EnemySpawners"]
|
||||
position = Vector2(99, 118)
|
||||
script = ExtResource("5_ehmby")
|
||||
Enemy = ExtResource("6_112g0")
|
||||
|
||||
[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."]
|
||||
visible = false
|
||||
|
|
@ -69,4 +74,24 @@ collision_mask = 2
|
|||
position = Vector2(162, 175.5)
|
||||
shape = SubResource("RectangleShape2D_4lag8")
|
||||
|
||||
[node name="Features" type="Node2D" parent="."]
|
||||
|
||||
[node name="Chest" type="Marker2D" parent="Features"]
|
||||
position = Vector2(185, 136)
|
||||
script = ExtResource("7_wcv20")
|
||||
MarkerTexture = SubResource("AtlasTexture_kwstq")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[node name="Chest2" type="Marker2D" parent="Features"]
|
||||
position = Vector2(105, 55)
|
||||
script = ExtResource("7_wcv20")
|
||||
MarkerTexture = SubResource("AtlasTexture_kwstq")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[node name="Chest3" type="Marker2D" parent="Features"]
|
||||
position = Vector2(185, 56)
|
||||
script = ExtResource("7_wcv20")
|
||||
MarkerTexture = SubResource("AtlasTexture_kwstq")
|
||||
SpawnChance = 10.0
|
||||
|
||||
[connection signal="area_entered" from="PlayerEnterDetector" to="." method="OnRoomEntered"]
|
||||
|
|
|
|||
120
Scenes/Maps/RogueliteMaps/corridor_1x2.tscn
Normal file
120
Scenes/Maps/RogueliteMaps/corridor_1x2.tscn
Normal file
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue