From bfdb71dd84190b229344cb6f22b395b84ce712d7 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Thu, 13 Feb 2025 22:28:34 +0100 Subject: [PATCH] Patterns --- Resources/BossPhases/Rumia_NS2.tres | 74 ++++++++++++++++++++++--- Scenes/test.tscn | 6 +- Scripts/Actors/Boss.cs | 1 - Scripts/AttackPatterns/SpiralPattern.cs | 2 - 4 files changed, 72 insertions(+), 11 deletions(-) diff --git a/Resources/BossPhases/Rumia_NS2.tres b/Resources/BossPhases/Rumia_NS2.tres index 92ab437a..a98b7d9c 100644 --- a/Resources/BossPhases/Rumia_NS2.tres +++ b/Resources/BossPhases/Rumia_NS2.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=25 format=3 uid="uid://ddb5dqocmk6x7"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=30 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" path="res://Scripts/Resources/BossPhase.cs" id="1_fdlxv"] @@ -159,7 +159,7 @@ bulletSpeed = 80.0 bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 -duration = 1.0 +duration = 0.8 burstInterval = 1.0 spread = 180.0 owner = 2 @@ -185,7 +185,7 @@ bulletSpeed = 80.0 bulletCount = 12 rotationSpeed = 0.0 _rotationOffset = 45.0 -duration = 1.0 +duration = 0.8 burstInterval = 1.0 spread = 180.0 owner = 2 @@ -196,9 +196,69 @@ _timeModifiers = Array[Resource]([SubResource("Resource_hutbf"), SubResource("Re _targetPlayer = false WaitForCompletion = true +[sub_resource type="Resource" id="Resource_q7cr0"] +script = ExtResource("6_bw7cj") +relativeTargetPosition = Vector2(40, 0) +moveDuration = 0.4 +transitionType = 0 +easeType = 2 +WaitForCompletion = true + +[sub_resource type="Resource" id="Resource_vkthc"] +script = ExtResource("2_wkmhk") +BulletScene = ExtResource("7_gsnyb") +bulletSpeed = 80.0 +bulletCount = 12 +rotationSpeed = 0.0 +_rotationOffset = 45.0 +duration = 0.8 +burstInterval = 1.0 +spread = 180.0 +owner = 2 +_damageType = 0 +_bulletDamage = 1.0 +_modifier = SubResource("Resource_80ngy") +_timeModifiers = Array[Resource]([SubResource("Resource_hutbf"), SubResource("Resource_krtsy")]) +_targetPlayer = false +WaitForCompletion = true + +[sub_resource type="Resource" id="Resource_8kl6r"] +script = ExtResource("6_bw7cj") +relativeTargetPosition = Vector2(45, 0) +moveDuration = 0.4 +transitionType = 0 +easeType = 2 +WaitForCompletion = true + +[sub_resource type="Resource" id="Resource_n2gn4"] +script = ExtResource("2_wkmhk") +BulletScene = ExtResource("7_gsnyb") +bulletSpeed = 80.0 +bulletCount = 12 +rotationSpeed = 0.0 +_rotationOffset = 45.0 +duration = 0.8 +burstInterval = 1.0 +spread = 180.0 +owner = 2 +_damageType = 0 +_bulletDamage = 1.0 +_modifier = SubResource("Resource_80ngy") +_timeModifiers = Array[Resource]([SubResource("Resource_hutbf"), SubResource("Resource_krtsy")]) +_targetPlayer = false +WaitForCompletion = true + +[sub_resource type="Resource" id="Resource_ha2b6"] +script = ExtResource("6_bw7cj") +relativeTargetPosition = Vector2(0, 0) +moveDuration = 2.0 +transitionType = 0 +easeType = 2 +WaitForCompletion = true + [resource] script = ExtResource("1_fdlxv") -PhaseName = "" -Threshold = 800 -PlayAnimation = false -Patterns = Array[Object]([SubResource("Resource_puvpt"), SubResource("Resource_44j24"), SubResource("Resource_wkxow"), SubResource("Resource_gcqck"), SubResource("Resource_bxbto"), SubResource("Resource_q48s1"), SubResource("Resource_erexw"), SubResource("Resource_mpjrl"), SubResource("Resource_l05f2"), SubResource("Resource_ncfnl")]) +PhaseName = "Darkness Sign \"Demarcation\"" +Threshold = 850 +PlayAnimation = true +Patterns = Array[Object]([SubResource("Resource_puvpt"), SubResource("Resource_44j24"), SubResource("Resource_wkxow"), SubResource("Resource_gcqck"), SubResource("Resource_bxbto"), SubResource("Resource_q48s1"), SubResource("Resource_erexw"), SubResource("Resource_mpjrl"), SubResource("Resource_l05f2"), SubResource("Resource_ncfnl"), SubResource("Resource_q7cr0"), SubResource("Resource_vkthc"), SubResource("Resource_8kl6r"), SubResource("Resource_n2gn4"), SubResource("Resource_ha2b6")]) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index cfeb3f4b..bdba24fe 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=51 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=54 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"] @@ -41,6 +41,9 @@ [ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="34_17pjh"] [ext_resource type="PackedScene" uid="uid://d0yes7huiyisw" path="res://Scenes/Items/Blue_Keycard.tscn" id="35_rblsn"] [ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="36_f8fh1"] +[ext_resource type="Resource" uid="uid://ks6fypeil6gk" path="res://Resources/BossPhases/TestBoss1.tres" id="39_cfwbr"] +[ext_resource type="Resource" uid="uid://ccj0cqbveey8c" path="res://Resources/BossPhases/Rumia_SP1.tres" id="40_44asd"] +[ext_resource type="Resource" uid="uid://ddb5dqocmk6x7" path="res://Resources/BossPhases/Rumia_NS2.tres" id="41_aqvu2"] [ext_resource type="PackedScene" uid="uid://fxvlaidieiv7" path="res://Scenes/Interactable/ScriptableAreaTrigger.tscn" id="43_kf3qc"] [ext_resource type="Script" path="res://Scripts/Resources/Events/MovePlayerEvent.cs" id="44_klwgh"] [ext_resource type="Script" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="45_emjoj"] @@ -339,6 +342,7 @@ disabled = true [node name="Rumia" parent="." instance=ExtResource("19_acobs")] position = Vector2(-1483, -499) +Phases = Array[Resource]([ExtResource("39_cfwbr"), ExtResource("40_44asd"), ExtResource("41_aqvu2")]) [node name="Computer" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-794, -127) diff --git a/Scripts/Actors/Boss.cs b/Scripts/Actors/Boss.cs index 1ac68454..0df8d71c 100644 --- a/Scripts/Actors/Boss.cs +++ b/Scripts/Actors/Boss.cs @@ -102,7 +102,6 @@ public partial class Boss : Enemy, IActivable _bossHud.SpellCardName = CurrentPhase.PhaseName; StartPhase(CurrentPhase); } - } private void StartPhase(BossPhase phase) diff --git a/Scripts/AttackPatterns/SpiralPattern.cs b/Scripts/AttackPatterns/SpiralPattern.cs index 1ceec4df..07a18505 100644 --- a/Scripts/AttackPatterns/SpiralPattern.cs +++ b/Scripts/AttackPatterns/SpiralPattern.cs @@ -31,8 +31,6 @@ public partial class SpiralPattern : AttackPattern private double timer; private double burstTimer; private BulletSpawner spawner; - - private GameManager _gameManager; public override void Start(Boss boss) {