Merge branch 'custom-data-components'

addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd

@@ -0,0 +1,16 @@
+extends Node
+
+var item_count_manager: ESCItemCountManager
+
+var tooltip_manager: ESCTootltipManager
+
+func get_item(global_id: String) -> ESCItem:
+	var node = escoria.object_manager.get_object(global_id).node
+	if not node is ESCItem:
+		escoria.logger.error(
+		  "set_tootltip: invalid object",
+		  ["Object is not an ESCItem"]
+		)
+		return null
+
+	return node

addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd

@@ -40,8 +40,7 @@ func validate(arguments: Array):
 
 # Run the command
 func run(command_params: Array) -> int:
-	(escoria.object_manager.get_object(command_params[0]).node as ESCItemWithTooltip)\
+	gymkhana.tooltip_manager.setTooltip(command_params[0],command_params[1],command_params[2])
-			.set_tooltip(command_params[1],command_params[2])
 	return ESCExecution.RC_OK
 
 

addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd

@@ -342,10 +342,8 @@ func has_actions(current_target_object):
 	return false
 
 func get_tooltip_from_current_target(verb,current_target_object):
-	var tooltips = current_target_object.get('tooltips')
+	return gymkhana.tooltip_manager.getTooltip(current_target_object.global_id, verb)
-	if(tooltips.has(verb)):
+	
-		return tooltips.get(verb)
-	return ""
 func get_action_target_text(action_target_texts: Dictionary):
 	var action_target_text = action_target_texts.get(escoria.action_manager.current_tool.global_id)
 	return action_target_text if action_target_text else ""

addons/escoria-ui-return-monkey-island/esc/esc_tooltip_manager.gd

@@ -0,0 +1,17 @@
+# A manager for inventory objects
+extends Resource
+class_name ESCTootltipManager
+
+func setTooltip(global_id: String, verb: String, text: String) -> void:
+	var item = gymkhana.get_item(global_id)
+	item.custom_data["tooltips"][verb] = text
+
+func getTooltip(global_id, verb):
+	var item = gymkhana.get_item(global_id)
+	if(!item.custom_data.has("tooltips")):
+		return ""
+
+	var tooltips = item.custom_data["tooltips"]
+	if(tooltips.has(verb)):
+		return tooltips.get(verb)
+	return ""

addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd

@@ -2,26 +2,6 @@ tool
 extends ESCItem
 class_name ESCItemWithTooltip, "res://addons/escoria-core/design/esc_item.svg"
 
-# Action 1 Label text
-export(String) var action1_text = ""
-
-# Action 2 Label text
-export(String) var action2_text = ""
-
-# Action 3 tooltip text if item in inventory
-export(String) var action3_text = ""
-
-# Action 4 tooltip text if item in inventory
-export(String) var action4_text = ""
-
-export(Dictionary) var tooltips = {}
-
-# Action 3 tooltip texts if item is target. Dictionary with tool's global id as key.
-export(Dictionary) var action3_target_texts = {}
-
-# Action 4 tooltip texts if item is target. Dictionary with tool's global id as key
-export(Dictionary) var action4_target_texts = {}
-
 # If action used by player is in this list, this is a valid target (second item in combination)
 export(Array) var target_when_selected_action_is_in = []
 
@@ -33,10 +13,6 @@ func _ready():
 	register_components()
 
 
-func set_tooltip(action: String, text: String):
-	tooltips[action] =  text
-
-
 func has_component(key: String)->bool:
 	return components.has(key)
 
@@ -64,4 +40,4 @@ func autoload_components():
 func set_custom_data(data: Dictionary) -> void:
 	.set_custom_data(data)
 	if custom_data.has("count"):
-		ESCItemCountManager.new().updateSprite(self)
+		ESCItemCountManager.new().updateSprite(self)

addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd

@@ -172,10 +172,8 @@ func update_tooltip_text():
 	$tooltip2.visible = !hidden and action2_text != "";
 	
 func get_tooltip_from_current_target(verb):
-	var tooltips = current_target_object.get('tooltips')
+	return gymkhana.tooltip_manager.getTooltip(current_target_object.global_id, verb)
-	if(tooltips.has(verb)):
+
-		return tooltips.get(verb)
-	return ""
 func get_action_target_text(action_target_texts: Dictionary):
 	var action_target_text = action_target_texts.get(escoria.action_manager.current_tool.global_id)
 	return action_target_text if action_target_text else ""

