fix: merge duplicated custom_data in patata items

This commit is contained in:
2024-03-21 22:39:48 +01:00
parent 47161be549
commit 5125428b1f
14 changed files with 572 additions and 130 deletions

View File

@@ -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,
"minute": 0,
"hour": 22,
"minute": 33,
"month": 3,
"second": 50,
"weekday": 0,
"second": 54,
"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_dir": 2,
"last_deg": 21,
"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": {
},
"interactive": true,
"state": "default"
},
"turno_cocina_frontal": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Usar"
}
},
"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": [ ]
}