From 33e4c4c8f77685ab14160d95cb0953f8466b090b Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 30 Mar 2025 03:33:17 +0200 Subject: [PATCH 1/2] fix(save): post-intro, requires demo fork --- saves/save_001.tres | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/saves/save_001.tres b/saves/save_001.tres index e996867a..aaa05fa8 100644 --- a/saves/save_001.tres +++ b/saves/save_001.tres @@ -8,13 +8,13 @@ escoria_version = "1.0.0" game_version = "1.0" name = "post-intro" date = { -"day": 11, +"day": 30, "dst": false, -"hour": 13, -"minute": 32, +"hour": 1, +"minute": 42, "month": 3, -"second": 19, -"weekday": 2, +"second": 13, +"weekday": 0, "year": 2025 } main = { @@ -42,7 +42,7 @@ objects = { "_music": { "active": true, "interactive": true, -"playback_position": 6.46222, +"playback_position": 16.5202, "state": "res://gymkhana/sounds/music_loop.ogg" }, "_sound": { @@ -179,29 +179,6 @@ objects = { "interactive": true, "state": "default" }, -"turno_cocina_frontal": { -"active": true, -"custom_data": { -"tooltips": { -"action3": "tooltip_frontal_action3", -"action4": "tooltip_frontal_action4" -} -}, -"interactive": true, -"state": "default" -}, -"turno_cocina_libro_de_cocina": { -"active": false, -"custom_data": { -"tooltips": { -"action1": "tooltip_common_look", -"action2": "tooltip_common_pick", -"action3": "tooltip_turno_cocina_libro_de_cocina_action3" -} -}, -"interactive": true, -"state": "default" -}, "turno_cocina_madera": { "active": true, "custom_data": { @@ -233,7 +210,7 @@ settings = { "escoria_version": "1.0.0", "fullscreen": false, "master_volume": 0.391, -"music_volume": 0.525, +"music_volume": 0.0, "sfx_volume": 1.0, "speech_enabled": true, "speech_volume": 1.0, From afb3fc9230d698db816c24987a31d25188ee8d1b Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 30 Mar 2025 04:05:43 +0200 Subject: [PATCH 2/2] fix(eneko): action2 dialog was crashing --- .../escoria-ui-return-monkey-island/game.gd | 3 +- gymkhana/characters/eneko/eneko_smoking.esc | 32 +++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island/game.gd b/addons/escoria-ui-return-monkey-island/game.gd index 1833fb96..b96ee192 100644 --- a/addons/escoria-ui-return-monkey-island/game.gd +++ b/addons/escoria-ui-return-monkey-island/game.gd @@ -99,8 +99,7 @@ func _ready(): var time = Time.get_datetime_dict_from_system() var day = time["day"] var month = time["month"] - if( day == 8 and month ==2 ): - escoria.globals_manager.set_global('zorionak_eneko', true) + escoria.globals_manager.set_global('zorionak_eneko', day == 8 and month ==2 ) # Show inventory when video player finishes playing a video (inventory is hidden when a video starts) get_video_player().connect("finished", Callable(self, "show_ui")) diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index 3d79d450..e95d34b5 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -1,8 +1,3 @@ -:setup - global turno_cocina_tutorial_done -:ready - var cocina_delante_intro_dialog_option1_done = false - :action1 say($player, "Tiene pinta de que fuma", "cocina_delante_eneko_smoking_action1_say") @@ -73,6 +68,7 @@ done :intro_dialog2 + global turno_cocina_tutorial_done say($player, "Ya me he decidido, voy a hacer lentejas.", "cocina_delante_intro_dialog2_player_decision") say($eneko_smoking, "Vale, pero avísame cuando las tengas listas, quiero asegurarme de que se puedan comer.", "cocina_delante_intro_dialog2_player_decision_res") say($eneko_smoking, "Y si necesitas algún ingrediente y no lo encuentras búscalo mejor. A mí no me molestes, estoy ocupado.", "cocina_delante_intro_dialog2_player_decision_res_2") @@ -92,6 +88,13 @@ play_snd("res://gymkhana/sounds/music_loop.ogg", _music) :action2 + var name_known = false + global zorionak_eneko + var cocina_delante_dialog_option3_done = false + var cocina_delante_dialog_option4_done = false + var cocina_delante_dialog_option5_done = false + var cocina_delante_dialog_option6_done = false + ?! - "cocina_delante_intro_dialog_catar:Ya he hecho las lentejas!" [turno_cocina_ingrediente_lentejas and turno_cocina_economica_encendida] stop_snd() @@ -105,9 +108,10 @@ set_active($cocina_delante_puerta_detras, false) sched_event(7, $eneko_smoking, "turno_cocina_eneko_catando_end") stop - - "turno_cocina_eneko_zorionak:Zorionak!!!!" [zorionak_eneko] - say_last_dialog_option() - say($eneko_smoking, "Mila esker!" , "turno_cocina_eneko_zorionak_res") + # TODO: esc compiler crashing because zorionak_eneko is undefined. Related with this global programatically set? + # - "turno_cocina_eneko_zorionak:Zorionak!!!!" [zorionak_eneko] + # say_last_dialog_option() + # say($eneko_smoking, "Mila esker!", "turno_cocina_eneko_zorionak_res") - "cocina_delante_eneko_action2_dialog_option3:Quién eres tú?" [!cocina_delante_dialog_option3_done] say_last_dialog_option() if !name_known: @@ -116,17 +120,17 @@ say($eneko_smoking, "Ya te he dicho mi nombre!!", "cocina_delante_eneko_action2_dialog_option3_name_known_res_1") say($eneko_smoking, "NO PREGUNTES", "cocina_delante_eneko_action2_dialog_option3_name_known_res_2") say($eneko_smoking, "NI ME CONTACTES POR WHATSAPP O TE BLOQUEARÉ", "cocina_delante_eneko_action2_dialog_option3_name_known_res_3") - global cocina_delante_dialog_option3_done = true - global name_known = true + cocina_delante_dialog_option3_done = true + name_known = true - "cocina_delante_eneko_action2_dialog_option4:Qué haces?" [!cocina_delante_dialog_option4_done] say_last_dialog_option() say($eneko_smoking, "Fumar.", "cocina_delante_eneko_action2_dialog_option4_res_1") say($eneko_smoking, "No lo ves?", "cocina_delante_eneko_action2_dialog_option4_res_2") - global cocina_delante_dialog_option4_done = true + cocina_delante_dialog_option4_done = true - "cocina_delante_eneko_action2_dialog_option5:Me he quedado atascado, puedes ayudarme?" [!cocina_delante_dialog_option5_done] say_last_dialog_option() say($eneko_smoking, "Lo haría, pero estoy ocupado.", "cocina_delante_eneko_action2_dialog_option5_res") - global cocina_delante_dialog_option5_done = true + cocina_delante_dialog_option5_done = true - "cocina_delante_eneko_action2_dialog_option6:A veces tengo la sensación de que el mundo en el que vivimos no es real." [!cocina_delante_dialog_option6_done] say_last_dialog_option() say($eneko_smoking, "Sé exactamente a lo que te refieres. Algo no funciona en el mundo. No sabes lo que es, pero ahí está, como una astilla clavada en tu mente, y te está enloqueciendo. Esta sensación te ha traído hasta mí. ¿Sabes de lo que te estoy hablando?", "cocina_delante_eneko_action2_dialog_option6_1") @@ -138,11 +142,11 @@ say($eneko_smoking, "¿Pastillas? ¿Por la mañana? Anda y vete a hacer la comida!", "cocina_delante_eneko_action2_dialog_option6_7") set_angle($player, 180) say($player, "Menuda conversación más extraña...", "cocina_delante_eneko_action2_dialog_option6_8") - global cocina_delante_dialog_option6_done = true + cocina_delante_dialog_option6_done = true stop - "Agur" say($current_player, "Agur yogur!", "cocina_delante_eneko_action2_dialog_end") - stop + done :action3 "turno_cocina_frontal" if turno_cocina_frontal_debajo_sofa: