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

fix tooltip in inventory

Browse Source
This commit is contained in:
Eneko Nieto
2023-02-24 19:39:06 +01:00
parent 825d38636a
commit d9c89abada
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gymkhana/addons/escoria-ui-return-monkey-island/game.gd
View File

@@ -237,6 +237,16 @@ func element_unfocused() -> void:
## ITEMS ##
func click_on_item(item_global_id: String, event: InputEvent, action: String) -> void:
escoria.action_manager.set_current_action(action)
escoria.logger.info(self, "current_action:" + escoria.action_manager.current_action)
if escoria.action_manager.current_target == null:
escoria.logger.info(self, "current_target:null")
else:
escoria.logger.info(self, "current_target:" + escoria.action_manager.current_target.to_string())
if escoria.action_manager.current_tool == null:
escoria.logger.info(self, "current_tool:null")
else:
escoria.logger.info(self, "current_tool:" + escoria.action_manager.current_tool.to_string())
var target_obj = escoria.object_manager.get_object(item_global_id).node
@@ -269,6 +279,16 @@ func left_double_click_on_item(item_global_id: String, event: InputEvent) -> voi
func click_on_inventory_item(item_global_id: String, event: InputEvent, action: String) -> void:
escoria.action_manager.set_current_action(action)
escoria.logger.info(self, "current_action:" + escoria.action_manager.current_action)
if escoria.action_manager.current_target == null:
escoria.logger.info(self, "current_target:null")
else:
escoria.logger.info(self, "current_target:" + escoria.action_manager.current_target.to_string())
if escoria.action_manager.current_tool == null:
escoria.logger.info(self, "current_tool:null")
else:
escoria.logger.info(self, "current_tool:" + escoria.action_manager.current_tool.to_string())
var target_obj = escoria.object_manager.get_object(item_global_id).node
escoria.action_manager.do(
@@ -295,10 +315,8 @@ func right_click_on_inventory_item(inventory_item_global_id: String, event: Inpu
func inventory_item_focused(inventory_item_global_id: String) -> void:
var target_obj = escoria.object_manager.get_object(inventory_item_global_id).node
if target_obj is ESCItemWithTooltip:
$tooltip_layer/tooltip.set_target(target_obj.inventory_action1_text)
$tooltip_layer/tooltip2.set_target(target_obj.inventory_action2_text)
if target_obj is ESCPlayer:
$tooltip_layer/tooltip.set_target(target_obj.inventory_action1_text)
$tooltip_layer/tooltip.set_target(target_obj.action3_text)
$tooltip_layer/tooltip2.set_target(target_obj.action4_text)
func inventory_item_unfocused() -> void: