Picked observer, global observer

2025-09-14 04:44:12 +02:00
parent 5e1d88c333
commit f41fc361b8
28 changed files with 183 additions and 103 deletions
--- a/addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd
+++ b/addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd
@@ -4,6 +4,8 @@ var item_count_manager: ESCItemCountManager

 var tooltip_manager: ESCTootltipManager

+var global_observer: RTMIGlobalObserver
+
 var cursor_manager: RTMICursorManager = RTMICursorManager.new()

 var csv_parser: RTMICsvParser = RTMICsvParser.new()
--- a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd
+++ b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd
@@ -42,7 +42,6 @@ func register_components():

 func autoload_components():
 	add_child(ESCItemComponentOutline.new())
-	add_child(ESCItemComponentInventoryChecker.new())


 func set_custom_data(data: Dictionary) -> void:
--- a/addons/escoria-ui-return-monkey-island/game.gd
+++ b/addons/escoria-ui-return-monkey-island/game.gd
@@ -86,8 +86,9 @@ var last_target: Object
@export var dev_tools_node: Control

 func _init():
-	gymkhana.tooltip_manager = ESCTootltipManager.new()
 	gymkhana.item_count_manager = ESCItemCountManager.new()
+	gymkhana.tooltip_manager = ESCTootltipManager.new()
+	gymkhana.global_observer = RTMIGlobalObserver.new()
 	escoria.di = RTMIDependencyInjector.new()

 func _ready():
--- a/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd
+++ b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd
@@ -37,4 +37,4 @@ func _process(delta: float) -> void:
 		get_parent().visible = output_value
 	
 	elif targeted_property == TargetProperty.interactive:
-		escoria.object_manager.get_object(get_global_id()).active = output_value
+		escoria.object_manager.get_object(get_global_id()).interactive = output_value
--- a/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd
+++ b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd
@@ -0,0 +1,25 @@
+extends ESCItemComponent
+class_name ESCItemComponentPickedObserver
+
+
+
+func get_component_type():
+	return "picked-observer"
+
+	
+
+func _process(delta: float) -> void:
+	if "globals_manager" not in escoria:
+		return
+
+	var object = escoria.object_manager.get_object(get_global_id())
+	if object == null:
+		return
+
+	var is_picked = escoria.globals_manager.get_global(get_global_id() + RTMIGlobalObserver.PICKED_SUFFIX )
+	if is_picked == null or !is_picked:
+		return
+
+	escoria.object_manager.get_object(get_global_id()).active = false
+
+	
--- a/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd.uid
+++ b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd.uid
@@ -0,0 +1 @@
+uid://cde2xhhd2twx4
--- a/addons/escoria-ui-return-monkey-island/rtmi_global_observer.gd
+++ b/addons/escoria-ui-return-monkey-island/rtmi_global_observer.gd
@@ -0,0 +1,21 @@
+extends Resource
+class_name RTMIGlobalObserver
+
+const PICKED_SUFFIX = "_picked"
+
+func _init() -> void:
+	escoria.globals_manager.global_changed.connect(_on_escoria_global_changed)
+
+
+func _on_escoria_global_changed(global: String, old_value, new_value) -> void:
+	if !global.begins_with("i/"):
+		return
+	
+	var item = global.rsplit("i/", false)
+	
+	if item.size() != 1:
+		return
+	if !new_value:
+		return
+	
+	escoria.globals_manager.set_global("%s%s" % [item.get(0),PICKED_SUFFIX], true)
--- a/addons/escoria-ui-return-monkey-island/rtmi_global_observer.gd.uid
+++ b/addons/escoria-ui-return-monkey-island/rtmi_global_observer.gd.uid
@@ -0,0 +1 @@
+uid://codbrh1h68q0c
--- a/gymkhana/characters/eneko/eneko_smoking.esc
+++ b/gymkhana/characters/eneko/eneko_smoking.esc
@@ -1,3 +1,15 @@
+:init
+	global turno_cocina_ingrediente_lentejas
+	global turno_cocina_tutorial_done
+	global zorionak_eneko
+	global cocina_delante_catando
+	global turno_cocina_ingrediente_ajo_cogido
+	global turno_cocina_frontal_debajo_sofa
+	global turno_cocina_economica_encendida
+	global turno_cocina_frontal_entregado
+	global turno_cocina_eneko_cata_ok
+	global turno_cocina_ajo_picked
+
 :ready
 	global turno_cocina_ingrediente_lentejas
 	global turno_cocina_tutorial_done
@@ -8,6 +20,7 @@
 	global turno_cocina_economica_encendida
 	global turno_cocina_frontal_entregado
 	global turno_cocina_eneko_cata_ok
+	global turno_cocina_ajo_picked

 :action1
 	say($player, "Tiene pinta de que fuma", "cocina_delante_eneko_smoking_action1_say")
@@ -129,7 +142,7 @@
 	var cocina_delante_dialog_option4_done = false
 	var cocina_delante_dialog_option5_done = false
 	var cocina_delante_dialog_option6_done = false
-	global turno_cocina_ingrediente_ajo_cogido
+	#global turno_cocina_ingrediente_ajo_cogido

 	?!
 		- "cocina_delante_intro_dialog_catar:Ya he hecho las lentejas!" [turno_cocina_ingrediente_lentejas]
@@ -137,8 +150,8 @@
 			play_video("res://gymkhana/videos/turno_cocina/eneko_entra_cocina.ogv")
 			set_global("cocina_delante_catando", true)
 			set_active($eneko_smoking, false)
-			if !turno_cocina_ingrediente_ajo_cogido:
-				set_active($turno_cocina_ajo, true)
+			#if !turno_cocina_ajo_picked:
+			set_active($turno_cocina_ajo, true)
 			set_active($cocina_delante_puerta_cocina, false)
 			set_active($cocina_delante_puerta_despensa, false)
 			set_active($cocina_delante_puerta_detras, false)
--- a/gymkhana/items/inventory/turno_cocina_ajo.tscn
+++ b/gymkhana/items/inventory/turno_cocina_ajo.tscn
@@ -1,18 +1,17 @@
-[gd_scene load_steps=3 format=3 uid="uid://84h4l81cuwdv"]
+[gd_scene load_steps=4 format=3 uid="uid://84h4l81cuwdv"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://cueb8gkqhbads" path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" id="2"]
-[ext_resource type="Script" uid="uid://bh55kesnba2x4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd" id="6_fo2yn"]
-
+[ext_resource type="Texture2D" uid="uid://c47biotravims" path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" id="2"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="3_snubi"]

 [node name="turno_cocina_ajo" type="Area2D"]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_ajo"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_ajo.esc"
-combine_when_selected_action_is_in = ["action4"]
+combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("2")
-dialog_color = Color(1, 1, 1, 1)
+inventory_texture_hovered = ExtResource("2")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_turno_cocina_ajo_action1",
@@ -20,7 +19,6 @@ custom_data = {
 "action4": "tooltip_common_use"
 }
 }
-animations = null

 [node name="Sprite2D" type="Sprite2D" parent="."]
 scale = Vector2(0.101548, 0.101548)
@@ -29,8 +27,6 @@ texture = ExtResource("2")
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
 polygon = PackedVector2Array(-7, -6, 7, -6, 7, 6, -7, 6)

-[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="."]
-script = ExtResource("6_fo2yn")
-targeted_global_variable = "turno_cocina_ingrediente_ajo_cogido"
-inverted = true
-metadata/_custom_type_script = "uid://bh55kesnba2x4"
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("3_snubi")
+metadata/_custom_type_script = "uid://cde2xhhd2twx4"
--- a/gymkhana/items/inventory/turno_cocina_bol.tscn
+++ b/gymkhana/items/inventory/turno_cocina_bol.tscn
@@ -1,16 +1,21 @@
-[gd_scene load_steps=3 format=3 uid="uid://cpeqaymxabewi"]
+[gd_scene load_steps=4 format=3 uid="uid://cpeqaymxabewi"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://nktfki1vvj7h" path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://276uevmvuuhp" path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" id="2"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="3_g5aye"]

 [node name="turno_cocina_bol" type="Area2D"]
 process_mode = 1
 script = ExtResource("1")
+action3_target_texts = {
+"turno_cocina_peso": "tooltip_turno_cocina_bol_action3_turno_cocina_peso"
+}
+target_when_selected_action_is_in = ["action3"]
 global_id = "turno_cocina_bol"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc"
-combine_when_selected_action_is_in = ["action4"]
+combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("2")
-dialog_color = Color(1, 1, 1, 1)
+inventory_texture_hovered = ExtResource("2")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_turno_cocina_bol_action1",
@@ -18,8 +23,6 @@ custom_data = {
 "action4": "tooltip_common_use"
 }
 }
-action3_target_texts = {
-"turno_cocina_peso": "tooltip_turno_cocina_bol_action3_turno_cocina_peso"
-}
-target_when_selected_action_is_in = ["action3"]
-animations = null
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("3_g5aye")
--- a/gymkhana/items/inventory/turno_cocina_carton.esc
+++ b/gymkhana/items/inventory/turno_cocina_carton.esc
@@ -3,7 +3,6 @@

 :action2
 	say($player, "Cartón pa la saca!", "cocina_delante_carton_action2_say")
-	set_active($turno_cocina_carton, false)
 	inventory_add($turno_cocina_carton)

 :action3
--- a/gymkhana/items/inventory/turno_cocina_carton.tscn
+++ b/gymkhana/items/inventory/turno_cocina_carton.tscn
@@ -1,17 +1,22 @@
-[gd_scene load_steps=4 format=3 uid="uid://dyejne0ibag68"]
+[gd_scene load_steps=5 format=3 uid="uid://dyejne0ibag68"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://qkq00po4xvto" path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" id="2"]
-[ext_resource type="Texture2D" uid="uid://dfxjkbugt0jld" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://cpqta35jfbrd3" path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://cw3t327fk3bcg" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" id="3"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="4_2tvrr"]

 [node name="turno_cocina_carton" type="Area2D"]
 process_mode = 1
 script = ExtResource("1")
+action3_target_texts = {
+"turno_cocina_mechero": "tooltip_turno_cocina_carton_action3_turno_cocina_mechero"
+}
+target_when_selected_action_is_in = ["action3"]
 global_id = "turno_cocina_carton"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc"
-combine_when_selected_action_is_in = ["action4"]
+combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("3")
-dialog_color = Color(1, 1, 1, 1)
+inventory_texture_hovered = ExtResource("3")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -20,14 +25,12 @@ custom_data = {
 "action4": "tooltip_common_use"
 }
 }
-action3_target_texts = {
-"turno_cocina_mechero": "tooltip_turno_cocina_carton_action3_turno_cocina_mechero"
-}
-target_when_selected_action_is_in = ["action3"]
-animations = null

 [node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("2")

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
 polygon = PackedVector2Array(-23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17)
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("4_2tvrr")
--- a/gymkhana/items/inventory/turno_cocina_cuchillo.esc
+++ b/gymkhana/items/inventory/turno_cocina_cuchillo.esc
@@ -3,4 +3,4 @@

 :action3 "cocina_cuchillos"
 	say($player, "El cuchillo a su sitio!", "cocina_cuchillos_action3_cuchillo_say")
-	inventory_remove($turno_cocina_cuchillo)
+	inventory_remove("turno_cocina_cuchillo")
--- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn
+++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn
@@ -1,16 +1,17 @@
-[gd_scene load_steps=3 format=3 uid="uid://bnf0ylqtnajms"]
+[gd_scene load_steps=4 format=3 uid="uid://bnf0ylqtnajms"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://7hcp3g8e17po" path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://yisdxay77l1j" path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" id="2"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="3_ndiib"]

 [node name="turno_cocina_libro_de_cocina" type="Area2D"]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_libro_de_cocina"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc"
-combine_when_selected_action_is_in = []
+combine_when_selected_action_is_in = PackedStringArray()
 inventory_texture = ExtResource("2")
-dialog_color = Color(1, 1, 1, 1)
+inventory_texture_hovered = ExtResource("2")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -18,4 +19,7 @@ custom_data = {
 "action3": "tooltip_turno_cocina_libro_de_cocina_action3"
 }
 }
-animations = null
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("3_ndiib")
+metadata/_custom_type_script = "uid://cde2xhhd2twx4"
--- a/gymkhana/items/inventory/turno_cocina_madera.esc
+++ b/gymkhana/items/inventory/turno_cocina_madera.esc
@@ -4,7 +4,6 @@
 :action2
 	say($player, "cocina_delante_madera_action2_say", "Con esto podré hacer un buen fuego.")
 	inventory_add("turno_cocina_madera")
-	set_active("turno_cocina_madera", false)

 :action3
 	say($player, "cocina_delante_madera_action3_say", "Es leña de pino, esto tiene que dejar los tubos bien sucios.")
--- a/gymkhana/items/inventory/turno_cocina_madera.tscn
+++ b/gymkhana/items/inventory/turno_cocina_madera.tscn
@@ -1,15 +1,17 @@
-[gd_scene load_steps=3 format=3 uid="uid://cbsyjat8xvwfx"]
+[gd_scene load_steps=4 format=3 uid="uid://cbsyjat8xvwfx"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://bmivmrciqatkc" path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://b580c3swhl2q3" path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" id="2"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="3_3vrak"]

 [node name="turno_cocina_madera" type="Area2D"]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_madera"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc"
+combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("2")
-dialog_color = Color(1, 1, 1, 1)
+inventory_texture_hovered = ExtResource("2")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_cocina_delante_madera_action1",
@@ -18,5 +20,6 @@ custom_data = {
 "action4": "tooltip_common_use"
 }
 }
-animations = null
-combine_when_selected_action_is_in = ["action4"]
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("3_3vrak")
--- a/gymkhana/items/inventory/turno_cocina_mechero.esc
+++ b/gymkhana/items/inventory/turno_cocina_mechero.esc
@@ -4,7 +4,6 @@

 :action2
 	say_to_camera($player, "A la saca!", "mechero_action2_say")
-	set_active($turno_cocina_mechero, false)
 	inventory_add("turno_cocina_mechero")

 :action3
--- a/gymkhana/items/inventory/turno_cocina_mechero.tscn
+++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn
@@ -1,16 +1,17 @@
-[gd_scene load_steps=3 format=3 uid="uid://bxjtxquhseqdp"]
+[gd_scene load_steps=4 format=3 uid="uid://bxjtxquhseqdp"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://p48fq13qx3d5" path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://7jfdrbqf2a0h" path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" id="2"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="3_fiv88"]

 [node name="turno_cocina_mechero" type="Area2D"]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_mechero"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc"
-combine_when_selected_action_is_in = ["action4"]
+combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("2")
-dialog_color = Color(1, 1, 1, 1)
+inventory_texture_hovered = ExtResource("2")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -19,7 +20,6 @@ custom_data = {
 "action4": "tooltip_common_use"
 }
 }
-animations = null

 [node name="Sprite2D" type="Sprite2D" parent="."]
 position = Vector2(-2, 0)
@@ -28,3 +28,6 @@ texture = ExtResource("2")

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
 polygon = PackedVector2Array(-15, -29, 3, -33, 10, 30, -3, 32)
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("3_fiv88")
--- a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
+++ b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
@@ -40,7 +40,13 @@ polygon = PackedVector2Array(-59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13,
 [node name="SmokeParticles" parent="." instance=ExtResource("4")]
 script = ExtResource("5")

-[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="."]
+[node name="ESCItemComponentGlobalBooleanObserverVisible" type="Node" parent="."]
+script = ExtResource("6_fo2yn")
+targeted_global_variable = "turno_cocina_economica_con_olla"
+targeted_property = 1
+metadata/_custom_type_script = "uid://bh55kesnba2x4"
+
+[node name="ESCItemComponentGlobalBooleanObserverActive" type="Node" parent="."]
 script = ExtResource("6_fo2yn")
 targeted_global_variable = "turno_cocina_economica_con_olla"
 metadata/_custom_type_script = "uid://bh55kesnba2x4"
--- a/gymkhana/items/inventory/turno_cocina_olla_vacia.esc
+++ b/gymkhana/items/inventory/turno_cocina_olla_vacia.esc
@@ -3,7 +3,6 @@

 :action2
 	say($current_player, "Podria ser útil!!", "olla_vacia_action1")
-	set_active($turno_cocina_olla_vacia, false)
 	inventory_add("turno_cocina_olla_vacia")

 :action3
--- a/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn
+++ b/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://dgucic2086suo"]
+[gd_scene load_steps=5 format=3 uid="uid://dgucic2086suo"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://brjb1fkbo0so" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://bhdcferfexcgb" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="4_v2esb"]

 [node name="turno_cocina_olla_vacia" type="Area2D"]
 process_mode = 1
@@ -18,6 +19,7 @@ global_id = "turno_cocina_olla_vacia"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc"
 combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("2")
+inventory_texture_hovered = ExtResource("2")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -32,3 +34,6 @@ texture = ExtResource("3")

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
 polygon = PackedVector2Array(-59, 41, -59, -44, -63, -48, -62, -52, -59, -54, -49, -58, -34, -60, -16, -62, 1, -61, 21, -60, 44, -57, 57, -53, 61, -47, 58, -41, 56, -29, 62, -29, 64, -27, 58, -25, 56, -21, 53, 33, 50, 44, 44, 52, 33, 55, 12, 59, -12, 59, -40, 56, -54, 50)
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("4_v2esb")
--- a/gymkhana/items/inventory/turno_cocina_peso.tscn
+++ b/gymkhana/items/inventory/turno_cocina_peso.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://cwlq5pqwktbul"]
+[gd_scene load_steps=5 format=3 uid="uid://cwlq5pqwktbul"]

 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://dtxqb3363mlxa" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://bk7lml882oihk" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="3"]
+[ext_resource type="Script" uid="uid://cde2xhhd2twx4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentPickedObserver.gd" id="4_66neb"]

 [node name="turno_cocina_peso" type="Area2D"]
 process_mode = 1
@@ -15,6 +16,7 @@ global_id = "turno_cocina_peso"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc"
 combine_when_selected_action_is_in = PackedStringArray("action4")
 inventory_texture = ExtResource("3")
+inventory_texture_hovered = ExtResource("3")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_whats_this",
@@ -28,3 +30,6 @@ custom_data = {
 rotation = -0.0698132
 scale = Vector2(0.18, 0.18)
 texture = ExtResource("2")
+
+[node name="ESCItemComponentPickedObserver" type="Node" parent="."]
+script = ExtResource("4_66neb")
--- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=34 format=3 uid="uid://dowbdjo7ka0sq"]
+[gd_scene load_steps=32 format=3 uid="uid://dowbdjo7ka0sq"]

 [ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"]
@@ -11,10 +11,8 @@
 [ext_resource type="Texture2D" uid="uid://p7ou513681ag" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"]
 [ext_resource type="PackedScene" uid="uid://cwlq5pqwktbul" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"]
 [ext_resource type="PackedScene" uid="uid://cpeqaymxabewi" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"]
-[ext_resource type="Texture2D" uid="uid://bk7lml882oihk" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="11_fji2i"]
 [ext_resource type="PackedScene" uid="uid://d1ust40cvfjtw" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"]
 [ext_resource type="Texture2D" uid="uid://b8obukr30qnmd" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="13"]
-[ext_resource type="Texture2D" uid="uid://276uevmvuuhp" path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" id="13_wnoqk"]
 [ext_resource type="PackedScene" uid="uid://bnf0ylqtnajms" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"]
 [ext_resource type="Texture2D" uid="uid://xv1xya2lcavx" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" id="15"]
 [ext_resource type="Script" uid="uid://bh55kesnba2x4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd" id="15_fji2i"]
@@ -146,7 +144,6 @@ global_id = "puerta_delante_start"
 [node name="turno_cocina_peso" parent="." instance=ExtResource("10")]
 position = Vector2(2505, 160)
 scale = Vector2(0.880435, 0.88735)
-inventory_texture_hovered = ExtResource("11_fji2i")

 [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
 position = Vector2(15.9014, -11.2695)
@@ -159,8 +156,6 @@ script = ExtResource("5")
 [node name="turno_cocina_bol" parent="." instance=ExtResource("11")]
 position = Vector2(1505, 160)
 scale = Vector2(0.880435, 0.88735)
-combine_when_selected_action_is_in = PackedStringArray("action4")
-inventory_texture_hovered = ExtResource("13_wnoqk")

 [node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"]
 position = Vector2(169.235, 210.74)
@@ -176,7 +171,6 @@ scale = Vector2(0.880435, 0.88735)
 global_id = "cocina_pan"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/pan.esc"
 combine_when_selected_action_is_in = PackedStringArray()
-inventory_texture_hovered = ExtResource("13_wnoqk")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -292,6 +286,12 @@ polygon = PackedVector2Array(466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 5
 position = Vector2(420, 494)
 script = ExtResource("5")

+[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="debajo_sofa"]
+script = ExtResource("15_fji2i")
+targeted_global_variable = "cocina_debajo_sofa_picked"
+inverted = true
+metadata/_custom_type_script = "uid://bh55kesnba2x4"
+
 [node name="cocina_patata" type="Area2D" parent="."]
 process_mode = 1
 z_index = 1001
@@ -412,7 +412,6 @@ position = Vector2(-56, 78)
 script = ExtResource("5")

 [node name="turno_cocina_olla_llena" parent="." instance=ExtResource("12")]
-visible = false
 position = Vector2(1281, 491)
 scale = Vector2(1.06318, 1.06318)

@@ -422,7 +421,6 @@ script = ExtResource("5")

 [node name="turno_cocina_cuerno" parent="." instance=ExtResource("20")]
 position = Vector2(2801, 175)
-combine_when_selected_action_is_in = PackedStringArray()
 inventory_texture_hovered = ExtResource("23_fji2i")

 [node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno"]
--- a/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc
@@ -17,7 +17,6 @@
 				say($player, "La patata gigante no cuenta, es demasiado grande.", "cocina_debajo_sofa_action2_say_frontal_used_patata_grande_in_inventory")
 		inventory_add("turno_cocina_patata")
 		item_count_add("turno_cocina_patata")
-		set_active($cocina_debajo_sofa, false)
 		cocina_debajo_sofa_picked = true
 	else:
 		say($player, "No pienso meter la mano está muy oscuro.", "cocina_debajo_sofa_action2_say")
--- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://dwvu5kn7qr35s"]
+[gd_scene load_steps=15 format=3 uid="uid://dwvu5kn7qr35s"]

 [ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"]
@@ -13,9 +13,6 @@
 [ext_resource type="PackedScene" uid="uid://cbsyjat8xvwfx" path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" id="10"]
 [ext_resource type="PackedScene" uid="uid://84h4l81cuwdv" path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" id="11"]
 [ext_resource type="PackedScene" uid="uid://dyejne0ibag68" path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" id="12"]
-[ext_resource type="Texture2D" uid="uid://b580c3swhl2q3" path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" id="12_us6ip"]
-[ext_resource type="Texture2D" uid="uid://c47biotravims" path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" id="14_ref2y"]
-[ext_resource type="Texture2D" uid="uid://cw3t327fk3bcg" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" id="16_dqfmc"]

 [sub_resource type="NavigationPolygon" id="1"]
 vertices = PackedVector2Array(-768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166)
@@ -157,8 +154,6 @@ script = ExtResource("5")
 [node name="turno_cocina_madera" parent="." instance=ExtResource("10")]
 position = Vector2(1505, 160)
 scale = Vector2(0.880435, 0.88735)
-combine_when_selected_action_is_in = PackedStringArray("action4")
-inventory_texture_hovered = ExtResource("12_us6ip")

 [node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"]
 position = Vector2(396.395, 87.9022)
@@ -170,8 +165,6 @@ script = ExtResource("5")

 [node name="turno_cocina_ajo" parent="." instance=ExtResource("11")]
 position = Vector2(858, 399)
-combine_when_selected_action_is_in = PackedStringArray("action4")
-inventory_texture_hovered = ExtResource("14_ref2y")

 [node name="ESCLocation" type="Marker2D" parent="turno_cocina_ajo"]
 position = Vector2(-21, 91)
@@ -179,8 +172,6 @@ script = ExtResource("5")

 [node name="turno_cocina_carton" parent="." instance=ExtResource("12")]
 position = Vector2(1221, 423)
-combine_when_selected_action_is_in = PackedStringArray("action4")
-inventory_texture_hovered = ExtResource("16_dqfmc")

 [node name="ESCLocation" type="Marker2D" parent="turno_cocina_carton"]
 position = Vector2(-52, 34)
--- a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn
+++ b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn
@@ -1,13 +1,15 @@
-[gd_scene load_steps=10 format=3 uid="uid://nwfqcmgsuh8w"]
+[gd_scene load_steps=12 format=3 uid="uid://nwfqcmgsuh8w"]

 [ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"]
-[ext_resource type="Texture2D" uid="uid://blmv2ddwts1il" path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://dsu0dsn7ykt84" path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" id="3"]
 [ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"]
 [ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"]
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"]
 [ext_resource type="PackedScene" uid="uid://b3owsy6kidijt" path="res://gymkhana/items/inventory/turno_cocina_patata_grande.tscn" id="7"]
-[ext_resource type="Texture2D" uid="uid://bjt7tlgobhgo1" path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" id="8"]
+[ext_resource type="Texture2D" uid="uid://p3tb2n6jljfp" path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" id="8"]
+[ext_resource type="Texture2D" uid="uid://bj6ii0ic1xyce" path="res://gymkhana/items/inventory/assets/turno_cocina_patata_grande.png" id="8_m2e5b"]
+[ext_resource type="Script" uid="uid://bh55kesnba2x4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd" id="10_i2nyn"]

 [sub_resource type="NavigationPolygon" id="60"]
 vertices = PackedVector2Array(1137, 615, 1143, 660, 501, 666, 503, 650, 837, 624, 597, 610, 503, 628)
@@ -26,7 +28,7 @@ editor_debug_mode = 1
 position = Vector2(636, 289.125)
 texture = ExtResource("3")

-[node name="ESCTerrain" type="Navigation2D" parent="."]
+[node name="ESCTerrain" type="Node2D" parent="."]
 position = Vector2(206, -4)
 script = ExtResource("4")
 scale_min = 1.0
@@ -43,14 +45,13 @@ position = Vector2(863, 175)
 script = ExtResource("6")
 global_id = "turno_cocina_despensa_puerta_exterior"
 esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc"
+combine_when_selected_action_is_in = PackedStringArray()
 is_exit = true
-combine_when_selected_action_is_in = []
 custom_data = {
 "tooltips": {
 "action1": "tooltip_despensa_puerta_exterior"
 }
 }
-animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"]
 position = Vector2(161.721, -721)
@@ -74,14 +75,13 @@ position = Vector2(452, 192)
 script = ExtResource("6")
 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 = []
+combine_when_selected_action_is_in = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_turno_cocina_despensa_cebolla_action1",
 "action2": "tooltip_turno_cocina_despensa_cebolla_action2"
 }
 }
-animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla izq"]
 position = Vector2(60.6594, -46.582)
@@ -98,14 +98,13 @@ position = Vector2(941, 385)
 script = ExtResource("6")
 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 = []
+combine_when_selected_action_is_in = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_turno_cocina_despensa_cebolla_action1",
 "action2": "tooltip_turno_cocina_despensa_cebolla_action2"
 }
 }
-animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla der"]
 position = Vector2(-305.617, -238.789)
@@ -122,14 +121,13 @@ position = Vector2(941, 385)
 script = ExtResource("6")
 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 = []
+combine_when_selected_action_is_in = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look_inside",
 "action2": "tooltip_common_pick"
 }
 }
-animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_der"]
 position = Vector2(-129, 84)
@@ -146,14 +144,13 @@ position = Vector2(941, 385)
 script = ExtResource("6")
 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 = []
+combine_when_selected_action_is_in = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look_inside",
 "action2": "tooltip_common_look_pick"
 }
 }
-animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_izq"]
 position = Vector2(-300, 61)
@@ -167,6 +164,8 @@ script = ExtResource("5")
 [node name="turno_cocina_patata_grande" parent="." instance=ExtResource("7")]
 position = Vector2(440, 161)
 scale = Vector2(0.880435, 0.88735)
+combine_when_selected_action_is_in = PackedStringArray()
+inventory_texture_hovered = ExtResource("8_m2e5b")
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -184,30 +183,29 @@ script = ExtResource("5")
 polygon = PackedVector2Array(21.5802, 76.6327, 32.9383, 42.8241, 37.4815, 21.4121, 37.4815, -25.9199, 36.3457, -61.9823, -39.7531, -63.1093, -42.0247, 80.0135)

 [node name="foreground" type="Sprite2D" parent="."]
+z_index = 4096
 position = Vector2(304, 351)
 scale = Vector2(0.994367, 0.994367)
-z_index = 4096
 texture = ExtResource("8")

 [node name="bidon_cntr" type="Area2D" parent="."]
 process_mode = 1
 position = Vector2(941, 385)
 script = ExtResource("6")
+action3_target_texts = {
+"turno_cocina_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_bol",
+"turno_cocina_peso_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_peso_bol"
+}
+target_when_selected_action_is_in = ["action3"]
 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 = []
+combine_when_selected_action_is_in = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look_inside",
 "action2": "tooltip_common_pick"
 }
 }
-action3_target_texts = {
-"turno_cocina_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_bol",
-"turno_cocina_peso_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_peso_bol"
-}
-target_when_selected_action_is_in = ["action3"]
-animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_cntr"]
 position = Vector2(-245, 95)
@@ -217,3 +215,9 @@ polygon = PackedVector2Array(-39.2573, 118.226, -23.3422, 117.032, 63.6605, 118.
 [node name="ESCLocation" type="Marker2D" parent="bidon_cntr"]
 position = Vector2(-189, 372)
 script = ExtResource("5")
+
+[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="bidon_cntr"]
+script = ExtResource("10_i2nyn")
+targeted_global_variable = "turno_cocina_bol_lentejas_picked"
+inverted = true
+metadata/_custom_type_script = "uid://bh55kesnba2x4"
--- a/gymkhana/start_game.esc
+++ b/gymkhana/start_game.esc
@@ -21,6 +21,7 @@
 	set_global("turno_cocina_tutorial_done", false)
 	set_global("turno_cocina_eneko_cata_ok", false)
 	set_global("turno_cocina_hint_romero", false)
-	set_global("turno_cocina_ingrediente_ajo_cogido", false)
+	#set_global("turno_cocina_ingrediente_ajo_cogido", false)
+
 	# Starting scene
 	change_scene("res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn")