Skip to content
Closed

pull #13

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
948 changes: 934 additions & 14 deletions .gitignore

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions Monika After Story/game/chess.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -1189,10 +1189,10 @@ label mas_chess_start_chess:
menu:
m "Would you like to save this game?{fast}"

"Yes.":
"Yes.{#mas_chess_start_chess_1}":
call mas_chess_savegame

"No.":
"No.{#mas_chess_start_chess_2}":
pass

# FALL THROUGH
Expand All @@ -1203,18 +1203,18 @@ label mas_chess_play_again_ask:
menu:
m "Would you like to play again?{fast}"

"Yes.":
"Yes.{#mas_chess_play_again_ask_1}":
$ mas_assignModifyEVLPropValue("mas_chess", "shown_count", "+=", 1)
if drew_lots:
call mas_chess_draw_lots

jump mas_chess_start_chess

"Yes, but with different rules.":
"Yes, but with different rules.{#mas_chess_play_again_ask_2}":
$ mas_assignModifyEVLPropValue("mas_chess", "shown_count", "+=", 1)
jump mas_chess_remenu

"No.":
"No.{#mas_chess_play_again_ask_3}":
m 1eua "Alright, let's play again soon."

return
Expand Down Expand Up @@ -1289,10 +1289,10 @@ label mas_chess_savegame(silent=False, allow_return=True):
$ _history_list.pop()
menu:
m "Should I overwrite it?{fast}"
"Yes.":
"Yes.{#mas_chess_play_again_ask_4}":
pass

"No.":
"No.{#mas_chess_play_again_ask_5}":
#NOTE: Since jumping back to the main label causes arg resets, we jump to a local label inside to prevent that
#TODO: Jump with args
jump .save_start
Expand Down Expand Up @@ -1331,7 +1331,7 @@ label mas_chess_savegame(silent=False, allow_return=True):
menu:
m "Right, [player]?{fast}"

"Of course not.":
"Of course not.{#mas_chess_play_again_ask_6}":
m 1hua "Yay~"

if game_result == mas_chess.IS_ONGOING:
Expand Down Expand Up @@ -1507,16 +1507,16 @@ label mas_chess_dlg_quickfile_lost:
menu:
m "Did you mess with the saves, [player]?{fast}"

"I deleted the save.":
"I deleted the save.{#mas_chess_dlg_quickfile_lost_1}":
jump mas_chess_dlg_quickfile_lost_deleted

"It was an accident!":
"It was an accident!{#mas_chess_dlg_quickfile_lost_2}":
jump mas_chess_dlg_quickfile_lost_accident

"Maybe...":
"Maybe...{#mas_chess_dlg_quickfile_lost_3}":
jump mas_chess_dlg_quickfile_lost_maybe

"Of course not!":
"Of course not!{#mas_chess_dlg_quickfile_lost_4}":
jump mas_chess_dlg_quickfile_lost_ofcoursenot


Expand All @@ -1529,11 +1529,11 @@ label mas_chess_dlg_quickfile_lost_deleted:
menu:
m "Did you not want to continue that game?{fast}"

"Yeah.":
"Yeah.{#mas_chess_dlg_quickfile_lost_deleted_1}":
m 1eka "I understand, [player]."
m 1hua "Let's start a new game~"

"No.":
"No.{#mas_chess_dlg_quickfile_lost_deleted_2}":
m 1etc "Oh?"
m 1rsc "I guess you just deleted it by mistake then."
m 1eua "Let's just start a new game."
Expand Down Expand Up @@ -1649,7 +1649,7 @@ label mas_chess_quickfile_lost_maybe_filechecker_loop:
show screen mas_background_timed_jump(4, "mas_chess_quickfile_lost_maybe_filechecker_loop")
$ seconds += 4
menu:
"I deleted the save...":
"I deleted the save...{#mas_chess_quickfile_lost_maybe_filechecker_loop_1}":
hide screen mas_background_timed_jump
jump mas_chess_dlg_quickfile_lost_maybe_filechecker_no_file

Expand Down Expand Up @@ -1705,10 +1705,10 @@ label mas_chess_dlg_quickfile_edited:
menu:
m "Did you edit the save file?{fast}"

"Yes.":
"Yes.{#mas_chess_dlg_quickfile_edited_1}":
jump mas_chess_dlg_quickfile_edited_yes

"No.":
"No.{#mas_chess_dlg_quickfile_edited_2}":
jump mas_chess_dlg_quickfile_edited_no


Expand All @@ -1725,15 +1725,15 @@ label mas_chess_dlg_quickfile_edited_yes:
# we want a timed menu here. Let's give the player 5 seconds to say sorry
show screen mas_background_timed_jump(5, "mas_chess_dlg_quickfile_edited_yes.game_ruined")
menu:
"I'm sorry.":
"I'm sorry.{#mas_chess_dlg_quickfile_edited_yes_1}":
hide screen mas_background_timed_jump
# light affection boost for being honest
$ mas_gainAffection(modifier=0.5)
m 1hua "Apology accepted!"
m 1eua "Luckily, I still remember a little bit of the last game, so we can continue it from there."
return store.mas_chess.CHESS_GAME_BACKUP

"...":
"...{#mas_chess_dlg_quickfile_edited_yes_2}":
label .game_ruined:
pass

Expand Down Expand Up @@ -1797,7 +1797,7 @@ label mas_chess_dlg_quickfile_edited_no:
#NOTE: This is the ultimate choice, it dictates whether we delete everything or not
show screen mas_background_timed_jump(3, "mas_chess_dlg_quickfile_edited_no.menu_silent")
menu:
"I'm sorry.":
"I'm sorry.{#mas_chess_dlg_quickfile_edited_no_1}":
hide screen mas_background_timed_jump
# light affection boost for apologizing
$ mas_gainAffection(modifier=0.5)
Expand All @@ -1813,7 +1813,7 @@ label mas_chess_dlg_quickfile_edited_no:
m 2dktdc "..."
return store.mas_chess.CHESS_GAME_BACKUP

"...":
"...{#mas_chess_dlg_quickfile_edited_no_2}":
label .menu_silent:
hide screen mas_background_timed_jump
jump mas_chess_dlg_pre_go_ham
Expand Down
18 changes: 9 additions & 9 deletions Monika After Story/game/import_ddlc.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ label import_ddlc_persistent:
menu:
"Save data from Doki Doki Literature Club has been merged already. Aborting."

"Okay.":
"Okay.{#import_ddlc_persistent_1}":
pass

pause 0.3
Expand Down Expand Up @@ -81,10 +81,10 @@ label import_ddlc_persistent:
menu:
"Would you like to import Doki Doki Literature Club save data into [config.name]?\n(DDLC will not be affected)"

"Yes, import DDLC save data.":
"Yes, import DDLC save data.{#import_ddlc_persistent_2}":
pause 0.3

"No, do not import.":
"No, do not import.{#import_ddlc_persistent_3}":
pause 0.3
return

Expand All @@ -94,7 +94,7 @@ label import_ddlc_persistent:
menu:
"Save data will not be imported at this time."

"Okay.":
"Okay.{#import_ddlc_persistent_4}":
pause 0.3
return

Expand Down Expand Up @@ -122,7 +122,7 @@ label import_ddlc_persistent:
menu:
"Couldn't read/decode save data from Doki Doki Literature Club. Aborting."

"Okay.":
"Okay.{#import_ddlc_persistent_5}":
pass

pause 0.3
Expand All @@ -134,10 +134,10 @@ label import_ddlc_persistent:
menu:
"Previous Monika After Story save data has also been found.\nWould you like to merge with DDLC save data?"

"Merge save data.":
"Merge save data.{#import_ddlc_persistent_6}":
pass

"Cancel.":
"Cancel.{#import_ddlc_persistent_7}":
"DDLC data can be imported later in the Settings menu."
return

