fix: merge duplicated custom_data in patata items

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

@@ -46,4 +46,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)

gymkhana/characters/eneko/eneko_smoking.esc

@@ -78,11 +78,12 @@ say player "Si consigues hacer unas lentejas buenísimas Eneko se pondrá muy co
 say player "Espero que disfrutes el juego y buena suerte!"
 
 :turno_cocina_eneko_catando_end
-  play_video res://gymkhana/videos/turno_cocina/eneko_sale_le_gusta_muchisimo.ogv [turno_cocina_ingrediente_ajo,turno_cocina_ingrediente_romero]
+  play_video res://gymkhana/videos/turno_cocina/eneko_sale_le_gusta_muchisimo.ogv [turno_cocina_ingrediente_ajo_en_lentejas,turno_cocina_ingrediente_romero]
-  play_video res://gymkhana/videos/turno_cocina/eneko_sale_le_gusta.ogv [turno_cocina_ingrediente_ajo]
+  play_video res://gymkhana/videos/turno_cocina/eneko_sale_le_gusta.ogv [turno_cocina_ingrediente_ajo_en_lentejas]
-  play_video res://gymkhana/videos/turno_cocina/eneko_sale_no_le_gusta.ogv [!turno_cocina_ingrediente_ajo]
+  play_video res://gymkhana/videos/turno_cocina/eneko_sale_no_le_gusta.ogv [!turno_cocina_ingrediente_ajo_en_lentejas]
   set_active eneko_smoking true
   set_active turno_cocina_ajo false
+  play_snd res://gymkhana/sounds/music_loop.ogg _music
 
 :action2
 > [whatsapp_blocked]
@@ -95,11 +96,10 @@ say player "Espero que disfrutes el juego y buena suerte!"
 
 ?
   - cocina_delante_intro_dialog_catar:"Ya he hecho las lentejas!" [turno_cocina_ingrediente_lentejas,turno_cocina_economica_encendida]
-    say_last_dialog_option
+    stop_snd
-    say eneko_smoking cocina_delante_intro_dialog_catar_res:"En serio! Voy a probarlas!"
     play_video res://gymkhana/videos/turno_cocina/eneko_entra_cocina.ogv
     set_active eneko_smoking false
-    set_active turno_cocina_ajo true
+    set_active turno_cocina_ajo true [!turno_cocina_ingrediente_ajo_cogido]
     sched_event 10 eneko_smoking turno_cocina_eneko_catando_end
     stop
   - "Zorionak!!!!" [zorionak_eneko]

gymkhana/items/inventory/turno_cocina_ajo.esc

@@ -2,6 +2,7 @@
 say player "Ajooo!" 
 inventory_add turno_cocina_ajo 
 set_active turno_cocina_ajo false
+set_global turno_cocina_ingrediente_ajo_cogido true
 
 :action3
-say player "Una buena cabeza de ajo."
+say player "Una buena cabeza de ajo, justo lo que necesitaba para unas buenas lentejas."

gymkhana/items/inventory/turno_cocina_olla_llena.esc

@@ -2,7 +2,7 @@
     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 "ajo" [turno_cocina_ingrediente_ajo_en_lentejas]
     say player "romero" [turno_cocina_ingrediente_romero]
     
 
@@ -13,7 +13,7 @@
     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 "ajo" [turno_cocina_ingrediente_ajo_en_lentejas]
     say player "romero" [turno_cocina_ingrediente_romero]
 
 
@@ -43,5 +43,5 @@
 
 :action3 turno_cocina_ajo
     say player "Con ajo quedara al gusto de Eneko."
-    set_global turno_cocina_ingrediente_ajo true
+    set_global turno_cocina_ingrediente_ajo_en_lentejas true
     inventory_remove turno_cocina_ajo

gymkhana/items/inventory/turno_cocina_patata.tscn

@@ -15,12 +15,6 @@ 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" ]
-custom_data = {
-  "tooltips": {
-    "action3": "Contar las patatas",
-    "action4": "Usar",
-  }
-}
 action3_target_texts = {
 "turno_cocina_cuchillo": "Pelar patatas"
 }
@@ -35,7 +29,11 @@ custom_data = {
     { "start": 2, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png" },
     { "start": 3, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png" },
     { "start": 4, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" },
-  ]
+  ],
+  "tooltips": {
+    "action3": "Contar las patatas",
+    "action4": "Usar",
+  }
 }
 
 [node name="Sprite" type="Sprite" parent="."]

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -268,19 +268,17 @@ 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 )
-custom_data = {
-  "tooltips": {
-    "action1": "Admirar la patata",
-    "action2": "Cogerla"
-  }
-}
 custom_data = {
   "count_textures": [
     { "start": 1, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" },
     { "start": 2, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png" },
     { "start": 3, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png" },
     { "start": 4, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" },
-  ]
+  ],
+  "tooltips": {
+    "action1": "Admirar la patata",
+    "action2": "Cogerla"
+  }
 }
 animations = null
 

gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc

@@ -39,6 +39,7 @@ set_angle player 90
   accept_input ALL
   play_snd res://gymkhana/sounds/music_loop.ogg _music
 > [intro_dialog2_playing]
+  accept_input SKIP
   walk_block player new_game_start_location
   set_angle player 90
 	queue_event eneko_smoking intro_dialog2 intro_dialog2_channel true

gymkhana/start_game.esc

@@ -11,7 +11,7 @@ set_global new_game true
 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_ajo_en_lentejas false
 set_global turno_cocina_ingrediente_romero false
 set_global turno_cocina_libro_leido_count 0
 set_global turno_cocina_eneko_catando false

saves/save_001.tres

@@ -8,13 +8,13 @@ escoria_version = "1.0.0"
 game_version = "0.1.0"
 name = "2 patatas"
 date = {
-"day": 17,
+"day": 21,
 "dst": false,
-"hour": 17,
+"hour": 22,
-"minute": 37,
+"minute": 27,
 "month": 3,
-"second": 12,
+"second": 26,
-"weekday": 0,
+"weekday": 4,
 "year": 2024
 }
 main = {
@@ -35,7 +35,7 @@ globals = {
 "new_game": true,
 "turno_cocina_eneko_catando": false,
 "turno_cocina_frontal_debajo_sofa": true,
-"turno_cocina_ingrediente_ajo": false,
+"turno_cocina_ingrediente_ajo_en_lentejas": false,
 "turno_cocina_ingrediente_lentejas": false,
 "turno_cocina_ingrediente_patatas": false,
 "turno_cocina_ingrediente_romero": false,
@@ -52,14 +52,14 @@ objects = {
 "_music": {
 "active": true,
 "interactive": true,
-"playback_position": 4.32136,
+"playback_position": 1.20417,
 "state": "res://gymkhana/sounds/music_loop.ogg"
 },
 "_sound": {
 "active": true,
 "interactive": true,
-"playback_position": 0.0,
+"playback_position": 4.62113,
-"state": "off"
+"state": "default"
 },
 "_speech": {
 "active": true,
@@ -69,6 +69,10 @@ objects = {
 "cocina_cuchillos": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Contar los cuchillos",
+"action2": "Coger un buen cuchillo"
+}
 },
 "interactive": true,
 "state": "default"
@@ -76,6 +80,10 @@ objects = {
 "cocina_debajo_sofa": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar debajo del sofa",
+"action2": "Meter la mano"
+}
 },
 "interactive": true,
 "state": "default"
@@ -83,6 +91,10 @@ objects = {
 "cocina_fregadero_der": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -90,6 +102,10 @@ objects = {
 "cocina_fregadero_izq": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -109,7 +125,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action1": "Admirar la patata",
+"action2": "Cogerla"
+}
 },
 "interactive": true,
 "state": "default"
@@ -117,6 +137,9 @@ objects = {
 "cocina_puerta_delante": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Salir de la cocina"
+}
 },
 "interactive": true,
 "state": "default"
@@ -124,6 +147,9 @@ objects = {
 "cocina_puerta_detras": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Ir detrás"
+}
 },
 "interactive": true,
 "state": "default"
@@ -132,10 +158,10 @@ objects = {
 "active": true,
 "custom_data": {
 },
-"global_transform": Transform2D( 0.847843, 0, 0, 0.847843, 2412.05, 443.435 ),
+"global_transform": Transform2D( 0.787451, 0, 0, 0.787451, 2450, 423 ),
 "interactive": false,
-"last_deg": 71,
+"last_deg": 341,
-"last_dir": 4,
+"last_dir": 2,
 "state": "speak_down"
 },
 "puerta_delante_start": {
@@ -151,6 +177,11 @@ objects = {
 "turno_cocina_bol": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Coger un bol",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -158,6 +189,10 @@ objects = {
 "turno_cocina_cocina_gas": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Encender"
+}
 },
 "interactive": true,
 "state": "apagado"
@@ -165,6 +200,12 @@ objects = {
 "turno_cocina_cuerno": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el cuerno",
+"action2": "Coger el cuerno",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -172,13 +213,10 @@ objects = {
 "turno_cocina_economica": {
 "active": true,
 "custom_data": {
-},
+"tooltips": {
-"interactive": true,
+"action1": "Mirar",
-"state": "default"
+"action2": "Usar"
-},
+}
-"turno_cocina_frontal": {
-"active": true,
-"custom_data": {
 },
 "interactive": true,
 "state": "default"
@@ -186,6 +224,11 @@ objects = {
 "turno_cocina_libro_de_cocina": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Leer"
+}
 },
 "interactive": true,
 "state": "default"
@@ -193,6 +236,11 @@ objects = {
 "turno_cocina_olla_llena": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar dentro",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -213,7 +261,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action3": "Contar las patatas",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -221,6 +273,12 @@ objects = {
 "turno_cocina_peso": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -228,7 +286,9 @@ objects = {
 }
 events = {
 "events_queue": {
-"_front": [  ]
+"_front": [  ],
+"intro_dialog2_channel": [  ],
+"intro_dialog_channel": [  ]
 },
 "sched_events": [  ]
 }

saves/save_002.tres

@@ -8,13 +8,13 @@ escoria_version = "1.0.0"
 game_version = "0.1.0"
 name = "Post-intro"
 date = {
-"day": 17,
+"day": 21,
 "dst": false,
-"hour": 17,
+"hour": 22,
-"minute": 34,
+"minute": 26,
 "month": 3,
-"second": 14,
+"second": 6,
-"weekday": 0,
+"weekday": 4,
 "year": 2024
 }
 main = {
@@ -31,7 +31,7 @@ globals = {
 "intro_dialog2_playing": false,
 "new_game": true,
 "turno_cocina_eneko_catando": false,
-"turno_cocina_ingrediente_ajo": false,
+"turno_cocina_ingrediente_ajo_en_lentejas": false,
 "turno_cocina_ingrediente_lentejas": false,
 "turno_cocina_ingrediente_patatas": false,
 "turno_cocina_ingrediente_romero": false,
@@ -48,7 +48,7 @@ objects = {
 "_music": {
 "active": true,
 "interactive": true,
-"playback_position": 16.7352,
+"playback_position": 22.27,
 "state": "res://gymkhana/sounds/music_loop.ogg"
 },
 "_sound": {
@@ -65,6 +65,10 @@ objects = {
 "cocina_delante_pegatinas": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "cocina_delante_pegatinas_action1",
+"action2": "cocina_delante_pegatinas_action2"
+}
 },
 "interactive": true,
 "state": "default"
@@ -72,6 +76,9 @@ objects = {
 "cocina_delante_puerta_cocina": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "cocina_delante_puerta_cocina_action1"
+}
 },
 "interactive": true,
 "state": "default"
@@ -79,6 +86,9 @@ objects = {
 "cocina_delante_puerta_despensa": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "cocina_delante_puerta_despensa_action1"
+}
 },
 "interactive": true,
 "state": "default"
@@ -86,6 +96,9 @@ objects = {
 "cocina_delante_puerta_detras": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "cocina_delante_puerta_detras_action1"
+}
 },
 "interactive": true,
 "state": "default"
@@ -93,6 +106,10 @@ objects = {
 "eneko_smoking": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "cocina_delante_eneko_smoking_action1",
+"action2": "cocina_delante_eneko_smoking_action2"
+}
 },
 "global_transform": Transform2D( 1.23314, 0, 0, 1.23314, 813, 440 ),
 "interactive": true,
@@ -133,6 +150,11 @@ objects = {
 "turno_cocina_ajo": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Coger ajo",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -140,6 +162,12 @@ objects = {
 "turno_cocina_carton": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -147,6 +175,10 @@ objects = {
 "turno_cocina_frontal": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action3": "frontal_action3",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -154,6 +186,11 @@ objects = {
 "turno_cocina_libro_de_cocina": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Leer"
+}
 },
 "interactive": true,
 "state": "default"
@@ -161,6 +198,12 @@ objects = {
 "turno_cocina_madera": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "cocina_delante_madera_action1",
+"action2": "cocina_delante_madera_action2",
+"action3": "cocina_delante_madera_action3",
+"action4": "cocina_delante_madera_action4"
+}
 },
 "interactive": true,
 "state": "default"

saves/save_003.tres

@@ -8,13 +8,13 @@ escoria_version = "1.0.0"
 game_version = "0.1.0"
 name = "1 patata"
 date = {
-"day": 17,
+"day": 21,
 "dst": false,
-"hour": 17,
+"hour": 22,
-"minute": 35,
+"minute": 26,
 "month": 3,
-"second": 12,
+"second": 58,
-"weekday": 0,
+"weekday": 4,
 "year": 2024
 }
 main = {
@@ -34,7 +34,7 @@ globals = {
 "new_game": true,
 "turno_cocina_eneko_catando": false,
 "turno_cocina_frontal_debajo_sofa": true,
-"turno_cocina_ingrediente_ajo": false,
+"turno_cocina_ingrediente_ajo_en_lentejas": false,
 "turno_cocina_ingrediente_lentejas": false,
 "turno_cocina_ingrediente_patatas": false,
 "turno_cocina_ingrediente_romero": false,
@@ -51,7 +51,7 @@ objects = {
 "_music": {
 "active": true,
 "interactive": true,
-"playback_position": 2.58313,
+"playback_position": 11.9587,
 "state": "res://gymkhana/sounds/music_loop.ogg"
 },
 "_sound": {
@@ -68,6 +68,10 @@ objects = {
 "cocina_cuchillos": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Contar los cuchillos",
+"action2": "Coger un buen cuchillo"
+}
 },
 "interactive": true,
 "state": "default"
@@ -75,6 +79,10 @@ objects = {
 "cocina_debajo_sofa": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar debajo del sofa",
+"action2": "Meter la mano"
+}
 },
 "interactive": true,
 "state": "default"
@@ -82,6 +90,10 @@ objects = {
 "cocina_fregadero_der": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -89,6 +101,10 @@ objects = {
 "cocina_fregadero_izq": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -108,7 +124,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action1": "Admirar la patata",
+"action2": "Cogerla"
+}
 },
 "interactive": true,
 "state": "default"
@@ -116,6 +136,9 @@ objects = {
 "cocina_puerta_delante": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Salir de la cocina"
+}
 },
 "interactive": true,
 "state": "default"
@@ -123,6 +146,9 @@ objects = {
 "cocina_puerta_detras": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Ir detrás"
+}
 },
 "interactive": true,
 "state": "default"
@@ -131,10 +157,10 @@ objects = {
 "active": true,
 "custom_data": {
 },
-"global_transform": Transform2D( 0.679608, 0, 0, 0.679608, 2121.49, 387.985 ),
+"global_transform": Transform2D( 0.916863, 0, 0, 0.916863, 2421, 467 ),
 "interactive": false,
-"last_deg": 341,
+"last_deg": 71,
-"last_dir": 2,
+"last_dir": 4,
 "state": "speak_down"
 },
 "puerta_delante_start": {
@@ -150,6 +176,11 @@ objects = {
 "turno_cocina_bol": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Coger un bol",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -157,6 +188,10 @@ objects = {
 "turno_cocina_cocina_gas": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Encender"
+}
 },
 "interactive": true,
 "state": "apagado"
@@ -164,6 +199,12 @@ objects = {
 "turno_cocina_cuerno": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el cuerno",
+"action2": "Coger el cuerno",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -171,6 +212,10 @@ objects = {
 "turno_cocina_economica": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -178,6 +223,11 @@ objects = {
 "turno_cocina_libro_de_cocina": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Leer"
+}
 },
 "interactive": true,
 "state": "default"
@@ -185,6 +235,11 @@ objects = {
 "turno_cocina_olla_llena": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar dentro",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -205,7 +260,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action3": "Contar las patatas",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -213,6 +272,12 @@ objects = {
 "turno_cocina_peso": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"

saves/save_004.tres

@@ -8,13 +8,13 @@ escoria_version = "1.0.0"
 game_version = "0.1.0"
 name = "4 patatas"
 date = {
-"day": 17,
+"day": 21,
 "dst": false,
-"hour": 17,
+"hour": 22,
-"minute": 39,
+"minute": 28,
 "month": 3,
-"second": 28,
+"second": 17,
-"weekday": 0,
+"weekday": 4,
 "year": 2024
 }
 main = {
@@ -36,7 +36,7 @@ globals = {
 "turno_cocina_cuchillo_en_inventario": true,
 "turno_cocina_eneko_catando": false,
 "turno_cocina_frontal_debajo_sofa": true,
-"turno_cocina_ingrediente_ajo": false,
+"turno_cocina_ingrediente_ajo_en_lentejas": false,
 "turno_cocina_ingrediente_lentejas": false,
 "turno_cocina_ingrediente_patatas": false,
 "turno_cocina_ingrediente_romero": false,
@@ -54,7 +54,7 @@ objects = {
 "_music": {
 "active": true,
 "interactive": true,
-"playback_position": 19.9472,
+"playback_position": 16.7636,
 "state": "res://gymkhana/sounds/music_loop.ogg"
 },
 "_sound": {
@@ -71,6 +71,10 @@ objects = {
 "cocina_cuchillos": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Contar los cuchillos",
+"action2": "Coger un buen cuchillo"
+}
 },
 "interactive": true,
 "state": "default"
@@ -78,6 +82,10 @@ objects = {
 "cocina_debajo_sofa": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar debajo del sofa",
+"action2": "Meter la mano"
+}
 },
 "interactive": true,
 "state": "default"
@@ -85,6 +93,10 @@ objects = {
 "cocina_fregadero_der": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -92,6 +104,10 @@ objects = {
 "cocina_fregadero_izq": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -111,7 +127,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action1": "Admirar la patata",
+"action2": "Cogerla"
+}
 },
 "interactive": true,
 "state": "default"
@@ -119,6 +139,9 @@ objects = {
 "cocina_puerta_delante": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Salir de la cocina"
+}
 },
 "interactive": true,
 "state": "default"
@@ -126,6 +149,9 @@ objects = {
 "cocina_puerta_detras": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Ir detrás"
+}
 },
 "interactive": true,
 "state": "default"
@@ -134,10 +160,10 @@ objects = {
 "active": true,
 "custom_data": {
 },
-"global_transform": Transform2D( 0.942745, 0, 0, 0.942745, 2428.6, 475.98 ),
+"global_transform": Transform2D( 0.714118, 0, 0, 0.714118, 1956.44, 399 ),
 "interactive": false,
-"last_deg": 71,
+"last_deg": 111,
-"last_dir": 4,
+"last_dir": 5,
 "state": "speak_down"
 },
 "puerta_delante_start": {
@@ -153,6 +179,11 @@ objects = {
 "turno_cocina_bol": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Coger un bol",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -160,6 +191,10 @@ objects = {
 "turno_cocina_cocina_gas": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Encender"
+}
 },
 "interactive": true,
 "state": "apagado"
@@ -167,6 +202,10 @@ objects = {
 "turno_cocina_cuchillo": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -174,6 +213,12 @@ objects = {
 "turno_cocina_cuerno": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el cuerno",
+"action2": "Coger el cuerno",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -181,13 +226,10 @@ objects = {
 "turno_cocina_economica": {
 "active": true,
 "custom_data": {
-},
+"tooltips": {
-"interactive": true,
+"action1": "Mirar",
-"state": "default"
+"action2": "Usar"
-},
+}
-"turno_cocina_frontal": {
-"active": true,
-"custom_data": {
 },
 "interactive": true,
 "state": "default"
@@ -195,6 +237,11 @@ objects = {
 "turno_cocina_libro_de_cocina": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Leer"
+}
 },
 "interactive": true,
 "state": "default"
@@ -202,6 +249,11 @@ objects = {
 "turno_cocina_olla_llena": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar dentro",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -222,7 +274,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action3": "Contar las patatas",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -230,6 +286,12 @@ objects = {
 "turno_cocina_peso": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -237,7 +299,9 @@ objects = {
 }
 events = {
 "events_queue": {
-"_front": [  ]
+"_front": [  ],
+"intro_dialog2_channel": [  ],
+"intro_dialog_channel": [  ]
 },
 "sched_events": [  ]
 }

saves/save_005.tres

@@ -8,13 +8,13 @@ escoria_version = "1.0.0"
 game_version = "0.1.0"
 name = "Lentejas cocinando sin patata"
 date = {
-"day": 17,
+"day": 21,
 "dst": false,
-"hour": 18,
+"hour": 22,
-"minute": 26,
+"minute": 31,
 "month": 3,
-"second": 31,
+"second": 13,
-"weekday": 0,
+"weekday": 4,
 "year": 2024
 }
 main = {
@@ -23,7 +23,7 @@ main = {
 }
 globals = {
 "ESC_CURRENT_SCENE": "cocina",
-"ESC_DIALOG_CHOSEN_OPTION": "Agur",
+"ESC_DIALOG_CHOSEN_OPTION": "¿Que te parece que haga la comida?",
 "ESC_LAST_SCENE": "cocina_delante",
 "FORCE_LAST_SCENE_NULL": false,
 "_COUNT_turno_cocina_patata": 4,
@@ -40,14 +40,14 @@ globals = {
 "turno_cocina_economica_encendida": true,
 "turno_cocina_eneko_catando": false,
 "turno_cocina_frontal_debajo_sofa": true,
-"turno_cocina_ingrediente_ajo": false,
+"turno_cocina_ingrediente_ajo_en_lentejas": false,
 "turno_cocina_ingrediente_lentejas": true,
 "turno_cocina_ingrediente_patatas": false,
 "turno_cocina_ingrediente_romero": false,
 "turno_cocina_libro_leido_count": 0,
 "turno_cocina_patata_grande_picked": true
 }
-inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_patata", "turno_cocina_cuchillo", "turno_cocina_peso", "turno_cocina_mechero", "turno_cocina_bol_inventario" ]
+inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_patata", "turno_cocina_cuchillo", "turno_cocina_mechero", "turno_cocina_peso", "turno_cocina_bol_inventario" ]
 objects = {
 "_camera": {
 "active": true,
@@ -58,7 +58,7 @@ objects = {
 "_music": {
 "active": true,
 "interactive": true,
-"playback_position": 17.6745,
+"playback_position": 8.68027,
 "state": "res://gymkhana/sounds/music_loop.ogg"
 },
 "_sound": {
@@ -75,6 +75,10 @@ objects = {
 "cocina_cuchillos": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Contar los cuchillos",
+"action2": "Coger un buen cuchillo"
+}
 },
 "interactive": true,
 "state": "default"
@@ -82,6 +86,10 @@ objects = {
 "cocina_debajo_sofa": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar debajo del sofa",
+"action2": "Meter la mano"
+}
 },
 "interactive": true,
 "state": "default"
@@ -89,6 +97,10 @@ objects = {
 "cocina_fregadero_der": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -96,6 +108,10 @@ objects = {
 "cocina_fregadero_izq": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -115,7 +131,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action1": "Admirar la patata",
+"action2": "Cogerla"
+}
 },
 "interactive": true,
 "state": "default"
@@ -123,6 +143,9 @@ objects = {
 "cocina_puerta_delante": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Salir de la cocina"
+}
 },
 "interactive": true,
 "state": "default"
@@ -130,6 +153,9 @@ objects = {
 "cocina_puerta_detras": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Ir detrás"
+}
 },
 "interactive": true,
 "state": "default"
@@ -138,10 +164,10 @@ objects = {
 "active": true,
 "custom_data": {
 },
-"global_transform": Transform2D( 1.19294, 0, 0, 1.19294, 1758, 563 ),
+"global_transform": Transform2D( 1.17137, 0, 0, 1.17137, 1649.23, 555.149 ),
 "interactive": false,
-"last_deg": 21,
+"last_deg": 111,
-"last_dir": 3,
+"last_dir": 5,
 "state": "speak_down"
 },
 "puerta_delante_start": {
@@ -157,6 +183,11 @@ objects = {
 "turno_cocina_bol": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Coger un bol",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -164,6 +195,36 @@ objects = {
 "turno_cocina_bol_inventario": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar dentro",
+"action4": "Usar"
+}
+},
+"interactive": true,
+"state": "default"
+},
+"turno_cocina_carton": {
+"active": false,
+"custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
+},
+"interactive": true,
+"state": "default"
+},
+"turno_cocina_carton_encendido": {
+"active": true,
+"custom_data": {
+"tooltips": {
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -171,6 +232,10 @@ objects = {
 "turno_cocina_cocina_gas": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Encender"
+}
 },
 "interactive": true,
 "state": "apagado"
@@ -178,6 +243,10 @@ objects = {
 "turno_cocina_cuchillo": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -185,6 +254,12 @@ objects = {
 "turno_cocina_cuerno": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el cuerno",
+"action2": "Coger el cuerno",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -192,13 +267,10 @@ objects = {
 "turno_cocina_economica": {
 "active": false,
 "custom_data": {
-},
+"tooltips": {
-"interactive": true,
+"action1": "Mirar",
-"state": "default"
+"action2": "Usar"
-},
+}
-"turno_cocina_frontal": {
-"active": true,
-"custom_data": {
 },
 "interactive": true,
 "state": "default"
@@ -206,6 +278,24 @@ objects = {
 "turno_cocina_libro_de_cocina": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Leer"
+}
+},
+"interactive": true,
+"state": "default"
+},
+"turno_cocina_madera": {
+"active": false,
+"custom_data": {
+"tooltips": {
+"action1": "cocina_delante_madera_action1",
+"action2": "cocina_delante_madera_action2",
+"action3": "cocina_delante_madera_action3",
+"action4": "cocina_delante_madera_action4"
+}
 },
 "interactive": true,
 "state": "default"
@@ -213,6 +303,12 @@ objects = {
 "turno_cocina_mechero": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -220,6 +316,24 @@ objects = {
 "turno_cocina_olla_llena": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar dentro",
+"action3": "Mirar",
+"action4": "Usar"
+}
+},
+"interactive": true,
+"state": "default"
+},
+"turno_cocina_olla_vacia": {
+"active": false,
+"custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -240,7 +354,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action3": "Contar las patatas",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -248,6 +366,25 @@ objects = {
 "turno_cocina_peso": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
+},
+"interactive": true,
+"state": "default"
+},
+"turno_cocina_peso_bol": {
+"active": true,
+"custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -255,7 +392,9 @@ objects = {
 }
 events = {
 "events_queue": {
-"_front": [  ]
+"_front": [  ],
+"intro_dialog2_channel": [  ],
+"intro_dialog_channel": [  ]
 },
 "sched_events": [  ]
 }

saves/save_006.tres

@@ -8,13 +8,13 @@ escoria_version = "1.0.0"
 game_version = "0.1.0"
 name = "Lentejas listas"
 date = {
-"day": 17,
+"day": 21,
 "dst": false,
-"hour": 20,
+"hour": 22,
-"minute": 0,
+"minute": 33,
 "month": 3,
-"second": 50,
+"second": 54,
-"weekday": 0,
+"weekday": 4,
 "year": 2024
 }
 main = {
@@ -40,14 +40,15 @@ globals = {
 "turno_cocina_economica_encendida": true,
 "turno_cocina_eneko_catando": false,
 "turno_cocina_frontal_debajo_sofa": true,
-"turno_cocina_ingrediente_ajo": true,
+"turno_cocina_ingrediente_ajo_cogido": true,
+"turno_cocina_ingrediente_ajo_en_lentejas": true,
 "turno_cocina_ingrediente_lentejas": true,
 "turno_cocina_ingrediente_patatas": true,
 "turno_cocina_ingrediente_romero": false,
 "turno_cocina_libro_leido_count": 0,
 "turno_cocina_patata_grande_picked": true
 }
-inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_cuchillo", "turno_cocina_peso", "turno_cocina_mechero", "turno_cocina_bol_inventario" ]
+inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_cuchillo", "turno_cocina_mechero", "turno_cocina_peso", "turno_cocina_bol_inventario" ]
 objects = {
 "_camera": {
 "active": true,
@@ -58,7 +59,7 @@ objects = {
 "_music": {
 "active": true,
 "interactive": true,
-"playback_position": 0.296893,
+"playback_position": 20.2657,
 "state": "res://gymkhana/sounds/music_loop.ogg"
 },
 "_sound": {
@@ -75,6 +76,10 @@ objects = {
 "cocina_cuchillos": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Contar los cuchillos",
+"action2": "Coger un buen cuchillo"
+}
 },
 "interactive": true,
 "state": "default"
@@ -82,6 +87,10 @@ objects = {
 "cocina_debajo_sofa": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar debajo del sofa",
+"action2": "Meter la mano"
+}
 },
 "interactive": true,
 "state": "default"
@@ -89,6 +98,10 @@ objects = {
 "cocina_fregadero_der": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -96,6 +109,10 @@ objects = {
 "cocina_fregadero_izq": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el fregadero",
+"action2": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -115,7 +132,11 @@ objects = {
 }, {
 "start": 4,
 "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
-} ]
+} ],
+"tooltips": {
+"action1": "Admirar la patata",
+"action2": "Cogerla"
+}
 },
 "interactive": true,
 "state": "default"
@@ -123,6 +144,9 @@ objects = {
 "cocina_puerta_delante": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Salir de la cocina"
+}
 },
 "interactive": true,
 "state": "default"
@@ -130,6 +154,9 @@ objects = {
 "cocina_puerta_detras": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Ir detrás"
+}
 },
 "interactive": true,
 "state": "default"
@@ -138,10 +165,10 @@ objects = {
 "active": true,
 "custom_data": {
 },
-"global_transform": Transform2D( 1.07647, 0, 0, 1.07647, 2681.66, 522 ),
+"global_transform": Transform2D( 1.06353, 0, 0, 1.06353, 2452.59, 516 ),
 "interactive": false,
-"last_deg": 341,
+"last_deg": 21,
-"last_dir": 2,
+"last_dir": 3,
 "state": "speak_down"
 },
 "puerta_delante_start": {
@@ -155,8 +182,13 @@ objects = {
 "state": "default"
 },
 "turno_cocina_bol": {
-"active": true,
+"active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Coger un bol",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -164,6 +196,12 @@ objects = {
 "turno_cocina_bol_inventario": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar dentro",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -171,6 +209,10 @@ objects = {
 "turno_cocina_cocina_gas": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Encender"
+}
 },
 "interactive": true,
 "state": "apagado"
@@ -178,6 +220,10 @@ objects = {
 "turno_cocina_cuchillo": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -185,6 +231,12 @@ objects = {
 "turno_cocina_cuerno": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar el cuerno",
+"action2": "Coger el cuerno",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -192,13 +244,10 @@ objects = {
 "turno_cocina_economica": {
 "active": false,
 "custom_data": {
-},
+"tooltips": {
-"interactive": true,
+"action1": "Mirar",
-"state": "default"
+"action2": "Usar"
-},
+}
-"turno_cocina_frontal": {
-"active": true,
-"custom_data": {
 },
 "interactive": true,
 "state": "default"
@@ -206,6 +255,11 @@ objects = {
 "turno_cocina_libro_de_cocina": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Leer"
+}
 },
 "interactive": true,
 "state": "default"
@@ -213,6 +267,12 @@ objects = {
 "turno_cocina_mechero": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -220,6 +280,11 @@ objects = {
 "turno_cocina_olla_llena": {
 "active": true,
 "custom_data": {
+"tooltips": {
+"action1": "Mirar dentro",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -227,6 +292,12 @@ objects = {
 "turno_cocina_peso": {
 "active": false,
 "custom_data": {
+"tooltips": {
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
+}
 },
 "interactive": true,
 "state": "default"
@@ -234,7 +305,9 @@ objects = {
 }
 events = {
 "events_queue": {
-"_front": [  ]
+"_front": [  ],
+"intro_dialog2_channel": [  ],
+"intro_dialog_channel": [  ]
 },
 "sched_events": [  ]
 }