Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

2023-10-31 22:18:06 +01:00
parent 68f68357a6 923a40c8f1
commit 05cf4407ee
22 changed files with 260 additions and 63 deletions
--- a/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd
@@ -323,3 +323,30 @@ func _check_item_needs_combine_obj(obj: ESCObject) -> bool:
 			and (current_action in current_tool.node.combine_when_selected_action_is_in
 	# MODIFIED FOR RETURN TO MONKEY UI
 			or current_action in  obj.node.target_when_selected_action_is_in)
+
+
+func has_actions(current_target_object):
+	if(current_target_object == null):
+		return
+
+	var item_in_inventory = escoria.inventory_manager.inventory_has(current_target_object.global_id)
+	var waiting_for_target_item = escoria.action_manager.action_state == ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+
+	var action1_text = get_action_target_text(current_target_object.action3_target_texts) if waiting_for_target_item else get_tooltip_from_current_target("action3",current_target_object) if item_in_inventory else get_tooltip_from_current_target("action1",current_target_object)
+	if(action1_text != ""):
+		return true
+		
+	var action2_text = get_action_target_text(current_target_object.action4_target_texts) if waiting_for_target_item else get_tooltip_from_current_target("action4",current_target_object) if item_in_inventory else get_tooltip_from_current_target("action2",current_target_object)
+	if(action2_text != ""):
+			return true
+	return false
+
+func get_tooltip_from_current_target(verb,current_target_object):
+	var tooltips = current_target_object.get('tooltips')
+	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 ""
+
--- a/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd
@@ -164,7 +164,6 @@ func update_tooltip_text():
 		
 	$tooltip1/label.text = action1_text
 	$tooltip1.visible = !hidden and action1_text != "";
-
 	$tooltip2/label.text = action2_text
 	$tooltip2.visible = !hidden and action2_text != "";
 	
--- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
@@ -252,11 +252,14 @@ func element_focused(element_id: String) -> void:
 	if target_obj is ESCItem or ESCItemWithTooltip:
 		$tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
 		$tooltip_layer/tooltip.set_target_object(target_obj)
-		target_obj.get_component('outline').highlight(true)
-		if last_target != null:
-			last_target.get_component('outline').highlight(false)
-		last_target = target_obj
 		
+		if is_instance_valid(last_target):
+			last_target.get_component('outline').highlight(false)
+			
+		if(escoria.action_manager.has_actions(target_obj)):
+			target_obj.get_component('outline').highlight(true)
+			last_target = target_obj
+	

 func element_unfocused() -> void:
 	$tooltip_layer/tooltip.set_target("")
--- a/gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd
@@ -25,8 +25,6 @@ func highlight(value: bool):
 	isHighlighted = value

 func _process(_delta: float):
-	# if not escoria.action_manager.is_object_actionable(get_global_id()):
-	#    return
 	if not outline is ItemOutline:
 	   return
 	if isHighlighted != lastHighlightState:
--- a/gymkhana/items/inventory/assets/turno_cocina_patata_grande.png
+++ b/gymkhana/items/inventory/assets/turno_cocina_patata_grande.png
--- a/gymkhana/items/inventory/turno_cocina_bol_lentejas.esc
+++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas.esc
@@ -1,6 +1,2 @@
-:action1
-say player "Que cosa tan curiosa"
-
-:action2
-say player "No lo quiero coger"
-
+:action3
+say player "Parece la cantidad exacta de lentejas"
--- a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn
+++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn
@@ -15,12 +15,10 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar dentro",
+    "action3": "Mirar",
    "action4": "Usar"
 }
-
+combine_when_selected_action_is_in = [ "action4" ]
 animations = null

 [node name="Sprite" type="Sprite" parent="."]
--- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc
+++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc
@@ -1,6 +1,24 @@
 :action1
-say player "Que cosa tan curiosa"
+say player "Hay varios libros de recetas"

 :action2
-say player "No lo quiero coger"
+say player "Este libro de recetas tiene buena pinta"
+inventory_add turno_cocina_libro_de_cocina
+set_active turno_cocina_libro_de_cocina false
+
+:action3
+say player "a ver...."
+say player "Lentejas con patatas:"
+say player "4 patatas medianas"
+say player "1 kg de lentejas"
+say player "1 diente de ajo"
+set_global turno_cocina_hint_romero true [eq turno_cocina_libro_leido_count 4]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 4]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 8]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 12]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 16]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 20]
+
+
+inc_global turno_cocina_libro_leido_count

--- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn
+++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn
@@ -1,36 +1,20 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=3 format=2]

 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
 [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" type="Texture" id=2]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
-
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 22.5, 12.5 )

 [node name="turno_cocina_libro_de_cocina" type="Area2D"]
 pause_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 = [  ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar dentro",
-    "action4": "Usar"
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar dentro",
+"action4": "Usar"
 }
 animations = null
-
-[node name="Sprite" type="Sprite" parent="."]
-position = Vector2( -2, 0 )
-scale = Vector2( 0.5, 0.5 )
-texture = ExtResource( 2 )
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( -1.5, -0.5 )
-shape = SubResource( 1 )
-
-[node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( -51, 69 )
-script = ExtResource( 3 )
--- a/gymkhana/items/inventory/turno_cocina_olla_llena.esc
+++ b/gymkhana/items/inventory/turno_cocina_olla_llena.esc
@@ -1,2 +1,33 @@
+:action1
+    say player "Está llena de agua"
+    say player "lentejas" [turno_cocina_ingrediente_lentejas]
+    say player "patatas" [turno_cocina_ingrediente_patatas]
+    say player "ajo" [turno_cocina_ingrediente_ajo]
+    say player "romero" [turno_cocina_ingrediente_romero]
+    
+
+:action2
+    say player "Ya la estoy usando."
+
 :action3
    say player "Está llena de agua." 
+
+
+:action3 turno_cocina_bol_lentejas
+    say player "Lentejas pa'entro"
+    inventory_remove turno_cocina_bol_lentejas
+    inventory_add turno_cocina_bol_inventario
+    set_global turno_cocina_ingrediente_lentejas true
+
+
+
+:action3 turno_cocina_patata
+    say player "Tienen que ser 4 patatas" [!eq count/turno_cocina_patata 4]
+    say player "Patatas pa'entro" [eq count/turno_cocina_patata 4]
+    inventory_remove turno_cocina_patata [eq count/turno_cocina_patata 4]
+    set_global turno_cocina_ingrediente_patatas true [eq count/turno_cocina_patata 4]
+
+:action3 turno_cocina_romero
+    say player "Romero pa'entro"
+    set_global turno_cocina_ingrediente_romero true
+    inventory_remove turno_cocina_romero
--- a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
+++ b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
@@ -1,29 +1,34 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]

 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
 [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" type="Texture" id=2]
+[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture" id=3]

 [node name="turno_cocina_olla_llena" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
 global_id = "turno_cocina_olla_llena"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc"
+interaction_direction = 3
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
 "action1": "Mirar dentro",
 "action3": "Mirar",
-"action4": "Poner encima de la económica"
+"action4": "Usar"
 }
-action4_target_texts = {
+action3_target_texts = {
 "turno_cocina_ajo": "Echar en la olla.",
 "turno_cocina_bol_lentejas": "Echar en la olla.",
 "turno_cocina_patata": "Echar en la olla.",
 "turno_cocina_romero": "Echar en la olla."
 }
-target_when_selected_action_is_in = [ "action4" ]
+target_when_selected_action_is_in = [ "action3" ]
 animations = null

+[node name="Sprite" type="Sprite" parent="."]
+texture = ExtResource( 3 )
+
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-polygon = PoolVector2Array( -18, -4, -5, 18, 17, 4, 20, -13, -12, -29 )
+polygon = PoolVector2Array( -59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54 )
--- a/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn
+++ b/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn
@@ -16,7 +16,7 @@ tooltips = {
 "action1": "Mirar",
 "action2": "Coger",
 "action3": "Mirar",
-"action4": "Llenar de agua"
+"action4": "Usar"
 }
 animations = null

--- a/gymkhana/items/inventory/turno_cocina_patata.tscn
+++ b/gymkhana/items/inventory/turno_cocina_patata.tscn
@@ -16,6 +16,7 @@ inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
 "action3": "Contar las patatas",
+"action4": "Usar",
 }
 action3_target_texts = {
 "turno_cocina_cuchillo": "Pelar patatas"
--- a/gymkhana/items/inventory/turno_cocina_romero.esc
+++ b/gymkhana/items/inventory/turno_cocina_romero.esc
@@ -1,2 +1,17 @@
+#
+#  ToDO: una posible idea seria que eneko o el libro de recetas te puedan dar la pista.
+#        - Si es en el libro de recetas... podria ser que haga falta leerlo.
+#        - Si es eneko... podria ser que le puedas preguntar como le gustan las lentejas.
+#
+
+:action1
+say player "Hay muchas llervas"
+
+:action2
+say player "No sabria cual coger." [!turno_cocina_hint_romero]
+say player "¡Esta parece romero!" [turno_cocina_hint_romero]
+inventory_add turno_cocina_romero [turno_cocina_hint_romero]
+set_active turno_cocina_romero false [turno_cocina_hint_romero]
+
 :action3
-    say player "Creo que es romero"
+say player "Casi seguro que es romero"
--- a/gymkhana/items/inventory/turno_cocina_romero.tscn
+++ b/gymkhana/items/inventory/turno_cocina_romero.tscn
@@ -3,16 +3,19 @@
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
 [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_romero.png" type="Texture" id=2]

-[node name="turno_cocina_cuchillo" type="Area2D"]
+[node name="turno_cocina_romero" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
-global_id = "turno_cocina_cuchillo"
+global_id = "turno_cocina_romero"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_romero.esc"
+interaction_direction = 6
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-animations = null
 tooltips = {
-  "action3": "Mirar",
-  "action4": "Usar",
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
 }
+animations = null
--- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=16 format=2]

 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
 [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
@@ -11,7 +11,9 @@
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture" id=9]
 [ext_resource path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" type="PackedScene" id=10]
 [ext_resource path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" type="PackedScene" id=11]
+[ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12]
 [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture" id=13]
+[ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14]

 [sub_resource type="NavigationPolygon" id=3]
 vertices = PoolVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 )
@@ -20,6 +22,9 @@ outlines = [ PoolVector2Array( 1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1

 [node name="ESCRoom" type="Node2D"]
 script = ExtResource( 1 )
+__meta__ = {
+"_edit_lock_": true
+}
 global_id = "cocina"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc"
 player_scene = ExtResource( 2 )
@@ -29,6 +34,9 @@ editor_debug_mode = 1
 [node name="background" type="Sprite" parent="."]
 position = Vector2( 1462.5, 289 )
 texture = ExtResource( 3 )
+__meta__ = {
+"_edit_lock_": true
+}

 [node name="ESCTerrain" type="Navigation2D" parent="."]
 position = Vector2( 302.5, 0 )
@@ -105,7 +113,7 @@ scale = Vector2( 0.880435, 0.88735 )

 [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
 position = Vector2( 15.9014, -11.2695 )
-polygon = PoolVector2Array( -5.6792, 1.12694, -4.54321, 21.412, -25, 22, -24.9878, 1.12694 )
+polygon = PoolVector2Array( -2.27197, 1.12694, -2.27197, 23.666, -27.2595, 24.7929, -27.2595, 1.12694 )

 [node name="turno_cocina_peso_location" type="Position2D" parent="turno_cocina_peso"]
 position = Vector2( -3.40724, 268.214 )
@@ -141,7 +149,7 @@ target_when_selected_action_is_in = [ "action3" ]
 animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"]
-polygon = PoolVector2Array( 2327, 294, 2395, 296, 2401, 290, 2367, 286, 2365, 260, 2362, 259, 2362, 278, 2356, 286, 2334, 286 )
+polygon = PoolVector2Array( 2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286 )

 [node name="ESCLocation" type="Position2D" parent="fregadero_der"]
 position = Vector2( 2370, 395 )
@@ -165,7 +173,7 @@ target_when_selected_action_is_in = [ "action3" ]
 animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"]
-polygon = PoolVector2Array( 1800, 276, 1804, 280, 1895, 273, 1883, 266, 1863, 267, 1839, 268, 1835, 264, 1835, 259, 1838, 254, 1848, 248, 1854, 252, 1858, 252, 1856, 246, 1851, 244, 1843, 247, 1836, 251, 1831, 258, 1830, 263, 1828, 265, 1826, 264, 1823, 265, 1822, 269, 1824, 270, 1822, 272, 1809, 272, 1798, 273 )
+polygon = PoolVector2Array( 1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273 )

 [node name="ESCLocation" type="Position2D" parent="fregadero_izq"]
 position = Vector2( 1855, 400 )
@@ -210,7 +218,7 @@ target_when_selected_action_is_in = [ "action3" ]
 animations = null

 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"]
-polygon = PoolVector2Array( 485, 394, 485, 421, 556, 423, 551, 415, 550, 409, 551, 395 )
+polygon = PoolVector2Array( 466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386 )

 [node name="ESCLocation" type="Position2D" parent="debajo_sofa"]
 position = Vector2( 420, 494 )
@@ -255,8 +263,61 @@ texture = ExtResource( 13 )
 [node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata"]
 position = Vector2( 9.0867, -13.5233 )
 z_index = 1001
-polygon = PoolVector2Array( 6.50781, 0.0583801, 20.7368, 12.8992, 7.896, 27.1279, -19.937, 31.269, -42.4258, 16.1375, -26.0684, -0.0810547 )
+polygon = PoolVector2Array( 0.538086, -10.4924, 30.5234, 9.68311, 15.3916, 32.1716, -12.4419, 36.3127, -38.7476, 34.9473, -47.9326, 14.6101, -37.8452, -0.38208, -25.7676, -11.8577 )

 [node name="turno_cocina_patata_location" type="Position2D" parent="cocina_patata"]
 position = Vector2( 93.1357, 65.3632 )
 script = ExtResource( 5 )
+
+[node name="turno_cocina_economica" type="Area2D" parent="."]
+pause_mode = 1
+position = Vector2( 1299, 506 )
+script = ExtResource( 6 )
+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 = {
+"action1": "Mirar",
+"action2": "Usar"
+}
+action4_target_texts = {
+"turno_cocina_olla_llena": "Poner encima de la economica."
+}
+target_when_selected_action_is_in = [ "action3" ]
+animations = null
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica"]
+position = Vector2( -6, -4 )
+scale = Vector2( 2.68591, 6.73791 )
+polygon = PoolVector2Array( -14.1479, -5.04608, -35.7421, 5.63972, 13.4033, 9.05325, 11.5417, 2.52303, 8.93552, -4.74925 )
+
+[node name="ESCLocation" type="Position2D" parent="turno_cocina_economica"]
+position = Vector2( -182, 205 )
+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 = {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar"
+}
+
+[node name="ESCLocation" type="Position2D" parent="turno_cocina_libro_de_cocina"]
+position = Vector2( -16.9304, 145.789 )
+script = ExtResource( 5 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"]
+polygon = PoolVector2Array( -44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304 )
+
+[node name="turno_cocina_olla_llena" parent="." instance=ExtResource( 12 )]
+position = Vector2( 1281, 491 )
+scale = Vector2( 1.06318, 1.06318 )
+interaction_direction = 3
+
+[node name="ESCLocation" type="Position2D" parent="turno_cocina_olla_llena"]
+position = Vector2( -160.838, 201.283 )
+script = ExtResource( 5 )
+interaction_direction = 3
--- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
@@ -10,10 +10,22 @@
 > [cocina_debajo_sofa_picked]
  set_active cocina_debajo_sofa false

+> [turno_cocina_economica_con_olla]
+  set_active turno_cocina_olla_llena true
+  set_active turno_cocina_economica false
+> [!turno_cocina_economica_con_olla]
+  set_active turno_cocina_olla_llena false
+  set_active turno_cocina_economica true
+  
 # Position player depending of last scene
 > [eq ESC_LAST_SCENE cocina_detras]
  teleport player puerta_detras_start
  set_angle player 180
  stop
+
 teleport player puerta_delante_start
 set_angle player 270
+set_active turno_cocina_olla_llena true [turno_cocina_economica_con_olla]
+set_active turno_cocina_olla_llena false [!turno_cocina_economica_con_olla]
+set_active turno_cocina_economica true [!turno_cocina_economica_con_olla]
+set_active turno_cocina_economica false [turno_cocina_economica_con_olla]
--- a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc
@@ -0,0 +1,12 @@
+:action1
+say player "Yo diria que sirve para cocinar."
+    
+:action2
+say player "No pienso poner la mano encima."
+
+:action3 turno_cocina_olla_llena
+say player "Me siento un cocinero de verdad."
+set_global turno_cocina_economica_con_olla true
+set_active turno_cocina_olla_llena true
+set_active turno_cocina_economica false
+inventory_remove turno_cocina_olla_llena
--- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=12 format=2]

 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
 [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
@@ -9,6 +9,7 @@
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7]
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture" id=8]
 [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9]
+[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=10]

 [sub_resource type="NavigationPolygon" id=1]
 vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 )
@@ -17,6 +18,9 @@ outlines = [ PoolVector2Array( -1146, 112, -1013, 114, -864, 131, -852, 111, -79

 [node name="ESCRoom" type="Node2D"]
 script = ExtResource( 1 )
+__meta__ = {
+"_edit_lock_": true
+}
 global_id = "cocina_detras"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc"
 player_scene = ExtResource( 2 )
@@ -25,9 +29,15 @@ camera_limits = [ Rect2( 0, 0, 1500, 577 ) ]
 [node name="background" type="Sprite" parent="."]
 position = Vector2( 750, 289 )
 texture = ExtResource( 3 )
+__meta__ = {
+"_edit_lock_": true
+}

 [node name="ESCTerrain" type="Navigation2D" parent="."]
 script = ExtResource( 4 )
+__meta__ = {
+"_edit_lock_": true
+}
 scales = ExtResource( 7 )
 scale_min = 0.5
 player_speed_multiplier = 1.3
@@ -36,6 +46,9 @@ player_doubleclick_speed_multiplier = 2.0
 [node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"]
 position = Vector2( 1252, 260 )
 navpoly = SubResource( 1 )
+__meta__ = {
+"_edit_lock_": true
+}

 [node name="puerta_cocina" type="Area2D" parent="."]
 pause_mode = 1
@@ -95,3 +108,15 @@ scale = Vector2( 0.5, 0.5 )
 [node name="ESCLocation" type="Position2D" parent="turno_cocina_olla_vacia"]
 position = Vector2( 1, 96 )
 script = ExtResource( 5 )
+
+[node name="turno_cocina_romero" parent="." instance=ExtResource( 10 )]
+position = Vector2( 61, 341 )
+
+[node name="ESCLocation" type="Position2D" parent="turno_cocina_romero"]
+position = Vector2( 89, 60 )
+script = ExtResource( 5 )
+interaction_direction = 6
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero"]
+position = Vector2( -61, -341 )
+polygon = PoolVector2Array( 75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434 )
--- a/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_der.esc
+++ b/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_der.esc
@@ -2,4 +2,4 @@
 say player "Cebollas!"

 :action2
-say player "mmm, no!"
+say player "mmm, quizas... no!"
--- a/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc
+++ b/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc
@@ -2,4 +2,6 @@
 say player "Cebollas!"

 :action2
-say player "mmm, quizas... no!"
+say player "mmm, no!"
+say player "no me gusta la cebolla."
+inc_global turno_cocina_cebolla_count
--- a/gymkhana/start_game.esc
+++ b/gymkhana/start_game.esc
@@ -6,6 +6,13 @@ show_menu main
 play_snd res://gymkhana/sounds/intro_menu_loop.ogg _music

 :newgame
-# 1/ Simple scene
 set_global new_game true
+# Ingredientes start value
+set_global turno_cocina_libro_leido_count 0
+set_global turno_cocina_ingrediente_lentejas false
+set_global turno_cocina_ingrediente_patatas false
+set_global turno_cocina_ingrediente_ajo false
+set_global turno_cocina_ingrediente_romero false
+set_global turno_cocina_libro_leido_count 0
+# Starting scene
 change_scene res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn