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

last commit fix

Browse Source
This commit is contained in:
Oier Bravo
2023-02-24 18:55:22 +01:00
parent eb8b8ff04d
commit 8e72e44a4c
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) click_on_inventory_item(inventory_item_global_id, event, ACTION3)
func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: 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, ACTION4)
=======
click_on_inventory_item(inventory_item_global_id, event, VERB_USE)
>>>>>>> Stashed changes
func inventory_item_focused(inventory_item_global_id: String) -> void: func inventory_item_focused(inventory_item_global_id: String) -> void:
var target_obj = escoria.object_manager.get_object(inventory_item_global_id).node var target_obj = escoria.object_manager.get_object(inventory_item_global_id).node
if target_obj is ESCItemWithTooltip: 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/tooltip.set_target(target_obj.inventory_action1_text)
$tooltip_layer/tooltip2.set_target(target_obj.inventory_action2_text) $tooltip_layer/tooltip2.set_target(target_obj.inventory_action2_text)
if target_obj is ESCPlayer: if target_obj is ESCPlayer:
$tooltip_layer/tooltip.set_target(target_obj.inventory_action1_text) $tooltip_layer/tooltip.set_target(target_obj.inventory_action1_text)
>>>>>>> Stashed changes
func inventory_item_unfocused() -> void: func inventory_item_unfocused() -> void: