diff --git a/addons/escoria-core/game/core-scripts/esc_item.gd b/addons/escoria-core/game/core-scripts/esc_item.gd index 302297d7d..f0ac96382 100644 --- a/addons/escoria-core/game/core-scripts/esc_item.gd +++ b/addons/escoria-core/game/core-scripts/esc_item.gd @@ -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( diff --git a/project.godot b/project.godot index d14785d9b..139add59f 100644 --- a/project.godot +++ b/project.godot @@ -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