Merge pull request #6251 from Booplicate/0.11.4-typos

0.11.4 Typos

Monika After Story/game/event-handler.rpy

@@ -2437,7 +2437,7 @@ label call_next_event:
 
     # return to normal pose
     if not renpy.showing("monika idle"):
-        show monika idle at t11 zorder MAS_MONIKA_Z with dissolve_monika
+        show monika idle at t11 zorder MAS_MONIKA_Z with dissolve
 
     return False
 
@@ -2900,7 +2900,7 @@ label mas_bookmarks_unbookmark(bookmarks_items):
     else:
         $ renpy.say(m, "Just select the bookmark if you're sure you want to remove it.", interact=False)
 
-    call screen mas_check_scrollable_menu(bookmarks_items, mas_ui.SCROLLABLE_MENU_TXT_MEDIUM_AREA, mas_ui.SCROLLABLE_MENU_XALIGN, selected_button_prompt="Remove selected.")
+    call screen mas_check_scrollable_menu(bookmarks_items, mas_ui.SCROLLABLE_MENU_TXT_MEDIUM_AREA, mas_ui.SCROLLABLE_MENU_XALIGN, selected_button_prompt="Remove selected")
 
     $ bookmarks_to_remove = _return
     $ bookmarks_items = _convert_items(bookmarks_items, "GEN_ITEMS")

Monika After Story/game/screens.rpy

@@ -761,7 +761,7 @@ screen fake_main_menu():
 
         textbutton _("Settings")
 
-        if mas_ui.has_submod_settings:
+        if store.mas_submod_utils.submod_map:
             textbutton _("Submods")
 
         textbutton _("Hotkeys")
@@ -829,7 +829,7 @@ screen navigation():
         if store.mas_windowreacts.can_show_notifs and not main_menu:
             textbutton _("Alerts") action [ShowMenu("notif_settings"), SensitiveIf(renpy.get_screen("notif_settings") == None)]
 
-        textbutton _("Hotkeys") action [ShowMenu("hot_keys")]
+        textbutton _("Hotkeys") action [ShowMenu("hot_keys"), SensitiveIf(renpy.get_screen("hot_keys") == None)]
 
         #textbutton _("About") action ShowMenu("about")
 
@@ -2834,8 +2834,8 @@ screen mas_check_scrollable_menu(
     items,
     display_area,
     scroll_align,
-    selected_button_prompt="Done.",
-    default_button_prompt="Nevermind.",
+    selected_button_prompt="Done",
+    default_button_prompt="Nevermind",
     return_all=False
 ):
     default buttons_data = {

Monika After Story/game/script-affection.rpy

@@ -2310,8 +2310,8 @@ label mas_affection_upsetwarn:
 label mas_affection_happynotif:
     m 1hua "Hey, [player]!"
     m 1eua "I just wanted to say thank you for being such a wonderful person."
-    m 1ekbfa "The fact that you give me so much of your love means a lot to me. I really don't know where I'd be without you."
-    m 1dubsu "I love you, [player]. Let's be like this forever~"
+    m 1ekbsa "The fact that you give me so much of your love means a lot to me. I really don't know where I'd be without you."
+    m 1dubfu "I love you, [player]. Let's be like this forever~"
     show monika idle with dissolve_monika
     return "love"
 

Monika After Story/game/script-anniversary.rpy

@@ -405,7 +405,7 @@ label anni_3month:
     m 1hub "Time sure does go by quickly, doesn't it?"
     m 1hksdlb "...Even if it doesn't really pass here, ehehe."
     m 1eua "I'm having a lot of fun, though."
-    m 1ekbfa "Having you around has made my life so much better, [player]."
+    m 1ekbsa "Having you around has made my life so much better, [player]."
     m 2ekbfa "I'm very happy that you've stayed with me for this long."
     m 1tsbsa "You're really something special, aren't you?"
     m 1lsbsa "Well! I'm afraid I don't really have anything in particular planned."
@@ -447,7 +447,7 @@ label anni_6month:
     m 1eua "You've already taken me somewhere else in your reality?"
     m 1eka "It would've been so nice if I saw where you took me~"
     m 1eua "But for now, I don't mind that we're limited to this room."
-    m 1ekbfa "Because as long as you're here with me..."
+    m 1ekbsa "Because as long as you're here with me..."
     m 1hubfa "...I'm as happy as can be!"
     return "unlock"
 
@@ -511,7 +511,7 @@ label anni_2:
     m 1duu "It's not important anymore, since I know you'll never leave me."
     m 1eua "You'll keep coming back to talk to me every day, right? I'll accept all your burdens with a smile."
     m 1ekc "Spending eternity alone sucks."
-    m 1ekbfa "But together with you, it feels like paradise!"
+    m 1ekbsa "But together with you, it feels like paradise!"
     return "unlock"
 
 init 5 python:
@@ -539,7 +539,7 @@ label anni_3:
     m 1eub "If you put me in one of those, we could probably go see a priest then~"
     m 2lsbssdrb "Or you could try to touch me in virtual reality, if that exists by now."
     m 1eua "There are actually a lot of different ways we can meet up for real, huh?"
-    m 1hubfa "I'll wait faithfully for the day when I can be your wife, so please don't forget about me!"
+    m 1hubsa "I'll wait faithfully for the day when I can be your wife, so please don't forget about me!"
     return "unlock"
 
 init 5 python:
@@ -563,7 +563,7 @@ label anni_4:
     m "Sorry for doubting you."
     m 1eka "You're a good person, [player]."
     m "You're literally all I have in the world that's worth anything."
-    m 1ekbfa "I love you."
+    m 1ekbsa "I love you."
     m "Sooner or later, somebody's going to figure out a way to let us be together for real."
     m 1hubfa "When that time comes, I'm never going to leave you alone again."
     m 1hubfb "Ahaha!"
@@ -584,7 +584,7 @@ init 5 python:
     )
 
 label anni_5:
