From 9d065a6f2b769967dde7552baaaad6ac38743adc Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 21 Mar 2025 18:13:24 +0100 Subject: [PATCH] Added new enemies --- Scenes/test.tscn | 185 ++++++++++++++++++++++++----------------------- 1 file changed, 96 insertions(+), 89 deletions(-) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 3ee59e6e..2ea8d872 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -79,15 +79,14 @@ [ext_resource type="PackedScene" uid="uid://cjsnhyl0nqbau" path="res://Scenes/Props/ICCTv.tscn" id="71_ji7au"] [ext_resource type="Resource" uid="uid://cfdvg162u65sr" path="res://Resources/Enemies/Thermathron.tres" id="71_xhinl"] [ext_resource type="PackedScene" uid="uid://cyy5i38sf7fid" path="res://Scenes/Props/Locker.tscn" id="72_fasrq"] -[ext_resource type="PackedScene" uid="uid://bc054js8ep2b" path="res://Scenes/Actors/FairyGuard_New.tscn" id="73_cfpaq"] [ext_resource type="PackedScene" uid="uid://bdvj4cxnyr3w4" path="res://Scenes/Actors/Thermathron.tscn" id="73_ier4h"] -[ext_resource type="PackedScene" uid="uid://dfat0erkvb513" path="res://Scenes/Actors/Fairy_New.tscn" id="73_s4x1s"] [ext_resource type="PackedScene" uid="uid://c21m7w5ahpsd0" path="res://Scenes/Activable/Shroud.tscn" id="74_oaf68"] [ext_resource type="PackedScene" uid="uid://d0j1bmgbefyp2" path="res://Scenes/Actors/Lightbridge.tscn" id="75_jn1m0"] [ext_resource type="Script" uid="uid://crpkvxepkcrir" path="res://Scripts/Components/Actors/ForceFieldCollisionDisabler.cs" id="76_h0jm4"] [ext_resource type="PackedScene" uid="uid://drdgcu2r3yrp7" path="res://Scenes/Interactable/control_pad_green_keycard.tscn" id="76_usuub"] [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="77_yot54"] [ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="79_jn1m0"] +[ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="80_f37sa"] [ext_resource type="PackedScene" uid="uid://ihy1ew7bo6no" path="res://Scenes/Items/Yin_Yang_Orb.tscn" id="81_ati1v"] [ext_resource type="Resource" uid="uid://b0jpn0kkmciuq" path="res://Resources/Music/Overtime_Fairy_Dance.tres" id="82_ksslq"] [ext_resource type="PackedScene" uid="uid://cvctgw8eo2f7e" path="res://Scenes/Items/SpiderBomb_Pickup.tscn" id="83_jn1m0"] @@ -110,6 +109,7 @@ [ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="99_xwjvv"] [ext_resource type="PackedScene" uid="uid://8yggb3ay3hr0" path="res://Scenes/Items/Yellow_Keycard.tscn" id="101_l476f"] [ext_resource type="PackedScene" uid="uid://ey71mxa5ocpn" path="res://Scenes/Items/Shield_Extend_Pickup.tscn" id="103_0bqta"] +[ext_resource type="PackedScene" uid="uid://bb32f4p5e671j" path="res://Scenes/Actors/Fairy_Guard_FSM.tscn" id="103_f37sa"] [ext_resource type="PackedScene" uid="uid://clieeuln36a7a" path="res://Scenes/Actors/Fairy_FSM.tscn" id="104_0bqta"] [ext_resource type="PackedScene" uid="uid://ue3i2qyhhtbg" path="res://Scenes/Interactable/control_pad_yellow_keycard.tscn" id="109_j6vrf"] @@ -166,11 +166,12 @@ Targets = Array[NodePath]([NodePath("../../HorizontalForceField3")]) WaitForCompletion = true metadata/_custom_type_script = "uid://bwox5lmgiijcs" -[sub_resource type="Resource" id="Resource_yot54"] -script = ExtResource("64_rphi8") -Target = NodePath("../../ServerRoom/ControllabeFairyGuard2") +[sub_resource type="Resource" id="Resource_0bqta"] +script = ExtResource("45_emjoj") +ActivationType = 0 +Targets = Array[NodePath]([NodePath("../../ServerRoom/ThermatronFsm")]) WaitForCompletion = true -metadata/_custom_type_script = "uid://v57xjmhi28kw" +metadata/_custom_type_script = "uid://bwox5lmgiijcs" [sub_resource type="Resource" id="Resource_o2kpk"] script = ExtResource("64_rphi8") @@ -220,7 +221,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_0bqta"] +[sub_resource type="Resource" id="Resource_wma5c"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -876,7 +877,7 @@ Targets = [NodePath("Computer5Script")] [node name="Computer5Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer5"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("45_f37sa")]([SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_yot54")]) +Events = Array[ExtResource("45_f37sa")]([SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")]) [node name="Computer3" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-612.57, -358.528) @@ -925,7 +926,7 @@ Events = Array[ExtResource("45_f37sa")]([SubResource("Resource_068l7"), SubResou [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[ExtResource("45_f37sa")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_0bqta")]) +Events = Array[ExtResource("45_f37sa")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_wma5c")]) [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) @@ -944,48 +945,6 @@ State = 1 [node name="VerticalDoor3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("15_mgtvp")] position = Vector2(-1940, -648) -[node name="FairyGuard" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-692, 56) - -[node name="FairyGuard2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-796, 100) - -[node name="FairyGuard7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-1014.21, 203.243) - -[node name="Fairy" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-682, -8) - -[node name="Fairy2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-921, 184) - -[node name="FairyGuard3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-1434, 7) - -[node name="FairyGuard4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-1274, -24) - -[node name="FairyGuard5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-1527, -147) - -[node name="FairyGuard6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-1666, -188) - -[node name="Fairy3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1471, -118) - -[node name="Fairy4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1229, 12) - -[node name="Fairy5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1128, 170) - -[node name="Fairy6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-922, 105) - -[node name="FairyGuard9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-866, -92) - [node name="Shroud" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("74_oaf68")] [node name="Shroud4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("74_oaf68")] @@ -1030,31 +989,16 @@ position = Vector2(-885, -219) [node name="ServerRoom" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps"] -[node name="ControllabeFairyGuard2" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_ier4h")] -position = Vector2(-1199, -260) -StartingAiState = 1 - -[node name="FairyGuard" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] -position = Vector2(-1281, -391) - -[node name="FairyGuard2" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] -position = Vector2(-1131, -398) - -[node name="FairyGuard4" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] -position = Vector2(-1242.52, -666.44) - -[node name="FairyGuard5" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] -position = Vector2(-1060.45, -646.447) - -[node name="FairyGuard3" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")] -position = Vector2(-1067, -363) - [node name="Ammo1" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("34_17pjh")] position = Vector2(-1303, -428) [node name="Ammo2" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("34_17pjh")] position = Vector2(-1289, -429) +[node name="ThermatronFsm" parent="Parallax2D/Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("80_f37sa")] +position = Vector2(-1201, -257) +StartingAiState = 1 + [node name="HealthStation" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("38_kuhg5")] position = Vector2(-648, -135) @@ -1070,21 +1014,6 @@ position = Vector2(-1144, -148) [node name="Power2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("19_2boii")] position = Vector2(-968, 88) -[node name="FairyGuard8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-934, -159) - -[node name="Fairy7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1272, -340) - -[node name="Fairy8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1107, -327) - -[node name="Fairy9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1220, -402) - -[node name="Fairy10" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] -position = Vector2(-1080, -399) - [node name="Turret362" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("DefeatScript") instance=ExtResource("62_h0jm4")] position = Vector2(-1928, -659) DefeatScript = NodePath("../VerticalDoor3") @@ -1267,17 +1196,95 @@ position = Vector2(-1646, 38) [node name="ShieldExtendPickup2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_0bqta")] position = Vector2(-1097.18, -108.733) +[node name="ThermatronFsm" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("80_f37sa")] +position = Vector2(-1840, 16) + [node name="FairyFsm" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] -position = Vector2(-1829, 49) +position = Vector2(-680, -5) [node name="FairyFsm2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] -position = Vector2(-1911, 69) +position = Vector2(-653, 159) + +[node name="FairyGuardFsm" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-705, 55) + +[node name="FairyGuardFsm2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-787, 99) + +[node name="FairyGuardFsm3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1015, 207) [node name="FairyFsm3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] -position = Vector2(-1964, -47) +position = Vector2(-920, 190) [node name="FairyFsm4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] -position = Vector2(-1497, -17) +position = Vector2(-922, 104) + +[node name="FairyFsm5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1095, 159) + +[node name="FairyFsm6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1271, 32) + +[node name="FairyGuardFsm4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1469, -22) + +[node name="FairyFsm7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1462, -150) + +[node name="FairyGuardFsm5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1680, -131) + +[node name="FairyGuardFsm6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1965, -37) + +[node name="FairyGuardFsm7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1895, 68) + +[node name="FairyFsm8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1616, -164) + +[node name="FairyFsm9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1257, -344) + +[node name="FairyFsm10" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1277, -400) + +[node name="FairyGuardFsm8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1099, -393) + +[node name="FairyGuardFsm9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1059, -323) + +[node name="FairyGuardFsm10" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1197, -331) + +[node name="FairyGuardFsm11" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1273, -650) + +[node name="FairyGuardFsm12" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1198, -783) + +[node name="FairyFsm11" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1035, -646) + +[node name="FairyFsm12" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1126, -673) + +[node name="FairyFsm13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1246, -587) + +[node name="FairyGuardFsm13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-1615, -661) + +[node name="FairyFsm14" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("104_0bqta")] +position = Vector2(-1988, 45) + +[node name="FairyGuardFsm14" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-927, -159) + +[node name="FairyGuardFsm15" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_f37sa")] +position = Vector2(-862, -94) [node name="PlayerParent" type="Node2D" parent="Parallax2D/Factory Tilemaps"]