From 48180bad64214040ad56d5709f900c229e1d85eb Mon Sep 17 00:00:00 2001 From: penelope Date: Thu, 8 Jun 2023 17:21:34 -0400 Subject: [PATCH] duck jumping makes sg's jump one pixel higher --- objects/player/player.gd | 5 +++++ objects/player/player.tscn | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/objects/player/player.gd b/objects/player/player.gd index 2c94c6c..6e11515 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -373,3 +373,8 @@ func _process_movement(delta: float) -> void: func _on_Hitbox_body_entered(body: Node) -> void: if body.is_in_group("death"): die() + + +func _on_Ducking_event_received(event): + if event == "jump": + position.y -= 1 diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 59d869d..1401257 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1042,6 +1042,14 @@ to = NodePath("../../Shooting") event = "shoot" guard_expression = "can_shoot" +[node name="On Jump" type="Node" parent="StateChart/Root/Movement/Grounded/Ducking"] +script = ExtResource( 10 ) +__meta__ = { +"_editor_description_": "enter jump state when the jump button is pressed" +} +to = NodePath("../../../Airborne/Jump/NormalJump") +event = "jump" + [node name="Shooting" type="Node" parent="StateChart/Root/Movement/Grounded"] script = ExtResource( 11 ) consumed_events = [ "jump", "duck_pressed" ] @@ -1251,6 +1259,7 @@ script = ExtResource( 8 ) [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Stimming" to="." method="_on_Stimming_state_entered"] +[connection signal="event_received" from="StateChart/Root/Movement/Grounded/Ducking" to="." method="_on_Ducking_event_received"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Ducking" to="." method="_on_Ducking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Shooting" to="." method="_on_Shooting_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_on_Pushing_state_entered"]