From 8e72e44a4c0de4a1f673adbc6e2a731914c91998 Mon Sep 17 00:00:00 2001 From: oier Date: Fri, 24 Feb 2023 18:55:22 +0100 Subject: [PATCH] last commit fix --- .../addons/escoria-ui-return-monkey-island/game.gd | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index a9df04c0..c3c3c9b9 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -290,25 +290,17 @@ func left_click_on_inventory_item(inventory_item_global_id: String, event: Input click_on_inventory_item(inventory_item_global_id, event, ACTION3) func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: -<<<<<<< Updated upstream click_on_inventory_item(inventory_item_global_id, event, ACTION4) -======= - click_on_inventory_item(inventory_item_global_id, event, VERB_USE) ->>>>>>> Stashed changes + 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: -<<<<<<< Updated upstream - $tooltip_layer/tooltip.set_target(target_obj.action3_text) - $tooltip_layer/tooltip2.set_target(target_obj.action4_text) -======= $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) ->>>>>>> Stashed changes func inventory_item_unfocused() -> void: