oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: merge duplicated custom_data in patata items

Browse Source
This commit is contained in:
Eneko Nieto
2024-03-21 22:39:48 +01:00
parent 47161be549
commit 5125428b1f
14 changed files with 572 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
saves/save_005.tres
View File

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