From 4660c97854d20f13da0947a6e9aa8f7d18e8e25e Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Mon, 31 Mar 2025 21:11:45 +0200 Subject: [PATCH] Mapping --- Resources/Debug/DebugLevels.tres | 12 ++++----- Scenes/Maps/Level3.tscn | 42 ++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index fa43b907..761b0414 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -19,7 +19,7 @@ _name = "Intro" [sub_resource type="Resource" id="Resource_cfhv5"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_0k62o"] script = ExtResource("2_tnajf") @@ -31,7 +31,7 @@ StartData = SubResource("Resource_cfhv5") [sub_resource type="Resource" id="Resource_tpb7s"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_edoov"] script = ExtResource("2_tnajf") @@ -43,7 +43,7 @@ StartData = SubResource("Resource_tpb7s") [sub_resource type="Resource" id="Resource_1sw5g"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_47bot"] script = ExtResource("2_tnajf") @@ -73,7 +73,7 @@ _name = "Rebel Base" [sub_resource type="Resource" id="Resource_maxpt"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_pein5"] script = ExtResource("2_tnajf") @@ -128,7 +128,7 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_7sue8"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_ognca"] @@ -142,7 +142,7 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_olpjo"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_nbnej"] diff --git a/Scenes/Maps/Level3.tscn b/Scenes/Maps/Level3.tscn index cfbd0b83..f1a61007 100644 --- a/Scenes/Maps/Level3.tscn +++ b/Scenes/Maps/Level3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=60 format=4 uid="uid://dnpmeebmjgv2t"] +[gd_scene load_steps=62 format=4 uid="uid://dnpmeebmjgv2t"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_0pe42"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_bn5f4"] @@ -53,14 +53,16 @@ [ext_resource type="PackedScene" uid="uid://drdgcu2r3yrp7" path="res://Scenes/Interactable/control_pad_green_keycard.tscn" id="44_udf20"] [ext_resource type="PackedScene" uid="uid://bc64lr3vlwchq" path="res://Scenes/Door_Vertical.tscn" id="45_wy0ue"] [ext_resource type="PackedScene" uid="uid://ddwcib46ttlrp" path="res://Scenes/Items/Ice_Shotgun_Pickup.tscn" id="46_y412u"] +[ext_resource type="PackedScene" uid="uid://dth038hcu6v1i" path="res://Scenes/Actors/Fairy_SpecialForce_FSM.tscn" id="47_wkglj"] [ext_resource type="PackedScene" uid="uid://dqr6myj0yaqvd" path="res://Scenes/Interactable/ScriptableMovementSensorLonger.tscn" id="50_tu8ih"] [ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="51_rasxb"] [ext_resource type="Script" uid="uid://c8tx1gh0lxt0t" path="res://Scripts/Resources/Events/AlarmEnableEvent.cs" id="52_udf20"] +[ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="58_pjj1f"] [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_w0rax") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("3_w0rax")]([]) [sub_resource type="RectangleShape2D" id="RectangleShape2D_tvyok"] size = Vector2(52, 64) @@ -426,6 +428,12 @@ position = Vector2(836, 808) [node name="IceShotgun" parent="Tilemaps/Actors" instance=ExtResource("46_y412u")] position = Vector2(573, 341) +[node name="Camera6" parent="Tilemaps/Actors" instance=ExtResource("23_hh3t5")] +position = Vector2(976, 892) + +[node name="FairyGuardFsm7" parent="Tilemaps/Actors" instance=ExtResource("47_wkglj")] +position = Vector2(794, 844) + [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 script = ExtResource("9_nrpyf") @@ -463,3 +471,33 @@ autoplay = true [node name="MovementSensorLonger" parent="." instance=ExtResource("50_tu8ih")] position = Vector2(400, 368) Events = Array[ExtResource("51_rasxb")]([SubResource("Resource_wy0ue")]) + +[node name="ThermatronFsm" parent="." instance=ExtResource("58_pjj1f")] +position = Vector2(617, 863) + +[node name="FairyFsm" parent="." instance=ExtResource("22_hh3t5")] +position = Vector2(541, 891) + +[node name="FairyFsm2" parent="." instance=ExtResource("22_hh3t5")] +position = Vector2(618, 1012) + +[node name="FairyFsm3" parent="." instance=ExtResource("22_hh3t5")] +position = Vector2(744, 938) + +[node name="FairyGuardFsm" parent="." instance=ExtResource("21_qga4v")] +position = Vector2(865, 935) + +[node name="FairyGuardFsm2" parent="." instance=ExtResource("21_qga4v")] +position = Vector2(483, 1033) + +[node name="FairyGuardFsm3" parent="." instance=ExtResource("21_qga4v")] +position = Vector2(535, 991) + +[node name="FairyGuardFsm4" parent="." instance=ExtResource("21_qga4v")] +position = Vector2(480, 806) + +[node name="FairyGuardFsm5" parent="." instance=ExtResource("21_qga4v")] +position = Vector2(818, 805) + +[node name="FairyGuardFsm6" parent="." instance=ExtResource("21_qga4v")] +position = Vector2(1228, 937)