creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-13 22:12:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduced bugs

Browse Source
This commit is contained in:
Paul Norberger
2020-04-20 19:50:34 +02:00
parent 0eea6edee7
commit b68689dfa0
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Boss/SlimeBoss/SlimeBossStateMachine.gd
View File

@@ -145,7 +145,7 @@ func _decide_on_next_state():
return $States/Stomp return $States/Stomp
if _phase == PHASES.PHASE_THREE: if _phase == PHASES.PHASE_THREE:
if angry_phases_done < 2: if angry_phases_done < 3:
set_invincible(true) set_invincible(true)
if sequence_cycles < 6: if sequence_cycles < 6:
if state_active == $States/ChargeSequence: if state_active == $States/ChargeSequence:
@@ -154,7 +154,7 @@ func _decide_on_next_state():
sequence_cycles += 1 sequence_cycles += 1
return $States/ChargeSequence return $States/ChargeSequence
else: else:
angry_phases_done = 2 angry_phases_done = 3
sequence_cycles = 0 sequence_cycles = 0
return $States/ReturnToCenter return $States/ReturnToCenter
else: else:
@@ -167,7 +167,7 @@ func _decide_on_next_state():
return $States/ChargeSequence return $States/ChargeSequence
if state_active == $States/ChargeSequence: if state_active == $States/ChargeSequence:
return $States/Stomp return $States/Stomp
# # Death # # Death
# if state_active == $States/Die: # if state_active == $States/Die:
# queue_free() # queue_free()

2
src/Boss/SlimeBoss/States/Charge/Sprint.gd
View File

@@ -1,6 +1,6 @@
extends "res://Boss/SlimeBoss/States/BossState.gd" extends "res://Boss/SlimeBoss/States/BossState.gd"
export(float) var SPEED = 800.0 export(float) var SPEED = 300.0
var direction = Vector2() var direction = Vector2()

1
src/Boss/SlimeBoss/States/ReturnToCenter.gd
View File

@@ -6,7 +6,6 @@ export(float) var MAX_SPEED = 300.0
export(float) var ARRIVE_DISTANCE = 6.0 export(float) var ARRIVE_DISTANCE = 6.0
var velocity = Vector2.ZERO var velocity = Vector2.ZERO
var center = Vector2.ZERO
func update(delta): func update(delta):
velocity = Steering.arrive_to(velocity, velocity = Steering.arrive_to(velocity,

2
src/Boss/SlimeBoss/States/Roam/MoveToRandomPosition.gd
View File

@@ -4,7 +4,7 @@ export(float) var ARRIVE_DISTANCE = 6.0
export(float) var SLOW_RADIUS = 200.0 export(float) var SLOW_RADIUS = 200.0
export(float) var MASS = 5.0 export(float) var MASS = 5.0
export(float) var MAX_SPEED = 300.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 var time_since_start = 0

6
src/World.tscn
View File

@@ -23,7 +23,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 1280, 720 ) region_rect = Rect2( 0, 0, 1280, 720 )
[node name="Background" parent="." instance=ExtResource( 7 )] [node name="Background" parent="." instance=ExtResource( 7 )]
frame = 40 frame = 14
[node name="FloorTileMap" type="TileMap" parent="."] [node name="FloorTileMap" type="TileMap" parent="."]
visible = false visible = false
@@ -61,8 +61,6 @@ position = Vector2( 240, 120 )
[node name="DialogueBox" parent="CanvasLayer" instance=ExtResource( 6 )] [node name="DialogueBox" parent="CanvasLayer" instance=ExtResource( 6 )]
visible = false visible = false
[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )]
[node name="DebugLabel" type="Control" parent="CanvasLayer"] [node name="DebugLabel" type="Control" parent="CanvasLayer"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@@ -104,5 +102,7 @@ margin_top = 32.0
margin_right = 40.0 margin_right = 40.0
margin_bottom = 44.0 margin_bottom = 44.0
custom_fonts/font = ExtResource( 9 ) 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="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"] [connection signal="state_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_state_changed"]