From d644cece7f7e68f75fc3c5a5e753c8e3a3c0ce5d Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 13 May 2025 11:23:05 +0200 Subject: [PATCH] Resources Update --- Resources/BossPhases/Marisa/marisa_ns1.tres | 6 +- Resources/BossPhases/Rumia_NS2.tres | 33 +++++++---- Resources/BossPhases/Rumia_SP1.tres | 9 ++- .../Basic_Enemy_Emitter_Spiral_Bullets.tres | 6 +- Resources/Debug/DebugLevels.tres | 28 +++++----- Resources/Maps/Tutorial.tres | 7 ++- Resources/Patterns/rumia_ns_1_spiralized.tres | 6 +- Resources/Patterns/rumia_ns_2.tres | 12 ++-- Scenes/Maps/Level2.tscn | 9 +-- Scenes/Maps/Level3.tscn | 14 +++-- Scenes/Maps/PlayerFSMTest.tscn | 13 +++-- Scenes/test.tscn | 56 ++++++++++--------- 12 files changed, 115 insertions(+), 84 deletions(-) diff --git a/Resources/BossPhases/Marisa/marisa_ns1.tres b/Resources/BossPhases/Marisa/marisa_ns1.tres index 6c1c9064..d6f24d91 100644 --- a/Resources/BossPhases/Marisa/marisa_ns1.tres +++ b/Resources/BossPhases/Marisa/marisa_ns1.tres @@ -1,10 +1,12 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=4 format=3 uid="uid://da1vjfavqs7u2"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=5 format=3 uid="uid://da1vjfavqs7u2"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_7asq8"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="1_ykywc"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="1_ys2v3"] [sub_resource type="Resource" id="Resource_q4pcc"] script = ExtResource("1_ys2v3") +EmitterOffset = Vector2(0, 0) bulletCount = 16 rotationSpeed = 4.0 _rotationOffset = 0.0 @@ -22,7 +24,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("1_ykywc")]([]) WaitForCompletion = true [resource] diff --git a/Resources/BossPhases/Rumia_NS2.tres b/Resources/BossPhases/Rumia_NS2.tres index 055b2606..9f78ec45 100644 --- a/Resources/BossPhases/Rumia_NS2.tres +++ b/Resources/BossPhases/Rumia_NS2.tres @@ -1,10 +1,11 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=41 format=3 uid="uid://ddb5dqocmk6x7"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=42 format=3 uid="uid://ddb5dqocmk6x7"] [ext_resource type="PackedScene" uid="uid://dh81snen2f6bf" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_blue_small.tscn" id="1_as8n2"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_fdlxv"] [ext_resource type="Script" uid="uid://dka43xos84kbw" path="res://Scripts/Resources/Modifiers/DelayedRotationModifier.cs" id="2_onj13"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_wkmhk"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="3_ow5fu"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="4_3qh6s"] [ext_resource type="PackedScene" uid="uid://ctrk5qrb7n3fm" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_green_small.tscn" id="4_tek7n"] [ext_resource type="PackedScene" uid="uid://chowj81jsdvcx" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_red_small.tscn" id="5_n4xqo"] [ext_resource type="Script" uid="uid://bhc7rbcico4kp" path="res://Scripts/Resources/SimpleMovementPattern.cs" id="6_bw7cj"] @@ -40,6 +41,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_cj86d")]) [sub_resource type="Resource" id="Resource_puvpt"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_jtuih") +EmitterOffset = Vector2(0, 0) bulletCount = 20 rotationSpeed = 0.0 _rotationOffset = 0.0 @@ -57,7 +59,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = false [sub_resource type="Resource" id="Resource_pbgtt"] @@ -88,6 +90,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")]) [sub_resource type="Resource" id="Resource_44j24"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_axlrq") +EmitterOffset = Vector2(0, 0) bulletCount = 20 rotationSpeed = 0.0 _rotationOffset = 180.0 @@ -105,7 +108,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_w7b0n"] @@ -129,6 +132,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_cj86d")]) [sub_resource type="Resource" id="Resource_wkxow"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_w7b0n") +EmitterOffset = Vector2(0, 0) bulletCount = 20 rotationSpeed = 0.0 _rotationOffset = 0.0 @@ -146,7 +150,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = false [sub_resource type="Resource" id="Resource_3iv0j"] @@ -170,6 +174,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")]) [sub_resource type="Resource" id="Resource_gcqck"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_3iv0j") +EmitterOffset = Vector2(0, 0) bulletCount = 20 rotationSpeed = 0.0 _rotationOffset = 180.0 @@ -187,7 +192,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_5jr31"] @@ -211,6 +216,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_cj86d")]) [sub_resource type="Resource" id="Resource_bxbto"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_5jr31") +EmitterOffset = Vector2(0, 0) bulletCount = 20 rotationSpeed = 0.0 _rotationOffset = 0.0 @@ -228,7 +234,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = false [sub_resource type="Resource" id="Resource_mg2qy"] @@ -252,6 +258,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")]) [sub_resource type="Resource" id="Resource_q48s1"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_mg2qy") +EmitterOffset = Vector2(0, 0) bulletCount = 20 rotationSpeed = 0.0 _rotationOffset = 180.0 @@ -269,7 +276,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_erexw"] @@ -315,6 +322,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resou [sub_resource type="Resource" id="Resource_mpjrl"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_gfhkm") +EmitterOffset = Vector2(0, 0) bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 @@ -332,7 +340,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_l05f2"] @@ -364,6 +372,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resou [sub_resource type="Resource" id="Resource_ncfnl"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_4r74g") +EmitterOffset = Vector2(0, 0) bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 @@ -381,7 +390,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_q7cr0"] @@ -413,6 +422,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resou [sub_resource type="Resource" id="Resource_vkthc"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_vgg5n") +EmitterOffset = Vector2(0, 0) bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 @@ -430,7 +440,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_8kl6r"] @@ -462,6 +472,7 @@ TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resou [sub_resource type="Resource" id="Resource_n2gn4"] script = ExtResource("2_wkmhk") BulletResource = SubResource("Resource_wlhxp") +EmitterOffset = Vector2(0, 0) bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 @@ -479,7 +490,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("4_3qh6s")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_ha2b6"] diff --git a/Resources/BossPhases/Rumia_SP1.tres b/Resources/BossPhases/Rumia_SP1.tres index 38d2e91a..83a05f05 100644 --- a/Resources/BossPhases/Rumia_SP1.tres +++ b/Resources/BossPhases/Rumia_SP1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=23 format=3 uid="uid://ccj0cqbveey8c"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=24 format=3 uid="uid://ccj0cqbveey8c"] [ext_resource type="Script" uid="uid://bhc7rbcico4kp" path="res://Scripts/Resources/SimpleMovementPattern.cs" id="1_lw82i"] [ext_resource type="PackedScene" uid="uid://dohakkayqj4w2" path="res://Scenes/Weapons/Bullets/enemyBullet_green.tscn" id="1_o4um1"] @@ -7,6 +7,7 @@ [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="3_o6234"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="4_juoir"] [ext_resource type="PackedScene" uid="uid://by2rk6gx67f7e" path="res://Scenes/Weapons/Bullets/enemyBullet_yellow.tscn" id="4_ruawj"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="5_763gk"] [ext_resource type="Script" uid="uid://cbafxkmgns6ry" path="res://Scripts/Resources/PatternGroup.cs" id="6_6mg1u"] [sub_resource type="Resource" id="Resource_upj22"] @@ -56,6 +57,7 @@ TimeModifiers = Array[Object]([]) [sub_resource type="Resource" id="Resource_0v4v8"] script = ExtResource("2_7268a") BulletResource = SubResource("Resource_2o6nd") +EmitterOffset = Vector2(0, 0) bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 10.0 @@ -73,7 +75,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("5_763gk")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_e6jj0"] @@ -106,6 +108,7 @@ TimeModifiers = [] [sub_resource type="Resource" id="Resource_7yi74"] script = ExtResource("2_7268a") BulletResource = SubResource("Resource_j7r4h") +EmitterOffset = Vector2(0, 0) bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = -10.0 @@ -123,7 +126,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("5_763gk")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_gm1rv"] diff --git a/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres b/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres index 729fe904..cb7b20cf 100644 --- a/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres +++ b/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres @@ -1,12 +1,14 @@ -[gd_resource type="Resource" script_class="BulletScript" load_steps=5 format=3 uid="uid://cmra7n6so1x4u"] +[gd_resource type="Resource" script_class="BulletScript" load_steps=6 format=3 uid="uid://cmra7n6so1x4u"] [ext_resource type="Resource" uid="uid://dqnvesdj0dk3v" path="res://Resources/Bullets/simple_enemy_bullet.tres" id="1_lkipe"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="2_omk5v"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_v7d4m"] [ext_resource type="Script" uid="uid://bngko08ho85p6" path="res://Scripts/Resources/BulletScript.cs" id="3_omk5v"] [sub_resource type="Resource" id="Resource_lkipe"] script = ExtResource("2_v7d4m") BulletResource = ExtResource("1_lkipe") +EmitterOffset = Vector2(0, 0) bulletCount = 16 rotationSpeed = 20.0 _rotationOffset = 0.0 @@ -24,7 +26,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("2_omk5v")]([]) WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index c5224ec4..83bc6d0d 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -21,8 +21,8 @@ _name = "Intro" [sub_resource type="Resource" id="Resource_cfhv5"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_0k62o"] script = ExtResource("2_tnajf") @@ -34,8 +34,8 @@ StartData = SubResource("Resource_cfhv5") [sub_resource type="Resource" id="Resource_tpb7s"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_edoov"] script = ExtResource("2_tnajf") @@ -47,8 +47,8 @@ StartData = SubResource("Resource_tpb7s") [sub_resource type="Resource" id="Resource_1sw5g"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_47bot"] script = ExtResource("2_tnajf") @@ -61,7 +61,7 @@ StartData = SubResource("Resource_1sw5g") script = ExtResource("1_ov731") EggIndex = 2 StartingEquipment = Array[ExtResource("2_bkci5")]([ExtResource("3_fydgr"), ExtResource("4_38yta"), ExtResource("5_em757"), ExtResource("6_sdmg8")]) -RemoveEquipment = [] +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_mgdm6"] script = ExtResource("2_tnajf") @@ -79,8 +79,8 @@ _name = "Rebel Base" [sub_resource type="Resource" id="Resource_maxpt"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_pein5"] script = ExtResource("2_tnajf") @@ -117,7 +117,7 @@ _name = "Default Scene" script = ExtResource("1_ov731") EggIndex = 0 StartingEquipment = Array[ExtResource("2_bkci5")]([ExtResource("7_b3oo5")]) -RemoveEquipment = [] +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_6ijnv"] script = ExtResource("2_tnajf") @@ -136,8 +136,8 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_7sue8"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_ognca"] @@ -151,8 +151,8 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_olpjo"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_nbnej"] diff --git a/Resources/Maps/Tutorial.tres b/Resources/Maps/Tutorial.tres index 0d3a4d03..c3497b3f 100644 --- a/Resources/Maps/Tutorial.tres +++ b/Resources/Maps/Tutorial.tres @@ -1,13 +1,14 @@ -[gd_resource type="Resource" script_class="MapResource" load_steps=4 format=3 uid="uid://b4u3cs6ietmow"] +[gd_resource type="Resource" script_class="MapResource" load_steps=5 format=3 uid="uid://b4u3cs6ietmow"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_3bwtp"] [ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="1_5stb7"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_dpitu"] [sub_resource type="Resource" id="Resource_dpitu"] script = ExtResource("1_3bwtp") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("1_dpitu")]([]) +RemoveEquipment = Array[ExtResource("1_dpitu")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [resource] diff --git a/Resources/Patterns/rumia_ns_1_spiralized.tres b/Resources/Patterns/rumia_ns_1_spiralized.tres index 2621c6ab..0930a788 100644 --- a/Resources/Patterns/rumia_ns_1_spiralized.tres +++ b/Resources/Patterns/rumia_ns_1_spiralized.tres @@ -1,11 +1,13 @@ -[gd_resource type="Resource" script_class="SpiralPattern" load_steps=3 format=3 uid="uid://jjky5fqn74qk"] +[gd_resource type="Resource" script_class="SpiralPattern" load_steps=4 format=3 uid="uid://jjky5fqn74qk"] [ext_resource type="Resource" uid="uid://bifeoxb6nfykq" path="res://Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres" id="1_lasr5"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="2_ho5ah"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="3_ryait"] [resource] script = ExtResource("3_ryait") BulletResource = ExtResource("1_lasr5") +EmitterOffset = Vector2(0, 0) bulletCount = 10 rotationSpeed = 0.0 _rotationOffset = 0.0 @@ -23,5 +25,5 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("2_ho5ah")]([]) WaitForCompletion = true diff --git a/Resources/Patterns/rumia_ns_2.tres b/Resources/Patterns/rumia_ns_2.tres index 28926ccc..65bcb448 100644 --- a/Resources/Patterns/rumia_ns_2.tres +++ b/Resources/Patterns/rumia_ns_2.tres @@ -1,8 +1,9 @@ -[gd_resource type="Resource" script_class="PatternGroup" load_steps=12 format=3 uid="uid://du2kuv125vbrx"] +[gd_resource type="Resource" script_class="PatternGroup" load_steps=13 format=3 uid="uid://du2kuv125vbrx"] [ext_resource type="PackedScene" uid="uid://dre2wvw4pa3hc" path="res://Scenes/Weapons/Bullets/enemyBullet_mid_blue.tscn" id="1_4xpdn"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_ee42k"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="2_gfvud"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="3_fgjeq"] [ext_resource type="PackedScene" uid="uid://dohakkayqj4w2" path="res://Scenes/Weapons/Bullets/enemyBullet_green.tscn" id="3_gr7a3"] [ext_resource type="Script" uid="uid://cbafxkmgns6ry" path="res://Scripts/Resources/PatternGroup.cs" id="3_jvysx"] @@ -27,6 +28,7 @@ TimeModifiers = [] [sub_resource type="Resource" id="Resource_ne4q3"] script = ExtResource("2_ee42k") BulletResource = SubResource("Resource_uv53h") +EmitterOffset = Vector2(0, 0) bulletCount = 10 rotationSpeed = 120.0 _rotationOffset = 0.0 @@ -44,7 +46,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("3_fgjeq")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_wtj61"] @@ -68,6 +70,7 @@ TimeModifiers = [] [sub_resource type="Resource" id="Resource_kohuh"] script = ExtResource("2_ee42k") BulletResource = SubResource("Resource_wtj61") +EmitterOffset = Vector2(0, 0) bulletCount = 16 rotationSpeed = 60.0 _rotationOffset = 0.0 @@ -85,7 +88,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("3_fgjeq")]([]) WaitForCompletion = true [sub_resource type="Resource" id="Resource_qbq0m"] @@ -109,6 +112,7 @@ TimeModifiers = [] [sub_resource type="Resource" id="Resource_depjj"] script = ExtResource("2_ee42k") BulletResource = SubResource("Resource_qbq0m") +EmitterOffset = Vector2(0, 0) bulletCount = 10 rotationSpeed = 60.0 _rotationOffset = 0.0 @@ -126,7 +130,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("3_fgjeq")]([]) WaitForCompletion = true [resource] diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 79c35b9e..3c1aaadd 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=88 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=89 format=4 uid="uid://6a6tjohypmmb"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"] @@ -13,6 +13,7 @@ [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_mnq21"] [ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="9_qo7ri"] [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="11_7an4p"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="13_5t0ab"] [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="14_s23f3"] [ext_resource type="PackedScene" uid="uid://oi8svqsspcsj" path="res://Scenes/Interactable/ScriptableMovementSensor.tscn" id="16_ehuec"] [ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="16_s23f3"] @@ -390,7 +391,7 @@ position = Vector2(196, 296) [node name="MotionSensor" parent="Tilemaps/Actors" instance=ExtResource("16_ehuec")] position = Vector2(254, 296) -Events = [SubResource("Resource_s23f3")] +Events = Array[ExtResource("13_5t0ab")]([SubResource("Resource_s23f3")]) [node name="ControlPad" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")] position = Vector2(205, 292) @@ -411,11 +412,11 @@ position = Vector2(504, 468) [node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")] position = Vector2(226, 486) -Events = [SubResource("Resource_qi6uc")] +Events = Array[ExtResource("13_5t0ab")]([SubResource("Resource_qi6uc")]) [node name="MovementSensorLonger2" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")] position = Vector2(391, 455) -Events = [SubResource("Resource_mq37i")] +Events = Array[ExtResource("13_5t0ab")]([SubResource("Resource_mq37i")]) [node name="WallEmitter" parent="Tilemaps/Actors" instance=ExtResource("21_qi6uc")] position = Vector2(264, 482) diff --git a/Scenes/Maps/Level3.tscn b/Scenes/Maps/Level3.tscn index 97a03bd3..c1fbfbfc 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"] @@ -13,6 +13,7 @@ [ext_resource type="PackedScene" uid="uid://d0j1bmgbefyp2" path="res://Scenes/Actors/Lightbridge.tscn" id="11_6nsxd"] [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="11_7j1cb"] [ext_resource type="PackedScene" uid="uid://djf0y08ix66fn" path="res://Scenes/Interactable/Chest.tscn" id="12_6nsxd"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="12_pjj1f"] [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"] @@ -50,6 +51,7 @@ [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="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="48_87jtn"] [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="49_87jtn"] [ext_resource type="PackedScene" uid="uid://dqr6myj0yaqvd" path="res://Scenes/Interactable/ScriptableMovementSensorLonger.tscn" id="50_tu8ih"] [ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="51_wkglj"] @@ -144,19 +146,19 @@ State = 1 [node name="Chest" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(72, 408) -LootTable = [ExtResource("14_l8btv"), ExtResource("15_mi8uj")] +LootTable = Array[ExtResource("12_pjj1f")]([ExtResource("14_l8btv"), ExtResource("15_mi8uj")]) [node name="Chest2" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(249, 312) -LootTable = [ExtResource("14_l8btv")] +LootTable = Array[ExtResource("12_pjj1f")]([ExtResource("14_l8btv")]) [node name="Chest9" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(-119, 390) -LootTable = [ExtResource("14_l8btv")] +LootTable = Array[ExtResource("12_pjj1f")]([ExtResource("14_l8btv")]) [node name="Chest10" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(-102, 488) -LootTable = [ExtResource("14_l8btv")] +LootTable = Array[ExtResource("12_pjj1f")]([ExtResource("14_l8btv")]) [node name="Chest3" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")] position = Vector2(360, 136) @@ -427,7 +429,7 @@ position = Vector2(794, 844) [node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("50_tu8ih")] position = Vector2(400, 368) -Events = [SubResource("Resource_wy0ue")] +Events = Array[ExtResource("48_87jtn")]([SubResource("Resource_wy0ue")]) [node name="ThermatronFsm" parent="Tilemaps/Actors" instance=ExtResource("58_pjj1f")] position = Vector2(617, 863) diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 7efb6ace..c416ecff 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=131 format=4 uid="uid://dqyfnby0t7gu1"] +[gd_scene load_steps=132 format=4 uid="uid://dqyfnby0t7gu1"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_rgw1q"] [ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"] [ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="4_nadrw"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_u1i8n"] @@ -85,8 +86,8 @@ [sub_resource type="Resource" id="Resource_vto58"] script = ExtResource("4_u1i8n") EggIndex = 0 -StartingEquipment = [ExtResource("3_6314l")] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_rgw1q")]([ExtResource("3_6314l")]) +RemoveEquipment = Array[ExtResource("2_rgw1q")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_1tvdd"] @@ -475,7 +476,7 @@ TimeModifiers = Array[ExtResource("50_6khjs")]([]) WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" -[sub_resource type="Resource" id="Resource_amdeb"] +[sub_resource type="Resource" id="Resource_okvfm"] resource_local_to_scene = true script = ExtResource("39_83jc5") Patterns = Array[Object]([SubResource("Resource_kuo18")]) @@ -709,7 +710,7 @@ position = Vector2(59, 386) [node name="Chest" parent="Tilemaps/Actors" instance=ExtResource("18_v2gcl")] position = Vector2(56, 320) -LootTable = [ExtResource("19_1ajuh"), ExtResource("20_rff8l"), ExtResource("21_cub4j"), ExtResource("22_4gtx8"), ExtResource("3_6314l"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh")] +LootTable = Array[ExtResource("2_rgw1q")]([ExtResource("19_1ajuh"), ExtResource("20_rff8l"), ExtResource("21_cub4j"), ExtResource("22_4gtx8"), ExtResource("3_6314l"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh")]) [node name="Turret360" parent="Tilemaps/Actors" instance=ExtResource("24_rff8l")] position = Vector2(374, 503) @@ -809,7 +810,7 @@ InvertSignal = true [node name="FloorEmitter2" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")] position = Vector2(601, 147) -Script = SubResource("Resource_amdeb") +Script = SubResource("Resource_okvfm") InvertSignal = true [node name="Camera" parent="Tilemaps/Actors" instance=ExtResource("48_r562v")] diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 4b3c4082..038e2fdf 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=167 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=169 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ksslq"] @@ -49,6 +49,7 @@ [ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="34_17pjh"] [ext_resource type="PackedScene" uid="uid://byjq8xpx4crfd" path="res://Scenes/Interactable/control_pad_blue_keycard.tscn" id="35_gdbcj"] [ext_resource type="PackedScene" uid="uid://d0yes7huiyisw" path="res://Scenes/Items/Blue_Keycard.tscn" id="35_rblsn"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="36_7lma1"] [ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="36_f8fh1"] [ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="36_rd6f6"] [ext_resource type="PackedScene" uid="uid://dsbk2l40er2da" path="res://Scenes/Props/Box_Blue.tscn" id="37_gtga7"] @@ -81,6 +82,7 @@ [ext_resource type="Resource" uid="uid://ckfqrq8a0uj1t" path="res://Resources/Items/LaserWeapon.tres" id="57_uh0gg"] [ext_resource type="Resource" uid="uid://c57od7cpn5kwf" path="res://Resources/Items/IceShotgun_Sawed_T2.tres" id="58_dfo5i"] [ext_resource type="PackedScene" uid="uid://bjskkeb3ppcs8" path="res://Scenes/Actors/Turret360.tscn" id="62_h0jm4"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="62_w8skm"] [ext_resource type="Script" uid="uid://v57xjmhi28kw" path="res://Scripts/Resources/Events/ControlActorEvent.cs" id="64_rphi8"] [ext_resource type="PackedScene" uid="uid://b0gpbkxdfbnjh" path="res://Scenes/Actors/ForceField_Horizontal.tscn" id="66_nxn3h"] [ext_resource type="PackedScene" uid="uid://cjsnhyl0nqbau" path="res://Scenes/Props/ICCTv.tscn" id="71_ji7au"] @@ -298,7 +300,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_r7hyp"] +[sub_resource type="Resource" id="Resource_jm0wb"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -689,7 +691,7 @@ position = Vector2(-1832, -99) [node name="Chest2" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("25_4b2ed")] position = Vector2(-679, -408) -LootTable = [ExtResource("76_dskij"), ExtResource("77_wma5c"), ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("76_dskij")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("76_dskij"), ExtResource("77_wma5c"), ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("76_dskij")]) [node name="Valve" parent="Parallax2D/Factory Tilemaps/Debug Room" node_paths=PackedStringArray("Target") instance=ExtResource("48_8usll")] position = Vector2(-666, -545) @@ -838,7 +840,7 @@ position = Vector2(-1210, -370) [node name="LaserTutorial" parent="Parallax2D/Factory Tilemaps/Part2" instance=ExtResource("43_kf3qc")] position = Vector2(-1488, -298) scale = Vector2(1.455, 1.455) -Events = [SubResource("Resource_uh0gg")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_uh0gg")]) [node name="LevelProps" type="Node2D" parent="Parallax2D/Factory Tilemaps"] y_sort_enabled = true @@ -929,7 +931,7 @@ Invisible = true metadata/_edit_group_ = true [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps/DebugTeleporter" instance=ExtResource("43_kf3qc")] -Events = [SubResource("Resource_usuub")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_usuub")]) [node name="BlueKeycard2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("35_rblsn")] position = Vector2(-1032, -317) @@ -995,7 +997,7 @@ position = Vector2(-1488, -544) [node name="Chest" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-920, -424) -LootTable = [ExtResource("27_y1lom"), ExtResource("28_u0dff"), ExtResource("29_wb5l5"), ExtResource("30_0d2o6"), ExtResource("5_nqier")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("27_y1lom"), ExtResource("28_u0dff"), ExtResource("29_wb5l5"), ExtResource("30_0d2o6"), ExtResource("5_nqier")]) [node name="RedKeycard_Switch_2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("17_e3v0b")] position = Vector2(-1095, 132) @@ -1125,7 +1127,7 @@ position = Vector2(-1423, -188) [node name="LevelStartTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-762, -129) scale = Vector2(1.455, 1.455) -Events = [SubResource("Resource_5er5x"), SubResource("Resource_b25hy")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_5er5x"), SubResource("Resource_b25hy")]) [node name="AreaTrigger2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("28_6au4t")] position = Vector2(-435, -162) @@ -1168,7 +1170,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer2"] position = Vector2(120, 25) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_wma5c")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_wma5c")]) [node name="Computer8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-2073, -215) @@ -1179,7 +1181,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer8"] position = Vector2(120, 25) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_dferh")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_dferh")]) [node name="Computer6" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1113, -139) @@ -1189,7 +1191,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer6"] position = Vector2(0, 1) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_cxj4w")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_cxj4w")]) [node name="Computer7" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1175.36, 213.708) @@ -1200,7 +1202,7 @@ metadata/_edit_group_ = true [node name="Computer7Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer7"] position = Vector2(0, 1) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_tcc7d")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_tcc7d")]) [node name="Computer5" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1344, -251) @@ -1208,7 +1210,7 @@ Targets = [NodePath("Computer5Script")] [node name="Computer5Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer5"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")] +Events = Array[ExtResource("62_w8skm")]([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) @@ -1216,7 +1218,7 @@ Target = NodePath("Script") [node name="Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer3"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_o2kpk")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_o2kpk")]) [node name="Computer4" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-791, -505) @@ -1224,7 +1226,7 @@ Target = NodePath("Node2D") [node name="Node2D" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_s3g2w")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_s3g2w")]) [node name="Label" type="Label" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] offset_left = -5.0 @@ -1241,11 +1243,11 @@ EnemyData = ExtResource("71_xhinl") [node name="BossBattleEndScript" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps"] position = Vector2(-1628.53, -477.628) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_068l7"), SubResource("Resource_l3nop")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_068l7"), SubResource("Resource_l3nop")]) [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = [SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_r7hyp")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_jm0wb")]) [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) @@ -1374,7 +1376,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 = [ExtResource("84_ma1ta")] +Requirements = Array[ExtResource("36_7lma1")]([ExtResource("84_ma1ta")]) [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) @@ -1434,35 +1436,35 @@ position = Vector2(-1624, -813) [node name="Chest3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-376, 54) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) [node name="Chest5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1048, -139) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")]) [node name="Chest6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-2104, -362) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")]) [node name="Chest4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-823, 67) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) [node name="Chest7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1417, 326) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) [node name="Chest10" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1515, 408) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) [node name="Chest8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1544, 552) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) [node name="Chest9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1384, 231) -LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] +LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) [node name="Ammo13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-392, 52) @@ -1558,7 +1560,7 @@ position = Vector2(-2232, -203) [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-2063, -232) -Events = [SubResource("Resource_l476f"), SubResource("Resource_dskij")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_l476f"), SubResource("Resource_dskij")]) [node name="ShieldExtendPickup" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_0bqta")] position = Vector2(-1646, 38) @@ -1686,7 +1688,7 @@ position = Vector2(-1633, 391) [node name="MovementSensorLonger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("112_j86ly")] position = Vector2(-1495, 516) -Events = [SubResource("Resource_uslvo")] +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_uslvo")]) [node name="WallEmitter" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("113_dferh")] position = Vector2(-1480, 451)