diff --git a/Resources/BossPhases/Marisa/marisa_ns1.tres b/Resources/BossPhases/Marisa/marisa_ns1.tres index a6fb1889..7b059b80 100644 --- a/Resources/BossPhases/Marisa/marisa_ns1.tres +++ b/Resources/BossPhases/Marisa/marisa_ns1.tres @@ -1,33 +1,18 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=7 format=3 uid="uid://da1vjfavqs7u2"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=4 format=3 uid="uid://da1vjfavqs7u2"] -[ext_resource type="PackedScene" uid="uid://c034favdy56p0" path="res://Scenes/Weapons/Bullets/enemyBullet_star_yellow.tscn" id="1_0bb8a"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_7asq8"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="1_ys2v3"] -[ext_resource type="Script" uid="uid://bhg4g71w5ltds" path="res://Scripts/Resources/Modifiers/DelayedContinuousRotationModifier.cs" id="2_t0hje"] - -[sub_resource type="Resource" id="Resource_n6wfp"] -script = ExtResource("2_t0hje") -TimeInSeconds = 0.0 -ModifierType = 0 -Value = 80.0 -Continuous = false [sub_resource type="Resource" id="Resource_q4pcc"] script = ExtResource("1_ys2v3") -BulletScene = ExtResource("1_0bb8a") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 30.0 bulletCount = 16 rotationSpeed = 4.0 _rotationOffset = 0.0 duration = 5.0 -burstInterval = 0.9 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = Array[Object]([SubResource("Resource_n6wfp")]) +burstInterval = 0.9 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true diff --git a/Resources/BossPhases/Rumia_Lasers.tres b/Resources/BossPhases/Rumia_Lasers.tres index 70ae36a8..c78567c4 100644 --- a/Resources/BossPhases/Rumia_Lasers.tres +++ b/Resources/BossPhases/Rumia_Lasers.tres @@ -1,30 +1,13 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=20 format=3 uid="uid://hy1alw04fbds"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=15 format=3 uid="uid://hy1alw04fbds"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_kkx86"] -[ext_resource type="PackedScene" uid="uid://djro6xmsq7kqk" path="res://Scenes/Weapons/Bullets/enemyBullet_mid_blue_laser.tscn" id="1_nfjet"] [ext_resource type="Resource" uid="uid://ouxb1jj48ipn" path="res://Resources/Bullets/Boss/Rumia/LaserBulletTest.tres" id="1_sewog"] -[ext_resource type="Script" uid="uid://cq7pfooyqayc4" path="res://Scripts/Resources/Modifiers/DelayedSpeedModifier.cs" id="2_1bi0q"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_peiit"] [ext_resource type="Script" uid="uid://ckcuhstelos4x" path="res://Scripts/AttackPatterns/LaserPattern.cs" id="2_tctyt"] -[ext_resource type="Script" uid="uid://c6kkaq6j4thug" path="res://Scripts/Resources/Modifiers/DelayedPlayerFacingModifier.cs" id="3_7fbut"] [ext_resource type="PackedScene" uid="uid://dbcj1u77spk6p" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_yellow_small.tscn" id="4_7kssw"] [ext_resource type="Script" uid="uid://dka43xos84kbw" path="res://Scripts/Resources/Modifiers/DelayedRotationModifier.cs" id="6_vwx23"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="8_6iihn"] -[sub_resource type="Resource" id="Resource_3a5dw"] -script = ExtResource("2_1bi0q") -TimeInSeconds = 0.8 -ModifierType = 0 -Value = 0.0 -Continuous = false - -[sub_resource type="Resource" id="Resource_rtncg"] -script = ExtResource("3_7fbut") -TimeInSeconds = 0.9 -ModifierType = 2 -Value = 0.0 -Continuous = false - [sub_resource type="Resource" id="Resource_3idsw"] script = ExtResource("2_tctyt") SpawnDelay = 1.0 @@ -33,20 +16,14 @@ LethalTime = 4.0 PreFireColor = Color(0, 0, 1, 0.501961) LethalColor = Color(0, 0, 1, 1) BulletResource = ExtResource("1_sewog") -BulletScene = ExtResource("1_nfjet") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 40.0 bulletCount = 8 rotationSpeed = 0.0 _rotationOffset = 0.0 duration = 4.0 -burstInterval = 6.0 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = Array[Object]([SubResource("Resource_3a5dw"), SubResource("Resource_rtncg")]) +burstInterval = 6.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true @@ -73,20 +50,14 @@ TimeModifiers = Array[Object]([SubResource("Resource_54787")]) [sub_resource type="Resource" id="Resource_7tuk4"] script = ExtResource("2_peiit") BulletResource = SubResource("Resource_burw2") -BulletScene = ExtResource("4_7kssw") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 40.0 bulletCount = 16 rotationSpeed = 0.0 _rotationOffset = 0.0 duration = 0.1 -burstInterval = 8.0 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = Array[Object]([SubResource("Resource_54787")]) +burstInterval = 8.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true @@ -113,20 +84,14 @@ TimeModifiers = Array[Object]([SubResource("Resource_1yaaf")]) [sub_resource type="Resource" id="Resource_reykq"] script = ExtResource("2_peiit") BulletResource = SubResource("Resource_t47fr") -BulletScene = ExtResource("4_7kssw") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 40.0 bulletCount = 16 rotationSpeed = 0.0 _rotationOffset = 0.0 duration = 4.0 -burstInterval = 8.0 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = Array[Object]([SubResource("Resource_1yaaf")]) +burstInterval = 8.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = false diff --git a/Resources/BossPhases/Rumia_SP1.tres b/Resources/BossPhases/Rumia_SP1.tres index 16657b9d..e0cab098 100644 --- a/Resources/BossPhases/Rumia_SP1.tres +++ b/Resources/BossPhases/Rumia_SP1.tres @@ -42,21 +42,14 @@ TimeModifiers = null [sub_resource type="Resource" id="Resource_0v4v8"] script = ExtResource("2_7268a") BulletResource = SubResource("Resource_2o6nd") -BulletScene = ExtResource("1_o4um1") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 80.0 bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 duration = 1.0 -burstInterval = 1.0 spread = 180.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_modifier = SubResource("Resource_80ngy") -_timeModifiers = Array[Resource]([]) +burstInterval = 1.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true @@ -85,21 +78,14 @@ TimeModifiers = null [sub_resource type="Resource" id="Resource_7yi74"] script = ExtResource("2_7268a") BulletResource = SubResource("Resource_j7r4h") -BulletScene = ExtResource("4_ruawj") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 80.0 bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = -45.0 duration = 1.0 -burstInterval = 1.0 spread = 180.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_modifier = SubResource("Resource_e6jj0") -_timeModifiers = null +burstInterval = 1.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index 8b91e794..39a72ac8 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/Resources/Patterns/rumia_ns_1_spiralized.tres b/Resources/Patterns/rumia_ns_1_spiralized.tres index ad3bd096..07e1c8bc 100644 --- a/Resources/Patterns/rumia_ns_1_spiralized.tres +++ b/Resources/Patterns/rumia_ns_1_spiralized.tres @@ -1,31 +1,18 @@ -[gd_resource type="Resource" script_class="SpiralPattern" load_steps=6 format=3 uid="uid://jjky5fqn74qk"] +[gd_resource type="Resource" script_class="SpiralPattern" load_steps=3 format=3 uid="uid://jjky5fqn74qk"] -[ext_resource type="PackedScene" uid="uid://bi3f14klscvlw" path="res://Scenes/Weapons/Bullets/enemyBullet_mid_red.tscn" id="1_iwsrv"] [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://b6h8slfcd5suh" path="res://Scripts/Resources/DecreasingSpeedModifier.cs" id="2_etidu"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="3_ryait"] -[sub_resource type="Resource" id="Resource_jeq72"] -script = ExtResource("2_etidu") -decreaseRate = 4.0 - [resource] script = ExtResource("3_ryait") BulletResource = ExtResource("1_lasr5") -BulletScene = ExtResource("1_iwsrv") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 70.0 bulletCount = 10 rotationSpeed = 0.0 _rotationOffset = 0.0 duration = 2.0 -burstInterval = 0.3 spread = 0.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_modifier = SubResource("Resource_jeq72") -_timeModifiers = Array[Object]([]) +burstInterval = 0.3 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = true WaitForCompletion = true diff --git a/Resources/Patterns/rumia_ns_2.tres b/Resources/Patterns/rumia_ns_2.tres index 2e2a3e29..4e9a3427 100644 --- a/Resources/Patterns/rumia_ns_2.tres +++ b/Resources/Patterns/rumia_ns_2.tres @@ -22,20 +22,14 @@ TimeModifiers = null [sub_resource type="Resource" id="Resource_ne4q3"] script = ExtResource("2_ee42k") BulletResource = SubResource("Resource_uv53h") -BulletScene = ExtResource("1_4xpdn") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 40.0 bulletCount = 10 rotationSpeed = 120.0 _rotationOffset = 0.0 duration = 0.4 -burstInterval = 2.0 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = Array[Object]([]) +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true @@ -55,20 +49,14 @@ TimeModifiers = null [sub_resource type="Resource" id="Resource_kohuh"] script = ExtResource("2_ee42k") BulletResource = SubResource("Resource_wtj61") -BulletScene = ExtResource("3_gr7a3") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 50.0 bulletCount = 16 rotationSpeed = 60.0 _rotationOffset = 0.0 duration = 0.4 -burstInterval = 2.0 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = null +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true @@ -88,20 +76,14 @@ TimeModifiers = null [sub_resource type="Resource" id="Resource_depjj"] script = ExtResource("2_ee42k") BulletResource = SubResource("Resource_qbq0m") -BulletScene = ExtResource("1_4xpdn") -_bulletLifeTime = 20.0 -_destroyOnCollision = false -bulletSpeed = 50.0 bulletCount = 10 rotationSpeed = 60.0 _rotationOffset = 0.0 duration = 0.4 -burstInterval = 2.0 spread = 360.0 -owner = 2 -_damageType = 0 -_bulletDamage = 1.0 -_timeModifiers = null +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 _targetPlayer = false WaitForCompletion = true diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 096b2dda..9b21466a 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -339,9 +339,8 @@ frame = 1 [node name="BulletSpawner" type="Node2D" parent="Tilemaps/Actors/ScriptableEmitter"] script = ExtResource("43_b8ffn") -[node name="ControlPad3" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("20_0knpf")] +[node name="ControlPad3" parent="Tilemaps/Actors" instance=ExtResource("20_0knpf")] position = Vector2(436, 161) -Target = NodePath("") [node name="FloorEmitter" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")] position = Vector2(639.074, 158.001) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index f5805358..7683ef82 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1026,7 +1026,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("6_8tdlb")]([ExtResource("84_ma1ta")]) [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) diff --git a/Scripts/AttackPatterns/IPatternMachine.cs.uid b/Scripts/AttackPatterns/IPatternMachine.cs.uid new file mode 100644 index 00000000..42a00595 --- /dev/null +++ b/Scripts/AttackPatterns/IPatternMachine.cs.uid @@ -0,0 +1 @@ +uid://fdmfpubi8flk diff --git a/Scripts/AttackPatterns/IScriptHost.cs.uid b/Scripts/AttackPatterns/IScriptHost.cs.uid new file mode 100644 index 00000000..c13dc8c9 --- /dev/null +++ b/Scripts/AttackPatterns/IScriptHost.cs.uid @@ -0,0 +1 @@ +uid://bbggc3f4akkw