Expand Down Expand Up @@ -297,8 +297,8 @@ label import_ddlc_persistent:
label merge_unmatched_names:
menu:
"Player names do not match. Which would you like to keep?"
"[ddlc_persistent.playername]":
"[ddlc_persistent.playername]{#merge_unmatched_names_1}":
$ persistent.playername = ddlc_persistent.playername
"[persistent.playername]":
"[persistent.playername]{#merge_unmatched_names_2}":
$ persistent.playername
return
16 changes: 8 additions & 8 deletions Monika After Story/game/pong.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -562,15 +562,15 @@ label demo_minigame_pong:
menu:
m "Would you like to play again?{fast}"

"Yes.":
"Yes.{#demo_minigame_pong_1}":
$ pong_ev = mas_getEV("mas_pong")
if pong_ev:
# each game counts as a game played
$ pong_ev.shown_count += 1

jump demo_minigame_pong

"No.":
"No.{#demo_minigame_pong_2}":
if winner == "monika":
if renpy.seen_label(store.mas_pong.DLG_WINNER_END):
$ end_dialogue = store.mas_pong.DLG_WINNER_FAST
Expand Down Expand Up @@ -654,7 +654,7 @@ label mas_pong_dlg_winner:
menu:
m "[menu_response]{fast}"

"...Maybe.":
"...Maybe.{#mas_pong_dlg_winner_1}":
m 1hua "Ehehe!~"
m 1eka "Thank you, [player]~"
show monika 5eka at t11 zorder MAS_MONIKA_Z with dissolve_monika
Expand All @@ -666,18 +666,18 @@ label mas_pong_dlg_winner:
$ player_lets_monika_win_on_purpose = True
$ persistent._mas_pm_ever_let_monika_win_on_purpose = True

"No.":
"No.{#mas_pong_dig_winner}":
if persistent._mas_pm_ever_let_monika_win_on_purpose:
show monika 1ttu
m "Are you {i}sure?{/i}{nw}"
$ _history_list.pop()
menu:
m "Are you {i}sure?{/i}{fast}"

"Yes":
"Yes{#mas_pong_dlg_winner_2}":
call mas_pong_dlg_sorry_assuming

"No":
"No{#mas_pong_dlg_winner_3}":
m 1rfu "[player]!"
m 2hksdlb "Stop teasing me!"
$ player_lets_monika_win_on_purpose = True
Expand Down Expand Up @@ -871,7 +871,7 @@ label mas_pong_dlg_sorry_assuming:
menu:
m "Would you like to take a break, [player]?{fast}"

"Okay.":
"Okay.{#mas_pong_dlg_sorry_assuming_1}":
m 1eka "Alright, [player].{w=0.3} {nw}"
extend 1hua "I had fun, thanks for playing Pong with me!"
m 1eua "Let me know when you're ready to play again."
Expand All @@ -883,7 +883,7 @@ label mas_pong_dlg_sorry_assuming:
show monika idle with dissolve_monika
jump ch30_loop

"No.":
"No.{#mas_pong_dlg_sorry_assuming_2}":
m 1eka "Alright, [player]. If you're sure."
m 1hub "Keep going, you'll beat me soon!"
return
Expand Down
2 changes: 1 addition & 1 deletion Monika After Story/game/screens.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -3218,7 +3218,7 @@ screen mas_apikeys():
spacing 10

if feature_data[2]:
textbutton _("Clear"):
textbutton _("Clear{#mas_apikeys}"):
style "mas_button_simple"
yalign 0.5
action Function(store.mas_api_keys.screen_clear, feature_data[1])
Expand Down
16 changes: 8 additions & 8 deletions Monika After Story/game/script-affection.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -2838,7 +2838,7 @@ label monika_affection_nickname:
$ _history_list.pop()
menu:
m "What do you say?{fast}"
"Yes.":
"Yes.{#monika_affection_nickname_1}":
label monika_affection_nickname_yes:
pass

Expand Down Expand Up @@ -2967,7 +2967,7 @@ label monika_affection_nickname:
$ mas_lockEVL("monika_affection_nickname", "EVE")
$ done = True

"No.":
"No.{#monika_affection_nickname_yes_1}":
m 1ekc "Oh..."
m 1lksdlc "Alright then, if you say so."
m 3eka "Just tell me if you ever change your mind, [player]."
Expand Down Expand Up @@ -3013,12 +3013,12 @@ label mas_affection_playernickname:
menu:
m "Is that alright with you?{fast}"

"Sure, [m_name].":
"Sure, [m_name].{#mas_affection_playernickname_1}":
m 1hua "Great!"
m 3eud "I should ask though, what names are you comfortable with?"
call mas_player_nickname_loop("Deselect the names you're not comfortable with me calling you.", base_nicknames)

"No.":
"No.{#mas_affection_playernickname_2}":
m 1eka "Alright, [player]."
m 3eua "Just let me know if you ever change your mind, okay?"

Expand Down Expand Up @@ -3096,7 +3096,7 @@ label mas_player_nickname_loop(check_scrollable_text, nickname_pool):
menu:
m "[dlg_line]{fast}"

"Yes.":
"Yes.{#monika_change_player_nicknames_1}":
label .name_enter_skip_loop:
pass

Expand Down Expand Up @@ -3148,7 +3148,7 @@ label mas_player_nickname_loop(check_scrollable_text, nickname_pool):
#If this is all good, then we'll add this to a list of things to add
$ acceptable_nicknames.append(lowername)

"No.":
"No.{#monika_change_player_nicknames_2}":
$ done = True

if acceptable_nicknames:
Expand Down Expand Up @@ -3349,9 +3349,9 @@ label mas_finalfarewell:
call mas_showpoem(mas_poems.getPoem(persistent._mas_finalfarewell_poem_id))

menu:
"I'm sorry.":
"I'm sorry.{#mas_finalfarewell_1}":
pass
"...":
"...{#mas_finalfarewell_2}":
pass

jump mas_finalfarewell
Expand Down
12 changes: 6 additions & 6 deletions Monika After Story/game/script-brbs.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ label monika_idle_shower:
menu:
m "Can I come with you?{fast}"

"Yes.":
"Yes.{#monika_idle_shower_1}":
hide screen mas_background_timed_jump
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?"
Expand All @@ -389,7 +389,7 @@ label monika_idle_shower:
show monika 5kubfu at t11 zorder MAS_MONIKA_Z with dissolve_monika
m 5kubfu "Maybe another time~"

"No.":
"No.{#monika_idle_shower_2}":
hide screen mas_background_timed_jump
m 2eka "Aw, you rejected me so fast."
m 3tubsb "Are you shy, [player]?"
Expand Down Expand Up @@ -428,11 +428,11 @@ label monika_idle_shower_callback:
menu:
m "Did you take a bath instead?{fast}"

"Yes.":
"Yes.{#monika_idle_shower_callback_1}":
m 7hub "Oh! {w=0.3}I see!"
m 3eua "I hope it was nice and relaxing!"

"No.":
"No.{#monika_idle_shower_callback_2}":
m 7rua "Oh...{w=0.3}maybe you just like really long showers..."
m 3duu "Sometimes it can be nice just to feel the water rushing over you...{w=0.3}it can be really soothing."
m 1hksdlb "...Or maybe I'm overthinking this and you just didn't come back right away, ahaha!"
Expand Down Expand Up @@ -672,11 +672,11 @@ label monika_idle_workout_callback:
menu:
m "Are you sure you can't keep going?{fast}"

"I'm sure.":
"I'm sure.{#monika_idle_workout_callback_1}":
m 1eka "That's okay."
m 1hua "I'm sure you did your best, [player]~"

"I'll try to keep going.":
"I'll try to keep going.{#monika_idle_workout_callback_2}":
# continue workout and return Monika to idle state
m 1hub "That's the spirit!"

Expand Down
Loading
Loading