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

CHANGE TO escoria-core. Added ESCItem.tooltip2_name

Browse Source
This commit is contained in:
Eneko Nieto
2023-02-10 20:08:10 +01:00
parent 8c1e59a40c
commit 91faea0a6e
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addons/escoria-core/game/core-scripts/esc_item.gd
View File

@@ -98,14 +98,11 @@ export(bool) var player_orients_on_arrival = true
# item # item
export(int) var interaction_direction export(int) var interaction_direction
# The name for the tooltip of this item # The text for the tooltip of action1
export(String) var tooltip_name export(String) var tooltip_name
# The text for the tooltip of action1
export(String) var action1
# The text for the tooltip of action2 # The text for the tooltip of action2
export(String) var action2 export(String) var tooltip2_name
# Default action to use if object is not in the inventory # Default action to use if object is not in the inventory
export(String) var default_action export(String) var default_action

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

@@ -221,8 +221,7 @@ func element_focused(element_id: String) -> void:
) )
var target_obj = escoria.object_manager.get_object(element_id).node var target_obj = escoria.object_manager.get_object(element_id).node
$tooltip_layer/tooltip.set_target(target_obj.action1 + " " + target_obj.action2) $tooltip_layer/tooltip.set_target(target_obj.tooltip_name + " " + target_obj.tooltip2_name)
# $tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
if escoria.action_manager.current_action != VERB_USE \ if escoria.action_manager.current_action != VERB_USE \
and escoria.action_manager.current_tool == null \ and escoria.action_manager.current_tool == null \

5
gymkhana/rooms/home/room01.tscn
View File

@@ -106,9 +106,8 @@ pause_mode = 1
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "r1_wall_item1" global_id = "r1_wall_item1"
esc_script = "res://gymkhana/rooms/home/esc/wall_item.esc" esc_script = "res://gymkhana/rooms/home/esc/wall_item.esc"
tooltip_name = "Artwork" tooltip_name = "This is action1"
action1 = "This is action1" tooltip2_name = "This is action2"
action2 = "This is action2"
default_action = "action2" default_action = "action2"
combine_when_selected_action_is_in = [ ] combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 10 ) inventory_texture = ExtResource( 10 )