diff --git a/src/Boss/SlimeBoss/SlimeBossStateMachine.gd b/src/Boss/SlimeBoss/SlimeBossStateMachine.gd index 09b0669..8c01e7a 100644 --- a/src/Boss/SlimeBoss/SlimeBossStateMachine.gd +++ b/src/Boss/SlimeBoss/SlimeBossStateMachine.gd @@ -145,7 +145,7 @@ func _decide_on_next_state(): return $States/Stomp if _phase == PHASES.PHASE_THREE: - if angry_phases_done < 2: + if angry_phases_done < 3: set_invincible(true) if sequence_cycles < 6: if state_active == $States/ChargeSequence: @@ -154,7 +154,7 @@ func _decide_on_next_state(): sequence_cycles += 1 return $States/ChargeSequence else: - angry_phases_done = 2 + angry_phases_done = 3 sequence_cycles = 0 return $States/ReturnToCenter else: @@ -167,7 +167,7 @@ func _decide_on_next_state(): return $States/ChargeSequence if state_active == $States/ChargeSequence: return $States/Stomp - + # # Death # if state_active == $States/Die: # queue_free() diff --git a/src/Boss/SlimeBoss/States/Charge/Sprint.gd b/src/Boss/SlimeBoss/States/Charge/Sprint.gd index bd81bfd..befd4eb 100644 --- a/src/Boss/SlimeBoss/States/Charge/Sprint.gd +++ b/src/Boss/SlimeBoss/States/Charge/Sprint.gd @@ -1,6 +1,6 @@ extends "res://Boss/SlimeBoss/States/BossState.gd" -export(float) var SPEED = 800.0 +export(float) var SPEED = 300.0 var direction = Vector2() diff --git a/src/Boss/SlimeBoss/States/ReturnToCenter.gd b/src/Boss/SlimeBoss/States/ReturnToCenter.gd index 2bdd65d..df2e5a4 100644 --- a/src/Boss/SlimeBoss/States/ReturnToCenter.gd +++ b/src/Boss/SlimeBoss/States/ReturnToCenter.gd @@ -6,7 +6,6 @@ export(float) var MAX_SPEED = 300.0 export(float) var ARRIVE_DISTANCE = 6.0 var velocity = Vector2.ZERO -var center = Vector2.ZERO func update(delta): velocity = Steering.arrive_to(velocity, diff --git a/src/Boss/SlimeBoss/States/Roam/MoveToRandomPosition.gd b/src/Boss/SlimeBoss/States/Roam/MoveToRandomPosition.gd index 9e0db85..1b5c1cf 100644 --- a/src/Boss/SlimeBoss/States/Roam/MoveToRandomPosition.gd +++ b/src/Boss/SlimeBoss/States/Roam/MoveToRandomPosition.gd @@ -4,7 +4,7 @@ export(float) var ARRIVE_DISTANCE = 6.0 export(float) var SLOW_RADIUS = 200.0 export(float) var MASS = 5.0 export(float) var MAX_SPEED = 300.0 -export(float) var ROAM_RADIUS = 200.0 +export(float) var ROAM_RADIUS = 100.0 var time_since_start = 0 diff --git a/src/World.tscn b/src/World.tscn index 85e2b4a..8603521 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -23,7 +23,7 @@ region_enabled = true region_rect = Rect2( 0, 0, 1280, 720 ) [node name="Background" parent="." instance=ExtResource( 7 )] -frame = 40 +frame = 14 [node name="FloorTileMap" type="TileMap" parent="."] visible = false @@ -61,8 +61,6 @@ position = Vector2( 240, 120 ) [node name="DialogueBox" parent="CanvasLayer" instance=ExtResource( 6 )] visible = false -[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] - [node name="DebugLabel" type="Control" parent="CanvasLayer"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -104,5 +102,7 @@ margin_top = 32.0 margin_right = 40.0 margin_bottom = 44.0 custom_fonts/font = ExtResource( 9 ) + +[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] [connection signal="phase_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_phase_changed"] [connection signal="state_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_state_changed"]