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

fix: Safety guard for characters without speaking animations (#457)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-22 15:09:37 +01:00
committed by GitHub
parent 879022217c
commit f4c5803646
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,7 +442,9 @@ func turn_to(object: Node, wait: float = 0.0):
# Play the talking animation
func start_talking():
if get_animation_player():
if get_animation_player() and \
_movable.last_dir >= 0 and \
_movable.last_dir <= animations.speaks.size():
if get_animation_player().is_playing():
get_animation_player().stop()
get_animation_player().play(
@@ -452,7 +454,9 @@ func start_talking():
# Stop playing the talking animation
func stop_talking():
if get_animation_player():
if get_animation_player() and \
_movable.last_dir >= 0 and \
_movable.last_dir <= animations.idles.size():
if get_animation_player().is_playing():
get_animation_player().stop()
get_animation_player().play(

2
project.godot
View File

@@ -721,7 +721,7 @@ ui/inventory_item_size=Vector2( 72, 72 )
debug/enable_room_selector=true
debug/room_selector_room_dir="res://game/rooms"
ui/dialog_managers=[ "res://addons/escoria-dialog-simple/esc_dialog_simple.gd" ]
ui/default_dialog_type="avatar"
ui/default_dialog_type="floating"
dialog_simple/avatars_path="res://game/dialog_avatars"
dialog_simple/text_speed_per_character=0.1
dialog_simple/fast_text_speed_per_character=0.25