Skip to content

Fix player animation String blending warning #2898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Leonardo-UTP wants to merge 1 commit into from
Closed

Fix player animation String blending warning #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scenes/game_elements/characters/player/components/animation_player.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")


Expand All @@ -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)

Expand All @@ -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")


Expand Down
12 changes: 6 additions & 6 deletions scenes/game_elements/characters/player/player.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down