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

fix: clears tooltip after any action has finished regardless of success

Browse Source
This commit is contained in:
Duncan Brown
2022-08-26 20:47:48 -04:00
parent 99c274f00d
commit 6e220e7e64
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
View File

@@ -286,8 +286,8 @@ func _activate(
escoria.event_manager, escoria.event_manager,
"event_finished" "event_finished"
) )
if event_returned[0] == ESCExecution.RC_OK:
escoria.action_manager.clear_current_action() clear_current_action()
emit_signal("action_finished") emit_signal("action_finished")
return event_returned[0] return event_returned[0]
elif combine_with.events.has(combine_with_event)\ elif combine_with.events.has(combine_with_event)\
@@ -306,8 +306,8 @@ func _activate(
escoria.event_manager, escoria.event_manager,
"event_finished" "event_finished"
) )
if event_returned[0] == ESCExecution.RC_OK:
escoria.action_manager.clear_current_action() clear_current_action()
emit_signal("action_finished") emit_signal("action_finished")
return event_returned[0] return event_returned[0]
else: else:
@@ -327,6 +327,8 @@ func _activate(
self, self,
"Invalid action" + str(errors) "Invalid action" + str(errors)
) )
clear_current_action()
emit_signal("action_finished") emit_signal("action_finished")
return ESCExecution.RC_ERROR return ESCExecution.RC_ERROR
else: else:
@@ -342,6 +344,8 @@ func _activate(
combine_with.global_id combine_with.global_id
] ]
) )
clear_current_action()
emit_signal("action_finished") emit_signal("action_finished")
return ESCExecution.RC_ERROR return ESCExecution.RC_ERROR
else: else:
@@ -374,8 +378,7 @@ func _activate(
escoria.event_manager, escoria.event_manager,
"event_finished" "event_finished"
) )
if event_returned[0] == ESCExecution.RC_OK: clear_current_action()
clear_current_action()
emit_signal("action_finished") emit_signal("action_finished")
return event_returned[0] return event_returned[0]
else: else:
@@ -387,6 +390,7 @@ func _activate(
target.global_id target.global_id
] ]
) )
clear_current_action()
emit_signal("action_finished") emit_signal("action_finished")
return ESCExecution.RC_ERROR return ESCExecution.RC_ERROR