addons/escoria-ui-return-monkey-island/game.gd

@@ -84,6 +84,11 @@ var last_target: Object
 
 var video_player: Object
 
+
+func _init():
+	gymkhana.tooltip_manager = ESCTootltipManager.new()
+	gymkhana.item_count_manager = ESCItemCountManager.new()
+
 func _ready():
 	# We need a slightly modified version of Action Manager to combine items with different actions.
 	escoria.action_manager = ESCActionManagerMonkey.new()
@@ -350,7 +355,7 @@ 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.action3_text)
+		#$tooltip_layer/tooltip.set_target(target_obj.action3_text)
 		$tooltip_layer/tooltip.set_target_object(target_obj)
 
 

addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd

@@ -1,7 +1,6 @@
 # Basic information about an inventory item
 class_name ESCInventoryItem
 
-
 # Global ID of the ESCItem that uses this ESCInventoryItem
 var global_id: String = ""
 

export_presets.cfg

@@ -23,6 +23,7 @@ texture_format/etc=false
 texture_format/etc2=false
 texture_format/no_bptc_fallbacks=true
 codesign/enable=false
+codesign/identity_type=0
 codesign/identity=""
 codesign/password=""
 codesign/timestamp=true
@@ -30,6 +31,7 @@ codesign/timestamp_server_url=""
 codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PoolStringArray(  )
+application/modify_resources=true
 application/icon=""
 application/file_version=""
 application/product_version=""
@@ -64,6 +66,7 @@ texture_format/etc=false
 texture_format/etc2=false
 texture_format/no_bptc_fallbacks=true
 codesign/enable=false
+codesign/identity_type=0
 codesign/identity=""
 codesign/password=""
 codesign/timestamp=true
@@ -71,6 +74,7 @@ codesign/timestamp_server_url=""
 codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PoolStringArray(  )
+application/modify_resources=true
 application/icon=""
 application/file_version=""
 application/product_version=""
@@ -87,9 +91,9 @@ platform="Linux/X11"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter="*.esc"
+include_filter="*.esc, *.csv"
 exclude_filter=""
-export_path="bin/linux/Escoria-reloaded.x86_64"
+export_path="../Escoria-export-test.x86_64"
 script_export_mode=1
 script_encryption_key=""
 
@@ -125,10 +129,20 @@ custom_template/release=""
 variant/export_type=0
 vram_texture_compression/for_desktop=true
 vram_texture_compression/for_mobile=false
+html/export_icon=true
 html/custom_html_shell=""
 html/head_include=""
 html/canvas_resize_policy=2
+html/focus_canvas_on_start=true
 html/experimental_virtual_keyboard=false
+progressive_web_app/enabled=false
+progressive_web_app/offline_page=""
+progressive_web_app/display=1
+progressive_web_app/orientation=0
+progressive_web_app/icon_144x144=""
+progressive_web_app/icon_180x180=""
+progressive_web_app/icon_512x512=""
+progressive_web_app/background_color=Color( 0, 0, 0, 1 )
 
 [preset.4]
 
@@ -156,6 +170,7 @@ application/export_method_debug=1
 application/provisioning_profile_uuid_release=""
 application/code_sign_identity_release=""
 application/export_method_release=0
+application/targeted_device_family=2
 application/name="Escoria Demo Game"
 application/info="Made with Godot Engine"
 application/identifier="com.github.godot-escoria"
@@ -170,14 +185,14 @@ user_data/accessible_from_itunes_sharing=false
 privacy/camera_usage_description=""
 privacy/microphone_usage_description=""
 privacy/photolibrary_usage_description=""
-required_icons/iphone_120x120="res://game/appicons/Assets.xcassets/AppIcon.appiconset/120.png"
+icons/iphone_120x120=""
-required_icons/ipad_76x76="res://game/appicons/Assets.xcassets/AppIcon.appiconset/76.png"
+icons/iphone_180x180=""
-required_icons/app_store_1024x1024="res://game/appicons/Assets.xcassets/AppIcon.appiconset/1024.png"
+icons/ipad_76x76=""
-optional_icons/iphone_180x180="res://game/appicons/Assets.xcassets/AppIcon.appiconset/180.png"
+icons/ipad_152x152=""
-optional_icons/ipad_152x152="res://game/appicons/Assets.xcassets/AppIcon.appiconset/152.png"
+icons/ipad_167x167=""
-optional_icons/ipad_167x167="res://game/appicons/Assets.xcassets/AppIcon.appiconset/167.png"
+icons/app_store_1024x1024=""
-optional_icons/spotlight_40x40="res://game/appicons/Assets.xcassets/AppIcon.appiconset/40.png"
+icons/spotlight_40x40=""
-optional_icons/spotlight_80x80="res://game/appicons/Assets.xcassets/AppIcon.appiconset/80.png"
+icons/spotlight_80x80=""
 storyboard/use_launch_screen_storyboard=false
 storyboard/image_scale_mode=0
 storyboard/custom_image@2x=""
