From dd17ae7b50e602d469c6e71345e23985e554d635 Mon Sep 17 00:00:00 2001 From: Spotted Dove <84446131+Wingdinggaster656@users.noreply.github.com> Date: Mon, 5 Sep 2022 01:07:05 +0800 Subject: [PATCH 1/6] Logic --- Monika After Story/game/script-topics.rpy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 377b509198..c0771088e4 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -1644,7 +1644,8 @@ init 5 python: eventlabel="monika_lastpoem", category=['monika'], prompt="Monika's last poem", - random=True + conditional="persistent.playthrough >= 3", + action=EV_ACT_RANDOM ) ) From 712b8e46e50893134793a29f3da487c07298c3e9 Mon Sep 17 00:00:00 2001 From: Spotted Dove <84446131+Wingdinggaster656@users.noreply.github.com> Date: Mon, 5 Sep 2022 01:40:13 +0800 Subject: [PATCH 2/6] I wish this is the correct way --- Monika After Story/game/updates.rpy | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 92992e2fbf..9c9c0174d4 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -374,6 +374,15 @@ label v0_3_1(version=version): # 0.3.1 # non generic updates go here +# 0.12.9 +label v0_12_9(version="v0_12_9"): + python hide: + mas_setEVLPropValues( + "monika_lastpoem", + conditional="persistent.playthrough >= 3" + ) + + return # 0.12.8.6 label v0_12_8_6(version="v0_12_8_6"): From f4c785a7c9be04750ccd8270ee44c1eae79e2225 Mon Sep 17 00:00:00 2001 From: Spotted Dove <84446131+Wingdinggaster656@users.noreply.github.com> Date: Mon, 5 Sep 2022 02:00:59 +0800 Subject: [PATCH 3/6] *Again I wish this is the correct way* --- Monika After Story/game/updates.rpy | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 83928130f8..7f1b54d960 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -377,11 +377,12 @@ label v0_3_1(version=version): # 0.3.1 # 0.12.9.1 label v0_12_9_1(version="v0_12_9_1"): python hide: - mas_setEVLPropValues( - "monika_lastpoem", - conditional="persistent.playthrough >= 3" - ) - + event_lastpoem = mas_getEV('monika_lastpoem') + if ( + event_lastpoem + and event_lastpoem.shown_count == 0 + ): + event_lastpoem.conditional = "persistent.playthrough >= 3" return # 0.12.8.6 From 2bd57455cccaec238495810cfa6a22442bb06afa Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+Booplicate@users.noreply.github.com> Date: Mon, 5 Sep 2022 02:11:30 +0300 Subject: [PATCH 4/6] fix conditional and update script Co-Authored-By: John W --- Monika After Story/game/script-topics.rpy | 8 ++++++-- Monika After Story/game/updates.rpy | 14 ++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 48c93c18d9..aed863fe4d 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -1644,13 +1644,16 @@ init 5 python: eventlabel="monika_lastpoem", category=['monika'], prompt="Monika's last poem", - conditional="persistent.playthrough >= 3", + # the correct check is persistent.seen_colors_poem + # but our imports are messed up so we have to use persistent.playthrough >= 2 + conditional="persistent.playthrough >= 2", action=EV_ACT_RANDOM ) ) label monika_lastpoem: m 3eud "Hey, you remember that last poem I showed you?" + if not mas_safeToRefDokis(): m 3rssdlc "I mean, the one with all the messed-up colors and stuff." else: @@ -1666,7 +1669,8 @@ label monika_lastpoem: show monika 5eua at t11 zorder MAS_MONIKA_Z with dissolve_monika m 5eua "I'm happy with where we are now." m 5hua "And I can tell you are, too." - return + + return "derandom" init 5 python: addEvent(Event(persistent.event_database,eventlabel="monika_anxious",category=['psychology'],prompt="Sudden anxiety",random=True)) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 7f1b54d960..91492b35fe 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -377,12 +377,14 @@ label v0_3_1(version=version): # 0.3.1 # 0.12.9.1 label v0_12_9_1(version="v0_12_9_1"): python hide: - event_lastpoem = mas_getEV('monika_lastpoem') - if ( - event_lastpoem - and event_lastpoem.shown_count == 0 - ): - event_lastpoem.conditional = "persistent.playthrough >= 3" + if not mas_seenEvent("monika_lastpoem"): + mas_setEVLPropValues( + "monika_lastpoem", + conditional="persistent.playthrough >= 2", + action=EV_ACT_RANDOM + ) + else: + mas_hideEVL("monika_lastpoem", "EVE", derandom=True) return # 0.12.8.6 From f0e1fcc519ce8ca59eac2b83cfcfa57403f2a238 Mon Sep 17 00:00:00 2001 From: John W Date: Sun, 18 Sep 2022 18:01:17 -0400 Subject: [PATCH 5/6] derand for everyone and then add cond/act if needed --- Monika After Story/game/updates.rpy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 3c40ef1869..0ec28a3e01 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -377,14 +377,16 @@ label v0_3_1(version=version): # 0.3.1 # 0.12.9.1 label v0_12_9_1(version="v0_12_9_1"): python hide: + mas_hideEVL("monika_lastpoem", "EVE", derandom=True) + if not mas_seenEvent("monika_lastpoem"): mas_setEVLPropValues( "monika_lastpoem", conditional="persistent.playthrough >= 2", action=EV_ACT_RANDOM ) - else: - mas_hideEVL("monika_lastpoem", "EVE", derandom=True) + + mas_hideEVL("monika_lastpoem", "EVE", derandom=True) if mas_seenLabels(['monika_solipsism']): mas_protectedShowEVL("monika_materialism","EVE", _random=True) From 8f1a78a6e414a6fd3ff5798df7acabb13213290a Mon Sep 17 00:00:00 2001 From: John W Date: Sun, 18 Sep 2022 19:32:38 -0400 Subject: [PATCH 6/6] swear i already did this --- Monika After Story/game/updates.rpy | 2 -- 1 file changed, 2 deletions(-) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 0ec28a3e01..78e0c2e766 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -386,8 +386,6 @@ label v0_12_9_1(version="v0_12_9_1"): action=EV_ACT_RANDOM ) - mas_hideEVL("monika_lastpoem", "EVE", derandom=True) - if mas_seenLabels(['monika_solipsism']): mas_protectedShowEVL("monika_materialism","EVE", _random=True)