diff --git a/game/script.rpy b/game/script.rpy index 74b5a0f..e21f53d 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -20,6 +20,7 @@ init -1 python: mod_menu_access = [] init python: + import random import webbrowser #function for insult layers @@ -48,6 +49,12 @@ init python: if persistent.autoup == None: persistent.autoup = False + def randomize_choices(choices): + # fine for size of 2 + if (renpy.random.randint(0, 1)): + choices.reverse() + return choices + pass transform randPosition: diff --git a/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy b/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy index 7164a06..a088d83 100644 --- a/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy +++ b/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy @@ -935,11 +935,11 @@ label chapter_3: # TODO: phone overlay with Elliot Raptor, and the text ‘he made some valid points :^)’ show layeredanonphone shitpost_elliot with dissolve - "Ah yes, perfect." + "Ah yes, perfect." show layeredanonphone shitpost_elliotbp with dissolve "Click post." pause .5 - show layeredanonphone shitpost_elliotsuccess with dissolve + show layeredanonphone shitpost_elliotsuccess with dissolve pause .5 show layeredanonphone shitpost_elliotwait with dissolve "{cps=*.3}Aaaand{/cps} now to wait." @@ -1679,14 +1679,13 @@ label chapter_3: window auto pause .5 - menu: - "Speak Up": - pause .5 - jump .GuitarQuestionSpeakUp - "Stay Silent": - pause .5 - jump .GuitarQuestionStaySilent - + python: + #menu item text then label to jump into + choices = [(_('Speak Up'), '.GuitarQuestionSpeakUp'), + (_('Stay Silent'), '.GuitarQuestionStaySilent')] + _value = renpy.display_menu(randomize_choices(choices)) + renpy.pause(0.5) + renpy.jump(_value) label .GuitarQuestionSpeakUp: diff --git a/game/script/4.anon-needs-help-during-music-period.rpy b/game/script/4.anon-needs-help-during-music-period.rpy index 98ead89..b8248e9 100644 --- a/game/script/4.anon-needs-help-during-music-period.rpy +++ b/game/script/4.anon-needs-help-during-music-period.rpy @@ -644,13 +644,13 @@ label chapter_4: pause .5 stop music fadeout 5 - menu: - "Heads, ask Fang for help": - pause .5 - jump .Heads - "Tails, leave Fang alone": - pause .5 - jump .Tails + + python: + choices = [(_('Heads, ask Fang for help'), '.Heads'), + (_('Tails, leave Fang alone'), '.Tails')] + _value = renpy.display_menu(randomize_choices(choices)) + renpy.pause(0.5) + renpy.jump(_value) label .Heads: diff --git a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy index 7783f6d..91501fc 100644 --- a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy +++ b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy @@ -1181,17 +1181,13 @@ label chapter_5: window auto pause .5 - menu: - - "Explain it to her honestly, she should understand by now": - stop music fadeout 3 - pause .5 - jump .beHonest - - "Joking is a good way to move past mistakes.": - stop music fadeout 3 - pause .5 - jump .jokeAround + python: + choices = [(_('Explain it to her honestly, she should understand by now'), '.beHonest'), + (_('Joking is a good way to move past mistakes.'), '.jokeAround')] + _value = renpy.display_menu(randomize_choices(choices)) + renpy.music.stop(fadeout=3) + renpy.pause(0.5) + renpy.jump(_value) label .beHonest: @@ -3272,12 +3268,16 @@ label chapter_5: window auto pause .5 - menu: - "Stay quiet...": - pause .5 - "Interrupt": - pause .5 - jump .interrupt4b + python: + choices = [(_('Stay quiet...'), None), + (_('Interrupt'), '.interrupt4')] + choices = randomize_choices(choices) + _value = renpy.display_menu(choices) + _tick = 1 + + renpy.pause(0.5) + if _value != None: + renpy.jump(_value+chr(0x61+_tick)) "There’s a time to speak and a time to listen." pause .5 @@ -3407,12 +3407,12 @@ label chapter_5: window auto pause .5 - menu: - "Stay quiet...": - pause .5 - "Interrupt": - pause .5 - jump .interrupt4c + python: + _value = renpy.display_menu(choices) + _tick += 1 + renpy.pause(0.5) + if _value != None: + renpy.jump(_value+chr(0x61+_tick)) $ wingStory = True @@ -3496,12 +3496,12 @@ label chapter_5: window auto pause .5 - menu: - "Stay quiet...": - pause .5 - "Interrupt": - pause .5 - jump .interrupt4d + python: + _value = renpy.display_menu(choices) + _tick += 1 + renpy.pause(0.5) + if _value != None: + renpy.jump(_value+chr(0x61+_tick)) show fang: easein_quart 1 xalign 0.2 @@ -3578,12 +3578,12 @@ label chapter_5: window auto pause .5 - menu: - "Stay quiet...": - pause .5 - "Interrupt": - pause .5 - jump .interrupt4e + python: + _value = renpy.display_menu(choices) + _tick += 1 + renpy.pause(0.5) + if _value != None: + renpy.jump(_value+chr(0x61+_tick)) $ fangscore += 1 $ anonscore += 1 diff --git a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy index 6544755..e4b4825 100644 --- a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy +++ b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy @@ -1696,14 +1696,12 @@ label chapter_6: window auto pause .5 - menu: - "Excuse myself": - pause .5 - jump .AnonExcusesHimself - "Wait for Fang": - pause .5 - jump .AnonWaitsForFang - + python: + choices = [(_('Excuse myself'), '.AnonExcusesHimself'), + (_('Wait for Fang'), '.AnonWaitsForFang')] + _value = renpy.display_menu(randomize_choices(choices)) + renpy.pause(0.5) + renpy.jump(_value) label .AnonExcusesHimself: @@ -2088,13 +2086,12 @@ label chapter_6: window auto pause .5 - menu: - "Ask Naser": - pause .5 - jump .AskNaser - "Ask Fang": - pause .5 - jump .AskFang + python: + choices = [(_('Ask Naser'), '.AskNaser'), + (_('Ask Fang'), '.AskFang')] + _value = renpy.display_menu(randomize_choices(choices)) + renpy.pause(0.5) + renpy.jump(_value) label .AskNaser: diff --git a/game/script/7.concert-day.rpy b/game/script/7.concert-day.rpy index bb9d9da..4b13667 100644 --- a/game/script/7.concert-day.rpy +++ b/game/script/7.concert-day.rpy @@ -300,7 +300,7 @@ label chapter_7: window auto pause 0.15 play sound 'audio/effects/whoosh.ogg' - + # show stella neutral alt flip with Dissolve(.25) show stella: easeout_quad 0.6 xalign -0.5 @@ -470,11 +470,11 @@ label chapter_7: pause .5 define LeftStage = False - menu: - "Leave the stage as-is": - jump LeaveStageAsIs - "Fix the cables": - jump FixCables + + python: + choices = [(_('Leave the stage as-is'), 'LeaveStageAsIs'), + (_('Fix the cables'), 'FixCables')] + renpy.jump(renpy.display_menu(randomize_choices(choices))) label LeaveStageAsIs: $ anonscore += 1 @@ -518,7 +518,7 @@ label chapter_7: stop music fadeout 3 scene black with Dissolve(1) - scene moes pizza + scene moes pizza show fang hiding at sright with Dissolve(1) pause 0.5 @@ -900,7 +900,7 @@ label chapter_7: # zoom 0.8 # xalign 1.0 yalign -0.1 #with dissolve - + "Trish looks like she’s sucked on a lemon with how twisted her face is." "The tiny triceratops pulls Fang out of my hands, and I can picture my fist twisting that horn right off her face." @@ -909,7 +909,7 @@ label chapter_7: pause 0.5 hide fanganonhug - hide trish + hide trish show fang neutral flip at scenter show anon neutral flip at sright: @@ -973,7 +973,7 @@ label chapter_7: show moealt with dissolve: xalign 2.0 easein_cubic 1 xalign 1.6 yalign 0.0 - show fang happy + show fang happy show anon neutral behind fang show trish surprised with Dissolve(0.5) @@ -1221,7 +1221,7 @@ label chapter_7: show fang: easein_cubic 1 xalign 0.3 show fang happy flip with Dissolve(0.5) - + F "Trish! Didn’t you say you wanted to set up our merch!" show trish unimpressed show anon neutral flip @@ -1414,7 +1414,7 @@ label chapter_7: Re "Er{cps=*.1}...{/cps} Probably shouldn’t have mentioned that…" A "Fang wasn’t herself?" - show reed explanatory flip with Dissolve(0.5) + show reed explanatory flip with Dissolve(0.5) Re "Honestly{cps=*.1}...{/cps} That’s probably something to be left for Fang and Fang alone to talk about{cps=*.1}...{/cps} Sorry." @@ -1486,7 +1486,7 @@ label chapter_7: show fang neutral with dissolve: xalign -1.0 - easein_cubic 1 xalign -0.5 + easein_cubic 1 xalign -0.5 pause 0.5 F "Come on Anon, don’t you have any good memories from your old school?" @@ -1515,8 +1515,8 @@ label chapter_7: A "I didn’t say I was good at it. I was just clicking buttons and seeing what stuck." A "And spoiler alert, nothing did." - show trish considering flip - show fang happy + show trish considering flip + show fang happy with Dissolve(0.25) "That got a giggle out of Fang and a look from Trish." @@ -1618,7 +1618,7 @@ label chapter_7: easein_cubic 0.5 xalign 0.175 ease_cubic 0.75 xalign 0.2 show reed neutral flip with Dissolve(0.25) - + "Reed gives me a fist bump." pause 0.5 @@ -1643,7 +1643,7 @@ label chapter_7: $ renpy.music.set_volume(0.35, 1, 'music') play ambient 'audio/effects/heartbeat.ogg' volume 0.5 fadein 0.5 - show anon concerned + show anon concerned show dimmer_darker behind anon with Dissolve(0.5) @@ -1671,7 +1671,7 @@ label chapter_7: stop music fadeout 5.0 A "Yeah, yeah, thanks man." - + T "Sounds personal, guess we shouldn’t pry." T "We’re all friends here, after all." @@ -1703,7 +1703,7 @@ label chapter_7: easein_cubic 1 xalign 1.2 show moe alt flip with dissolve: - xalign -1.0 yalign 0.1 + xalign -1.0 yalign 0.1 easein_cubic 1.4 xalign -0.7 pause 0.25 diff --git a/game/script/8.anon-and-fang-study-together.rpy b/game/script/8.anon-and-fang-study-together.rpy index 502d251..0571177 100644 --- a/game/script/8.anon-and-fang-study-together.rpy +++ b/game/script/8.anon-and-fang-study-together.rpy @@ -257,7 +257,7 @@ label chapter_8: # xalign 0.3 yalign 0.1 #show student3: # xalign 0.6 yalign 0.1 - #with dissolve + #with dissolve "With that the sea of students begins to funnel out of the auditorium." @@ -266,9 +266,9 @@ label chapter_8: #show student2: # ease_quart 1.5 xalign -0.5 alpha 0.0 #with Dissolve(1.0) - #pause 1.0 + #pause 1.0 #hide student1 - #hide student2 + #hide student2 # pause 0.3 #show student3: @@ -276,13 +276,13 @@ label chapter_8: #show teacher4: # ease_quart 1.8 xalign -0.5 alpha 0.0 #with Dissolve(1.0) - #pause 1.0 + #pause 1.0 #hide student3 #hide teacher4 # pause 0.4 #show teacher1: - # ease_quart 1.5 xalign 1.5 alpha 0.0 + # ease_quart 1.5 xalign 1.5 alpha 0.0 #show teacher2: # ease_quart 1.8 xalign 1.5 alpha 0.0 #show teacher3: @@ -381,7 +381,7 @@ label chapter_8: pause 0.5 show trish: - easeout_cubic 1 xalign 1.4 alpha 0.0 + easeout_cubic 1 xalign 1.4 alpha 0.0 show trish neutral with dissolve hide trish with dissolve pause 0.25 @@ -449,16 +449,16 @@ label chapter_8: "OH GO FUCK YOURSELF BILL WITHERS." window hide window auto - + show fang behind anon: easeout_cubic 1 xpos 0.0 alpha 0.0 - show anon: + show anon: easeout_cubic 1 xalign -0.2 alpha 0.0 show fang unimpressed flip with Dissolve(0.25) pause 0.25 hide fang - hide anon + hide anon with dissolve pause 0.25 @@ -619,11 +619,10 @@ label chapter_8: window auto pause .5 - menu: - "Play The Guitar": - jump LetFangPlayGuit - "Get to Studying": - jump GetStartedOnStudy + python: + choices = [(_('Play The Guitar'), '.LetFangPlayGuit'), + (_('Get to Studying'), '.GetStartedOnStudy')] + renpy.jump(renpy.display_menu(randomize_choices(choices))) label LetFangPlayGuit: @@ -729,7 +728,7 @@ label chapter_8: F "Alright, try these chords." play sound 'audio/effects/goodA.ogg' fadein 0.5 "Her fingers press mine down, holding down the strings in an awkward position." - + F "Then this." play sound 'audio/effects/goodB.ogg' fadein 0.5 "My hands are slid down closer to the base of the neck and too close to my crotch." @@ -1429,7 +1428,7 @@ label chapter_8: window hide window auto pause 0.5 - + show anonphone at scenter with easeinbottom pause .5 @@ -1530,7 +1529,7 @@ label chapter_8: "Or rather proud of herself that she was that good of a music teacher." - "Her way of ‘congratulating’ me was to hip-check me right into my locker, only to apologize while laughing her ass off." + "Her way of ‘congratulating’ me was to hip-check me right into my locker, only to apologize while laughing her ass off." pause 0.5 "Actually, the whole ordeal made me remember I had this old music program installed on my computer." @@ -1631,7 +1630,7 @@ label chapter_8: show anon neutral with dissolve A "So, what? We take turns reading it?" - show fang unimpressed with Dissolve(0.25) + show fang unimpressed with Dissolve(0.25) F "Too slow. Let’s just huddle and read it together." @@ -1878,7 +1877,7 @@ label chapter_8: "She reaches elbow-deep into her purse and pulls out a small flipbook." FM "Oh Lucy, this is my FAVORITE little picture of you and Naser!" - + show fangmom: easein_cubic 1 xalign 0.0 pause 0.5 @@ -1902,13 +1901,13 @@ label chapter_8: pause 0.5 F "{cps=*1.3}Oh my god mom{/cps}, he doesn’t have time for this!" - + "Fang pulls me off the ground and begins to push me towards the door." window hide window auto pause 0.25 - #show anon neutral flip at acenter + #show anon neutral flip at acenter #show fang angry flip at sleft: # xalign 1.3 #with dissolve diff --git a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy index 62cd553..9bd63da 100644 --- a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy +++ b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy @@ -563,7 +563,7 @@ label chapter_9: linear 0.5 alpha 0 pause .25 show reed considering: - xalign 1.05 + xalign 1.05 with Dissolve(0.2) pause .2 show reed: #flip @@ -1076,18 +1076,12 @@ label chapter_9: $ TalkedWithTrish = 0 - menu: - - "Talk with Trish": - - pause .5 - jump .TalkWithTrish - - "Ignore Trish": - - pause .5 - jump .IgnoreTrish - + python: + choices = [(_('Talk with Trish'), '.TalkWithTrish'), + (_('Ignore Trish'), '.IgnoreTrish')] + _value = renpy.display_menu(randomize_choices(choices)) + renpy.pause(0.5) + renpy.jump(_value) label .TalkWithTrish: