diff --git a/scenes/game_elements/characters/player/components/animation_player.gd b/scenes/game_elements/characters/player/components/animation_player.gd index 0447ece84..c7551ef48 100644 --- a/scenes/game_elements/characters/player/components/animation_player.gd +++ b/scenes/game_elements/characters/player/components/animation_player.gd @@ -25,10 +25,13 @@ func _process(_delta: float) -> void: return if player.velocity.is_zero_approx(): + player_sprite.animation = &"idle" play(&"idle") elif player_sprite.sprite_frames.has_animation(&"run") and _is_player_running: + player_sprite.animation = &"run" play(&"run") else: + player_sprite.animation = &"walk" play(&"walk") var double_speed: bool = current_animation == &"walk" and _is_player_running @@ -45,6 +48,7 @@ func _on_player_mode_changed(mode: Player.Mode) -> void: match player.mode: Player.Mode.DEFEATED: speed_scale = original_speed_scale + player_sprite.animation = &"defeated" play(&"defeated") @@ -59,6 +63,7 @@ func _on_player_repel_repelling_changed(repelling: bool) -> void: # Repel animation is being played for the first time. So skip the anticipation and go # directly to the action. speed_scale = original_speed_scale + player_sprite.animation = &"attack_02" play(&"repel") seek(player_repel.REPEL_ANTICIPATION_TIME, false, false) @@ -69,6 +74,7 @@ func _on_player_hook_string_thrown() -> void: if current_animation in [&"repel", &"throw_string"]: stop() speed_scale = original_speed_scale + player_sprite.animation = &"attack_01" play(&"throw_string") diff --git a/scenes/game_elements/characters/player/player.tscn b/scenes/game_elements/characters/player/player.tscn index 8c507a27b..2fdaf5f41 100644 --- a/scenes/game_elements/characters/player/player.tscn +++ b/scenes/game_elements/characters/player/player.tscn @@ -117,7 +117,7 @@ tracks/0/keys = { } tracks/1/type = "value" tracks/1/imported = false -tracks/1/enabled = true +tracks/1/enabled = false tracks/1/path = NodePath("PlayerSprite:animation") tracks/1/interp = 1 tracks/1/loop_wrap = true @@ -146,7 +146,7 @@ tracks/0/keys = { } tracks/1/type = "value" tracks/1/imported = false -tracks/1/enabled = true +tracks/1/enabled = false tracks/1/path = NodePath("PlayerSprite:animation") tracks/1/interp = 1 tracks/1/loop_wrap = true @@ -175,7 +175,7 @@ tracks/0/keys = { } tracks/1/type = "value" tracks/1/imported = false -tracks/1/enabled = true +tracks/1/enabled = false tracks/1/path = NodePath("PlayerSprite:animation") tracks/1/interp = 1 tracks/1/loop_wrap = true @@ -205,7 +205,7 @@ tracks/0/keys = { } tracks/1/type = "value" tracks/1/imported = false -tracks/1/enabled = true +tracks/1/enabled = false tracks/1/path = NodePath("PlayerSprite:animation") tracks/1/interp = 1 tracks/1/loop_wrap = true @@ -234,7 +234,7 @@ length = 0.4 step = 0.1 tracks/0/type = "value" tracks/0/imported = false -tracks/0/enabled = true +tracks/0/enabled = false tracks/0/path = NodePath("PlayerSprite:animation") tracks/0/interp = 1 tracks/0/loop_wrap = true @@ -276,7 +276,7 @@ tracks/0/keys = { } tracks/1/type = "value" tracks/1/imported = false -tracks/1/enabled = true +tracks/1/enabled = false tracks/1/path = NodePath("PlayerSprite:animation") tracks/1/interp = 1 tracks/1/loop_wrap = true