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

3
gymkhana/items/inventory/turno_cocina_ajo.esc
View File

@@ -2,6 +2,7 @@
say player "Ajooo!"
inventory_add turno_cocina_ajo
set_active turno_cocina_ajo false
set_global turno_cocina_ingrediente_ajo_cogido true
:action3
say player "Una buena cabeza de ajo."
say player "Una buena cabeza de ajo, justo lo que necesitaba para unas buenas lentejas."

6
gymkhana/items/inventory/turno_cocina_olla_llena.esc
View File

@@ -2,7 +2,7 @@
say player "Está llena de agua"
say player "lentejas" [turno_cocina_ingrediente_lentejas]
say player "patatas" [turno_cocina_ingrediente_patatas]
say player "ajo" [turno_cocina_ingrediente_ajo]
say player "ajo" [turno_cocina_ingrediente_ajo_en_lentejas]
say player "romero" [turno_cocina_ingrediente_romero]
@@ -13,7 +13,7 @@
say player "Está llena de agua."
say player "lentejas" [turno_cocina_ingrediente_lentejas]
say player "patatas" [turno_cocina_ingrediente_patatas]
say player "ajo" [turno_cocina_ingrediente_ajo]
say player "ajo" [turno_cocina_ingrediente_ajo_en_lentejas]
say player "romero" [turno_cocina_ingrediente_romero]
@@ -43,5 +43,5 @@
:action3 turno_cocina_ajo
say player "Con ajo quedara al gusto de Eneko."
set_global turno_cocina_ingrediente_ajo true
set_global turno_cocina_ingrediente_ajo_en_lentejas true
inventory_remove turno_cocina_ajo

12
gymkhana/items/inventory/turno_cocina_patata.tscn
View File

@@ -15,12 +15,6 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_patata.esc"
inventory_texture = ExtResource( 2 )
dialog_color = Color( 1, 1, 1, 1 )
combine_when_selected_action_is_in = [ "action4" ]
custom_data = {
"tooltips": {
"action3": "Contar las patatas",
"action4": "Usar",
}
}
action3_target_texts = {
"turno_cocina_cuchillo": "Pelar patatas"
}
@@ -35,7 +29,11 @@ custom_data = {
{ "start": 2, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png" },
{ "start": 3, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png" },
{ "start": 4, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" },
]
],
"tooltips": {
"action3": "Contar las patatas",
"action4": "Usar",
}
}
[node name="Sprite" type="Sprite" parent="."]