From 6e220e7e64c62013cfd369e2237e502fd2323e2a Mon Sep 17 00:00:00 2001 From: Duncan Brown Date: Fri, 26 Aug 2022 20:47:48 -0400 Subject: [PATCH] fix: clears tooltip after any action has finished regardless of success --- .../game/core-scripts/esc/esc_action_manager.gd | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd index b90d8f9c..cc0dc1ac 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd @@ -286,8 +286,8 @@ func _activate( escoria.event_manager, "event_finished" ) - if event_returned[0] == ESCExecution.RC_OK: - escoria.action_manager.clear_current_action() + + clear_current_action() emit_signal("action_finished") return event_returned[0] elif combine_with.events.has(combine_with_event)\ @@ -306,8 +306,8 @@ func _activate( escoria.event_manager, "event_finished" ) - if event_returned[0] == ESCExecution.RC_OK: - escoria.action_manager.clear_current_action() + + clear_current_action() emit_signal("action_finished") return event_returned[0] else: @@ -327,6 +327,8 @@ func _activate( self, "Invalid action" + str(errors) ) + + clear_current_action() emit_signal("action_finished") return ESCExecution.RC_ERROR else: @@ -342,6 +344,8 @@ func _activate( combine_with.global_id ] ) + + clear_current_action() emit_signal("action_finished") return ESCExecution.RC_ERROR else: @@ -374,8 +378,7 @@ func _activate( escoria.event_manager, "event_finished" ) - if event_returned[0] == ESCExecution.RC_OK: - clear_current_action() + clear_current_action() emit_signal("action_finished") return event_returned[0] else: @@ -387,6 +390,7 @@ func _activate( target.global_id ] ) + clear_current_action() emit_signal("action_finished") return ESCExecution.RC_ERROR