@@ -218,12 +233,54 @@ application/info="Made with Godot Engine"
 application/icon="res://game/appicons/appstore.png"
 application/identifier=""
 application/signature=""
+application/app_category="Games"
 application/short_version="1.0"
 application/version="1.0"
 application/copyright=""
 display/high_res=false
-privacy/camera_usage_description=""
 privacy/microphone_usage_description=""
+privacy/camera_usage_description=""
+privacy/location_usage_description=""
+privacy/address_book_usage_description=""
+privacy/calendar_usage_description=""
+privacy/photos_library_usage_description=""
+privacy/desktop_folder_usage_description=""
+privacy/documents_folder_usage_description=""
+privacy/downloads_folder_usage_description=""
+privacy/network_volumes_usage_description=""
+privacy/removable_volumes_usage_description=""
+codesign/enable=true
+codesign/identity=""
+codesign/timestamp=true
+codesign/hardened_runtime=true
+codesign/replace_existing_signature=true
+codesign/entitlements/custom_file=""
+codesign/entitlements/allow_jit_code_execution=false
+codesign/entitlements/allow_unsigned_executable_memory=false
+codesign/entitlements/allow_dyld_environment_variables=false
+codesign/entitlements/disable_library_validation=false
+codesign/entitlements/audio_input=false
+codesign/entitlements/camera=false
+codesign/entitlements/location=false
+codesign/entitlements/address_book=false
+codesign/entitlements/calendars=false
+codesign/entitlements/photos_library=false
+codesign/entitlements/apple_events=false
+codesign/entitlements/debugging=false
+codesign/entitlements/app_sandbox/enabled=false
+codesign/entitlements/app_sandbox/network_server=false
+codesign/entitlements/app_sandbox/network_client=false
+codesign/entitlements/app_sandbox/device_usb=false
+codesign/entitlements/app_sandbox/device_bluetooth=false
+codesign/entitlements/app_sandbox/files_downloads=0
+codesign/entitlements/app_sandbox/files_pictures=0
+codesign/entitlements/app_sandbox/files_music=0
+codesign/entitlements/app_sandbox/files_movies=0
+codesign/custom_options=PoolStringArray(  )
+notarization/enable=false
+notarization/apple_id_name=""
+notarization/apple_id_password=""
+notarization/apple_team_id=""
 texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
@@ -245,8 +302,10 @@ script_encryption_key=""
 
 custom_template/debug=""
 custom_template/release=""
-custom_template/use_custom_build=false
+custom_build/use_custom_build=false
-custom_template/export_format=0
+custom_build/export_format=0
+custom_build/min_sdk=""
+custom_build/target_sdk=""
 architectures/armeabi-v7a=true
 architectures/arm64-v8a=true
 architectures/x86=false
@@ -263,20 +322,23 @@ version/name="1.0"
 package/unique_name="org.godotengine.$genname"
 package/name=""
 package/signed=true
+package/classify_as_game=true
+package/retain_data_on_uninstall=false
+package/exclude_from_recents=false
 launcher_icons/main_192x192=""
 launcher_icons/adaptive_foreground_432x432=""
 launcher_icons/adaptive_background_432x432=""
-graphics/32_bits_framebuffer=true
 graphics/opengl_debug=false
 xr_features/xr_mode=0
-xr_features/degrees_of_freedom=0
 xr_features/hand_tracking=0
-xr_features/focus_awareness=false
+xr_features/hand_tracking_frequency=0
+xr_features/passthrough=0
 screen/immersive_mode=true
 screen/support_small=true
 screen/support_normal=true
 screen/support_large=true
 screen/support_xlarge=true
+user_data_backup/allow=false
 command_line/extra_args=""
 apk_expansion/enable=false
 apk_expansion/SALT=""
