Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New idle mode exps + fixes #7576

Merged
merged 15 commits into from Feb 20, 2022
22 changes: 10 additions & 12 deletions Monika After Story/game/event-handler.rpy
Expand Up @@ -2655,19 +2655,15 @@ label prompt_menu:
# restored on a relaunch, which would make no sense lol.

# only call label if it exists
if cb_label is not None:
if renpy.has_label(cb_label):
call expression cb_label
Booplicate marked this conversation as resolved.
Show resolved Hide resolved

#Show idle exp here so we dissolve like other topics
show monika idle with dissolve_monika

# clean up idle stuff
$ persistent._mas_greeting_type = None
$ store.mas_globals.in_idle_mode = False
else:
call mas_brb_generic_callback

# this event will cleanup the remaining idle vars
$ pushEvent("mas_idle_mode_greeting_cleanup")
$ mas_idle_mailbox.send_skipmidloopeval()
#Show idle exp here so we dissolve like other topics
if not renpy.showing("monika idle"):
show monika idle at t11 zorder MAS_MONIKA_Z with dissolve_monika

# NOTE: we only need to enable music hotkey since we are in dlg mode
#$ mas_DropShield_idle()
Expand Down Expand Up @@ -2773,9 +2769,11 @@ label prompt_menu:
jump prompt_menu

label prompt_menu_end:

show monika at t11
$ mas_DropShield_dlg()
if store.mas_globals.in_idle_mode:
$ mas_dlgToIdleShield()
else:
$ mas_DropShield_dlg()
jump ch30_visual_skip

label show_prompt_list(sorted_event_labels):
Expand Down