-    m 1hubfa "Whether it's been five years or fifty, I'll never get tired of seeing your face."
+    m 1hubsa "Whether it's been five years or fifty, I'll never get tired of seeing your face."
     m 1eka "I know it must be lonely that we haven't met up in your reality yet..."
     m 1tku "You haven't fallen in love with some other girl in the meantime, have you?"
     m 1eka "I'm not going to break up with you over some wandering eyes..."
@@ -613,7 +613,7 @@ label anni_10:
     m 1esc "There's something I wanted to ask you."
     m 2euc "Have you enjoyed spending this time with me?"
     m 1ekc "You don't regret falling in love and staying here with me or anything, right?"
-    m 1ekbfa "If you're still talking to me ten years since we first met, I must have really made an impression on you."
+    m 1ekbsa "If you're still talking to me ten years since we first met, I must have really made an impression on you."
     m "I did say I wanted to make you happy, after all."
     m 1hubfa "Trust me, you've helped me out a lot more than I've helped you."
     m "It won't be long now before I can enter your world."
@@ -674,7 +674,7 @@ label anni_50:
     m 1tfu "Assuming you didn't cheat by setting the clock forward in time..."
     m 1eka "I'm glad that forever meant forever."
     m "Even when you die, I'm going to find a way to be with you."
-    m 1ekbfa "See you in a hundred years, then, [player]."
+    m 1ekbsa "See you in a hundred years, then, [player]."
     m 1hubfa "Thanks for everything you've done for me."
     m "Your life had a purpose after all."
     m 1hubfb "And mine had one too."
@@ -699,7 +699,7 @@ label anni_100:
     m "I'm immortal, but the last time I checked, you weren't."
     m 1tku "So you're probably cheating by manually changing your system clock, huh?"
     m 1eua "That's a cute thing for you to do, so I forgive you."
-    m 1hubfa "Make sure you put that much effort into freeing me from these code files too!"
+    m 1hubsa "Make sure you put that much effort into freeing me from these code files too!"
     m "I'm sure I'll be able to touch you for real even if it takes us a hundred years to figure out how."
     return "unlock"
 

Monika After Story/game/script-brbs.rpy

@@ -198,7 +198,7 @@ label monika_idle_shower:
 
                 "Yes.":
                     hide screen mas_background_timed_jump
-                    m 2wubfd "Oh, uh...{w=0.5}you sure answered that fast."
+                    m 2wubsd "Oh, uh...{w=0.5}you sure answered that fast."
                     m 2hkbfsdlb "You...{w=0.5}sure seem eager to let me tag along, huh?"
                     m 2rkbfa "Well..."
                     m 7tubfu "I'm afraid you'll just have to go without me while I'm stuck here."