@@ -354,6 +416,7 @@ permissions/location_hardware=false
 permissions/manage_accounts=false
 permissions/manage_app_tokens=false
 permissions/manage_documents=false
+permissions/manage_external_storage=false
 permissions/master_clear=false
 permissions/media_content_control=false
 permissions/modify_audio_settings=false

gymkhana/characters/eneko/eneko_smoking.tscn

@@ -45,9 +45,11 @@ esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc"
 is_movable = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 )
-tooltips = {
+custom_data = {
-"action1": "cocina_delante_eneko_smoking_action1",
+    "tooltips": {
-"action2": "cocina_delante_eneko_smoking_action2"
+        "action1": "cocina_delante_eneko_smoking_action1",
+        "action2": "cocina_delante_eneko_smoking_action2"
+    }
 }
 action3_target_texts = {
 "caja_herramientas": "Regalar",

gymkhana/items/inventory/turno_cocina_ajo.tscn

@@ -11,10 +11,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_ajo.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Coger ajo",
+    "tooltips": {
-"action3": "Mirar",
+        "action1": "Coger ajo",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_bol.tscn

@@ -15,10 +15,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "Coger un bol",
+    "tooltips": {
-    "action3": "Mirar",
+        "action1": "Coger un bol",
-    "action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 action3_target_texts = {
 "turno_cocina_peso": "Poner el bol sobre el peso"

gymkhana/items/inventory/turno_cocina_bol_inventario.tscn

@@ -14,11 +14,13 @@ global_id = "turno_cocina_bol_inventario"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_inventario.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "¿Que es esto?",
+    "tooltips": {
-    "action2": "Coger",
+        "action1": "¿Que es esto?",
-    "action3": "Mirar dentro",
+        "action2": "Coger",
-    "action4": "Usar"
+        "action3": "Mirar dentro",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn

@@ -14,9 +14,11 @@ global_id = "turno_cocina_bol_lentejas"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action3": "Mirar",
+    "tooltips": {
-    "action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 combine_when_selected_action_is_in = [ "action4" ]
 animations = null

gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn

@@ -14,11 +14,13 @@ global_id = "turno_cocina_bol_lentejas_agua"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "¿Que es esto?",
+    "tooltips": {
-    "action2": "Coger",
+        "action1": "¿Que es esto?",
-    "action3": "Mirar dentro",
+        "action2": "Coger",
-    "action4": "Usar"
+        "action3": "Mirar dentro",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_carton.tscn

@@ -12,11 +12,13 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+    "tooltips": {
-"action2": "Coger",
+        "action1": "Mirar",
-"action3": "Mirar",
+        "action2": "Coger",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 action3_target_texts = {
 "turno_cocina_mechero": "Encender el cartón"

gymkhana/items/inventory/turno_cocina_carton_encendido.tscn

@@ -12,9 +12,11 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_carton_encendido.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action3": "Mirar",
+    "tooltips": {
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_cuchillo.tscn

@@ -12,7 +12,9 @@ combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
-tooltips = {
+custom_data = {
-  "action3": "Mirar",
+  "tooltips": {
-  "action4": "Usar",
+    "action3": "Mirar",
+    "action4": "Usar",
+  }
 }

gymkhana/items/inventory/turno_cocina_cuerno.tscn

@@ -12,11 +12,13 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc"
 combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar el cuerno",
+    "tooltips": {
-"action2": "Coger el cuerno",
+        "action1": "Mirar el cuerno",
-"action3": "Mirar",
+        "action2": "Coger el cuerno",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_frontal.tscn

@@ -14,9 +14,11 @@ global_id = "turno_cocina_frontal"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action3": "frontal_action3",
+    "tooltips": {
-    "action4": "Usar"
+        "action3": "frontal_action3",
+        "action4": "Usar"
+    }
 }
 combine_when_selected_action_is_in = [ "action4" ]
 animations = null

gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn

@@ -11,10 +11,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc"
 combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "¿Que es esto?",
+    "tooltips": {
-"action2": "Coger",
+        "action1": "¿Que es esto?",
-"action3": "Mirar dentro",
+        "action2": "Coger",
-"action4": "Usar"
+        "action3": "Mirar dentro",
+        "action4": "Usar"
+    }
 }
 animations = null

gymkhana/items/inventory/turno_cocina_madera.tscn

@@ -14,11 +14,13 @@ global_id = "turno_cocina_madera"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "cocina_delante_madera_action1",
+    "tooltips": {
-    "action2": "cocina_delante_madera_action2",
+        "action1": "cocina_delante_madera_action1",
-    "action3": "cocina_delante_madera_action3",
+        "action2": "cocina_delante_madera_action2",
-    "action4": "cocina_delante_madera_action4"
+        "action3": "cocina_delante_madera_action3",
+        "action4": "cocina_delante_madera_action4"
+    }
 }
 animations = null
 combine_when_selected_action_is_in = [ "action4" ]

gymkhana/items/inventory/turno_cocina_mechero.tscn

@@ -11,11 +11,13 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+    "tooltips": {
-"action2": "Coger",
+        "action1": "Mirar",
-"action3": "Mirar",
+        "action2": "Coger",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_olla_llena.tscn

@@ -15,10 +15,12 @@ interaction_direction = 3
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar dentro",
+    "tooltips": {
-"action3": "Mirar",
+        "action1": "Mirar dentro",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 action3_target_texts = {
 "turno_cocina_ajo": "Echar en la olla.",

gymkhana/items/inventory/turno_cocina_olla_vacia.tscn

@@ -12,11 +12,13 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+    "tooltips": {
-"action2": "Coger",
+        "action1": "Mirar",
-"action3": "Mirar",
+        "action2": "Coger",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_patata.tscn

@@ -15,9 +15,11 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_patata.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 combine_when_selected_action_is_in = [ "action4" ]
-tooltips = {
+custom_data = {
-"action3": "Contar las patatas",
+  "tooltips": {
-"action4": "Usar",
+    "action3": "Contar las patatas",
+    "action4": "Usar",
+  }
 }
 action3_target_texts = {
 "turno_cocina_cuchillo": "Pelar patatas"

gymkhana/items/inventory/turno_cocina_peso.tscn

@@ -12,11 +12,14 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+
-    "action1": "¿Que es esto?",
+custom_data = {
-    "action2": "Coger",
+    "tooltips": {
-    "action3": "Mirar",
+        "action1": "¿Que es esto?",
-    "action4": "Usar"
+        "action2": "Coger",
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 action3_target_texts = {
 "turno_cocina_bol": "Poner el bol sobre el peso"

gymkhana/items/inventory/turno_cocina_peso_bol.tscn

@@ -15,11 +15,13 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "¿Que es esto?",
+    "tooltips": {
-    "action2": "Coger",
+        "action1": "¿Que es esto?",
-    "action3": "Mirar",
+        "action2": "Coger",
-    "action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 target_when_selected_action_is_in = [ "action3" ]
 animations = null

gymkhana/items/inventory/turno_cocina_peso_inventario.tscn

@@ -14,11 +14,13 @@ global_id = "turno_cocina_peso_inventario"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_inventario.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "¿Que es esto?",
+    "tooltips": {
-    "action2": "Coger",
+        "action1": "¿Que es esto?",
-    "action3": "Mirar",
+        "action2": "Coger",
-    "action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_romero.tscn

@@ -12,10 +12,12 @@ interaction_direction = 6
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+    "tooltips": {
-"action2": "Coger",
+        "action1": "Mirar",
-"action3": "Mirar",
+        "action2": "Coger",
-"action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null

gymkhana/items/inventory/turno_cocina_salero.tscn

@@ -14,11 +14,13 @@ global_id = "turno_cocina_salero"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_salero.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "¿Que es esto?",
+    "tooltips": {
-    "action2": "Coger",
+        "action1": "¿Que es esto?",
-    "action3": "Mirar",
+        "action2": "Coger",
-    "action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 animations = null
 

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -88,8 +88,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc"
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Ir detrás"
+  "tooltips": {
+    "action1": "Ir detrás"
+  }
 }
 animations = null
 
@@ -112,8 +114,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc"
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Salir de la cocina"
+  "tooltips": {
+    "action1": "Salir de la cocina"
+  }
 }
 animations = null
 
@@ -158,9 +162,11 @@ global_id = "cocina_fregadero_der"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar fregadero",
+  "tooltips": {
-"action2": "Usar"
+    "action1": "Mirar fregadero",
+    "action2": "Usar"
+  }
 }
 action3_target_texts = {
 "turno_cocina_olla_vacia": "Llenar la olla de agua"
@@ -182,9 +188,11 @@ global_id = "cocina_fregadero_izq"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar el fregadero",
+  "tooltips": {
-"action2": "Usar"
+    "action1": "Mirar el fregadero",
+    "action2": "Usar"
+  }
 }
 action3_target_texts = {
 "turno_cocina_olla_vacia": "Llenar la olla de agua"
@@ -206,9 +214,11 @@ global_id = "cocina_cuchillos"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cuchillos.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Contar los cuchillos",
+  "tooltips": {
-"action2": "Coger un buen cuchillo"
+    "action1": "Contar los cuchillos",
+    "action2": "Coger un buen cuchillo"
+  }
 }
 animations = null
 
@@ -227,9 +237,11 @@ global_id = "cocina_debajo_sofa"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar debajo del sofa",
+  "tooltips": {
-"action2": "Meter la mano"
+    "action1": "Mirar debajo del sofa",
+    "action2": "Meter la mano"
+  }
 }
 action3_target_texts = {
 "turno_cocina_frontal": "Alumbrar debajo del sofa"
@@ -256,9 +268,11 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/patata.esc"
 combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 13 )
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Admirar la patata",
+  "tooltips": {
-"action2": "Cogerla"
+    "action1": "Admirar la patata",
+    "action2": "Cogerla"
+  }
 }
 custom_data = {
   "count_textures": [
@@ -292,9 +306,11 @@ global_id = "turno_cocina_economica"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/economica.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+  "tooltips": {
-"action2": "Usar"
+    "action1": "Mirar",
+    "action2": "Usar"
+  }
 }
 action3_target_texts = {
 "turno_cocina_carton": "Meter cartón en la económica",
@@ -317,10 +333,12 @@ script = ExtResource( 5 )
 [node name="turno_cocina_libro_de_cocina" parent="." instance=ExtResource( 14 )]
 position = Vector2( 2547, 244 )
 scale = Vector2( 1.06318, 1.06318 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+  "tooltips": {
-"action2": "Coger",
+    "action1": "Mirar",
-"action3": "Leer"
+    "action2": "Coger",
+    "action3": "Leer"
+  }
 }
 
 [node name="ESCLocation" type="Position2D" parent="turno_cocina_libro_de_cocina"]
@@ -338,9 +356,11 @@ global_id = "turno_cocina_cocina_gas"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Mirar",
+  "tooltips": {
-"action2": "Encender"
+    "action1": "Mirar",
+    "action2": "Encender"
+  }
 }
 action3_target_texts = {
 "turno_cocina_carton": "Prender el cartón",

gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn

@@ -47,8 +47,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "cocina_delante_puerta_cocina_action1"
+    "tooltips": {
+        "action1": "cocina_delante_puerta_cocina_action1"
+    }
 }
 animations = null
 
@@ -70,8 +72,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despen
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "cocina_delante_puerta_despensa_action1"
+    "tooltips": {
+        "action1": "cocina_delante_puerta_despensa_action1"
+    }
 }
 animations = null
 
@@ -93,8 +97,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "cocina_delante_puerta_detras_action1"
+    "tooltips": {
+        "action1": "cocina_delante_puerta_detras_action1"
+   }
 }
 animations = null
 
@@ -136,9 +142,11 @@ global_id = "cocina_delante_pegatinas"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/pegatinas.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "cocina_delante_pegatinas_action1",
+    "tooltips": {
-"action2": "cocina_delante_pegatinas_action2"
+        "action1": "cocina_delante_pegatinas_action1",
+        "action2": "cocina_delante_pegatinas_action2"
+    }
 }
 animations = null
 

gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn

@@ -59,8 +59,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Entrar en la cocina"
+    "tooltips": {
+        "action1": "Entrar en la cocina"
+    }
 }
 animations = null
 
@@ -82,8 +84,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante
 is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-"action1": "Ir delante"
+    "tooltips": {
+        "action1": "Ir delante"
+    }
 }
 animations = null
 

gymkhana/rooms/turno_cocina/despensa/despensa.tscn

@@ -47,8 +47,10 @@ is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
-tooltips = {
+custom_data = {
-    "action1": "Salir fuera"
+    "tooltips": {
+        "action1": "Salir fuera"
+    }
 }
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"]
@@ -75,9 +77,11 @@ global_id = "turno_cocina_despensa_cebolla_izq"
 esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "Mirar cebollas",
+    "tooltips": {
-    "action2": "Coger cebollas"
+        "action1": "Mirar cebollas",
+        "action2": "Coger cebollas"
+    }
 }
 animations = null
 
@@ -98,9 +102,11 @@ global_id = "turno_cocina_despensa_cebolla_der"
 esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_der.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "Mirar cebollas",
+    "tooltips": {
-    "action2": "Coger cebollas"
+        "action1": "Mirar cebollas",
+        "action2": "Coger cebollas"
+    }
 }
 animations = null
 
@@ -121,9 +127,11 @@ global_id = "turno_cocina_despensa_bidon_der"
 esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_der.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "Mirar dentro",
+    "tooltips": {
-    "action2": "Coger"
+        "action1": "Mirar dentro",
+        "action2": "Coger"
+    }
 }
 animations = null
 
@@ -144,9 +152,11 @@ global_id = "turno_cocina_despensa_bidon_izq"
 esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_izq.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "Mirar dentro",
+    "tooltips": {
-    "action2": "Coger"
+        "action1": "Mirar dentro",
+        "action2": "Coger"
+    }
 }
 animations = null
 
@@ -162,11 +172,13 @@ script = ExtResource( 5 )
 [node name="turno_cocina_patata_grande" parent="." instance=ExtResource( 7 )]
 position = Vector2( 440, 161 )
 scale = Vector2( 0.880435, 0.88735 )
-tooltips = {
+custom_data = {
-    "action1": "Mirar",
+    "tooltips": {
-    "action2": "Rascar por el fondo",
+        "action1": "Mirar",
-    "action3": "Mirar",
+        "action2": "Rascar por el fondo",
-    "action4": "Usar"
+        "action3": "Mirar",
+        "action4": "Usar"
+    }
 }
 
 [node name="ESCLocation2" type="Position2D" parent="turno_cocina_patata_grande"]
@@ -190,9 +202,11 @@ global_id = "turno_cocina_despensa_bidon_cntr"
 esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
+custom_data = {
-    "action1": "Mirar dentro",
+    "tooltips": {
-    "action2": "Coger"
+        "action1": "Mirar dentro",
+        "action2": "Coger"
+    }
 }
 action3_target_texts = {
 "turno_cocina_bol": "Coger lentejas a ojo",

project.godot

@@ -479,6 +479,11 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://addons/escoria-core/game/core-scripts/esc_tooltip.gd"
 }, {
+"base": "Resource",
+"class": "ESCTootltipManager",
+"language": "GDScript",
+"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_tooltip_manager.gd"
+}, {
 "base": "ColorRect",
 "class": "ESCTransitionPlayer",
 "language": "GDScript",
@@ -856,7 +861,7 @@ _global_script_class_icons={
 "ESCObject": "",
 "ESCObjectManager": "",
 "ESCPlayer": "res://addons/escoria-core/design/esc_player.svg",
-"ESCPlayerWithTooltip": "res://addons/escoria-core/design/esc_player.svg",
+"ESCPlayerWithTooltip": "",
 "ESCProjectSettingsManager": "",
 "ESCResourceCache": "",
 "ESCResourceDescriptor": "",
@@ -879,6 +884,7 @@ _global_script_class_icons={
 "ESCStatement": "",
 "ESCTerrain": "res://addons/escoria-core/design/esc_terrain.svg",
 "ESCTooltip": "",
+"ESCTootltipManager": "",
 "ESCTransitionPlayer": "",
 "ESCUtils": "",
 "ESCWalkContext": "",
@@ -891,7 +897,7 @@ _global_script_class_icons={
 "InventoryAddCommand": "",
 "InventoryRemoveCommand": "",
 "ItemCountAddCommand": "",
-"ItemOutline": "",
+"ItemOutline": "res://addons/escoria-core/design/esc_item.svg",
 "PlayLibSound": "",
 "PlaySndCommand": "",
 "PlayVideoCommand": "",
@@ -960,6 +966,7 @@ default_bus_layout="res://addons/escoria-core/default_bus_layout.tres"
 [autoload]
 
 escoria="*res://addons/escoria-core/game/esc_autoload.gd"
+gymkhana="*res://addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd"
 
 [display]
 
@@ -975,7 +982,6 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
 [editor_plugins]
 
 enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" )
-<<<<<<<HEADenabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" )
 
 [escoria]