diff --git a/Monika After Story/game/script-farewells.rpy b/Monika After Story/game/script-farewells.rpy index 38a0de2418..a68353bd77 100644 --- a/Monika After Story/game/script-farewells.rpy +++ b/Monika After Story/game/script-farewells.rpy @@ -1322,7 +1322,7 @@ label bye_prompt_game: m 2euc "Again?" m 2eud "Alright then. Goodbye, [player]." - elif renpy.random.randint(1,10) == 1: + elif mas_getSessionLength() < datetime.timedelta(minutes=30) and renpy.random.randint(1,10) == 1: m 1ekc "You're leaving to play another game?" m 3efc "Don't you think you should be spending a little more time with me?" m 2efc "..." diff --git a/Monika After Story/game/script-songs.rpy b/Monika After Story/game/script-songs.rpy index b3f838d32b..3cd0922091 100644 --- a/Monika After Story/game/script-songs.rpy +++ b/Monika After Story/game/script-songs.rpy @@ -1519,7 +1519,7 @@ label mas_song_wonderwall: m 3rkc "Like this song says, the way from here to your world is a winding road, there's no telling what we'll find beyond the next curve." if mas_isMoniEnamored(higher=True): - m 1dubsa "...And with you by my side, there's no way I could be afraid." + m 1dubsa "...But with you by my side, there's no way I could be afraid." m 1ekbsa "I know the place it leads to will be worth it.{w=0.3} {nw}" extend 3ekbsu "After all, you're my wonderwall~" diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index aac4ef93ec..970483a93c 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -1441,23 +1441,23 @@ label monika_okayeveryone: show monika 5eka at t11 zorder MAS_MONIKA_Z with dissolve_monika m 5eka "You're too much of a sweetheart to do that, aren't you?" m 5hub "Ahaha~" - return + return "no_unlock" init 5 python: - if not persistent.clearall: - addEvent( - Event( - persistent.event_database, - eventlabel="monika_whispers", - category=['ddlc','club members'], - prompt="Others still lingering", - random=True, - rules={ - "derandom_override_label": "mas_bad_derand_topic", - "rerandom_callback": renpy.partial(mas_bookmarks_derand.wrappedGainAffection, 2.5) - } - ) + addEvent( + Event( + persistent.event_database, + eventlabel="monika_whispers", + category=['ddlc','club members'], + prompt="Others still lingering", + conditional="not persistent.clearall", + action=EV_ACT_RANDOM, + rules={ + "derandom_override_label": "mas_bad_derand_topic", + "rerandom_callback": renpy.partial(mas_bookmarks_derand.wrappedGainAffection, 2.5) + } ) + ) label monika_whispers: m 2euc "You know what's kind of creepy?" @@ -1476,7 +1476,7 @@ label monika_whispers: m 2hua "I believe in you, [player]!" if store.mas_anni.pastOneMonth() and not persistent._mas_pm_cares_about_dokis: #derandom after a month if player doesn't care about the others, she wouldn't feel guilty and hear the voices forever - return "derandom" + $ mas_hideEVL("monika_whispers", "EVE", lock=True, derandom=True) return init 5 python: @@ -2837,8 +2837,8 @@ label monika_debate: m 3eua "It's a win-win, you know?" m 1lksdla "...Well, I guess that would be Monika's Debate Tip of the Day!" m 1eka "Ahaha! That sounds a little silly. Thanks for listening, though." - $ mas_showEVL('monika_taking_criticism', 'EVE', _random=True) - $ mas_showEVL('monika_giving_criticism', 'EVE', _random=True) + $ mas_protectedShowEVL('monika_taking_criticism', 'EVE', _random=True) + $ mas_protectedShowEVL('monika_giving_criticism', 'EVE', _random=True) return init 5 python: @@ -3373,8 +3373,8 @@ label monika_ks_kenji: m 1tku "Though if you ever decide to go drinking, make sure to stay away from long falls, alright?" return -init 5 python: - addEvent(Event(persistent.event_database,eventlabel="monika_totono",category=['ddlc'],prompt="Have you ever heard of Totono?",pool=True)) +#init 5 python: +# addEvent(Event(persistent.event_database,eventlabel="monika_totono",category=['ddlc'],prompt="Have you ever heard of Totono?",pool=True)) label monika_totono: m 1euc "A lot of people on the Internet are making comparisons between this game and that one..." @@ -4511,7 +4511,7 @@ init 5 python: addEvent(Event(persistent.event_database,eventlabel="monika_ribbon",category=['monika'],prompt="Ribbons",random=True)) label monika_ribbon: - if not monika_chr.is_wearing_acs_type('ribbon'): + if not monika_chr.is_wearing_acs_types("ribbon", "twin-ribbons", "s-type-ribbon"): m 1eua "Do you miss my ribbon, [player]?" if monika_chr.hair.name != "def": @@ -4549,9 +4549,15 @@ label monika_ribbon: m 3ekbsa "I can't wait to wear this ribbon on a fancy date with you, [player]~" else: - m 3eka "I just want to thank you again for this ribbon, [player]." - m 1eka "It really was a wonderful gift and I think it's just beautiful!" - m 3eka "I'll wear it anytime you want~" + if monika_chr.is_wearing_acs_type("twin-ribbons"): + m 3eka "I just want to thank you again for these ribbons, [player]." + m 1ekb "They really were a wonderful gift and I think they're just beautiful!" + m 3hua "I'll wear them anytime you want~" + + else: + m 3eka "I just want to thank you again for this ribbon, [player]." + m 1ekb "It really was a wonderful gift and I think it's just beautiful!" + m 3hua "I'll wear it anytime you want~" return init 5 python: @@ -9191,8 +9197,17 @@ label monika_attractiveness: if mas_isMoniNormal(higher=True): m 2ekc "I'm sorry, [player]. I guess I just needed to vent." m 4eud "I know I don't really need to, but I still try to eat right, get enough exercise, and keep myself clean...among other things." - m 4eub "It simply feels satisfying to keep good habits like that, and besides, who knows when I'll be able to cross over into your reality and have a normal body like you." - m 1hua "It won't hurt to make sure I'll be ready for that transition whenever it'll happen." + + if mas_isMoniEnamored(higher=True): + $ first_line_var = "when" + $ second_line_end = "whenever it'll happen" + + else: + $ first_line_var = "maybe" + $ second_line_end = "if it'll ever happen" + + m 4eub "It simply feels satisfying to keep good habits like that, and besides, who knows [first_line_var] I'll be able to cross over into your reality and have a normal body like you." + m 1hua "It won't hurt to make sure I'll be ready for that transition [second_line_end]." m 1eua "You don't have to worry though, [player]." show monika 5eua at t11 zorder MAS_MONIKA_Z with dissolve_monika m 5eua "I'll always love you no matter how you look." @@ -12968,8 +12983,9 @@ init 5 python: label monika_load_custom_music: m 1hua "Sure!" - m 1dsc "Give me a moment to check the folder..." + m 1dsc "Give me a moment to check the folder.{w=0.2}.{w=0.2}.{w=0.2}{nw}" python: + # FIXME: this is not entirely correct, as one may delete a song before adding a new one old_music_count = len(store.songs.music_choices) store.songs.initMusicChoices( persistent.playername.lower() == "sayori" @@ -12994,7 +13010,8 @@ label monika_load_custom_music: menu: m "Do you remember how to add custom music?{fast}" "Yes.": - m "Okay, but make sure you did it correctly before asking me to check for custom music." + m "Okay, make sure you did it correctly." + "No.": $ pushEvent("monika_add_custom_music",True) return @@ -14873,7 +14890,7 @@ label monika_movie_adaptations: m 1hub "It's a great way to build upon the original in ways you might not have thought of before!" m 3rtc "Maybe that's what I'm looking for when I look at an adaptation...{w=0.2}to explore further upon those stories I love." m 1hua "...Though getting a version to satisfy my inner fan would be nice too, ehehe~" - $ mas_showEVL("monika_striped_pajamas","EVE",_random=True) + $ mas_protectedShowEVL("monika_striped_pajamas", "EVE", _random=True) return init 5 python: @@ -16070,7 +16087,7 @@ label monika_piano_lessons: m 3eka "Remember? I told you when I first performed {i}Your Reality{/i} that I wasn't really good at piano. {w=0.2}{nw}" extend 3rkb "Like, at all." else: - m 3eka "I'm actually not (i)that{/i} good at playing piano, [mas_get_player_nickname()]." + m 3eka "I'm actually not {i}that{/i} good at playing piano, [mas_get_player_nickname()]." m 3rkd "Certainly not good enough to be teaching other people yet..." m 2eud "If you can believe it, I started to learn after my epiphany." @@ -16098,9 +16115,8 @@ label monika_stargazing: m 5eka "You know [mas_get_player_nickname()], to me you're like a star..." m 5rkbsu "A beautiful, bright beacon from a distant world, forever out of reach." m 5dkbsu "..." - m 5ekbsa "At least, for now..." - show monika 5kkbsa - pause 2.0 + m 5ekbsa "At least, for now...{nw}" + extend 5kkbsa "" return init 5 python: @@ -16122,7 +16138,7 @@ label monika_taking_criticism: m 1eksdlc "In particular, for people faced with great expectations, this kind of logic can easily become a big source of anguish." m 3dksdld "What if others think less of you because you didn't give a perfect answer? {w=0.2}What if they start rejecting you or laugh behind your back?" m 2rksdlc "It'd be like showing some kind of vulnerability for others to take advantage of." - m 4eud "But let me tell you, there's absoultely no shame in changing your mind, [player]!" + m 4eud "But let me tell you, there's absolutely no shame in changing your mind, [player]!" m 2eka "After all, we all make mistakes, don't we?{w=0.3} {nw}" extend 7dsu "What matters is what we learn from those mistakes." m 3eua "Personally, I've always admired people who can acknowledge their flaws and still work in a constructive way to overcome them." diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 7d8ec8f4cb..19c6970689 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -375,6 +375,22 @@ label v0_3_1(version=version): # 0.3.1 # 0.11.7 label v0_11_7(version="v0_11_7"): python: + with MAS_EVL("monika_whispers") as whispers_ev: + if ( + not persistent.clearall + and store.mas_anni.pastOneMonth() + and not persistent._mas_pm_cares_about_dokis + ): + whispers_ev.conditional = None + whispers_ev.action = None + + else: + whispers_ev.conditional = "not persistent.clearall" + whispers_ev.action = EV_ACT_RANDOM + + whispers_ev.random = False + whispers_ev.unlocked = False + mas_setEVLPropValues( 'mas_d25_spent_time_monika', conditional="persistent._mas_d25_in_d25_mode", @@ -408,6 +424,7 @@ label v0_11_7(version="v0_11_7"): ) safeDel("_mas_d25_gifted_cookies") + return # 0.11.6 diff --git a/Monika After Story/game/zz_consumables.rpy b/Monika After Story/game/zz_consumables.rpy index cfc3252ff1..44e1e2ea36 100644 --- a/Monika After Story/game/zz_consumables.rpy +++ b/Monika After Story/game/zz_consumables.rpy @@ -1599,7 +1599,13 @@ label mas_consumables_generic_running_out(consumable): else: line_ender = renpy.substitute("[consumable.disp_name][plur] left.") - m 3eud "I just wanted to let you know I only have [amt_left] [line_ender]" + if amt_left > 2: + about = "about " + + else: + about = "" + + m 3eud "I just wanted to let you know I only have [about][amt_left] [line_ender]" if not renpy.seen_label("mas_consumables_refill_explain"): call mas_consumables_refill_explain diff --git a/Monika After Story/game/zz_selector.rpy b/Monika After Story/game/zz_selector.rpy index e160ced9a5..bff002bde3 100644 --- a/Monika After Story/game/zz_selector.rpy +++ b/Monika After Story/game/zz_selector.rpy @@ -3467,8 +3467,6 @@ init 5 python: markSeen=True ) - #Selectors shouldn't be in unseen - persistent._seen_ever default persistent._mas_setting_ocb = False # Outfit CheckBox setting