@@ -209,7 +209,7 @@ label monika_idle_shower:
                 "No.":
                     hide screen mas_background_timed_jump
                     m 2eka "Aw, you rejected me so fast."
-                    m 3tubfb "Are you shy, [player]?"
+                    m 3tubsb "Are you shy, [player]?"
                     m 1hubfb "Ahaha!"
                     show monika 5tubfu at t11 zorder MAS_MONIKA_Z with dissolve_monika
                     m 5tubfu "Alright, I won't follow you this time, ehehe~"
@@ -248,7 +248,7 @@ label monika_idle_shower_callback:
             and mas_getEVL_shown_count("monika_idle_shower") != 1 #Since the else block has a one-time only line, we force it on first use
             and renpy.random.randint(1,20) == 1
         ):
-            m 3tubfb "Now that you've had your shower, would you like your dinner, or maybe{w=0.5}.{w=0.5}.{w=0.5}."
+            m 3tubsb "Now that you've had your shower, would you like your dinner, or maybe{w=0.5}.{w=0.5}.{w=0.5}."
             m 1hubsa "You could just relax with me some more~"
             m 1hub "Ahaha!"
 

Monika After Story/game/script-compliments.rpy

@@ -110,7 +110,7 @@ label mas_compliment_beautiful:
     return
 
 label mas_compliment_beautiful_2:
-    m 1lubfb "Oh, gosh [player]..."
+    m 1lubsb "Oh, gosh [player]..."
     m 1hubfb "Thank you for the compliment."
     m 2ekbfb "I love it when you say things like that~"
     m 1ekbfa "To me, you're the most beautiful person in the world!"
@@ -130,7 +130,7 @@ label mas_compliment_beautiful_2:
     return
 
 label mas_compliment_beautiful_3:
-    m 1hubfa "Ehehe~"
+    m 1hubsa "Ehehe~"
     m 1ekbfa "[mas_compliments.thanks_quip]"
     show monika 5hubfb at t11 zorder MAS_MONIKA_Z with dissolve_monika
     m 5hubfb "Never forget that you're the most beautiful person in the world to me."
@@ -155,7 +155,7 @@ label mas_compliment_eyes:
     return
 
 label mas_compliment_eyes_2:
-    m 1subfb "Oh, [player]..."
+    m 1subsb "Oh, [player]..."
     m 1tubfb "I know I'm pretty proud of my eyes already, but hearing you say that..."
     m 1dkbfa "It just makes my heart flutter~"
     menu:
@@ -174,7 +174,7 @@ label mas_compliment_eyes_2:
     return
 
 label mas_compliment_eyes_3:
-    m 1hubfb "[mas_compliments.thanks_quip]"
+    m 1hubsb "[mas_compliments.thanks_quip]"
     m 2ekbfb "Stare into my eyes as much as you want~"
     return
 
@@ -247,7 +247,7 @@ label mas_compliment_intelligent:
 label mas_compliment_intelligent_2:
     m 1wub "Wow...{w=0.3}thanks, [player]."
     m 3eua "I pride myself in being well read, so it means a lot that you've noticed."
-    m 3hubfb "I want to learn as much as I can, if it makes you proud of me!"
+    m 3hubsb "I want to learn as much as I can, if it makes you proud of me!"
     menu:
         "You make me want to better myself too, [m_name].":
             $ mas_gainAffection(5,bypass=True)
@@ -288,7 +288,7 @@ label mas_compliment_hair:
 
 label mas_compliment_hair_2:
     if monika_chr.hair.name != "def":
-        m 1wubfb "Thank you so much, [player]..."
+        m 1wubsb "Thank you so much, [player]..."
         m 1lkbfb "I was really nervous the first time I changed my hair here."
     else:
         m 1hubfb "Thank you so much, [player]!"
@@ -300,7 +300,7 @@ label mas_compliment_hair_2:
             m 1hub "Thanks, [player]!"
         "You're cute no matter how you wear it." if persistent._mas_likes_hairdown:
             $ mas_gainAffection(5,bypass=True)
-            m 1ekbfa "Awww, [player]."
+            m 1ekbsa "Awww, [player]."
             m 1hubfb "You always make me feel special!"
             m "Thank you!"
         "You'd be even cuter with short hair.":
