diff --git a/Resources/BossPhases/Rumia_SP1.tres b/Resources/BossPhases/Rumia_SP1.tres index d4cf5751..579bde02 100644 --- a/Resources/BossPhases/Rumia_SP1.tres +++ b/Resources/BossPhases/Rumia_SP1.tres @@ -1,8 +1,7 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=14 format=3 uid="uid://ccj0cqbveey8c"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=12 format=3 uid="uid://ccj0cqbveey8c"] [ext_resource type="Script" 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"] -[ext_resource type="Script" path="res://Scripts/Resources/SpeedModifier.cs" id="2_8gbml"] [ext_resource type="Script" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_7268a"] [ext_resource type="Script" path="res://Scripts/Resources/BossPhase.cs" id="3_o6234"] [ext_resource type="PackedScene" uid="uid://by2rk6gx67f7e" path="res://Scenes/Weapons/Bullets/enemyBullet_yellow.tscn" id="4_ruawj"] @@ -16,26 +15,17 @@ transitionType = 1 easeType = 2 WaitForCompletion = true -[sub_resource type="Resource" id="Resource_l3ln6"] -script = ExtResource("2_8gbml") -ModifierType = 1 -Easing = 1 -Invert = true -MinimumSpeed = 20.0 -ScalingFactor = 10.0 - [sub_resource type="Resource" id="Resource_0v4v8"] script = ExtResource("2_7268a") BulletScene = ExtResource("1_o4um1") bulletSpeed = 80.0 bulletCount = 12 rotationSpeed = 0.0 -_rotationOffset = 45.0 +_rotationOffset = 0.0 duration = 1.0 burstInterval = 1.0 spread = 180.0 owner = 2 -_modifier = SubResource("Resource_l3ln6") _timeModifiers = Array[Resource]([]) WaitForCompletion = true @@ -45,12 +35,11 @@ BulletScene = ExtResource("4_ruawj") bulletSpeed = 80.0 bulletCount = 12 rotationSpeed = 0.0 -_rotationOffset = -45.0 +_rotationOffset = 0.0 duration = 1.0 burstInterval = 1.0 spread = 180.0 owner = 2 -_modifier = SubResource("Resource_l3ln6") _timeModifiers = null WaitForCompletion = true diff --git a/Resources/BossPhases/TestBoss1.tres b/Resources/BossPhases/TestBoss1.tres index 020ea250..460f190a 100644 --- a/Resources/BossPhases/TestBoss1.tres +++ b/Resources/BossPhases/TestBoss1.tres @@ -39,5 +39,5 @@ WaitForCompletion = false [resource] script = ExtResource("1_0cgch") -Threshold = 800 +Threshold = 1000 Patterns = Array[Resource]([SubResource("Resource_acaax"), ExtResource("2_3486e"), ExtResource("3_mwcf3"), SubResource("Resource_o8win"), ExtResource("2_3486e"), ExtResource("3_mwcf3"), SubResource("Resource_k77ig"), ExtResource("2_3486e"), ExtResource("3_mwcf3"), SubResource("Resource_5ocg5"), ExtResource("2_3486e"), ExtResource("3_mwcf3")]) diff --git a/Resources/Patterns/rumia_ns_2.tres b/Resources/Patterns/rumia_ns_2.tres index 92eae717..74a5938d 100644 --- a/Resources/Patterns/rumia_ns_2.tres +++ b/Resources/Patterns/rumia_ns_2.tres @@ -16,6 +16,7 @@ duration = 1.0 burstInterval = 2.0 spread = 360.0 owner = 2 +_timeModifiers = null WaitForCompletion = true [sub_resource type="Resource" id="Resource_kohuh"] @@ -29,6 +30,7 @@ duration = 1.0 burstInterval = 2.0 spread = 360.0 owner = 2 +_timeModifiers = null WaitForCompletion = true [sub_resource type="Resource" id="Resource_depjj"] @@ -42,6 +44,7 @@ duration = 4.0 burstInterval = 2.0 spread = 360.0 owner = 2 +_timeModifiers = null WaitForCompletion = true [resource] diff --git a/Scenes/Maps/BossTestArena.tscn b/Scenes/Maps/BossTestArena.tscn index 4e9eb2ab..c72557de 100644 --- a/Scenes/Maps/BossTestArena.tscn +++ b/Scenes/Maps/BossTestArena.tscn @@ -31,7 +31,7 @@ tile_set = ExtResource("3_cyhmq") [node name="Rumia" parent="." instance=ExtResource("2_47q21")] position = Vector2(176, 44) -Phases = Array[Resource]([ExtResource("6_1uicx"), ExtResource("5_jkuab")]) +Phases = Array[Resource]([ExtResource("5_jkuab"), ExtResource("6_1uicx")]) [node name="PlayerStartPosition" type="Marker2D" parent="."] position = Vector2(178, 115) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index fc47fd81..1afcc032 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -258,7 +258,7 @@ monitoring = false monitorable = false script = ExtResource("29_pvkri") _trackName = "Rumia_Intro" -_dialogueEndActivationTargets = [NodePath("../Rumia"), NodePath("../Factory Tilemaps/HorizontalDoor3")] +_dialogueEndActivationTargets = [] [node name="CollisionShape2D" type="CollisionShape2D" parent="RumiaDialogueStarter"] shape = SubResource("CircleShape2D_l22r0")