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

Action1 and tooltips on inventory items

Browse Source
This commit is contained in:
Eneko Nieto
2023-02-16 00:18:03 +01:00
parent fc50e75ad5
commit c9e9445f57
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,6 +261,7 @@ func left_double_click_on_item(item_global_id: String, event: InputEvent) -> voi
## INVENTORY ## ## INVENTORY ##
func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
click_on_item(inventory_item_global_id, event, ACTION1)
escoria.action_manager.do( escoria.action_manager.do(
escoria.action_manager.ACTION.ITEM_LEFT_CLICK, escoria.action_manager.ACTION.ITEM_LEFT_CLICK,
[inventory_item_global_id, event] [inventory_item_global_id, event]
@@ -268,16 +269,15 @@ func left_click_on_inventory_item(inventory_item_global_id: String, event: Input
func inventory_item_focused(inventory_item_global_id: String) -> void: func inventory_item_focused(inventory_item_global_id: String) -> void:
$tooltip_layer/tooltip.set_target( var target_obj = escoria.object_manager.get_object(inventory_item_global_id).node
escoria.object_manager.get_object( if target_obj is ESCItem && target_obj.inventory_action1_enabled:
inventory_item_global_id $tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
).node.tooltip_name if (target_obj is ESCItemWithTooltip) && target_obj.inventory_action2_enabled:
) $tooltip_layer/tooltip2.set_target(target_obj.tooltip2_name)
func inventory_item_unfocused() -> void: func inventory_item_unfocused() -> void:
$tooltip_layer/tooltip.set_target("") element_unfocused()
$tooltip_layer/tooltip2.set_target("")
func open_inventory(): func open_inventory():
$CanvasLayer/ui/HBoxContainer/inventory_ui.show_inventory() $CanvasLayer/ui/HBoxContainer/inventory_ui.show_inventory()

6
gymkhana/addons/escoria-ui-return-monkey-island/item.gd
View File

@@ -15,6 +15,12 @@ export(int) var action1_y = 0
# The text for the tooltip of action2 # The text for the tooltip of action2
export(String) var tooltip2_name export(String) var tooltip2_name
# Action1 enabled in inventory
export(bool) var inventory_action1_enabled
# Action2 enabled in inventory
export(bool) var inventory_action2_enabled
#$tooltips.visible = true; #$tooltips.visible = true;
var action1Tooltip: Object var action1Tooltip: Object
var action2Tooltip: Object var action2Tooltip: Object

2
gymkhana/items/inventory/I_Bombona.tscn
View File

@@ -19,6 +19,8 @@ dialog_color = Color( 1, 1, 1, 1 )
inventory_texture = ExtResource( 1 ) inventory_texture = ExtResource( 1 )
action1_text = "Mirar bombona" action1_text = "Mirar bombona"
action2_text = "Coger bombona" action2_text = "Coger bombona"
inventory_action1_enabled = true
inventory_action2_enabled = false
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite" type="Sprite" parent="."]