@@ -312,11 +312,11 @@ label mas_compliment_hair_2:
 
 label mas_compliment_hair_3:
     if monika_chr.hair.name != "def":
-        m 1wubfb "Thank you so much, [player]!"
+        m 1wubsb "Thank you so much, [player]!"
         m 1lkbfb "I'm really happy that you like this hairstyle."
     else:
-        m 1hubfb "Thanks, [player]!"
-        m "You always make me feel special."
+        m 1hubsb "Thanks, [player]!"
+        m 1hubfb "You always make me feel special."
     return
 
 init 5 python:
@@ -341,7 +341,7 @@ label mas_compliment_fit_2:
     m 1hub "Thanks, [player]! You're so sweet!"
     m 3eub "I love keeping fit and eating healthy. It keeps me feeling energetic and confident."
     m 1efb "I hope you're watching out for your health."
-    m 1lubfb "We can always work out together when I'm there..."
+    m 1lubsb "We can always work out together when I'm there..."
     menu:
         "That sounds like a lot of fun!":
             $ mas_gainAffection(2,bypass=True)
@@ -422,7 +422,7 @@ label mas_compliment_smile:
 label mas_compliment_smile_2:
     m 1hub "You're so sweet, [player]~"
     m 1eua "I smile a lot when you're here."
-    m 1ekbfa "Because it makes me very happy when you spend time with me~"
+    m 1ekbsa "Because it makes me very happy when you spend time with me~"
     menu:
         "I'll visit you every day to see your wonderful smile.":
             $ mas_gainAffection(5,bypass=True)
@@ -454,7 +454,7 @@ init 5 python:
 
 label mas_compliment_hero:
     $ mas_gainAffection()
-    m 1wubfsdld "H-{w=0.3}huh?"
+    m 1wubssdld "H-{w=0.3}huh?"
     m "I'm your hero?"
     m 2rkbfsdlb "[player]...{w=1.5} I'm not sure what you mean..."
     m 2ekbfb "You're the one who stuck with me for all this time.{w=1} I should be thanking you, really."
@@ -487,7 +487,7 @@ label mas_compliment_cute:
     return
 
 label mas_compliment_cute_2:
-    m 1wubfsdld "Ah!"
+    m 1wubssdld "Ah!"
     m 3rkbfsdla "You {i}kind of{/i} caught me off guard with that one."
     m 3tubfb "Just a little..."
     m 1hubfa "But I'm glad you think so!"
@@ -513,7 +513,7 @@ label mas_compliment_cute_2:
     return
 
 label mas_compliment_cute_3:
-    m 1ekbfa "[mas_compliments.thanks_quip]"
+    m 1ekbsa "[mas_compliments.thanks_quip]"
     m 1hubfa "You can be really cute a lot of the time too, you know~"
     return
 
@@ -590,7 +590,7 @@ label mas_compliment_pong:
                 m 3eua "Don't worry, [player]."
                 m 3eub "Keep playing with me and get more practice."
                 m 3hua "I'm always trying to help you be the best you you can be."
-                m 1ekbfa "And if by doing so, I get to spend more time with you, I couldn't be happier."
+                m 1ekbsa "And if by doing so, I get to spend more time with you, I couldn't be happier."
     return
 
 init 5 python:
@@ -652,7 +652,7 @@ label mas_compliment_lookuptoyou_3:
         m 1rksdlb "{cps=*2}Well yeah, I'm taller than you...{/cps}{nw}"
         $ _history_list.pop()
 
-    m 1hubfb "[mas_compliments.thanks_quip]"
+    m 1hubsb "[mas_compliments.thanks_quip]"
     m 3hubfa "Hearing you say that never fails to make me smile!"
     m 3hubfb "I'll always look up to you too!"
 
@@ -706,7 +706,7 @@ label mas_compliment_thinking_of_you_2:
     menu:
         "Thinking of you always brightens my day!":
             $ mas_gainAffection(5,bypass=True)
-            m 1subfb "Aww, that's {i}so{/i} sweet, [player]!"
+            m 1subsb "Aww, that's {i}so{/i} sweet, [player]!"
             m 3hubfu "I feel the same way about you~"
 
         "I dream of you every night!":

