From 6e23a00aa6983234d950bf17feb2a644a6f1079e Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 7 May 2025 17:17:05 +0200 Subject: [PATCH] Mapping --- Resources/RogueliteMaps/Factory_Theme.tres | 10 +---- .../Maps/RogueliteMaps/Transformers_Room.tscn | 43 ++++++++++++++++--- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/Resources/RogueliteMaps/Factory_Theme.tres b/Resources/RogueliteMaps/Factory_Theme.tres index 6db20f66..1c6283b7 100644 --- a/Resources/RogueliteMaps/Factory_Theme.tres +++ b/Resources/RogueliteMaps/Factory_Theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="RogueliteMapTheme" load_steps=73 format=3 uid="uid://cw6868vuvuynh"] +[gd_resource type="Resource" script_class="RogueliteMapTheme" load_steps=67 format=3 uid="uid://cw6868vuvuynh"] [ext_resource type="Script" uid="uid://bwtif3if3ea0u" path="res://Scripts/Resources/RogueliteMapTheme.cs" id="1_2rtdw"] [ext_resource type="Resource" uid="uid://cltxhkrqp055v" path="res://Resources/Items/Money_Pickup.tres" id="1_ae3bb"] @@ -57,13 +57,7 @@ [ext_resource type="Resource" uid="uid://brsukcuyoq364" path="res://Resources/Items/NuclearGunPickup.tres" id="47_to7mi"] [ext_resource type="Resource" uid="uid://bk8s87cgwi3jp" path="res://Resources/RogueliteMaps/Transformers_Room.tres" id="47_vgue3"] [ext_resource type="Resource" uid="uid://ccmuffmnevrt4" path="res://Resources/Items/Yin_Yang_Gun_Pickup.tres" id="48_w335g"] -[ext_resource type="Resource" uid="uid://bhllj7r3oxipf" path="res://Resources/Items/IceShotgun_T2.tres" id="56_hvkru"] -[ext_resource type="Resource" uid="uid://c01jixi7b2s7v" path="res://Resources/Items/IceShotgun_T1.tres" id="57_vgue3"] -[ext_resource type="Resource" uid="uid://c57od7cpn5kwf" path="res://Resources/Items/IceShotgun_Sawed_T2.tres" id="58_akf4h"] -[ext_resource type="Resource" uid="uid://btk4kojtepwv" path="res://Resources/Items/IceShotgun_Sawed_T1.tres" id="59_i20or"] [ext_resource type="Resource" uid="uid://dv0cdlx8d6evm" path="res://Resources/Items/IceShotgun_Sawed_T0.tres" id="60_vqfa4"] -[ext_resource type="Resource" uid="uid://dwwbyyy3fo4bt" path="res://Resources/Items/IcicleRepeater_Advanced.tres" id="61_58120"] -[ext_resource type="Resource" uid="uid://cajqlnyvlmybe" path="res://Resources/Items/IcicleRepeater_Improved.tres" id="62_j31dq"] [sub_resource type="Resource" id="Resource_nnvxo"] script = ExtResource("11_eegnh") @@ -146,7 +140,7 @@ metadata/_custom_type_script = "uid://rgx0g5iqksnn" [sub_resource type="Resource" id="Resource_eegnh"] script = ExtResource("11_eegnh") -Items = Array[Object]([ExtResource("45_f7mru"), ExtResource("46_3kwn2"), ExtResource("47_to7mi"), ExtResource("48_w335g"), ExtResource("56_hvkru"), ExtResource("57_vgue3"), ExtResource("58_akf4h"), ExtResource("59_i20or"), ExtResource("60_vqfa4"), ExtResource("61_58120"), ExtResource("62_j31dq")]) +Items = Array[Object]([ExtResource("45_f7mru"), ExtResource("46_3kwn2"), ExtResource("47_to7mi"), ExtResource("48_w335g"), ExtResource("60_vqfa4")]) metadata/_custom_type_script = "uid://rgx0g5iqksnn" [resource] diff --git a/Scenes/Maps/RogueliteMaps/Transformers_Room.tscn b/Scenes/Maps/RogueliteMaps/Transformers_Room.tscn index 8abe8870..28193939 100644 --- a/Scenes/Maps/RogueliteMaps/Transformers_Room.tscn +++ b/Scenes/Maps/RogueliteMaps/Transformers_Room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=4 uid="uid://640f2h7vxpq1"] +[gd_scene load_steps=14 format=4 uid="uid://640f2h7vxpq1"] [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_mvfa6"] [ext_resource type="Resource" uid="uid://bk8s87cgwi3jp" path="res://Resources/RogueliteMaps/Transformers_Room.tres" id="2_mvfa6"] @@ -6,6 +6,9 @@ [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="4_g3oii"] [ext_resource type="PackedScene" uid="uid://cxjumgf8bhr3l" path="res://Scenes/Elevator.tscn" id="5_523n1"] [ext_resource type="PackedScene" uid="uid://dcbcyp1qogcl0" path="res://Scenes/Props/BigTankHorizontal.tscn" id="6_bhaf8"] +[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="7_3lvph"] +[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="8_jl7y3"] +[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="9_2ex40"] [sub_resource type="Curve2D" id="Curve2D_bhaf8"] _data = { @@ -79,14 +82,40 @@ position = Vector2(31, 324) [node name="EnemySpawners" type="Node2D" parent="."] -[node name="RogueliteEnemySpawner" type="Marker2D" parent="EnemySpawners"] -position = Vector2(57, 67) +[node name="RogueliteEnemySpawner6" type="Marker2D" parent="EnemySpawners"] +position = Vector2(51, 127) +script = ExtResource("7_3lvph") +Enemy = ExtResource("8_jl7y3") -[node name="RogueliteEnemySpawner2" type="Marker2D" parent="EnemySpawners"] -position = Vector2(82, 185) +[node name="RogueliteEnemySpawner7" type="Marker2D" parent="EnemySpawners"] +position = Vector2(274.952, 191.558) +script = ExtResource("7_3lvph") +Enemy = ExtResource("8_jl7y3") -[node name="RogueliteEnemySpawner3" type="Marker2D" parent="EnemySpawners"] -position = Vector2(261, 248) +[node name="RogueliteEnemySpawner8" type="Marker2D" parent="EnemySpawners"] +position = Vector2(135.227, 170.482) +script = ExtResource("7_3lvph") +Enemy = ExtResource("8_jl7y3") + +[node name="RogueliteEnemySpawner9" type="Marker2D" parent="EnemySpawners"] +position = Vector2(173, 240) +script = ExtResource("7_3lvph") +Enemy = ExtResource("8_jl7y3") + +[node name="RogueliteEnemySpawner10" type="Marker2D" parent="EnemySpawners"] +position = Vector2(51.3138, 393.339) +script = ExtResource("7_3lvph") +Enemy = ExtResource("8_jl7y3") + +[node name="RogueliteEnemySpawner11" type="Marker2D" parent="EnemySpawners"] +position = Vector2(175.817, 383.582) +script = ExtResource("7_3lvph") +Enemy = ExtResource("9_2ex40") + +[node name="RogueliteEnemySpawner12" type="Marker2D" parent="EnemySpawners"] +position = Vector2(51.7041, 222) +script = ExtResource("7_3lvph") +Enemy = ExtResource("9_2ex40") [node name="NavigationRegion2D" type="NavigationRegion2D" parent="."] visible = false