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 = "Post-intro"
date = {
"day": 17,
"day": 21,
"dst": false,
"hour": 17,
"minute": 34,
"hour": 22,
"minute": 26,
"month": 3,
"second": 14,
"weekday": 0,
"second": 6,
"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"