Merge pull request #6024 from multimokia/0.11.3-fpyos

0.11.3 Fpyos

Monika After Story/game/definitions.rpy

@@ -5650,17 +5650,17 @@ init -1 python:
 
             for i in range(4):
                 # Value Name, Value Data, Value Type
-                n,installPath,t = _winreg.EnumValue(keyVal, i)
-                if n=="InstallPath":
+                n, installPath, t = _winreg.EnumValue(keyVal, i)
+                if n == "InstallPath":
                     break
 
-            installPath+="/steamapps"
+            installPath += "/steamapps"
 
-        elif renpy.mac:
-            installPath=os.environ.get("HOME") + "/Library/Application Support/Steam/SteamApps"
+        elif renpy.macintosh:
+            installPath = os.environ.get("HOME") + "/Library/Application Support/Steam/SteamApps"
 
         elif renpy.linux:
-            installPath=os.environ.get("HOME") + "/.steam/Steam/steamapps" \
+            installPath = os.environ.get("HOME") + "/.steam/Steam/steamapps"
             # Possibly also ~/.local/share/Steam/SteamApps/common/Kerbal Space Program?
 
         #Ideally we should never end up here, but in the case we do, we should prevent any work from being done

Monika After Story/game/event-handler.rpy

@@ -2236,7 +2236,7 @@ init python:
             for ev in evhand.event_database.itervalues()
             if (
                 Event._filterEvent(ev, unlocked=False, pool=True)
-                and "no unlock" not in ev.rules
+                and "no_unlock" not in ev.rules
             )
         ]
         u_count = count
@@ -2593,8 +2593,8 @@ label show_prompt_list(sorted_event_labels):
         hide_unseen_event = mas_getEV("mas_hide_unseen")
 
         final_items = (
-            (_("I don't want to see this menu anymore."), "mas_hide_unseen", False, False, 20),
-            (_("Nevermind."), False, False, False, 0)
+            (_("I don't want to see this menu anymore"), "mas_hide_unseen", False, False, 20),
+            (_("Nevermind"), False, False, False, 0)
         )
 
     call screen mas_gen_scrollable_menu(prompt_menu_items, mas_ui.SCROLLABLE_MENU_LOW_AREA, mas_ui.SCROLLABLE_MENU_XALIGN, *final_items)
@@ -2765,7 +2765,7 @@ label prompts_categories(pool=True):
 
 # sets up the bookmarks menu
 init 5 python:
-    addEvent(Event(persistent.event_database,eventlabel="mas_bookmarks",unlocked=False,rules={"no unlock":None}))
+    addEvent(Event(persistent.event_database,eventlabel="mas_bookmarks",unlocked=False,rules={"no_unlock":None}))
     # NOTE: do not use this as an ev.
 
 label mas_bookmarks:
@@ -2798,8 +2798,8 @@ label mas_bookmarks:
         bookmarks_items.sort()
 
         bk_menu_final_items = (
-            (_("I'd like to remove a bookmark."), "remove_bookmark", False, False, 20),
-            (_("Nevermind."), "nevermind", False, False, 0)
+            (_("I'd like to remove a bookmark"), "remove_bookmark", False, False, 20),
+            (_("Nevermind"), "nevermind", False, False, 0)
         )
 
     # FALL THROUGH

Monika After Story/game/pong.rpy

@@ -973,8 +973,6 @@ label mas_pong_dlg_loser:
 
         #Extreme
         else:
-            m 2wuo "Wow!"
-            m 2wuw "You beat me three times and I'm giving it all I have!"
             m 2hub "Great job, [player]!"
             m 1kua "Ehehe!"
 

Monika After Story/game/script-affection.rpy

@@ -1926,7 +1926,7 @@ init 5 python:
             random=False,
             pool=True,
             unlocked=True,
-            rules={"no unlock": None},
+            rules={"no_unlock": None},
             aff_range=(mas_aff.AFFECTIONATE, None)
         ),
         restartBlacklist=True
@@ -2175,7 +2175,7 @@ init 5 python:
             category=['you'],
             pool=True,
             unlocked=False,
-            rules={"no unlock": None},
+            rules={"no_unlock": None},
             aff_range=(mas_aff.AFFECTIONATE,None)
         )
     )

Monika After Story/game/script-compliments.rpy

@@ -719,7 +719,7 @@ label mas_compliment_thinking_of_you_2:
             $ mas_loseAffection()
             m 2esc "..."
             m 2etc "..."
-            m 2rksdlc "Oh, umm...."
+            m 2rksdlc "Oh, umm..."
             m 2rksdld "I'm sorry?"
     return
 

Monika After Story/game/script-farewells.rpy

@@ -368,7 +368,7 @@ init 5 python:
 label bye_leaving_already_2:
     m 1ekc "Aww, leaving already?"
     m 1eka "It's really sad whenever you have to go..."
-    m 3hubsa "I love you so much [player]!"
+    m 3hubsa "I love you so much, [player]!"
     show monika 5hubsb at t11 zorder MAS_MONIKA_Z with dissolve_monika
     m 5hubsb "Never forget that!"
     return 'quit'
@@ -1212,7 +1212,7 @@ label bye_prompt_game:
             m 3hksdlb "It's the middle of the night!"
             m 2rksdlc "It's one thing that you're still up this late..."
             m 2rksdld "But you're thinking of playing another game?"
-            m 4tfu "....A game big enough that you can't have me in the background..."
+            m 4tfu "...A game big enough that you can't have me in the background..."
             m 1eka "Well... {w=1}I can't stop you, but I really hope you go to bed soon..."
             m 1hua "Don't worry about coming back to say goodnight to me, you can go-{nw}"
             $ _history_list.pop()

Monika After Story/game/script-grammar.rpy

@@ -111,7 +111,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(1)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -143,7 +143,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(2)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -186,7 +186,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(3)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -221,7 +221,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(4)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -252,7 +252,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(5)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -282,7 +282,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(6)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -313,7 +313,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(7)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -347,7 +347,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(8)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 
@@ -387,7 +387,7 @@ init 5 python:
             pool=True,
             conditional="store.mas_gtod.has_day_past_tip(9)",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock":None}
+            rules={"no_unlock":None}
         )
     )
 

Monika After Story/game/script-greetings.rpy

@@ -978,7 +978,9 @@ init 5 python:
 label greeting_sweetpea:
     m 1hua "Look who's back."
     m 2hub "It's you, my sweetpea!"
-    m 1lkbsa "My goodness...that surely was embarrassing to say, ehehe~"
+
+    if mas_isMoniHappy(lower=True):
+        m 1lkbsa "Oh gosh...that was kinda embarrassing, ehehe~"
     return
 
 init 5 python:
@@ -2027,6 +2029,7 @@ label greeting_hai_domo:
     m "Virtual girlfriend, Monika here!"
     m 1hksdlb "Ahaha, sorry! I've been watching a certain Virtual Youtuber lately."
     m 1eua "I have to say, she's rather charming..."
+    $ mas_lockEVL("greeting_hai_domo", "GRE")
     return
 
 #TODO needs additional dialogue so can be used for all aff
@@ -3073,7 +3076,7 @@ label greeting_back_from_work:
             m 2dsc "You're just there trying your best, and somehow it's not good enough for someone..."
             m 2eka "If it's still really bothering you, I think it would do you some good to try and relax a little."
             m 3eka "Maybe talking about something else or even playing a game will help get your mind off of it."
-            m 1hua "I'm sure you'll feel better after we spend some together."
+            m 1hua "I'm sure you'll feel better after we spend some time together."
             return
 
         label .passed_over:
@@ -3285,14 +3288,20 @@ label greeting_ourreality:
     m 1hua "Ehehe~"
     m 3hksdlb "I'm feeling rather giddy right now, sorry."
     m 1eua "It's just that I'm super excited to show you what I've been working on."
-    m 3hksdrb "Just give me a second to get it ready..."
-    m 1dsc "..."
-    m 1dsd "Almost done..."
+    if persistent._mas_current_background != "spaceroom":
+        m 4eub "...But we need to go back to the spaceroom for the best view."
+        m 1hua "Let's head over, [player]."
+        call mas_background_change(mas_background_def, skip_leadin=True, skip_outro=True, set_persistent=True)
+        m 1eua "Here we are!"
+        m 3eub "Now give me a second to get it ready.{w=0.3}.{w=0.3}.{w=0.3}{nw}"
+    else:
+        m 3hksdrb "Just give me a second to get it ready.{w=0.3}.{w=0.3}.{w=0.3}{nw}"
+    m 1dsd "Almost done.{w=0.3}.{w=0.3}.{w=0.3}{nw}"
     m 1duu "Yeah, that should be good."
     m 1hua "Ahaha!"
     m 1eka "Sorry about that."
     m 1eua "Without any further ado..."
-    m 4eub "Would you kindly look out the window, [player]"
+    m 4eub "Would you kindly look out the window, [player]?"
     $ mas_OVLHide()
     $ disable_esc()
     if mas_current_background.isFltDay():

Monika After Story/game/script-holidays.rpy

@@ -717,7 +717,7 @@ label greeting_o31_orcaramelo_sakuya_izayoi:
         m "Oh!{w=0.5} It's you, [player]!"
 
     else:
-        m ".{w=0.3}.{w=0.3}."
+        m ".{w=0.3}.{w=0.3}.{w=0.3}{nw}"
         m "Welcome{w=0.3}, to the Scarlet Devil Spaceroom..."
         m "[player]."
         m "Please, let me offer you our hospitality."
@@ -1067,7 +1067,7 @@ label mas_o31_ret_home_cleanup(time_out=None, ret_tt_long=False):
     else:
         m 1esc "Anyway..."
 
-    m 1eua "I'll just take these decorations down.{w=0.5}.{w=0.5}.{nw}"
+    m 1eua "I'll just take these decorations down.{w=0.3}.{w=0.3}.{w=0.3}{nw}"
 
     #Hide vis
     $ mas_o31HideVisuals()
