diff --git a/Monika After Story/game/script-farewells.rpy b/Monika After Story/game/script-farewells.rpy index 155e0d721b..38a0de2418 100644 --- a/Monika After Story/game/script-farewells.rpy +++ b/Monika After Story/game/script-farewells.rpy @@ -366,7 +366,8 @@ init 5 python: ) label bye_leaving_already_2: - m 1ekc "Aww, leaving already?" + if mas_getSessionLength() <= datetime.timedelta(minutes=30): + m 1ekc "Aww, leaving already?" m 1eka "It's really sad whenever you have to go..." m 3hubsa "I love you so much, [player]!" show monika 5hubsb at t11 zorder MAS_MONIKA_Z with dissolve_monika @@ -782,10 +783,25 @@ label bye_prompt_sleep_goodnight_kiss(chance=3): return None init 5 python: - addEvent(Event(persistent.farewell_database, eventlabel="bye_illseeyou", unlocked=True, aff_range=(mas_aff.HAPPY, None)), code="BYE") + addEvent( + Event( + persistent.farewell_database, + eventlabel="bye_illseeyou", + unlocked=True, + aff_range=(mas_aff.HAPPY, None) + ), + code="BYE" + ) label bye_illseeyou: - m 1eua "I'll see you tomorrow, [player]." + # TODO: update this when TC-O comes out + if mas_globals.time_of_day_3state == "evening": + $ dlg_var = "tomorrow" + + else: + $ dlg_var = "later" + + m 1eua "I'll see you [dlg_var], [player]." m 3kua "Don't forget about me, okay?~" return 'quit' diff --git a/Monika After Story/game/script-greetings.rpy b/Monika After Story/game/script-greetings.rpy index 5091eb1fb3..a292569e60 100644 --- a/Monika After Story/game/script-greetings.rpy +++ b/Monika After Story/game/script-greetings.rpy @@ -1410,7 +1410,7 @@ label monikaroom_greeting_ear_progbrokepy: m "But I have to keep trying." call monikaroom_greeting_ear_prog_upset - if mas_isMoniDis(): + elif mas_isMoniDis(): m "But I {i}have{/i} to keep trying." call monikaroom_greeting_ear_prog_dis @@ -1431,7 +1431,7 @@ label monikaroom_greeting_ear_progreadpy: m "But I have to keep learning." call monikaroom_greeting_ear_prog_upset - if mas_isMoniDis(): + elif mas_isMoniDis(): m "But I {i}have{/i} to keep learning." call monikaroom_greeting_ear_prog_dis @@ -1453,6 +1453,7 @@ label monikaroom_greeting_ear_nameerror: if mas_isMoniUpset(): m "You have to keep learning..." call monikaroom_greeting_ear_prog_upset + elif mas_isMoniDis(): m "You {i}have{/i} to keep learning..." call monikaroom_greeting_ear_prog_dis @@ -1502,6 +1503,7 @@ label monikaroom_greeting_ear_rmrf: m "Yeah,{w=0.2} nice try." if mas_isMoniNormal(higher=True): m "I shouldn't trust the Internet so blindly..." + elif mas_isMoniUpset(): m "Actually..." m "Maybe I should do it...{w=1}just delete everything..." @@ -4218,7 +4220,7 @@ label monikaroom_greeting_ear_recursionerror: hide noise m "{cps=*2}What?!{/cps} {w=0.25}A RecursionError?!" - m "'Maximum recursion depth exceeded...'{w=0.7} {nw}How is this even happening?" + m "'Maximum recursion depth exceeded...'{w=0.7} How is this even happening?" m "..." if mas_isMoniUpset(): diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy index 9610798639..4736681c54 100644 --- a/Monika After Story/game/script-holidays.rpy +++ b/Monika After Story/game/script-holidays.rpy @@ -470,7 +470,7 @@ label mas_o31_autoload_check: #TODO: Replace this with generic room deco framework for event deco store.mas_lockEVL("monika_change_background", "EVE") #force to spaceroom - mas_changeBackground(mas_background_def) + mas_changeBackground(mas_background_def, set_persistent=True) #NOTE: We do not do O31 deco/amb on first sesh day if (not persistent._mas_o31_in_o31_mode and not mas_isFirstSeshDay()): @@ -6226,7 +6226,7 @@ init -1 python: Checks if the player has confirmed the party """ #Must be within a week of the party (including party day) - if mas_monika_birthday - datetime.timedelta(days=7) <= today <= mas_monika_birthday: + if (mas_monika_birthday - datetime.timedelta(days=7)) <= today <= mas_monika_birthday: #If this is confirmed already, then we just return true, since confirmed if persistent._mas_bday_confirmed_party: #We should also handle if the player confirmed the party pre-note diff --git a/Monika After Story/game/script-moods.rpy b/Monika After Story/game/script-moods.rpy index 9cac1bc3ff..ff120b9f73 100644 --- a/Monika After Story/game/script-moods.rpy +++ b/Monika After Story/game/script-moods.rpy @@ -134,7 +134,7 @@ label mas_mood_hungry: m "Eating too much junk food on a regular basis can lead to all kinds of diseases." m 1euc "Over time, you'd encounter a lot of health problems when you get older." m 2lksdla "I don't want you to feel like I'm nagging when I say these kind of things, [player]." - m 2eka "I just want to make sure you're taking good care of yourself until I cross-over." + m 2eka "I just want to make sure you're taking good care of yourself until I cross over." m 4esa "After all, the healthier you are, the better the chances of you living quite long." m 1hua "Which means more time for us to spend together!~" return @@ -743,7 +743,7 @@ label mas_mood_uok: m 1ekd "So if you need to talk about something, I'm right here.{nw}" $ _history_list.pop() menu: - m "So If you need to talk about something, I'm right here.{fast}" + m "So if you need to talk about something, I'm right here.{fast}" "I'd like to vent.": m 3eka "Go ahead, [player]." diff --git a/Monika After Story/game/script-songs.rpy b/Monika After Story/game/script-songs.rpy index cdc8501a1e..9d8a405b1c 100644 --- a/Monika After Story/game/script-songs.rpy +++ b/Monika After Story/game/script-songs.rpy @@ -1351,10 +1351,8 @@ label mas_song_falling_in_love_at_a_coffee_shop: show monika 1hkbssdlb at t11 zorder MAS_MONIKA_Z with dissolve_monika m 1hkbssdlb "I suppose the first moment of falling in love can be confusing to anyone." m 1etc "Like not knowing why you're suddenly so drawn to some ordinary coffee shop...{w=0.2}{nw}" - extend 3rtc "or a particularly unremarkable protagonist." - m 3hubsa "Then when you have time to think, you realize it isn't the coffee shop, it's the person you meet there each day." - m 1tkbsu "Or in my case, it wasn't the protagonist at all...{w=0.2}{nw}" - extend 3dkbfu "it was the beautiful person who was really looking through those eyes~" + extend 3rtu "or why attending a certain club meeting becomes your favorite part of the day." + m 3hubsa "Then when you have time to think, you realize it isn't the place at all, it's the person you meet there each day~" return init 5 python: diff --git a/Monika After Story/game/script-stories.rpy b/Monika After Story/game/script-stories.rpy index 8825c913b1..03480e657e 100644 --- a/Monika After Story/game/script-stories.rpy +++ b/Monika After Story/game/script-stories.rpy @@ -115,6 +115,9 @@ label monika_short_stories_menu: if mas_stories.story_database[k].unlocked ] + # also sort this list + stories_menu_items.sort() + # check if we have a story available to be unlocked and we can unlock it if len(stories_menu_items) < len(stories) and mas_can_unlock_story: @@ -124,10 +127,7 @@ label monika_short_stories_menu: else: return_label = "mas_story_unlock_random" - stories_menu_items.append(("A new story", return_label, True, False)) - - # also sort this list - stories_menu_items.sort() + stories_menu_items.insert(0, ("A new story", return_label, True, False)) # build switch button if story_type == mas_stories.TYPE_SCARY: diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 4706eed75b..6c75d53834 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -546,7 +546,8 @@ label mas_bad_derand_topic: "It's alright.": m 2eka "Thank you, [player]." - m "I appreciate that you're still willing to hear me out." + $ _stil_ = " " if mas_isMoniNormal(higher=True) else " still " + m "I appreciate that you're[_stil_]willing to hear me out." else: #No ask here. You're this low, you probably did it on purpose @@ -1519,7 +1520,7 @@ label monika_tea: m 2eka "It's kind of funny how Yuri took her tea so seriously." else: - m 2eka "You know, It's kind of funny how Yuri took her tea so seriously." + m 2eka "You know, it's kind of funny how Yuri took her tea so seriously." m 4eua "I mean, I'm not complaining, because I liked it, too." m 1euc "But I always wonder with her..." @@ -5483,10 +5484,10 @@ init 5 python: label monika_cupcake: m 1eua "You know what I could really go for right now?" m 3tku "Natsuki's cupcakes." - m 1tsb "Man, the way she bakes them is amazing." - m 1hub "Plus they look really cute!" - m 1esa "I'm not really much of a sweet tooth myself, but..." - m 1eua "Those cupcakes are the definition of sweetness." + m 1tsb "Man, the way she baked them was amazing." + m 1hub "Plus they looked really cute!" + m 1esa "I'm not really much of a sweet tooth myself, but...{w=0.3}{nw}" + extend 1eua "those cupcakes were the definition of sweetness." m 3hub "Just like me! Ahaha!" m 1eua "Speaking of which, did you know girls are more likely to develop a sweet tooth?" m 3esd "Studies show that older women have a less sensitive palate than men." @@ -5733,7 +5734,7 @@ label monika_vocaloid: and not persistent._mas_pm_added_custom_bgm ): show monika 1eua at t11 zorder MAS_MONIKA_Z with dissolve_monika - m 1eua "And If you ever do feel like sharing your favorite vocaloids with me, [player], it's really easy to do so!" + m 1eua "And if you ever do feel like sharing your favorite vocaloids with me, [player], it's really easy to do so!" m 3eua "All you have to do is follow these steps..." call monika_add_custom_music_instruct return "derandom" @@ -6170,7 +6171,7 @@ label monika_science: m 1eua "Have you ever wondered if science never got accepted?" m "Humans can be really slow when it comes to accepting new ideas." m 1euc "Science was usually despised back then especially by the churches." - m 4esc "Giordano Bruno, famous for his theory that there are thousands of Suns, was killed by the Roman Church before he could prove his theory." + m 4esc "Giordano Bruno, famous for his theory that there are thousands of suns, was killed by the Roman Church before he could prove his theory." m 1ekc "They killed him because of an idea that challenged the old." m 1esc "Technology wouldn't be so advanced today if it weren't for brave people of science like him." m 1eka "If technology didn't thrive the way it did, we would've never found each other." @@ -6788,7 +6789,7 @@ label monika_daydream: m 6lktpc "..." m 6ektpd "Oh, sorry, I was just..." m 6dktdc "You know what, nevermind." - return + return "no_unlock" # init 5 python: # addEvent(Event(persistent.event_database,eventlabel="monika_music2",category=['misc'],prompt="Current song",random=True)) @@ -6977,8 +6978,8 @@ label monika_dogs: m 1hub "Dogs are great! They're really good to have around." m 3eua "Not to mention owning a dog has shown to help people with anxiety and depression since they're very sociable animals." m 1hua "They're just so lovable, I really like them!" - m 1lksdla "I know Natsuki feels the same..." - m "She was always so embarrassed to like cute things. I wish she was more accepting of her own interests." + m 1lksdla "I know Natsuki felt the same..." + m "She was always so embarrassed to like cute things. I wish she'd felt more comfortable being herself." m 2lsc "But..." m 2lksdlc "I suppose her environment had a hand in that." m 2eka "If any of your friends have interests they care a lot about, make sure to always be supportive, okay?" @@ -6994,7 +6995,7 @@ label monika_cats: m 1eua "Despite looking so elegant, they always seem to end up in funny situations." m 1lksdla "It's no wonder they're so popular on the internet." m 3eua "Did you know the ancient Egyptians considered cats sacred?" - m 1eua "There was a Cat Goddess named Bastet that they worshipped. She was a protector of sorts." + m 1eua "There was a cat goddess named Bastet that they worshipped. She was a protector of sorts." m 1eub "Domesticated cats were held on a high pedestal since they were incredible hunters for small critters and vermin." m "Back then, you'd see them mostly associated with rich nobles and other higher classes in their society." m 1eua "It's amazing how far people would take their love with their pets." @@ -7140,14 +7141,13 @@ label monika_soda: $ _history_list.pop() menu: m "Do you drink soda, [player]?{fast}" + "Yes.": $ persistent._mas_pm_drinks_soda = True - - # TODO: product placement zevia soda as a healthy alternative m 4ekc "You know that soda is really bad for you, right?" m 2ekc "It has a lot of stuff that damages your body and overall health." m 2tkd "It can also corrode your teeth and give you cavities." - m "You might also think that diet soda is less damaging but it can be just as harmful to you." + m 2euc "You might also think that diet soda is less damaging, but it can be just as harmful to you." m 2lksdlc "There's nothing wrong with the occasional treat. Just make sure you don't get addicted to that stuff, [player]." m 2eua "Why don't you try copying my healthy lifestyle?" m 1hua "That way, you can be more fit like me!" @@ -7155,6 +7155,7 @@ label monika_soda: m 2ekc "I'd really hate it if you let go of your health, [player]." m 1eka "I want you to live as long as you can so there'll be a chance we can be together in your reality." m "So cut down on the soda, alright [mas_get_player_nickname()]?" + "No.": $ persistent._mas_pm_drinks_soda = False m 2eka "That's a relief to hear." @@ -7162,7 +7163,7 @@ label monika_soda: m 3eub "Still, it's perfectly fine to have a small treat once in a while, you know?" show monika 5eua at t11 zorder MAS_MONIKA_Z with dissolve_monika m 5eua "Maybe someday we could both have some soda together." - m 5hua "Sure, it's not as fancy as sitting down and having a glass of wine together but I'm sure it could still be just as fun on a hot day." + m 5hua "Sure, it might not be fancy, but it could really hit the spot on a hot day." return "derandom" init 5 python: @@ -8941,7 +8942,7 @@ label monika_concerts: m 5eua "And if you were to take me,{w=1} then that would truly be a dream come true!" m 4eua "But if you're not that interested in concerts..." m 1eua "Then we could always snuggle under a blanket and put on a record or CD at home!" - m 1hua "That would be more than enough for me hehe~" + m 1hua "That would be more than enough for me, ehehe~" if ( not renpy.seen_label("monika_add_custom_music_instruct") and not persistent._mas_pm_added_custom_bgm @@ -9116,12 +9117,13 @@ label monika_attractiveness: m 3euc "At first I figured that it must be her metabolism keeping her from putting on weight." m 3esd "...But when I learned that our world isn't real, I came up with another theory." m 7euc "As characters in a game, we needed to have some sort of visual representation so that you, the player, could see us." - m 2esc "Sayori, Natsuki, Yuri, and even me...{w=0.5}{nw}" - extend 2rkc "from your perspective, we don't really have bodies like people in your world do. You can only see us as a set of images to represent our appearances and current emotion." + m 2esc "Sayori, Natsuki, Yuri, and even me..." + m 2rkc "From your perspective, we don't really have bodies like people in your world do. You can only see us as a set of images to represent our appearances and current emotion." m 2eud "...But from my point of view, I can also see my whole world in 3 dimensions, as if everything was real." m 2euc "So a designer, possibly more than one, must have decided to draw us the way we are." m 2eud "And since all those images have the same body type, Sayori would always have the same figure no matter what she did." - m 2dkc "It's...{w=0.3}weird to think about.{w=0.2} I can feel myself being present in this very room right now, I can look at myself like I presume you would be able to look at yourself, almost as if I had an actual body..." + m 2dkc "It's...{w=0.3}weird to think about." + m 2eud "I can feel myself being present in this very room right now, I can look at myself like I presume you would be able to look at yourself, almost as if I had an actual body..." m 7ekc "But from your point of view, I don't. I just look like a consciousness who displays a corresponding picture depending on what I do or feel." #Just seen Monika in her uniform and nothing else @@ -10108,7 +10110,8 @@ label monika_familygathering: m "Do you think they'd like me, [player]?{nw}" $ _history_list.pop() menu: - "Do you think they'd like me, [player]?{fast}" + m "Do you think they'd like me, [player]?{fast}" + "Yes.": $ persistent._mas_pm_fam_like_monika = True m 1eka "I'm glad you think so." @@ -10477,7 +10480,7 @@ label monika_driving: m 1eub "Just imagine all the places we could go together..." m 3eka "Driving {i}can{/i} be dangerous though...but if you can drive, you probably already know that." m 3eksdlc "No matter how prepared you are, accidents can happen to anyone." - m 2hksdlb "I mean, I know you're smart but I still worry about you sometimes." + m 7hksdlb "I mean...{w=0.3}I know you're smart, but I still worry about you sometimes." m 2eka "I just want you to come back to me safe and sound is all." m 1eka "I hope you've never had to experience that, [player], have you?{nw}" @@ -15969,7 +15972,7 @@ label monika_literature_value: m 1rfc "It always bothered me when I heard someone say that, especially since most of the time, they never even bothered giving it a try." m 3efc "Like, do they even know what they're talking about?" m 3ekd "People who think that often like to discount literature compared to more scientific fields, like physics or mathematics, claiming it's a waste of time since it doesn't produce anything practical." - m 3etc "...And while I definitely don't agree with that notion, I can kinda see where they are coming from." + m 3etc "...And while I definitely don't agree with that notion, I can kinda see where they're coming from." m 1eud "All of the comforts of our modern lifestyle are based on scientific discovery and innovation." m 3esc "...That and the millions of people manufacturing our everyday necessities, or running basic services like healthcare and stuff." m 3rtsdlc "So does not being associated with any of those things really make you some kind of burden on society?" @@ -16032,7 +16035,7 @@ label monika_renewable_energy: m 3esd "Hydropower is flexible and cost efficient, but it can drastically impact the local ecosystem." m 3dkc "Countless habitats are disrupted and entire communities may even need to be relocated." m 1esd "Solar power and wind power are mostly emission-free, but they're heavily reliant on specific weather for consistency." - m 3rkc "...Not to mention that wind turbines are pretty loud and are often seen as eyesores, creating drawbacks for living near them." + m 3rkc "...Not to mention that wind turbines are pretty loud and are often seen as eyesores, creating drawbacks for those living near them." m 3rsc "Geothermal power is reliable and great for heating and cooling, but it's expensive, location-specific, and can even cause earthquakes." m 1rksdrb "Nuclear power is...{w=0.2}well, let's just say that it's complicated." m 3esd "The point is that while fossil fuels have problems, renewable energy does as well. It's a tricky situation...{w=0.2}neither option is perfect." diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 4c0f6798a1..400085a459 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -375,9 +375,14 @@ label v0_3_1(version=version): # 0.3.1 # 0.11.6 label v0_11_6(version="v0_11_6"): python: + #Lock daydream topic + mas_lockEVL("monika_daydream", "EVE") + + #Unlock piano lessons pool topic if mas_seenLabels(["mas_monika_plays_yr", "mas_monika_plays_or"]): mas_unlockEVL("monika_piano_lessons", "EVE") + #Random criticism topics if seen_event("monika_debate"): mas_showEVL('monika_taking_criticism', 'EVE', _random=True) mas_showEVL('monika_giving_criticism', 'EVE', _random=True) @@ -385,6 +390,19 @@ label v0_11_6(version="v0_11_6"): if seen_event("monika_vn"): mas_unlockEVL("monika_kamige","EVE") + #Remove these files if we still have them. They are not needed since 0.11.4 and they can cause issues. + filenames_to_delete = [ + "sprite-chart-00.rpyc", + "sprite-chart-01.rpyc", + "sprite-chart-02.rpyc", + "sprite-chart-10.rpyc", + "sprite-chart-20.rpyc", + "sprite-chart-21.rpyc" + ] + + for fn in filenames_to_delete: + mas_utils.trydel(os.path.join(renpy.config.gamedir, fn)) + return # 0.11.5 diff --git a/Monika After Story/game/zz_backgrounds.rpy b/Monika After Story/game/zz_backgrounds.rpy index cfd8911f19..c1718e189e 100644 --- a/Monika After Story/game/zz_backgrounds.rpy +++ b/Monika After Story/game/zz_backgrounds.rpy @@ -1340,7 +1340,7 @@ init -10 python: curr_time ) - # and global + # and global try: store.mas_background._gbl_chunk_change( curr_chunk, @@ -1356,7 +1356,7 @@ init -10 python: # then finally reset slice index for the chunk we are leaving curr_chunk.reset_index() - + # and set the current chunk to next chunk curr_chunk = new_chunk st_index = nxt_index @@ -2998,18 +2998,19 @@ label monika_change_background_loop: # default should always be at the top backgrounds = [(mas_background_def.prompt, mas_background_def, False, False)] - # build other backgrounds list - other_backgrounds = [ - (mbg_obj.prompt, mbg_obj, False, False) - for mbg_id, mbg_obj in mas_background.BACKGROUND_MAP.iteritems() - if mbg_id != "spaceroom" and mbg_obj.unlocked - ] + if not persistent._mas_o31_in_o31_mode: + # build other backgrounds list + other_backgrounds = [ + (mbg_obj.prompt, mbg_obj, False, False) + for mbg_id, mbg_obj in mas_background.BACKGROUND_MAP.iteritems() + if mbg_id != "spaceroom" and mbg_obj.unlocked + ] - # sort other backgrounds list - other_backgrounds.sort() + # sort other backgrounds list + other_backgrounds.sort() - # build full list - backgrounds.extend(other_backgrounds) + # build full list + backgrounds.extend(other_backgrounds) # now add final quit item final_item = (mas_background.BACKGROUND_RETURN, False, False, False, 20) diff --git a/Monika After Story/game/zz_consumables.rpy b/Monika After Story/game/zz_consumables.rpy index d137c7d1ff..59a411b93f 100644 --- a/Monika After Story/game/zz_consumables.rpy +++ b/Monika After Story/game/zz_consumables.rpy @@ -1193,7 +1193,8 @@ init 6 python: acs=mas_acs_mug, portable=True, split_list=[11], - late_entry_list=[10] + late_entry_list=[10], + max_re_serve=3 ) MASConsumable( @@ -1205,7 +1206,8 @@ init 6 python: acs=mas_acs_hotchoc_mug, portable=True, split_list=[22], - late_entry_list=[19] + late_entry_list=[19], + max_re_serve=3 ) #START: Finished brewing/drinking evs diff --git a/spritepacks/released/mocca_bun/blackandwhitestripedpullover/mod_assets/monika/j/mocca_bun_blackandwhitestripedpullover.json b/spritepacks/released/mocca_bun/blackandwhitestripedpullover/mod_assets/monika/j/mocca_bun_blackandwhitestripedpullover.json index 6016575fe9..226598d9c2 100644 --- a/spritepacks/released/mocca_bun/blackandwhitestripedpullover/mod_assets/monika/j/mocca_bun_blackandwhitestripedpullover.json +++ b/spritepacks/released/mocca_bun/blackandwhitestripedpullover/mod_assets/monika/j/mocca_bun_blackandwhitestripedpullover.json @@ -3,6 +3,9 @@ "multimokia", "mocca_bun" ], + "ex_props": { + "bare-right-shoulder": true + }, "version": 3, "type": 2, "name": "mocca_bun_blackandwhitestripedpullover",