From e473ddc1db02e8094ce109739e379d1f74218a00 Mon Sep 17 00:00:00 2001 From: nutbuster Date: Mon, 2 Oct 2023 16:14:58 +1100 Subject: [PATCH] Bonus Chapter 10 Unlock Requirement --- game/screens.rpy | 19 +++++++++++++++---- game/script.rpy | 8 ++++++++ game/script/x1-chicxulub-gutterlane.rpy | 2 ++ game/script/x2-the-mous-pad.rpy | 22 ++++++++++++---------- game/script/x3-PTA-meeting.rpy | 3 +++ game/script/x4-passion-of-the-trigga.rpy | 14 ++++++++------ game/script/x5-passion-of-the-trigga.rpy | 10 ++++++---- game/script/x6-passion-of-the-trigga.rpy | 2 ++ game/script/x7-naomi-tribulations.rpy | 14 ++++++++------ game/script/x8-naomi-tribulations.rpy | 17 ++++++++++------- game/script/x9-naomi-tribulations.rpy | 5 ++++- game/src/extra_chapters_menu.rpy | 3 +++ 12 files changed, 81 insertions(+), 38 deletions(-) diff --git a/game/screens.rpy b/game/screens.rpy index 2170fc7..b26eb8d 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -437,11 +437,17 @@ screen bonus_chapter_button(f="gui/button/menubuttons/template_idle.png"): action ShowMenu("ex_ch_menu") activate_sound "audio/ui/uiClick.wav" fixed: - if persistent.old_endings != persistent.endings: + if (persistent.old_endings != persistent.endings) \ + or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 $ persistent.old_endings = persistent.endings + #$ persistent.old_bonus_chapters = persistent.bonus_chapters else: add f xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 + + if (persistent.old_bonus_chapters != persistent.bonus_chapters): #just in case + $ persistent.old_bonus_chapters = persistent.bonus_chapters + text "Bonus Chapters" xalign 0.5 yalign 0.5 xanchor 0.5 # label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ] @@ -472,7 +478,9 @@ screen main_menu(): frame: pass - if persistent.old_endings != persistent.endings: + + if (persistent.old_endings != persistent.endings) \ + or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): fixed: xalign 0.125 yalign 0.5 @@ -484,11 +492,14 @@ screen main_menu(): add Solid(gui.accent_color) xysize ( int(1920/2)-20, int(1080/4)-12 ): xalign 0.5 yalign 0.5 - if persistent.endings == 0b1111: - text "You have unlocked all bonus chapters!" style "main_menu_text" yalign 0.5 + if persistent.endings == 0b1111 and (persistent.bonus_chapters == 0b111111111): + text "You have unlocked the final bonus chapter!" style "main_menu_text" yalign 0.5 + elif persistent.endings == 0b1111: + text "You have finished all endings! Complete all bonus chapters to receive the final chapter!" style "main_menu_text" yalign 0.5 else: text "You have unlocked new bonus chapters, complete unseen endings to see more!" style "main_menu_text" yalign 0.5 + ## The use statement includes another screen inside this one. The actual ## contents of the main menu are in the navigation screen. vbox: diff --git a/game/script.rpy b/game/script.rpy index 2e85614..0e6b2de 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -51,6 +51,14 @@ init python: if persistent.autoup == None: persistent.autoup = False + if persistent.bonus_chapters == None: + if renpy.seen_image("big ending"): #for returning players + persistent.bonus_chapters = 0b111111111 + persistent.old_bonus_chapters = 0b111111111 + else: + persistent.bonus_chapters = 0b0 + persistent.old_bonus_chapters = 0b0 + def randomize_choices(choices): # fine for size of 2 if (renpy.random.randint(0, 1)): diff --git a/game/script/x1-chicxulub-gutterlane.rpy b/game/script/x1-chicxulub-gutterlane.rpy index 426c67c..3720475 100644 --- a/game/script/x1-chicxulub-gutterlane.rpy +++ b/game/script/x1-chicxulub-gutterlane.rpy @@ -612,4 +612,6 @@ label chapter_x1: scene black with Dissolve(2) pause 1.5 + $ persistent.bonus_chapters |= (0b1 << 0) + return diff --git a/game/script/x2-the-mous-pad.rpy b/game/script/x2-the-mous-pad.rpy index 78a137d..c666802 100644 --- a/game/script/x2-the-mous-pad.rpy +++ b/game/script/x2-the-mous-pad.rpy @@ -6,7 +6,7 @@ label chapter_x2: scene black with Dissolve(2) pause 1 - scene skinrow + scene skinrow show anon neutral flip: yalign 0.1 xalign 0.7 show black @@ -62,7 +62,7 @@ label chapter_x2: pause .5 A "I’ve been living here for almost seven months and I wouldn’t trade it for anywhere else in the state." - + show anon neutral flip with dissolve A "So let’s head on inside for the grand tour!" window hide @@ -71,7 +71,7 @@ label chapter_x2: show black with Dissolve(1) - scene room anon day alt + scene room anon day alt show viewfinder show rec: ypos 0.072 xpos 0.91 @@ -104,7 +104,7 @@ label chapter_x2: window hide window auto pause .5 - + show anon shrug behind viewfinder: yalign 0.1 xalign -0.4 show anon: @@ -275,7 +275,7 @@ label chapter_x2: easeout_cubic 1 xalign -0.2 pause .5 hide anon with dissolve - + play sound 'audio/effects/doorslam.ogg' pause .1 window show Dissolve(0.0001) @@ -309,7 +309,7 @@ label chapter_x2: "{cps=*.1}...{/cps}" A "OH, YOU FUCKING KNOW, STELLA!" - + show fang: easein_cubic 1.5 xalign 0.5 F "PFFFFFFT." @@ -348,8 +348,8 @@ label chapter_x2: "{cps=*.1}.........{/cps}" - A "Apology not accepted!" - + A "Apology not accepted!" + A "Oh and by the way your husbando is shit!" pause .5 @@ -370,7 +370,7 @@ label chapter_x2: pause 1 A "Ugh{cps=*.1}...{/cps} I need a smo-" - + show anon neutral with Dissolve(.25) A "Wait." pause .5 @@ -405,4 +405,6 @@ label chapter_x2: scene black with Dissolve(1.5) pause 2 - return \ No newline at end of file + $ persistent.bonus_chapters |= (0b1 << 1) + + return diff --git a/game/script/x3-PTA-meeting.rpy b/game/script/x3-PTA-meeting.rpy index 88a115b..06b993c 100644 --- a/game/script/x3-PTA-meeting.rpy +++ b/game/script/x3-PTA-meeting.rpy @@ -304,4 +304,7 @@ label chapter_x3: scene black with Dissolve(2) pause 1.5 + + $ persistent.bonus_chapters |= (0b1 << 2) + return diff --git a/game/script/x4-passion-of-the-trigga.rpy b/game/script/x4-passion-of-the-trigga.rpy index 1d68af6..2a45a80 100644 --- a/game/script/x4-passion-of-the-trigga.rpy +++ b/game/script/x4-passion-of-the-trigga.rpy @@ -42,7 +42,7 @@ label chapter_x4: easein_cubic 1 xalign 0.05 show fang very happy with Dissolve(.25) F "I dunno but it's awesome! A real venue this time!" - + show dimmer_lighter behind trish with dissolve "It takes a second to actually register it." @@ -56,7 +56,7 @@ label chapter_x4: show trish: easein_cubic 1 xalign 0.75 with None - show trish very happy flip + show trish very happy flip hide dimmer_lighter with dissolve T "Our chance to make VVURM DRAMA the hit it deserves to be!" @@ -197,7 +197,7 @@ label chapter_x4: T "A trick probably." pause .5 - show dimmer_light behind trish + show dimmer_light behind trish show trish unimpressed flip with dissolve pause .5 @@ -219,7 +219,7 @@ label chapter_x4: show trish happy flip with Dissolve(.25) T "Sounds like a plan. We have to prepare for our biggest show yet!" - + show fang happy with Dissolve(.25) pause .5 @@ -234,7 +234,7 @@ label chapter_x4: "I hand Fang the blue strat, which they immediately set to tuning just right." "Mr. Jingo really needs to get some new gear, these things aren’t maintained at all." - + stop music fadeout 4 pause .5 "Even this bass, no one ever even uses it." @@ -245,4 +245,6 @@ label chapter_x4: window auto pause 2 - return \ No newline at end of file + $ persistent.bonus_chapters |= (0b1 << 3) + + return diff --git a/game/script/x5-passion-of-the-trigga.rpy b/game/script/x5-passion-of-the-trigga.rpy index 468c6cd..f3eab5b 100644 --- a/game/script/x5-passion-of-the-trigga.rpy +++ b/game/script/x5-passion-of-the-trigga.rpy @@ -5,7 +5,7 @@ label chapter_x5: stop music fadeout(3) scene black with Dissolve(2) pause 1 - + # skinrow soul? # summertime synth? play music 'audio/ost/skinrow soul.ogg' fadein 0.5 @@ -71,7 +71,7 @@ label chapter_x5: Re "We all make mistakes, amigo. Like{cps=*.1}...{/cps} like 'member that time I caught the cooking class on fire?" - T "Yeah, yeah, can't cook to save your life. That doesn't make me feel any less shitty." + T "Yeah, yeah, can't cook to save your life. That doesn't make me feel any less shitty." Re "Just makes us people, s'all. We all make 'em and we all gotta fix 'em, y'know?" pause .5 @@ -267,7 +267,7 @@ label chapter_x5: Re "BESIDES! King Rex can't be the only dude there without a date!" show reed neutral - show trish smile flip + show trish smile flip with dissolve "I shake my head and let a laugh escape." @@ -340,4 +340,6 @@ label chapter_x5: pause 2 - return \ No newline at end of file + $ persistent.bonus_chapters |= (0b1 << 4) + + return diff --git a/game/script/x6-passion-of-the-trigga.rpy b/game/script/x6-passion-of-the-trigga.rpy index ce5209c..586e3eb 100644 --- a/game/script/x6-passion-of-the-trigga.rpy +++ b/game/script/x6-passion-of-the-trigga.rpy @@ -1417,4 +1417,6 @@ label chapter_x6: window auto pause 2 + $ persistent.bonus_chapters |= (0b1 << 5) + return diff --git a/game/script/x7-naomi-tribulations.rpy b/game/script/x7-naomi-tribulations.rpy index 7ab6dba..fc1d3f7 100644 --- a/game/script/x7-naomi-tribulations.rpy +++ b/game/script/x7-naomi-tribulations.rpy @@ -850,7 +850,7 @@ label chapter_x7: subpixel True ease_quad 4 zoom 1.3 xpos 810 - + pause 2.5 @@ -891,7 +891,7 @@ label chapter_x7: pause .5 scene home fang day alt: - xalign 0.5 zoom 1.2 + xalign 0.5 zoom 1.2 ease_cubic 1 zoom 1 show dimmer_lighter: alpha 1 @@ -1230,12 +1230,12 @@ label chapter_x7: easein_cubic 1.5 xalign 0.75 parallel: linear 0.5 alpha 1 - show naser: + show naser: parallel: easein_cubic 1.5 xalign 3.5 parallel: linear 0.5 alpha 0 - show naomi: + show naomi: parallel: easein_cubic 1.5 xalign 2.0 parallel: @@ -1720,7 +1720,7 @@ label chapter_x7: show naser neutral flip with dissolve pause .5 show naser considering flip with dissolve - + show chadshark with dissolve show chadshark: easein_cubic 0.25 yalign 0.03 @@ -2092,4 +2092,6 @@ label chapter_x7: scene black with Dissolve(2) pause 2 - return \ No newline at end of file + $ persistent.bonus_chapters |= (0b1 << 6) + + return diff --git a/game/script/x8-naomi-tribulations.rpy b/game/script/x8-naomi-tribulations.rpy index e644290..f49c696 100644 --- a/game/script/x8-naomi-tribulations.rpy +++ b/game/script/x8-naomi-tribulations.rpy @@ -293,19 +293,19 @@ label chapter_x8: show naomi: easein_cubic 1.5 xalign 0.8 pause 1 - linear 0.045 yalign -0.002 + linear 0.045 yalign -0.002 linear 0.045 yalign 0.002 - linear 0.045 yalign -0.004 + linear 0.045 yalign -0.004 linear 0.045 yalign 0.004 - linear 0.045 yalign -0.005 + linear 0.045 yalign -0.005 linear 0.045 yalign 0.005 - linear 0.045 yalign -0.005 + linear 0.045 yalign -0.005 linear 0.045 yalign 0.005 - linear 0.045 yalign -0.005 + linear 0.045 yalign -0.005 linear 0.045 yalign 0.005 - linear 0.045 yalign -0.004 + linear 0.045 yalign -0.004 linear 0.045 yalign 0.004 - linear 0.045 yalign -0.002 + linear 0.045 yalign -0.002 linear 0.045 yalign 0.002 pause 0.5 easeout_cubic 0.8 yalign -0.3 @@ -538,4 +538,7 @@ label chapter_x8: window hide window auto pause 2 + + $ persistent.bonus_chapters |= (0b1 << 7) + return diff --git a/game/script/x9-naomi-tribulations.rpy b/game/script/x9-naomi-tribulations.rpy index db9b556..10d7022 100644 --- a/game/script/x9-naomi-tribulations.rpy +++ b/game/script/x9-naomi-tribulations.rpy @@ -1044,7 +1044,7 @@ label chapter_x9: F "Good night Anon." $ renpy.music.queue('audio/OST/good faith synth finale end.ogg', channel=u'music', loop=None, clear_queue=True) - queue music "" loop + queue music "" loop A "Night Lucy." @@ -1084,4 +1084,7 @@ label chapter_x9: window auto pause 2 $ renpy.music.set_volume(1.0, 0, 'music') + + $ persistent.bonus_chapters |= (0b1 << 8) + return diff --git a/game/src/extra_chapters_menu.rpy b/game/src/extra_chapters_menu.rpy index b1dd953..e4c97b0 100644 --- a/game/src/extra_chapters_menu.rpy +++ b/game/src/extra_chapters_menu.rpy @@ -59,6 +59,9 @@ screen ex_ch_menu(): for i in range(8, 8-w, -1): ex_chapters_menu.remove(ex_chapters[i]) ex_chapters_menu.pop() + else: + if not (persistent.bonus_chapters == 0b111111111): + ex_chapters_menu.pop() tag menu style_prefix "main_menu"