diff --git a/Scenes/Actors/Camera.tscn b/Scenes/Actors/Camera.tscn index 1bf5a583..c88714ba 100644 --- a/Scenes/Actors/Camera.tscn +++ b/Scenes/Actors/Camera.tscn @@ -13,10 +13,11 @@ radius = 85.0529 [sub_resource type="RectangleShape2D" id="RectangleShape2D_3bqsq"] size = Vector2(8, 12) -[node name="Camera" type="CharacterBody2D" node_paths=PackedStringArray("_playerDetection")] +[node name="Camera" type="CharacterBody2D" node_paths=PackedStringArray("AlarmActivationTargets", "_playerDetection")] collision_layer = 16 collision_mask = 75 script = ExtResource("1_2qb38") +AlarmActivationTargets = [] Health = 1.0 WalkSpeed = 0.0 CorpseTemplate = ExtResource("2_aysqd") @@ -30,6 +31,7 @@ visible = false shape = SubResource("CircleShape2D_nkpag") [node name="PlayerDetection" type="Area2D" parent="."] +visible = false collision_layer = 16 collision_mask = 2 script = ExtResource("3_ax0x5") diff --git a/Scenes/Actors/Fairy_FSM.tscn b/Scenes/Actors/Fairy_FSM.tscn index 47706d22..31a86593 100644 --- a/Scenes/Actors/Fairy_FSM.tscn +++ b/Scenes/Actors/Fairy_FSM.tscn @@ -149,7 +149,7 @@ script = ExtResource("8_fu65u") Root = NodePath("..") [node name="DamageReceiver" type="Area2D" parent="." node_paths=PackedStringArray("HealthProvider")] -collision_layer = 64 +collision_layer = 0 collision_mask = 136 script = ExtResource("10_l7aey") HealthProvider = NodePath("Health") diff --git a/Scenes/Maps/Level3.tscn b/Scenes/Maps/Level3.tscn index 28163253..a67ca0db 100644 --- a/Scenes/Maps/Level3.tscn +++ b/Scenes/Maps/Level3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=47 format=4 uid="uid://dnpmeebmjgv2t"] +[gd_scene load_steps=56 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"] @@ -20,7 +20,9 @@ [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="13_jhwgn"] [ext_resource type="PackedScene" uid="uid://dyvrwksve4ulg" path="res://Scenes/Items/Yin_Yang_Gun_Pickup.tscn" id="13_tn8mb"] [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="14_31m3n"] +[ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="14_l8btv"] [ext_resource type="PackedScene" uid="uid://iooa4gqy2uu2" path="res://Scenes/Items/Nuclear_Gun_Pickup.tscn" id="14_vr1yp"] +[ext_resource type="Resource" uid="uid://dodwpect0ldjf" path="res://Resources/Items/Heart_Pickup.tres" id="15_mi8uj"] [ext_resource type="PackedScene" uid="uid://cqi87wcxymbhx" path="res://Scenes/Props/Shelf.tscn" id="15_vr1yp"] [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="16_00msh"] [ext_resource type="PackedScene" uid="uid://bs6o3htusgyjl" path="res://Scenes/Door_Horizontal_Hidden.tscn" id="17_7j1cb"] @@ -41,9 +43,15 @@ [ext_resource type="PackedScene" uid="uid://cdr4m7pydqk6u" path="res://Scenes/Interactable/control_pad_red_keycard.tscn" id="33_qffie"] [ext_resource type="PackedScene" uid="uid://byjq8xpx4crfd" path="res://Scenes/Interactable/control_pad_blue_keycard.tscn" id="34_3m1mf"] [ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="34_bs5q6"] +[ext_resource type="PackedScene" uid="uid://b7gkxlll3b1eg" path="res://Scenes/Activable/FloorEmitter.tscn" id="35_cpj8l"] [ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="35_sdywl"] +[ext_resource type="Resource" uid="uid://cmra7n6so1x4u" path="res://Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres" id="36_lyg32"] [ext_resource type="PackedScene" uid="uid://bjskkeb3ppcs8" path="res://Scenes/Actors/Turret360.tscn" id="37_qffie"] [ext_resource type="PackedScene" uid="uid://btd0alc48qijq" path="res://Scenes/Props/Workbench.tscn" id="38_yhj5v"] +[ext_resource type="PackedScene" uid="uid://cnhgvn2salyxl" path="res://Scenes/Items/Icicle_Repeater.tscn" id="40_lyg32"] +[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"] [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_w0rax") @@ -53,6 +61,11 @@ StartingEquipment = [] [sub_resource type="RectangleShape2D" id="RectangleShape2D_tvyok"] size = Vector2(52, 64) +[sub_resource type="Resource" id="Resource_wy0ue"] +script = ExtResource("52_udf20") +WaitForCompletion = true +metadata/_custom_type_script = "uid://c8tx1gh0lxt0t" + [node name="GameScene" type="Node2D"] process_mode = 3 script = ExtResource("1_0pe42") @@ -83,8 +96,8 @@ tile_map_data = PackedByteArray("AAACAA0AAAACAAYAAAADAA0AAAAJAAMAAAAEAA0AAAAKAAM tile_set = ExtResource("5_6nsxd") metadata/_edit_lock_ = true -[node name="Props" type="TileMapLayer" parent="Tilemaps"] -tile_map_data = PackedByteArray("AAADABMAAQAAAAAAAQAEABMAAQAAAAAAAQANABQAAQAAAAAAAQAQABQAAQAAAAAAAQAQABIAAAAIAAgAAAAPABIAAAAEAAoAAAAOABIAAAAEAAoAAAANABIAAAAEAAoAAAAMABIAAAAEAAoAAAALABIAAAAEAAoAAAAJABIAAAAGAAoAAAAVABYAAAAJAAIAAAAVABcAAAAJAAMAAAAWABYAAAAKAAIAAAAWABcAAAAKAAMAAAAXABYAAAAKAAAAAAAXABcAAAAKAAEAAAAYABYAAAAJAAIAAAAYABcAAAAJAAMAAAAPABEAAQAAAAAAAgAQABEAAQAAAAAAAgAGABIAAAAIAAgAAAAFABIAAAAEAAoAAAAEABIAAAAEAAoAAAADABIAAAAGAAoAAAAKABIAAAAEAAoAAAAPABUAAAAEAAoAAAAOABUAAAAEAAoAAAANABUAAAAEAAoAAAAMABUAAAAEAAoAAAALABUAAAAEAAoAAAAKABUAAAAEAAoAAAAJABUAAAAGAAoAAAAQABUAAAAIAAgAAAAFABUAAAAIAAgAAAAEABUAAAAEAAoAAAADABUAAAAGAAoAAAAFABgAAQAAAAAADQAFABkAAQAAAAAADQAZABYAAAAKAAIAAAAZABcAAAAKAAMAAAAUABYAAAAKAAwAAAAUABcAAAAKAA0AAAAaABYAAAAJAAwAAAAaABcAAAAJAA0AAAApABYAAAAGAAYAAAApABcAAAAGAAYAAAApABgAAAAGAAYAAAApABkAAAAGAAYAAAApABoAAAAGAAYAAAApABsAAAAGAAYAAAApABwAAAAGAAYAAAAiAB0AAAAHAAUAAAAjAB0AAAAHAAUAAAAkAB0AAAAHAAUAAAAlAB0AAAAHAAUAAAAmAB0AAAAHAAUAAAAnAB0AAAAHAAUAAAAoAB0AAAAHAAUAAAAsABQAAAAKAAwAAAAsABUAAAAKAA0AAAAvABcAAAAJAAwAAAAvABgAAAAJAA0AAAAhAB0AAAAGAAUAAAAIAC0AAAAHAAUAAAAJAC0AAAAHAAUAAAAKAC0AAAAHAAUAAAANAC0AAAAHAAUAAAAOAC0AAAAHAAUAAAAPAC0AAAAHAAUAAAAQAC0AAAAHAAUAAAARAC0AAAAHAAUAAAAHAC0AAAAGAAUAAAAHAC4AAAAGAAYAAAAHAC8AAAAGAAYA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") +[node name="Props" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAADABMAAQAAAAAAAQAEABMAAQAAAAAAAQANABQAAQAAAAAAAQAQABQAAQAAAAAAAQAQABIAAAAIAAgAAAAPABIAAAAEAAoAAAAOABIAAAAEAAoAAAANABIAAAAEAAoAAAAMABIAAAAEAAoAAAALABIAAAAEAAoAAAAJABIAAAAGAAoAAAAVABYAAAAJAAIAAAAVABcAAAAJAAMAAAAWABYAAAAKAAIAAAAWABcAAAAKAAMAAAAXABYAAAAKAAAAAAAXABcAAAAKAAEAAAAYABYAAAAJAAIAAAAYABcAAAAJAAMAAAAPABEAAQAAAAAAAgAQABEAAQAAAAAAAgAGABIAAAAIAAgAAAAFABIAAAAEAAoAAAAEABIAAAAEAAoAAAADABIAAAAGAAoAAAAKABIAAAAEAAoAAAAPABUAAAAEAAoAAAAOABUAAAAEAAoAAAANABUAAAAEAAoAAAAMABUAAAAEAAoAAAALABUAAAAEAAoAAAAKABUAAAAEAAoAAAAJABUAAAAGAAoAAAAQABUAAAAIAAgAAAAFABUAAAAIAAgAAAAEABUAAAAEAAoAAAADABUAAAAGAAoAAAAFABgAAQAAAAAADQAFABkAAQAAAAAADQAZABYAAAAKAAIAAAAZABcAAAAKAAMAAAAUABYAAAAKAAwAAAAUABcAAAAKAA0AAAAaABYAAAAJAAwAAAAaABcAAAAJAA0AAAApABYAAAAGAAYAAAApABcAAAAGAAYAAAApABgAAAAGAAYAAAApABkAAAAGAAYAAAApABoAAAAGAAYAAAApABsAAAAGAAYAAAApABwAAAAGAAYAAAAiAB0AAAAHAAUAAAAjAB0AAAAHAAUAAAAkAB0AAAAHAAUAAAAlAB0AAAAHAAUAAAAmAB0AAAAHAAUAAAAnAB0AAAAHAAUAAAAoAB0AAAAHAAUAAAAsABQAAAAKAAwAAAAsABUAAAAKAA0AAAAvABcAAAAJAAwAAAAvABgAAAAJAA0AAAAhAB0AAAAGAAUAAAAIAC0AAAAHAAUAAAAJAC0AAAAHAAUAAAAKAC0AAAAHAAUAAAANAC0AAAAHAAUAAAAOAC0AAAAHAAUAAAAPAC0AAAAHAAUAAAAQAC0AAAAHAAUAAAARAC0AAAAHAAUAAAAHAC0AAAAGAAUAAAAHAC4AAAAGAAYAAAAHAC8AAAAGAAYAAAADACEAAAAIAAYAAAADACIAAAAIAAYAAAADACMAAAAIAAYAAAADACQAAAAIAAYAAAABACcAAAAHAAcAAAACACcAAAAHAAcAAAADACcAAAAIAAcAAAADACUAAAAIAAYAAAADACYAAAAIAAYAAAAeADUAAAAIAAgAAAAdADUAAAAGAAoAAAAiADUAAAAIAAgAAAAhADUAAAAGAAoAAAAmADgAAAAIAAgAAAAlADgAAAAGAAoAAAAqADgAAAAIAAgAAAApADgAAAAGAAoAAAAnACAAAQAAAAAAAQAnACEAAQAAAAAAAQAkACAAAQAAAAAAAQAkACEAAQAAAAAAAQAtAB0AAQAAAAAAAQAtABwAAQAAAAAAAQAqABYAAQAAAAAAAQArABYAAQAAAAAAAQA0ABkAAQAAAAAAAQA0ABoAAQAAAAAAAQAWACEAAQAAAAAAAQAXACEAAQAAAAAAAQAYACcAAQAAAAAAAQAYACgAAQAAAAAAAQAPAC8AAQAAAAAAAQAQAC8AAQAAAAAAAQARAC8AAQAAAAAAAQABACUAAQAAAAAAAQABACYAAQAAAAAAAQABACQAAQAAAAAAAQAGABkAAQAAAAAAAQAPABYAAQAAAAAAAQAQABYAAQAAAAAAAQAOABQAAQAAAAAAAQAPABQAAQAAAAAAAgAQABcAAQAAAAAAAgAhABYAAQAAAAAAAgAiABYAAQAAAAAAAgAtAB4AAQAAAAAAAgA0ABsAAQAAAAAAAgAwABkAAQAAAAAAAgAnACIAAQAAAAAADAAnACMAAQAAAAAAAgAkACIAAQAAAAAAAgAYACkAAQAAAAAAAgAYACoAAQAAAAAADwAYACEAAQAAAAAADAAZACEAAQAAAAAADAAIAC4AAQAAAAAADAAIAC8AAQAAAAAADAABACIAAQAAAAAADAAkACMAAQAAAAAADAApACMAAQAAAAAADAApACQAAQAAAAAADAAsACQAAQAAAAAADAAtAB8AAQAAAAAADAAyABkAAQAAAAAADAAqACQAAQAAAAAADQAbABgAAQAAAAAADQAMABYAAQAAAAAADQALABYAAQAAAAAADQAvAA8AAQAAAAAADQA0ACIAAQAAAAAADQAyACIAAQAAAAAADQAzACIAAQAAAAAADQApAB0AAAAFAA8AAABCADcAAAAIAAYAAABCADgAAAAIAAYAAABCADkAAAAIAAYAAABCADoAAAAIAAYAAABCADsAAAAIAAYAAABHADcAAAAGAAYAAABHADgAAAAGAAYAAABHADkAAAAGAAYAAABHADoAAAAGAAYAAABHADsAAAAGAAYAAABIADwAAAAHAAcAAABJADwAAAAHAAcAAABHADwAAAAGAAcAAABCADwAAAAIAAcAAABAADwAAAAHAAcAAABBADwAAAAHAAcAAAAhADgAAAAFAA4AAAAhADkAAAAGAAYAAAAhADoAAAAGAAYAAAAhADsAAAAGAAYAAAAeADgAAAAHAAcAAAAfADgAAAAHAAcAAAAgADgAAAAHAAcAAAAdADkAAAAIAAYAAAAdADoAAAAIAAYAAAAdADsAAAAIAAYAAAAeADwAAAAHAAUAAAAfADwAAAAHAAUAAAAgADwAAAAHAAUAAAAhADwAAAAFAA8AAAAdADgAAAAEAA4AAAAdADwAAAAEAA8AAAAjAA0AAAAJAAwAAAAjAA4AAAAJAA0AAAAcAA0AAAAKAAwAAAAcAA4AAAAKAA0AAAA1ABsAAAAJAAwAAAA1ABwAAAAJAA0AAAAgAB8AAAAKAAwAAAAgACAAAAAKAA0AAAAhAC8AAAAKAAwAAAAhADAAAAAKAA0AAAAgADQAAAAKAAwAAAAgADUAAAAKAA0AAAAkADcAAAAKAAwAAAAkADgAAAAKAA0AAAAvADcAAAAKAAwAAAAvADgAAAAKAA0AAAAkAD4AAAAKAAwAAAAkAD8AAAAKAA0AAAArAEMAAAAKAAwAAAArAEQAAAAKAA0AAAA/ADcAAAAKAAwAAAA/ADgAAAAKAA0AAABCADQAAAAKAAwAAABCADUAAAAKAA0AAABCADYAAAAKAAwAAABHADUAAAAJAAwAAABHADYAAAAJAA0AAABHADQAAAAJAAwAAABKADcAAAAJAAwAAABKADgAAAAJAA0AAAA0ADcAAAAJAAwAAAA0ADgAAAAJAA0AAAA7AD4AAAAJAAwAAAA7AD8AAAAJAA0AAAAhAEMAAAAJAAwAAAAhAEQAAAAJAA0AAAAjAD4AAAAJAAwAAAAjAD8AAAAJAA0AAAAjADcAAAAJAAwAAAAjADgAAAAJAA0AAAArADcAAAAJAAwAAAArADgAAAAJAA0AAAAnADIAAAAJAAwAAAAnADMAAAAJAA0AAAAfADQAAAAJAAwAAAAfADUAAAAJAA0AAAA0ADEAAAAKAA4AAAA0ADIAAAAKAA8AAAA4AD4AAAAKAAwAAAA4AD8AAAAKAA0AAAAgABYAAAAKAAwAAAAgABcAAAAKAA0AAAAvAB4AAAAKAAwAAAAvAB8AAAAKAA0AAAAuAB4AAAAJAAwAAAAuAB8AAAAJAA0AAAA3ABsAAAAKAAwAAAA3ABwAAAAKAA0AAAAHAA0AAAAAAAIAAAAIAA0AAAAAAAIAAAALAA0AAAAAAAIAAAAMAA0AAAAAAAIAAAARABcAAAAKAA4AAAARABgAAAAKAA8AAAAaAA0AAAAJAAwAAAAaAA4AAAAJAA0AAAAXAA0AAAAKAAwAAAAXAA4AAAAKAA0AAAAfABYAAAAJAAwAAAAfABcAAAAJAA0AAAAcABcAAAAKAAwAAAAcABYAAAAKAAwAAAAsAAUAAQAAAAAAEQAqAAUAAQAAAAAAEQAiAAYAAQAAAAAADAAiAAcAAQAAAAAADAAdAAkAAQAAAAAADAAdAAoAAQAAAAAADAAeABEAAQAAAAAADAAfABEAAQAAAAAADAAlABkAAQAAAAAADAAmABkAAQAAAAAADAAmABoAAQAAAAAAEAAmACMAAQAAAAAAEAAlACMAAQAAAAAAEAAxACIAAQAAAAAAEAArACQAAQAAAAAAEAAtACQAAQAAAAAAEAAXACoAAQAAAAAAEAAJAC8AAQAAAAAAEAABACEAAQAAAAAAEAACACEAAQAAAAAAEAAQABMAAQAAAAAAEAAOABMAAQAAAAAAEAADABkAAQAAAAAAEAADABgAAQAAAAAAEAANABEAAAAGAAAAAAAOABEAAAAHAAAAAAA=") tile_set = ExtResource("5_6nsxd") metadata/_edit_lock_ = true @@ -107,7 +120,10 @@ position = Vector2(707, 217) position = Vector2(66, 274) [node name="AlarmBox2" parent="Tilemaps/Actors" instance=ExtResource("9_w0rax")] -position = Vector2(159, 245) +position = Vector2(136, 243) + +[node name="AlarmBox6" parent="Tilemaps/Actors" instance=ExtResource("9_w0rax")] +position = Vector2(822, 388) [node name="AcidBridge" type="Area2D" parent="Tilemaps/Actors" groups=["Acid"]] position = Vector2(1104, 934) @@ -129,9 +145,11 @@ State = 1 [node name="Chest" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(72, 408) +LootTable = Array[ExtResource("3_w0rax")]([ExtResource("14_l8btv"), ExtResource("15_mi8uj")]) [node name="Chest2" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(249, 312) +LootTable = Array[ExtResource("3_w0rax")]([ExtResource("14_l8btv")]) [node name="Chest3" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(360, 136) @@ -237,25 +255,20 @@ position = Vector2(700, 125) [node name="FairyGuardFsm6" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")] position = Vector2(484, 96) -[node name="Camera" parent="Tilemaps/Actors" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("23_hh3t5")] +[node name="Camera" parent="Tilemaps/Actors" instance=ExtResource("23_hh3t5")] position = Vector2(305, 362) -AlarmActivationTargets = [] -[node name="Camera2" parent="Tilemaps/Actors" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("23_hh3t5")] +[node name="Camera2" parent="Tilemaps/Actors" instance=ExtResource("23_hh3t5")] position = Vector2(671, 334) -AlarmActivationTargets = [] -[node name="Camera5" parent="Tilemaps/Actors" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("23_hh3t5")] +[node name="Camera5" parent="Tilemaps/Actors" instance=ExtResource("23_hh3t5")] position = Vector2(599, 218) -AlarmActivationTargets = [] -[node name="Camera3" parent="Tilemaps/Actors" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("23_hh3t5")] +[node name="Camera3" parent="Tilemaps/Actors" instance=ExtResource("23_hh3t5")] position = Vector2(752, 491) -AlarmActivationTargets = [] -[node name="Camera4" parent="Tilemaps/Actors" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("23_hh3t5")] +[node name="Camera4" parent="Tilemaps/Actors" instance=ExtResource("23_hh3t5")] position = Vector2(439, 509) -AlarmActivationTargets = [] [node name="Teleporter3" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("8_skof0")] position = Vector2(929, 1063) @@ -309,21 +322,40 @@ position = Vector2(45, 544) [node name="BlueKeycard" parent="Tilemaps/Actors" instance=ExtResource("32_sdywl")] position = Vector2(632, 72) -[node name="ControlPad2" parent="Tilemaps/Actors" instance=ExtResource("33_qffie")] +[node name="ControlPad2" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("33_qffie")] position = Vector2(709, 337) +Target = NodePath("../HorizontalForceField3") +ActivationType = 2 [node name="Workbench" parent="Tilemaps/Actors" instance=ExtResource("38_yhj5v")] position = Vector2(635, 82) +[node name="FloorEmitter" parent="Tilemaps/Actors" instance=ExtResource("35_cpj8l")] +position = Vector2(694, 404) +Script = ExtResource("36_lyg32") + +[node name="AlarmTrigger" type="Node2D" parent="Tilemaps/Actors/FloorEmitter" node_paths=PackedStringArray("Target")] +script = ExtResource("27_ao3d3") +Target = NodePath("..") +ActivationType = 1 + +[node name="Workbench2" parent="Tilemaps/Actors" instance=ExtResource("38_yhj5v")] +position = Vector2(571, 355) + [node name="HeartExtendPickup" parent="Tilemaps/Actors" instance=ExtResource("35_sdywl")] position = Vector2(401, 166) -[node name="KeycardReaderBlue" parent="Tilemaps/Actors" instance=ExtResource("34_3m1mf")] +[node name="KeycardReaderBlue" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("34_3m1mf")] position = Vector2(884, 449) +Target = NodePath("../HorizontalForceField") +ActivationType = 2 [node name="Turret360" parent="Tilemaps/Actors" instance=ExtResource("37_qffie")] position = Vector2(349, 663) +[node name="IcicleRepeater" parent="Tilemaps/Actors" instance=ExtResource("40_lyg32")] +position = Vector2(220, 278) + [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 script = ExtResource("9_nrpyf") @@ -357,3 +389,7 @@ AlarmSound = ExtResource("34_bs5q6") [node name="AudioStreamPlayer2D" parent="." instance=ExtResource("14_31m3n")] process_mode = 3 autoplay = true + +[node name="MovementSensorLonger" parent="." instance=ExtResource("50_tu8ih")] +position = Vector2(369, 376) +Events = Array[ExtResource("51_rasxb")]([SubResource("Resource_wy0ue")]) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 55022ad5..72802326 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -811,13 +811,11 @@ position = Vector2(-1159, 213) [node name="AlarmBox7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("36_rd6f6")] position = Vector2(-1016, 152) -[node name="Camera" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("16_clqjt")] +[node name="Camera" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("16_clqjt")] position = Vector2(-1207, -58) -AlarmActivationTargets = [] -[node name="Camera2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("AlarmActivationTargets") instance=ExtResource("16_clqjt")] +[node name="Camera2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("16_clqjt")] position = Vector2(-1912, 12) -AlarmActivationTargets = [] [node name="ControlPad6" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("12_hfkf1")] position = Vector2(-1462, -60) @@ -1084,7 +1082,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) +Requirements = [ExtResource("84_ma1ta")] [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) diff --git a/Scripts/Components/AlarmTrigger.cs b/Scripts/Components/AlarmTrigger.cs index bce1e669..900a4517 100644 --- a/Scripts/Components/AlarmTrigger.cs +++ b/Scripts/Components/AlarmTrigger.cs @@ -28,6 +28,12 @@ public partial class AlarmTrigger : Node2D _alarmManager.AlarmDisabled += AlarmManagerOnAlarmDisabled; } } + + public override void _ExitTree() + { + _alarmManager.AlarmEnabled -= AlarmManagerOnAlarmEnabled; + _alarmManager.AlarmDisabled += AlarmManagerOnAlarmDisabled; + } private void AlarmManagerOnAlarmDisabled() {