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 = "2 patatas"
date = {
"day": 17,
"day": 21,
"dst": false,
"hour": 17,
"minute": 37,
"hour": 22,
"minute": 27,
"month": 3,
"second": 12,
"weekday": 0,
"second": 26,
"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,
"state": "off"
"playback_position": 4.62113,
"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_dir": 4,
"last_deg": 341,
"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": {
},
"interactive": true,
"state": "default"
},
"turno_cocina_frontal": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Usar"
}
},
"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": [ ]
}