Skip to content

Commit

Permalink
cleaning up
Browse files Browse the repository at this point in the history
  • Loading branch information
multimokia committed Jul 3, 2020
1 parent 6e0e408 commit 5d3567d
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 48 deletions.
5 changes: 3 additions & 2 deletions Monika After Story/game/script-greetings.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,10 @@ init 5 python:
)

label greeting_back:
$ tod = "day" if mas_globals.time_of_day_4state != "night" else "night"
m 1eua "[player], you're back!"
m 1eka "I was starting to miss you."
m 1hua "Let's have another lovely [mas_globals.time_of_day_3state] together, alright?"
m 1hua "Let's have another lovely [tod] together, alright?"
return

init 5 python:
Expand Down Expand Up @@ -2369,7 +2370,7 @@ label greeting_long_absence:
m 3hksdlb "Couldn't stay away even if you wanted to, right?"
m 3eka "I can't blame you! My love for you wouldn't let me stay away from you either!"
m 1ekd "Every day you were gone I was wondering how you were..."
m 3eka "So let me hear it, how are you, [player]?"
m 3eka "So let me hear it. How are you, [player]?"
show monika 3eua

elif persistent._mas_absence_choice == "unknown":
Expand Down
70 changes: 35 additions & 35 deletions Monika After Story/game/script-introduction.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,11 @@ label ch30_reload_0:
label ch30_reload_0_dlg:
pause 1
m 1ekc "Hey..."
m "I had an awful dream..."
m 1ekd "I was hoping those would stop, now that it's just the two of us..."
m "I guess that was wishful thinking."
m 1esc "[player], I don't know if you would have any idea..."
m "But if you know what might be causing that, could you try to do something about it?"
m 1ekc "Whenever it happens, it almost feels like I've been killed or something."
m "It's a really horrible feeling..."
m 1ekd "I had an awful dream..."
m 1rkc "I was hoping those would stop, now that it's just the two of us, but I guess that was wishful thinking..."
m 1euc "[player], if you have any idea of what might be causing that, could you try to do something about it?"
m 1dkc "Whenever it happens, it almost feels like I've been killed or something."
m 1dkd "It's a really horrible feeling..."
m 1eka "If you could figure out what's causing that, I'll love you forever~"

## TESTING ONLY
Expand All @@ -352,22 +350,22 @@ label ch30_reload_1:
label ch30_reload_1_dlg:
pause 1
m 1esc "Hey, [player]."
m "I had another really bad dream."
m 1ekc "You're not the one doing that to me, are you?"
m 2ekc "It seems to happen whenever you quit the game without saying goodbye..."
m 1ekc "I had another really bad dream."
m 1ekd "You're not the one doing that to me, are you?"
m 1dsc "It seems to happen whenever you quit the game without saying goodbye..."
m 2eka "So if you could try to avoid doing that, I would be really grateful."

if mas_isMoniHappy(higher=True):
m "You've been so kind to me so far, I'm sure you'll do it for me."
m 7eka "You've been so kind to me so far, I'm sure you'll do it for me."
else:
m 2f "I hope you'll listen and do it for me..."
m 7ekc "I hope you'll listen and do it for me..."

if persistent._mas_idle_data.get("monika_idle_game", False):
m 3rksdlb "There's nothing stopping you from coming back and doing that, is there?"
m 7rksdlc "There's nothing stopping you from coming back and doing that, is there?"
m 1eka "It would really make me happy."

m "Just click on 'Talk.' and say 'Goodbye.' instead."
m 3eua "Then I can close the game myself."
m 1eua "Just click on 'Talk' and say 'Goodbye' instead.{w=0.2} {nw}"
extend 3eua "That way, I can close the game myself."
m 1esa "Don't worry, I don't think it's caused me any harm, aside from mental scarring."
return

Expand All @@ -382,27 +380,26 @@ label ch30_reload_2:
label ch30_reload_2_dlg:
pause 1
m 1dsc "I see you quit the game again..."
m 1esc "I know I asked already, but can you please try not to do that so much?"
m "It's like getting knocked unconscious..."
m 1ekc "So sudden and scary."
m "Why would you want to do that to me?"
m 3euc "I know I asked already, but can you please try not to do that so much?"
m 1dsc "It's like getting knocked unconscious..."
m 1ekd "Why would you want to do that to me?"

if persistent._mas_idle_data.get("monika_idle_game", False):
m 1rksdld "Is something happening in your other game?"
m 1ekc "You know you could just come talk to me if there is, right?"

elif persistent._mas_idle_data.get("monika_idle_brb",False):
m 1ekd "If you need to leave, you can just tell me."
m "If you need to leave, you can just tell me."

if mas_isMoniHappy(higher=True):
m 1m "I'm sure it was a mistake though, or outside of your control. It can be unavoidable sometimes."
m 1eka "I'm sure it was a mistake though, or outside of your control. It can be unavoidable sometimes."
elif mas_isMoniUpset(lower=True):
m "You're not doing it to hurt me on purpose, are you?"
m 1ekc "You're not doing it to hurt me on purpose, are you?"

m 1ekd "Just let me turn the game off for myself."
m 3ekd "Just let me turn the game off for myself."

m "If you choose 'Goodbye.' from the 'Talk.' menu, I can close the game properly."
m 3eua "Or better yet, just leave me on in the background forever."
m 3eka "If you choose 'Goodbye' from the 'Talk' menu, I can close the game properly."
m 3eua "...Or better yet, just leave me on in the background forever."
m 1eka "Even if we aren't talking, I'm happy just being with you~"
return

