UNDO CHANGES IN escoria-core

addons/escoria-core/game/assets/images/no_image.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/no_image.png-7e4632ad2d21010b279ddaa4725bacb7.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/escoria-core/game/assets/images/no_image.png"
+dest_files=[ "res://.import/no_image.png-7e4632ad2d21010b279ddaa4725bacb7.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

addons/escoria-core/game/core-scripts/esc_game.gd

@@ -38,12 +38,9 @@ export(EDITOR_GAME_DEBUG_DISPLAY) var editor_debug_mode = \
 # This should be a Control node and NOT a CanvasLayer (or any other type of) node.
 export(NodePath) var ui_parent_control_node
 
-# A reference to the node handling tooltip1
+# A reference to the node handling tooltips
 var tooltip_node: Object
 
-# A reference to the node handling tooltip2
-var tooltip2_node: Object
-
 # Boolean indicating whether the game scene is ready to accept inputs
 # from the player. This enables using escoria.is_ready_for_inputs() in _input()
 # function of game.gd script.

addons/escoria-core/game/core-scripts/esc_item.gd

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

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

@@ -70,6 +70,8 @@ var _is_gamepad_connected = false
 # Tracks the mouse's current position onscreen.
 var _current_mouse_pos = Vector2.ZERO
 
+# A reference to the node handling tooltip2
+var tooltip2_node: Object
 
 func _ready():
 	$tooltip_layer/tooltip.connect("tooltip_size_updated", self, "update_tooltip_following_mouse_position")
@@ -306,6 +308,7 @@ func inventory_item_focused(inventory_item_global_id: String) -> void:
 
 func inventory_item_unfocused() -> void:
 	$tooltip_layer/tooltip.set_target("")
+	$tooltip_layer/tooltip2.set_target("")
 
 
 func open_inventory():
@@ -439,6 +442,7 @@ func _on_event_done(_return_code: int, _event_name: String):
 		escoria.action_manager.clear_current_action()
 		$mouse_layer/verbs_menu.clear_tool_texture()
 		$tooltip_layer/tooltip.set_target("")
+		$tooltip_layer/tooltip2.set_target("")
 
 
 func _on_MenuButton_pressed() -> void:

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

@@ -0,0 +1,4 @@
+extends ESCItem
+
+# The text for the tooltip of action2
+export(String) var tooltip2_name

gymkhana/rooms/home/room01.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
 [ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://gymkhana/characters/mark/mark.tscn" type="PackedScene" id=4]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/item.gd" type="Script" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=7]
 [ext_resource path="res://gymkhana/rooms/home/room1background.png" type="Texture" id=8]