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

12
gymkhana/rooms/turno_cocina/cocina/cocina.tscn
View File

@@ -268,19 +268,17 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/patata.esc"
combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 13 )
dialog_color = Color( 1, 1, 1, 1 )
custom_data = {
"tooltips": {
"action1": "Admirar la patata",
"action2": "Cogerla"
}
}
custom_data = {
"count_textures": [
{ "start": 1, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" },
{ "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": {
"action1": "Admirar la patata",
"action2": "Cogerla"
}
}
animations = null

1
gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
View File

@@ -39,6 +39,7 @@ set_angle player 90
accept_input ALL
play_snd res://gymkhana/sounds/music_loop.ogg _music
> [intro_dialog2_playing]
accept_input SKIP
walk_block player new_game_start_location
set_angle player 90
queue_event eneko_smoking intro_dialog2 intro_dialog2_channel true