diff --git a/game/options.rpy b/game/options.rpy index c2a3430..ee36814 100644 --- a/game/options.rpy +++ b/game/options.rpy @@ -24,7 +24,7 @@ define gui.show_name = True ## The version of the game. -define config.version = _("Patch8_BloodAndSpainAllOver") +define config.version = _("Patch8_NewYears") ## Text that is placed on the game's about screen. Place the text between the ## triple-quotes, and leave a blank line between paragraphs. diff --git a/game/script.rpy b/game/script.rpy index 2c30962..2e85614 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -319,4 +319,4 @@ label start: $ tradwife = False $ wingStory = False pause 1.0 - call storyline + call storyline from _call_storyline diff --git a/game/script/11.school-assignment-and-route-lock.rpy b/game/script/11.school-assignment-and-route-lock.rpy index 09a311c..e4adf84 100644 --- a/game/script/11.school-assignment-and-route-lock.rpy +++ b/game/script/11.school-assignment-and-route-lock.rpy @@ -448,7 +448,7 @@ label chapter_11: #THIS SECTION IS SCORE DEPENDENT # Doomer ending skips this segment - call get_ending + call get_ending from _call_get_ending if _return == 2: stop music fadeout 3 pause 2 @@ -585,7 +585,7 @@ label chapter_11: Nas "Don’t take it the wrong way, but my mind just screamed at me ‘worst case scenario’." pause .5 - call get_ending + call get_ending from _call_get_ending_1 if _return == 4: jump lSortingThings # Golden elif _return == 3: @@ -5211,7 +5211,7 @@ label chapter_11: "Fang and I have been together for a month now." pause .5 - call get_ending + call get_ending from _call_get_ending_2 if _return == 3: #tradwife "Things are going pretty well. When we discount Trish’s weekly attempt to talk with Fang." @@ -5466,7 +5466,7 @@ label chapter_11: "{cps=*.1}...{/cps}" - call get_ending + call get_ending from _call_get_ending_3 if _return != 1: # any route except Shooter # duplicated segment from 11B, 11C and 11D transplanted here window hide diff --git a/game/src/credits.rpy b/game/src/credits.rpy index 029313c..5733f40 100644 --- a/game/src/credits.rpy +++ b/game/src/credits.rpy @@ -217,7 +217,7 @@ image d_credits_text = Composite( label lending: - call get_ending + call get_ending from _call_get_ending_4 if _return == 4: pause 0.5 show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit diff --git a/game/storyline.rpy b/game/storyline.rpy index bd7851a..40907a8 100644 --- a/game/storyline.rpy +++ b/game/storyline.rpy @@ -11,45 +11,45 @@ init -1 python: persistent.endings = endings label storyline: - call chapter_1 - call chapter_2 - call chapter_3 - call chapter_4 - call chapter_5 - call chapter_6 - call chapter_7 - call chapter_8 - call chapter_9 - call chapter_10 - call chapter_11 - call get_ending + call chapter_1 from _call_chapter_1 + call chapter_2 from _call_chapter_2 + call chapter_3 from _call_chapter_3 + call chapter_4 from _call_chapter_4 + call chapter_5 from _call_chapter_5 + call chapter_6 from _call_chapter_6 + call chapter_7 from _call_chapter_7 + call chapter_8 from _call_chapter_8 + call chapter_9 from _call_chapter_9 + call chapter_10 from _call_chapter_10 + call chapter_11 from _call_chapter_11 + call get_ending from _call_get_ending_5 if _return == 4: - call chapter_11D - call chapter_12D - call chapter_12_5D - call chapter_13D - call chapter_14D + call chapter_11D from _call_chapter_11D + call chapter_12D from _call_chapter_12D + call chapter_12_5D from _call_chapter_12_5D + call chapter_13D from _call_chapter_13D + call chapter_14D from _call_chapter_14D elif _return == 3: $ tradwife = True - call chapter_11C - call chapter_12C - call chapter_12_5C - call chapter_13C - call chapter_14C + call chapter_11C from _call_chapter_11C + call chapter_12C from _call_chapter_12C + call chapter_12_5C from _call_chapter_12_5C + call chapter_13C from _call_chapter_13C + call chapter_14C from _call_chapter_14C elif _return == 2: - call chapter_11B - call chapter_12B + call chapter_11B from _call_chapter_11B + call chapter_12B from _call_chapter_12B # no chapter_13 here since the scene is different enough to the other routes for everything to go into 13C - call chapter_13B - call chapter_14B + call chapter_13B from _call_chapter_13B + call chapter_14B from _call_chapter_14B else: - call chapter_11A - call chapter_12A - call chapter_12_5D - call chapter_13A - call chapter_14A + call chapter_11A from _call_chapter_11A + call chapter_12A from _call_chapter_12A + call chapter_12_5D from _call_chapter_12_5D_1 + call chapter_13A from _call_chapter_13A + call chapter_14A from _call_chapter_14A $ ending_image() $ renpy.quit() $ ending_image() - call lending + call lending from _call_lending return \ No newline at end of file