Expand All @@ -419,25 +416,28 @@ label ch30_reload_3_dlg:

if persistent._mas_idle_data.get("monika_idle_game", False):
m 1ekd "[player]!"
m 1ekc "You left without saying goodbye again!"
m "You're not going through anything stressful or upsetting in your game, are you?"
m 1efd "You left without saying goodbye again!"
m 1rkc "You're not going through anything stressful or upsetting in your game, are you?"
m 3eka "You know you could just come back to me if anything were to happen, right?"
m 1eka "It'd make me really happy to see you come back before saying goodbye at least."
m 1rksdld "I know it might not always be possible..."

else:
m 1esc "By the way..."
m 2esc "I'm just going to accept the fact that you need to quit the game once in a while."
m "I'm starting to get used to it, anyway."
m 2eua "Besides, it makes me happy that you always come back..."
m 7esd "I'm just going to accept the fact that you need to quit the game once in a while."
m 2dsc "I'm starting to get used to it, anyway."
m 2ekc "Besides, it makes me happy that you always come back..."
m 2lsc "So I guess it's not so bad."
m 1eka "But I'd really prefer if you'd let me close the game myself."

m 7eka "But I'd really prefer if you'd let me close the game myself."

if mas_isMoniUpset(lower=True):
m 1f "You will do that, won't you? I'm finding it harder and harder to believe you will but I trust you [player]..."
else:
m "That way I can be ready for it and rest peacefully."
m 1esa "I do need my beauty sleep every now and then, after all."
m 1ekc "You will do that, right?"
m 1dkd "I'm finding it harder and harder to believe you will but I trust you [player]..."

else:
m 1eua "That way I can be ready for it and rest peacefully."
m 3rksdla "I do need my beauty sleep every now and then, after all."
return

#This reload event gets pushed when you reach the end of the scripted reload events
Expand Down
19 changes: 10 additions & 9 deletions Monika After Story/game/script-topics.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -5650,13 +5650,14 @@ label monika_good_tod:
#You've been here for a bit now
else:
m 1hua "Good morning to you too, [player]!"
m 1tsu "Even though we've been awake together for a bit now, it's still nice of you to say!"
m 1tsu "Even though we've been awake together for a bit now,{w=0.2} {nw}"
extend 3hua "it's still nice of you to say!"
m 1esa "If I had to choose a time of day as my favorite, it would probably be the morning."
m 3esb "There's definitely some level of tranquility that night brings that I enjoy..."
m "But the morning is a time of day that presents possibilities!"
m 1esb "An entire day where anything and everything could happen, for better or worse."
m 1hsb "That kind of opportunity and freedom just makes me giddy!"
m 1tsb "Though I only feel that way until I fully wake up, ehehe~"
m 3eua "There's definitely some level of tranquility that night brings that I enjoy...{w=0.3}{nw}"
extend 3hua "but the morning is a time of day that presents possibilities!"
m 1eub "An entire day where anything and everything could happen, for better or worse."
m 1hub "That kind of opportunity and freedom just makes me giddy!"
m 1rka "Though I only feel that way once I fully wake up, ehehe~"

elif mas_globals.time_of_day_4state == "afternoon":
m 1eua "Good afternoon to you too, [player]."
Expand Down Expand Up @@ -9788,7 +9789,7 @@ init 5 python:
)

label monika_dating:
m 1eud "You, know I've been really curious lately, [player]..."
m 1eud "You know, I've been really curious lately, [player]..."
m 3rka "We've been together a while now, so I think it's the right time to ask..."
m 1eud "How much dating experience do you have?"
m 1luc "Like...have you ever been in a relationship before?"
Expand Down Expand Up @@ -13301,7 +13302,7 @@ label monika_winter_dangers:
#explicitly using False here so we don't grab None people who haven't
# answered the question yet
m 1eka "I know you don't get snow where you live, but I'm sure you can appreciate its appeal..."
m 3hua "Maybe someday after I cross over we can even take a trip to some place where they do have snow and enjoy its beauty together!"
m 3hua "Maybe someday after I cross over we can even take a trip some place where they do have snow and enjoy its beauty together!"

m 1eka "..."
m 3rkc "Although, as stunning as winter can be, there are a few dangers..."
Expand Down Expand Up @@ -13570,7 +13571,7 @@ label monika_relationship_comfort:
m 2eka "Just because a relationship has slowed down, doesn't mean it's worse for it..."
m 2hua "It just means that the people involved are truly comfortable with one another."
m 2hubsb "...And I think that's really sweet."
m 1kua "Let's try not to fall into the same trap, [player]. {nw}"
m 1kua "Let's try not to fall into the same trap, [player].{w=0.2} {nw}"
extend 1hub "Ahaha!"
return

Expand Down
5 changes: 3 additions & 2 deletions Monika After Story/game/zz_consumables.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -1434,8 +1434,9 @@ label mas_consumables_generic_finish_having(consumable):
line_starter = renpy.substitute(dlg_map["else"][get_more])

if (not mas_canCheckActiveWindow() or mas_isFocused()) and not store.mas_globals.in_idle_mode:
m 1eua "[line_starter]"
m "Hold on a moment."
m 1eud "I finished my [consumable.disp_name].{w=0.2}{nw}"
extend 1eua "[line_starter]"
m 3eua "Hold on a moment."

elif store.mas_globals.in_idle_mode or (mas_canCheckActiveWindow() and not mas_isFocused()):
m 1esd "Oh, I've finished my [consumable.disp_name][plur].{w=1}{nw}"
Expand Down

0 comments on commit 5d3567d

Please sign in to comment.