couple fixes

This commit is contained in:
JoeMama
2025-10-17 11:48:28 +01:00
parent 80faeadafc
commit 5d0a1a8101
6 changed files with 24 additions and 21 deletions

View File

@@ -67,7 +67,8 @@ func exit_pipe() -> void:
can_enter = false
pipe_exited.emit()
for i in get_tree().get_nodes_in_group("Players"):
await i.ready
if i.is_node_ready() == false:
await i.ready
i.go_to_exit_pipe(self)
for i in get_tree().get_nodes_in_group("Players"):
await get_tree().create_timer(0.5, false).timeout

View File

@@ -159,7 +159,7 @@ const ANIMATION_FALLBACKS := {
"WingCrouch": "WaterCrouch",
"CrouchFall": "Crouch",
"CrouchJump": "Crouch",
"CrouchBump": "Bump",
"CrouchBump": "Crouch",
"CrouchMove": "Crouch",
"IdleAttack": "MoveAttack",
"CrouchAttack": "IdleAttack",
@@ -354,6 +354,7 @@ func camera_make_current() -> void:
func play_animation(animation_name := "") -> void:
if sprite.sprite_frames == null: return
animation_name = get_fallback_animation(animation_name)
print(animation_name)
if sprite.animation != animation_name:
sprite.play(animation_name)
@@ -685,10 +686,6 @@ func set_power_state_frame() -> void:
$ResourceSetterNew.update_resource()
if %Sprite.sprite_frames != null:
can_pose = %Sprite.sprite_frames.has_animation("PoseDoor")
can_bump_jump = %Sprite.sprite_frames.has_animation("JumpBump")
can_bump_crouch = %Sprite.sprite_frames.has_animation("CrouchBump")
can_bump_swim = %Sprite.sprite_frames.has_animation("SwimBump")
can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump")
can_kick_anim = %Sprite.sprite_frames.has_animation("Kick")
func get_power_up(power_name := "") -> void:

View File

@@ -212,7 +212,7 @@ func get_animation_name() -> String:
if player.kicking and player.can_kick_anim:
return "Kick"
if player.crouching and not wall_pushing:
if player.bumping and player.can_bump_crouch:
if player.bumping:
return "CrouchBump"
elif player.is_on_floor() == false:
if player.velocity.y > 0: