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

fix: UI should now highlight proper verb instead of always going back to an item's default action

Browse Source
This commit is contained in:
Duncan Brown
2022-09-13 19:24:32 -04:00
committed by Julian Murgia
parent e07c4043ad
commit 62c2920439
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/escoria-ui-9verbs/game.gd
View File

@@ -114,8 +114,7 @@ func element_focused(element_id: String) -> void:
ESCActionManager.ACTION_INPUT_STATE.COMPLETED: ESCActionManager.ACTION_INPUT_STATE.COMPLETED:
return return
ESCActionManager.ACTION_INPUT_STATE.AWAITING_VERB_OR_ITEM, \ ESCActionManager.ACTION_INPUT_STATE.AWAITING_VERB_OR_ITEM:
ESCActionManager.ACTION_INPUT_STATE.AWAITING_ITEM:
tooltip.set_target(target_obj.tooltip_name) tooltip.set_target(target_obj.tooltip_name)
# Hovering an ESCItem highlights its default action # Hovering an ESCItem highlights its default action
@@ -123,6 +122,11 @@ func element_focused(element_id: String) -> void:
and target_obj is ESCItem: and target_obj is ESCItem:
verbs_menu.set_by_name(target_obj.default_action) verbs_menu.set_by_name(target_obj.default_action)
ESCActionManager.ACTION_INPUT_STATE.AWAITING_ITEM:
tooltip.set_target(target_obj.tooltip_name)
verbs_menu.set_by_name(escoria.action_manager.current_action)
ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM: ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM:
tooltip.set_target2(target_obj.tooltip_name) tooltip.set_target2(target_obj.tooltip_name)