diff --git a/addons/escoria-ui-return-monkey-island/game.gd b/addons/escoria-ui-return-monkey-island/game.gd index 1c8fd567..da126083 100644 --- a/addons/escoria-ui-return-monkey-island/game.gd +++ b/addons/escoria-ui-return-monkey-island/game.gd @@ -98,11 +98,7 @@ func _ready(): if tooltip_node.connect("tooltip_size_updated", Callable(self, "update_tooltip_following_mouse_position").bind(tooltip_node)) != 0: escoria.logger.error(self, "Error connecting tooltip_size_updated with update_tooltip_following_mouse_position") - # We get current day and month - var time = Time.get_datetime_dict_from_system() - var day = time["day"] - var month = time["month"] - 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")) @@ -136,6 +132,11 @@ func _enter_tree(): if Input.connect("joy_connection_changed", Callable(self, "_on_joy_connection_changed")) != 0: escoria.logger.error(self, "Error connecting joy_connection_changed") + # We get current day and month + var time = Time.get_datetime_dict_from_system() + var day = time["day"] + var month = time["month"] + escoria.globals_manager.set_global('zorionak_eneko', day == 8 and month == 2) func _exit_tree(): escoria.inputs_manager.register_custom_input_handler(null) diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index 70557ddd..bce672e3 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -116,10 +116,9 @@ set_active($cocina_delante_puerta_detras, false) sched_event(7, $eneko_smoking, "turno_cocina_eneko_catando_end") done - # 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") + - "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: