Merge pull request #9491 from Wingdinggaster656/Fix-monika_lastpoem

Potentially illogical dialogue fixes

Monika After Story/game/script-topics.rpy

@@ -1644,12 +1644,16 @@ init 5 python:
             eventlabel="monika_lastpoem",
             category=['monika'],
             prompt="Monika's last poem",
-            random=True
+            # 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:
@@ -1665,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))

Monika After Story/game/updates.rpy

@@ -377,6 +377,15 @@ 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
+            )
+
         if mas_seenLabels(['monika_solipsism']):
             mas_protectedShowEVL("monika_materialism","EVE", _random=True)