From 02ca8df1da449ec500c2949bbf689f073339dcc7 Mon Sep 17 00:00:00 2001 From: multimokia Date: Wed, 16 Sep 2020 21:08:23 -0400 Subject: [PATCH 01/31] informality + tense --- Monika After Story/game/script-topics.rpy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 35cab0c0b9..a495dccacf 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -6928,7 +6928,7 @@ 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 1lksdla "I know Natsuki felt the same..." m "She was always so embarrassed to like cute things. I wish she was more accepting of her own interests." m 2lsc "But..." m 2lksdlc "I suppose her environment had a hand in that." @@ -15737,7 +15737,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?" From f348d2135253f2e9f0e0728113dca637bcc0c328 Mon Sep 17 00:00:00 2001 From: multimokia Date: Thu, 17 Sep 2020 16:47:32 -0400 Subject: [PATCH 02/31] more tense + an extend --- Monika After Story/game/script-topics.rpy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index a495dccacf..c2c2eded47 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -5464,10 +5464,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}" + 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." From b5c4f1284e0e8042acf0a50acfe5aa132692867b Mon Sep 17 00:00:00 2001 From: multimokia Date: Thu, 17 Sep 2020 16:56:02 -0400 Subject: [PATCH 03/31] daydream locked --- Monika After Story/game/script-topics.rpy | 2 +- Monika After Story/game/updates.rpy | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index c2c2eded47..6c54c0266c 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -6739,7 +6739,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)) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index d43eec0603..cae1fd5fb8 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -376,6 +376,7 @@ label v0_3_1(version=version): # 0.3.1 label v0_11_6(version="v0_11_6"): python: # Add update scripts here + mas_lockEVL("monika_daydream", "EVE") pass return From e2bd7e2818605ccc3c40f3d8795fc24722177265 Mon Sep 17 00:00:00 2001 From: John W Date: Sun, 20 Sep 2020 20:55:12 -0400 Subject: [PATCH 04/31] just in case --- Monika After Story/game/script-holidays.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy index a5b9b3e18a..1067370367 100644 --- a/Monika After Story/game/script-holidays.rpy +++ b/Monika After Story/game/script-holidays.rpy @@ -6122,7 +6122,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 From caacaebe65cf6df20a0090a8859a62477b6c1577 Mon Sep 17 00:00:00 2001 From: multimokia Date: Mon, 21 Sep 2020 15:12:18 -0400 Subject: [PATCH 05/31] more --- Monika After Story/game/script-topics.rpy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 6c54c0266c..f405d5142f 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -7091,14 +7091,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!" @@ -7106,6 +7105,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." @@ -7113,7 +7113,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: @@ -8892,7 +8892,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 @@ -10428,7 +10428,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}" From 553244f27653b37bedb3ce8140348056ca1eb107 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Sun, 27 Sep 2020 21:54:36 +0300 Subject: [PATCH 06/31] Monika isn't drawn to MC --- Monika After Story/game/script-songs.rpy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Monika After Story/game/script-songs.rpy b/Monika After Story/game/script-songs.rpy index ce386387f2..724ee091a2 100644 --- a/Monika After Story/game/script-songs.rpy +++ b/Monika After Story/game/script-songs.rpy @@ -1347,11 +1347,11 @@ label mas_song_falling_in_love_at_a_coffee_shop: m 5lubsa "..." 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 1etc "Like not knowing why you're suddenly so drawn to some ordinary coffee shop..." 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~" + m 3rub "Although, in my case...{w=0.4}{nw}" + extend 7eka "I knew what I was looking for~" + m 2hubsb "You!~" return init 5 python: From 6c4fd8115ec3dce6ab8cf15f7365cc6e49d45ae2 Mon Sep 17 00:00:00 2001 From: Rai99 <38822045+Rai99@users.noreply.github.com> Date: Tue, 29 Sep 2020 11:47:22 -0400 Subject: [PATCH 07/31] it's --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index f405d5142f..e3f3dc015a 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -1519,7 +1519,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..." From 4137a42d03e4952dac307359107eb728ce58de8a Mon Sep 17 00:00:00 2001 From: multimokia Date: Tue, 29 Sep 2020 12:04:19 -0400 Subject: [PATCH 08/31] those --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 516e4d1dc9..a89d92f309 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -15810,7 +15810,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." From afd1ac66e33bbc5e9b6e88e615b8bdd38ffb0c0f Mon Sep 17 00:00:00 2001 From: Rai99 <38822045+Rai99@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:30:29 -0400 Subject: [PATCH 09/31] And if --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index a89d92f309..e6d61e4cc9 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -5726,7 +5726,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" From 005c3084bcd7e374ec1870927601d4332bc64657 Mon Sep 17 00:00:00 2001 From: Rai99 <38822045+Rai99@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:38:03 -0400 Subject: [PATCH 10/31] suns Get lowercased, suns --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index e6d61e4cc9..3d71db5e18 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -6163,7 +6163,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." From 2fdb365099f76340b7fd1ae0f0c3b6ad788bb254 Mon Sep 17 00:00:00 2001 From: Rai99 <38822045+Rai99@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:40:16 -0400 Subject: [PATCH 11/31] goddess --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 3d71db5e18..9a9428e4be 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -6987,7 +6987,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." From 3a472e8cfdf479eacb7968505024a7e8ceb4373f Mon Sep 17 00:00:00 2001 From: Rai99 <38822045+Rai99@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:43:39 -0400 Subject: [PATCH 12/31] cat --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 9a9428e4be..b4a43ebe2d 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -6987,7 +6987,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." From 9afe86e899074349098a89abbcb4c8194ef77306 Mon Sep 17 00:00:00 2001 From: Rai99 <38822045+Rai99@users.noreply.github.com> Date: Wed, 30 Sep 2020 13:07:26 -0400 Subject: [PATCH 13/31] So if --- Monika After Story/game/script-moods.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-moods.rpy b/Monika After Story/game/script-moods.rpy index 9cac1bc3ff..be1b69f4d6 100644 --- a/Monika After Story/game/script-moods.rpy +++ b/Monika After Story/game/script-moods.rpy @@ -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]." From 6558cfd0fec1ac3a72bc922a0b0afa51ffab2516 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Wed, 30 Sep 2020 23:14:26 +0300 Subject: [PATCH 14/31] show new stories on top --- Monika After Story/game/script-stories.rpy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Monika After Story/game/script-stories.rpy b/Monika After Story/game/script-stories.rpy index 8825c913b1..23adb5ac50 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[:0] = [("A new story", return_label, True, False)] # build switch button if story_type == mas_stories.TYPE_SCARY: From 4ae6b5ac89dddf2361b523dcd5b48167861166c7 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Thu, 1 Oct 2020 00:04:53 +0300 Subject: [PATCH 15/31] cross over --- Monika After Story/game/script-moods.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-moods.rpy b/Monika After Story/game/script-moods.rpy index be1b69f4d6..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 From 930ee1d57aa02f318a9fd3e7c8db313a3bdc3a3b Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Fri, 2 Oct 2020 15:46:15 +0300 Subject: [PATCH 16/31] still --- Monika After Story/game/script-topics.rpy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index b4a43ebe2d..d51127d361 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 From 8779e50f3232855487bdc01420e1e69190091691 Mon Sep 17 00:00:00 2001 From: multimokia Date: Sun, 4 Oct 2020 12:17:09 -0400 Subject: [PATCH 17/31] fix --- Monika After Story/game/script-greetings.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-greetings.rpy b/Monika After Story/game/script-greetings.rpy index 914f3998f0..5c2b8f7558 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 From 06cebde32873c76f7efca363be76f8c8eb7eb13a Mon Sep 17 00:00:00 2001 From: multimokia Date: Sun, 4 Oct 2020 14:33:04 -0400 Subject: [PATCH 18/31] linebreaks --- Monika After Story/game/script-topics.rpy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index d51127d361..23e5639c5e 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -9110,12 +9110,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 From 4088a90e750fdb51967172dac1e340428ef7da8f Mon Sep 17 00:00:00 2001 From: multimokia Date: Sun, 4 Oct 2020 14:46:26 -0400 Subject: [PATCH 19/31] better tense again --- Monika After Story/game/script-topics.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 23e5639c5e..2d7a10aed4 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -6972,7 +6972,7 @@ label monika_dogs: 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 felt the same..." - m "She was always so embarrassed to like cute things. I wish she was more accepting of her own interests." + 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?" From 55955e334457dcc26181b12d2ca652a544efbc96 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Sun, 4 Oct 2020 23:15:52 +0300 Subject: [PATCH 20/31] some farewell adjustments --- Monika After Story/game/script-farewells.rpy | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Monika After Story/game/script-farewells.rpy b/Monika After Story/game/script-farewells.rpy index 155e0d721b..dc94512d1f 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,7 +783,24 @@ 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") + rules = dict() + # TODO: update this when TC-O comes out + rules.update( + MASSelectiveRepeatRule.create_rule( + hours=(18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6) + ) + ) + addEvent( + Event( + persistent.farewell_database, + eventlabel="bye_illseeyou", + unlocked=True, + rules=rules, + aff_range=(mas_aff.HAPPY, None) + ), + code="BYE" + ) + del rules label bye_illseeyou: m 1eua "I'll see you tomorrow, [player]." From 3d76dfeab1d492a55ff017e6228c90403880adf7 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Sun, 4 Oct 2020 23:20:37 +0300 Subject: [PATCH 21/31] elif here too --- Monika After Story/game/script-greetings.rpy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Monika After Story/game/script-greetings.rpy b/Monika After Story/game/script-greetings.rpy index 5c2b8f7558..a7986898e0 100644 --- a/Monika After Story/game/script-greetings.rpy +++ b/Monika After Story/game/script-greetings.rpy @@ -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..." From 5cb63c8bf6524ad3cc8b03ed397c86749da22a76 Mon Sep 17 00:00:00 2001 From: John W Date: Fri, 9 Oct 2020 20:05:43 -0400 Subject: [PATCH 22/31] another mmmmmmm --- Monika After Story/game/script-topics.rpy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy index 2d7a10aed4..08c6d57d54 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -10103,7 +10103,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." From 7c4aec18cd8e8333693a9503b65d0bf00263b417 Mon Sep 17 00:00:00 2001 From: multimokia Date: Tue, 20 Oct 2020 11:36:00 -0400 Subject: [PATCH 23/31] later, limit coffee/hotchoc to 3 re-serves --- Monika After Story/game/script-farewells.rpy | 2 +- Monika After Story/game/zz_consumables.rpy | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Monika After Story/game/script-farewells.rpy b/Monika After Story/game/script-farewells.rpy index dc94512d1f..b63079db30 100644 --- a/Monika After Story/game/script-farewells.rpy +++ b/Monika After Story/game/script-farewells.rpy @@ -803,7 +803,7 @@ init 5 python: del rules label bye_illseeyou: - m 1eua "I'll see you tomorrow, [player]." + m 1eua "I'll see you later, [player]." m 3kua "Don't forget about me, okay?~" return 'quit' 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 From c2db1b270fc363cbb6960ee9cd7af0c57a005ac0 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Tue, 20 Oct 2020 21:21:32 +0300 Subject: [PATCH 24/31] use tod instead --- Monika After Story/game/script-farewells.rpy | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Monika After Story/game/script-farewells.rpy b/Monika After Story/game/script-farewells.rpy index b63079db30..25221b379a 100644 --- a/Monika After Story/game/script-farewells.rpy +++ b/Monika After Story/game/script-farewells.rpy @@ -783,27 +783,25 @@ label bye_prompt_sleep_goodnight_kiss(chance=3): return None init 5 python: - rules = dict() - # TODO: update this when TC-O comes out - rules.update( - MASSelectiveRepeatRule.create_rule( - hours=(18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6) - ) - ) addEvent( Event( persistent.farewell_database, eventlabel="bye_illseeyou", unlocked=True, - rules=rules, aff_range=(mas_aff.HAPPY, None) ), code="BYE" ) - del rules label bye_illseeyou: - m 1eua "I'll see you later, [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' From e3e679eb5259aed1d1490803204562cd8f1eca61 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Tue, 20 Oct 2020 21:26:30 +0300 Subject: [PATCH 25/31] am dum --- Monika After Story/game/script-farewells.rpy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Monika After Story/game/script-farewells.rpy b/Monika After Story/game/script-farewells.rpy index 25221b379a..38a0de2418 100644 --- a/Monika After Story/game/script-farewells.rpy +++ b/Monika After Story/game/script-farewells.rpy @@ -796,10 +796,10 @@ init 5 python: label bye_illseeyou: # TODO: update this when TC-O comes out if mas_globals.time_of_day_3state == "evening": - dlg_var = "tomorrow" + $ dlg_var = "tomorrow" else: - dlg_var = "later" + $ dlg_var = "later" m 1eua "I'll see you [dlg_var], [player]." m 3kua "Don't forget about me, okay?~" From d6338b8c4ae6db76482b6de9158c066aee80f68e Mon Sep 17 00:00:00 2001 From: Legendkiller21 <42556779+Legendkiller21@users.noreply.github.com> Date: Fri, 23 Oct 2020 06:32:30 +0300 Subject: [PATCH 26/31] remove sprite charts --- Monika After Story/game/updates.rpy | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy index 6817c0bf2d..634438def6 100644 --- a/Monika After Story/game/updates.rpy +++ b/Monika After Story/game/updates.rpy @@ -387,6 +387,19 @@ label v0_11_6(version="v0_11_6"): mas_showEVL('monika_taking_criticism', 'EVE', _random=True) mas_showEVL('monika_giving_criticism', 'EVE', _random=True) + #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 From 1cedd8c1d667c44d328153a1335d912563c72562 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Fri, 23 Oct 2020 17:07:34 +0300 Subject: [PATCH 27/31] remove nw --- Monika After Story/game/script-greetings.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monika After Story/game/script-greetings.rpy b/Monika After Story/game/script-greetings.rpy index 8a49613495..a292569e60 100644 --- a/Monika After Story/game/script-greetings.rpy +++ b/Monika After Story/game/script-greetings.rpy @@ -4220,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(): From 9eee1e0a219db7d275770da3fa50bf7339d386f2 Mon Sep 17 00:00:00 2001 From: Totally a booplicate <53382877+thezotikrus@users.noreply.github.com> Date: Fri, 23 Oct 2020 18:44:27 +0300 Subject: [PATCH 28/31] forgotten ex_prop --- .../monika/j/mocca_bun_blackandwhitestripedpullover.json | 3 +++ 1 file changed, 3 insertions(+) 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", From 2006a4138f7e5f1027d77f50cd15fdb380890b4d Mon Sep 17 00:00:00 2001 From: John W Date: Fri, 23 Oct 2020 14:23:03 -0400 Subject: [PATCH 29/31] better analogy --- Monika After Story/game/script-songs.rpy | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Monika After Story/game/script-songs.rpy b/Monika After Story/game/script-songs.rpy index 8ea5806b75..9d8a405b1c 100644 --- a/Monika After Story/game/script-songs.rpy +++ b/Monika After Story/game/script-songs.rpy @@ -1350,11 +1350,9 @@ label mas_song_falling_in_love_at_a_coffee_shop: m 5lubsa "..." 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..." - 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 3rub "Although, in my case...{w=0.4}{nw}" - extend 7eka "I knew what I was looking for~" - m 2hubsb "You!~" + m 1etc "Like not knowing why you're suddenly so drawn to some ordinary coffee shop...{w=0.2}{nw}" + 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: From a814ab8d6379f6dfc4a912e72e86e3631f6315d3 Mon Sep 17 00:00:00 2001 From: John W Date: Mon, 26 Oct 2020 21:01:18 -0400 Subject: [PATCH 30/31] smols --- Monika After Story/game/script-stories.rpy | 2 +- Monika After Story/game/script-topics.rpy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Monika After Story/game/script-stories.rpy b/Monika After Story/game/script-stories.rpy index 23adb5ac50..03480e657e 100644 --- a/Monika After Story/game/script-stories.rpy +++ b/Monika After Story/game/script-stories.rpy @@ -127,7 +127,7 @@ label monika_short_stories_menu: else: return_label = "mas_story_unlock_random" - stories_menu_items[:0] = [("A new story", return_label, True, False)] + 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 ddc65ddf16..6c75d53834 100644 --- a/Monika After Story/game/script-topics.rpy +++ b/Monika After Story/game/script-topics.rpy @@ -5486,7 +5486,7 @@ label monika_cupcake: m 3tku "Natsuki's cupcakes." 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}" + 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?" From de0301397b46f6399a6a7a286255bb40a948edf0 Mon Sep 17 00:00:00 2001 From: Legendkiller21 <42556779+Legendkiller21@users.noreply.github.com> Date: Tue, 27 Oct 2020 04:38:49 +0200 Subject: [PATCH 31/31] allow only def in o31 --- Monika After Story/game/script-holidays.rpy | 2 +- Monika After Story/game/zz_backgrounds.rpy | 25 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy index 63da1c7284..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()): 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)