From d9c89abadad5821afebcf150fb6e3285d3896874 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Fri, 24 Feb 2023 19:39:06 +0100 Subject: [PATCH] fix tooltip in inventory --- .../escoria-ui-return-monkey-island/game.gd | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index 100b15b4..a4f91375 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -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: