From 96ff7ea842382a77d3f24194fa734d94e70367aa Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Wed, 14 Feb 2024 23:25:57 +0100 Subject: [PATCH] fix: use '_COUNT_' as prefix for count manager globals instead of 'count/' --- .../esc/esc_item_count_manager.gd | 2 +- .../inventory/turno_cocina_olla_llena.esc | 9 +- .../items/inventory/turno_cocina_patata.esc | 4 +- .../inventory/turno_cocina_patata_grande.esc | 6 +- saves/save_003.tres | 155 ++++++++++++++++++ 5 files changed, 165 insertions(+), 11 deletions(-) create mode 100644 saves/save_003.tres diff --git a/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd index 4e33924f..ed03bd59 100644 --- a/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd +++ b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd @@ -16,7 +16,7 @@ func remove(global_id: String, value:= 1) -> void: func set(global_id: String, value: int) -> void: var item = get_item(global_id) item.count = value - escoria.globals_manager.set_global("count/%s" % global_id, value) + escoria.globals_manager.set_global("_COUNT_%s" % global_id, value) updateSprite(item) diff --git a/gymkhana/items/inventory/turno_cocina_olla_llena.esc b/gymkhana/items/inventory/turno_cocina_olla_llena.esc index 5ba88ffd..bc032cb1 100644 --- a/gymkhana/items/inventory/turno_cocina_olla_llena.esc +++ b/gymkhana/items/inventory/turno_cocina_olla_llena.esc @@ -26,10 +26,10 @@ :action3 turno_cocina_patata - say player "Tienen que ser 4 patatas" [!eq count/turno_cocina_patata 4] - say player "Patatas pa'entro" [eq count/turno_cocina_patata 4] - inventory_remove turno_cocina_patata [eq count/turno_cocina_patata 4] - set_global turno_cocina_ingrediente_patatas true [eq count/turno_cocina_patata 4] + say player "Tienen que ser 4 patatas" [!eq _COUNT_turno_cocina_patata 4] + say player "Patatas pa'entro" [eq _COUNT_turno_cocina_patata 4] + inventory_remove turno_cocina_patata [eq _COUNT_turno_cocina_patata 4] + set_global turno_cocina_ingrediente_patatas true [eq _COUNT_turno_cocina_patata 4] :action3 turno_cocina_romero say player "Romero pa'entro" @@ -45,4 +45,3 @@ say player "Con ajo quedara al gusto de Eneko." set_global turno_cocina_ingrediente_ajo true inventory_remove turno_cocina_ajo - diff --git a/gymkhana/items/inventory/turno_cocina_patata.esc b/gymkhana/items/inventory/turno_cocina_patata.esc index 5ff6406a..3ef1b7e2 100644 --- a/gymkhana/items/inventory/turno_cocina_patata.esc +++ b/gymkhana/items/inventory/turno_cocina_patata.esc @@ -1,6 +1,6 @@ :action3 - say player "Tengo que conseguir tres patatas más." [eq count/turno_cocina_patata 1] - say player "Ya tengo {count/turno_cocina_patata} patatas!" [!eq count/turno_cocina_patata 1] + say player "Tengo que conseguir tres patatas más." [eq _COUNT_turno_cocina_patata 1] + say player "Ya tengo {_COUNT_turno_cocina_patata} patatas!" [!eq _COUNT_turno_cocina_patata 1] :action3 turno_cocina_cuchillo say current_player "No pienso pelarlas, son de la huerta." diff --git a/gymkhana/items/inventory/turno_cocina_patata_grande.esc b/gymkhana/items/inventory/turno_cocina_patata_grande.esc index 3a25c487..a77e0e08 100644 --- a/gymkhana/items/inventory/turno_cocina_patata_grande.esc +++ b/gymkhana/items/inventory/turno_cocina_patata_grande.esc @@ -21,6 +21,6 @@ say current_player "Creo que necesito patatas normales, no patatas gigantes..." inventory_add turno_cocina_patata item_count_add turno_cocina_patata 2 inventory_remove turno_cocina_patata_grande -say current_player "Tenía una patata demasiado grande y ahora tengo dos patatas perfectas." [eq count/turno_cocina_patata 2] -say current_player "Soy más listo que el hambre." [eq count/turno_cocina_patata 2] -say current_player "Ya tengo {count/turno_cocina_patata} patatas!" [!eq count/turno_cocina_patata 2] +say current_player "Tenía una patata demasiado grande y ahora tengo dos patatas perfectas." [eq _COUNT_turno_cocina_patata 2] +say current_player "Soy más listo que el hambre." [eq _COUNT_turno_cocina_patata 2] +say current_player "Ya tengo {_COUNT_turno_cocina_patata} patatas!" [!eq _COUNT_turno_cocina_patata 2] diff --git a/saves/save_003.tres b/saves/save_003.tres new file mode 100644 index 00000000..acdfc6bf --- /dev/null +++ b/saves/save_003.tres @@ -0,0 +1,155 @@ +[gd_resource type="Resource" load_steps=2 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1] + +[resource] +script = ExtResource( 1 ) +escoria_version = "1.0.0" +game_version = "0.1.0" +name = "cuchillo y mechero" +date = { +"day": 13, +"dst": false, +"hour": 23, +"minute": 3, +"month": 2, +"second": 4, +"weekday": 2, +"year": 2024 +} +main = { +"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn", +"last_scene_global_id": "" +} +globals = { +"ESC_CURRENT_SCENE": "cocina_detras", +"ESC_DIALOG_CHOSEN_OPTION": "¿Que te parece que haga la comida?", +"ESC_LAST_SCENE": "cocina", +"FORCE_LAST_SCENE_NULL": false, +"cocina_delante_intro_dialog_option1_done": true, +"cocina_delante_intro_dialog_option2_1_done": true, +"cocina_delante_intro_dialog_option2_2_done": true, +"cocina_delante_intro_dialog_option2_3_done": true, +"cocina_delante_intro_dialog_option2_done": true, +"cocina_delante_intro_dialog_option3_done": true, +"cocina_delante_intro_dialog_option4_done": true, +"cocina_delante_intro_dialog_option5_done": true, +"cocina_delante_intro_dialog_option6_done": true, +"cocina_delante_intro_played": true, +"cocina_intro_played": true, +"i/turno_cocina_cuchillo": true, +"i/turno_cocina_frontal": true, +"i/turno_cocina_libro_de_cocina": true, +"i/turno_cocina_mechero": true, +"intro_dialog2_playing": false, +"new_game": true, +"turno_cocina_cuchillo_en_inventario": true, +"turno_cocina_eneko_catando": false, +"turno_cocina_ingrediente_ajo": false, +"turno_cocina_ingrediente_lentejas": false, +"turno_cocina_ingrediente_patatas": false, +"turno_cocina_ingrediente_romero": false, +"turno_cocina_libro_leido_count": 1 +} +objects = { +"_camera": { +"active": true, +"interactive": true, +"state": "default" +}, +"_music": { +"active": true, +"interactive": true, +"playback_position": 19.6248, +"state": "res://gymkhana/sounds/music_loop.ogg" +}, +"_sound": { +"active": true, +"interactive": true, +"playback_position": 5.60528, +"state": "default" +}, +"_speech": { +"active": true, +"interactive": true, +"state": "default" +}, +"cocina_detras_puerta_cocina": { +"active": true, +"interactive": true, +"state": "default" +}, +"cocina_detras_puerta_delante": { +"active": true, +"interactive": true, +"state": "default" +}, +"player": { +"active": true, +"global_transform": Transform2D( 0.821569, 0, 0, 0.821569, 622.001, 515 ), +"interactive": false, +"last_deg": 341, +"last_dir": 2, +"state": "speak_down" +}, +"puerta_cocina_start": { +"active": true, +"interactive": true, +"state": "default" +}, +"puerta_delante_start": { +"active": true, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { +"active": false, +"interactive": true, +"state": "default" +}, +"turno_cocina_mechero": { +"active": false, +"interactive": true, +"state": "default" +}, +"turno_cocina_olla_vacia": { +"active": true, +"interactive": true, +"state": "default" +}, +"turno_cocina_romero": { +"active": true, +"interactive": true, +"state": "default" +} +} +events = { +"events_queue": { +"_front": [ ], +"intro_dialog2_channel": [ ], +"intro_dialog_channel": [ ] +}, +"sched_events": [ ] +} +terrain_navpolys = { +"cocina_detras": { +"NavigationPolygonInstance": true +} +} +settings = { +"custom_settings": { +"a_custom_setting": 100 +}, +"escoria_version": "1.0.0", +"fullscreen": false, +"master_volume": 0.391, +"music_volume": 0.649, +"sfx_volume": 1.0, +"speech_enabled": true, +"speech_volume": 1.0, +"text_lang": "es", +"voice_lang": "fr_FR" +} +custom_data = { +"ui_type": "simplemouse" +}