@@ -3975,7 +3975,7 @@ init 5 python:
             end_date=mas_d25c_end,
             action=EV_ACT_UNLOCK,
             pool=True,
-            rules={"no unlock": None},
+            rules={"no_unlock": None},
             years=[]
         ),
         skipCalendar=True
@@ -3992,7 +3992,7 @@ label mas_d25_monika_d25_mode_exit:
     m 3eua "I wouldn't mind getting right into the new year."
     m 1hua "As long as it's with you, of course~"
     m 3hub "Ahaha!"
-    m 2dsa "Just give me a second to take the decorations down.{w=1}.{w=1}.{nw}"
+    m 2dsa "Just give me a second to take the decorations down.{w=0.3}.{w=0.3}.{w=0.3}{nw}"
 
     call mas_d25_season_exit
 
@@ -4860,7 +4860,7 @@ init 5 python:
             unlocked=False,
             prompt="Let's go out for my birthday!",
             pool=True,
-            rules={"no unlock": None},
+            rules={"no_unlock": None},
             aff_range=(mas_aff.NORMAL,None),
         ),
         code="BYE"
@@ -5009,7 +5009,7 @@ label return_home_post_player_bday:
             else:
                 m 3rksdla "Oh...it's not your birthday anymore..."
             m 3hksdlb "We should probably take these decorations down now, ahaha!"
-            m 3eka "Just give me one second.{w=0.5}.{w=0.5}.{nw}"
+            m 3eka "Just give me one second.{w=0.3}.{w=0.3}.{w=0.3}{nw}"
             $ mas_surpriseBdayHideVisuals()
 
             #If we returned from a date post pbday but have O31 deco
@@ -5363,7 +5363,7 @@ label mas_f14_monika_valentines_intro:
             pause 2.0
             show monika 2rfc at t11 zorder MAS_MONIKA_Z with dissolve_monika
             m 2rfc "..."
-            m 2efc "You know, [player]...{w=0.5}it's not polite to stare...."
+            m 2efc "You know, [player]...{w=0.5}it's not polite to stare..."
             m 2tfc "..."
             m 2tsu "..."
             m 3tsb "Ahaha! I'm just kidding...{w=0.5}do you like my outfit?"
@@ -5531,7 +5531,7 @@ init 5 python:
             end_date=mas_f14+datetime.timedelta(days=1),
             aff_range=(mas_aff.NORMAL,None),
             years=[],
-            rules={"no unlock": None}
+            rules={"no_unlock": None}
         ),
         skipCalendar=True
     )
@@ -6289,7 +6289,7 @@ init 5 python:
             eventlabel="mas_bday_pool_happy_bday",
             prompt="Happy birthday!",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock": None},
+            rules={"no_unlock": None},
             start_date=mas_monika_birthday,
             end_date=mas_monika_birthday + datetime.timedelta(days=1),
             years=[]
@@ -6346,7 +6346,7 @@ init 5 python:
             eventlabel="mas_bday_pool_happy_belated_bday",
             prompt="Happy belated birthday!",
             action=EV_ACT_UNLOCK,
-            rules={"no unlock": None},
+            rules={"no_unlock": None},
             years=[]
         ),
         code="CMP",
@@ -6529,8 +6529,8 @@ init 5 python:
             eventlabel="mas_bday_spent_time_with",
             conditional="mas_recognizedBday()",
             action=EV_ACT_QUEUE,
-            start_date=datetime.datetime.combine(mas_monika_birthday, datetime.time(20)),
-            end_date=datetime.datetime.combine(mas_monika_birthday+datetime.timedelta(days=1), datetime.time(hour=1)),
+            start_date=datetime.datetime.combine(mas_monika_birthday, datetime.time(18)),
+            end_date=datetime.datetime.combine(mas_monika_birthday+datetime.timedelta(days=1), datetime.time(hour=3)),
             years=[]
         ),
         skipCalendar=True

Monika After Story/game/script-islands-event.rpy

@@ -222,7 +222,7 @@ init 5 python:
                 prompt="Can you show me the floating islands?",
                 pool=True,
                 unlocked=False,
-                rules={"no unlock": None, "bookmark_rule": store.mas_bookmarks_derand.WHITELIST},
+                rules={"no_unlock": None, "bookmark_rule": store.mas_bookmarks_derand.WHITELIST},
                 aff_range=(mas_aff.ENAMORED, None)
             )
         )
@@ -476,9 +476,9 @@ label mas_island_day3:
     return
 
 label mas_island_night1:
-    m "You're probably wondering what happened to that orange comet that occasionally passes by."
-    m "Don't worry, I've dealt with it."
-    m "I wouldn't want you to get hurt~"
+    m "While it's nice to be productive during the day, there's something so peaceful about the night."
+    m "The sounds of crickets chirping mixed with a gentle breeze is so relaxing."
+    m "You'd hold me on a night like that, right~"
     return
 
 label mas_island_night2: