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 = "1 patata"
date = {
"day": 17,
"day": 21,
"dst": false,
"hour": 17,
"minute": 35,
"hour": 22,
"minute": 26,
"month": 3,
"second": 12,
"weekday": 0,
"second": 58,
"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_dir": 2,
"last_deg": 71,
"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"