oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix: Mirroed ESCItem's talk animation was conflicting with mirrored idle

Browse Source 
Also remove multiple calls to get_animation_player()
Fixes https://github.com/godot-escoria/escoria-issues/issues/201
This commit is contained in:
Julian Murgia
2022-03-23 13:56:18 +01:00
parent 82eb95c99a
commit 284cb0d539
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
addons/escoria-core/game/core-scripts/esc_item.gd
View File

@@ -500,13 +500,16 @@ func start_talking():
and get_animation_player() \ and get_animation_player() \
and _movable.last_dir >= 0 \ and _movable.last_dir >= 0 \
and _movable.last_dir < animations.speaks.size(): and _movable.last_dir < animations.speaks.size():
if get_animation_player().is_playing(): var animation_player = get_animation_player()
get_animation_player().stop()
if animations.speaks[_movable.last_dir].mirrored: if animation_player.is_playing():
animation_player.stop()
if animations.speaks[_movable.last_dir].mirrored \
and not _movable.is_mirrored:
_sprite_node.scale.x *= -1 _sprite_node.scale.x *= -1
get_animation_player().play( animation_player.play(
animations.speaks[_movable.last_dir].animation animations.speaks[_movable.last_dir].animation
) )
@@ -518,13 +521,16 @@ func stop_talking():
and get_animation_player() \ and get_animation_player() \
and _movable.last_dir >= 0 \ and _movable.last_dir >= 0 \
and _movable.last_dir < animations.speaks.size(): and _movable.last_dir < animations.speaks.size():
if get_animation_player().is_playing(): var animation_player = get_animation_player()
get_animation_player().stop()
if animations.speaks[_movable.last_dir].mirrored: if animation_player.is_playing():
animation_player.stop()
if animations.speaks[_movable.last_dir].mirrored \
and not _movable.is_mirrored:
_sprite_node.scale.x *= -1 _sprite_node.scale.x *= -1
get_animation_player().play( animation_player.play(
animations.idles[_movable.last_dir].animation animations.idles[_movable.last_dir].animation
) )