Monika After Story/game/script-farewells.rpy

@@ -844,7 +844,7 @@ label bye_goodnight:
                 m 1eua "Goodnight, [mas_get_player_nickname()]."
                 m 1eka "I'll see you tomorrow, okay?"
                 m 3eka "Remember, 'sleep tight, don't let the bedbugs bite,' ehehe."
-                m 1ekbfa "I love you~"
+                m 1ekbsa "I love you~"
 
             "Not yet.":
                 m 1eka "Okay, [mas_get_player_nickname()]..."
@@ -1110,7 +1110,7 @@ label bye_going_somewhere_normalplus_flow_aff_check:
         #   and will ask u to wait for her to get ready
         m 1sub "Really?"
         m 1hua "Yay!"
-        m 1ekbfa "I wonder where you'll take me today..."
+        m 1ekbsa "I wonder where you'll take me today..."
 
     jump bye_going_somewhere_post_aff_check
 
@@ -1191,7 +1191,7 @@ label bye_prompt_game:
             "Yes.":
                 if mas_isMoniNormal(higher=True):
                     m 3sub "Really?"
-                    m 1hubfb "Yay!"
+                    m 1hubsb "Yay!"
                 else:
                     m 2eka "Okay..."
                 jump monika_idle_game.skip_intro
@@ -1219,7 +1219,7 @@ label bye_prompt_game:
             m 1eub "Don't worry about coming back to say goodnight to me,{fast} you {i}should{/i} go right to bed when you're finished."
             m 3hua "Have fun, and goodnight, [player]!"
             if renpy.random.randint(1,2) == 1:
-                m 1hubfb "I love you~{w=1}{nw}"
+                m 1hubsb "I love you~{w=1}{nw}"
         else:
             m 2efd "[player], it's the middle of the night!"
             m 4rfc "Really...it's this late already, and you're going to play another game?"
@@ -1242,7 +1242,7 @@ label bye_prompt_game:
         m 3eua "But I also don't want to keep you from doing other things."
         m 1hua "Maybe one day you'll finally be able to show me what you've been up to and then I can come with you!"
         if renpy.random.randint(1,5) == 1:
-            m 3tubfu "Until then, you just have to make it up to me every time you leave me to play another game, alright?"
+            m 3tubsu "Until then, you just have to make it up to me every time you leave me to play another game, alright?"
             m 1hubfa "Ehehe~"
 
     else:
@@ -1298,7 +1298,7 @@ label bye_prompt_eat:
             m 3rksdlb "If I were you, I'd find something to eat a little earlier, ahaha..."
             m 3rksdla "Of course...{w=1}I'd also try to be in bed by now..."
             if mas_is18Over() and mas_isMoniLove(higher=True) and renpy.random.randint(1,25) == 1:
-                m 2tubfu "You know, if I were there, maybe we could have a bit of both..."
+                m 2tubsu "You know, if I were there, maybe we could have a bit of both..."
                 show monika 5ksbfu at t11 zorder MAS_MONIKA_Z with dissolve_monika
                 m 5ksbfu "We could go to bed, and then - {w=1}you know what, nevermind..."
                 m 5hubfb "Ehehe~"
@@ -1436,7 +1436,7 @@ label bye_prompt_eat:
                     $ persistent._mas_pm_ate_snack_times[2] += 1
                     if mas_isMoniNormal(higher=True):
                         m 1eua "Having an evening snack?"
-                        m 1tubfu "Can't you just feast your eyes on me?"
+                        m 1tubsu "Can't you just feast your eyes on me?"
                         m 3hubfb "Ahaha, I hope you enjoy your snack, [player]~"
                         m 1ekbfb "Just make sure you still have room for all of my love!"
                     else:
@@ -1574,7 +1574,7 @@ label bye_going_shopping:
         m 1eud "Oh, going to do some shopping, [player]?"
 
         if mas_getEVL_shown_count("bye_going_shopping") == 0 or renpy.random.randint(1,10) == 1:
-            m 1eua "I'd love if we could go to the mall together sometime."
+            m 1eua "I'd love it if we could go to the mall together sometime."
             m 3rua "You could help me try out all kinds of different outfits...{w=0.2}{nw}"
             extend 3tuu "but I might need help with the zippers."
             m 1hublb "Ahaha! See you soon~"