Merge branch 'Monster-Update-6' into chapter-5-choreo

# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy
#	game/script/2.fourth-day-of-school.rpy
#	game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
This commit is contained in:
2021-08-02 14:38:11 +01:00
37 changed files with 2464 additions and 1943 deletions

View File

@ -1,7 +1,7 @@
label chapter_2:
scene room anon dark with fade
I "{cps=*0.2}-- Two Days Later --{/cps}"
pause .6
@ -588,7 +588,7 @@ label chapter_2:
A "Yeah what she said."
pause .5
stop music fadeout 2.5
show farnsworth behind fang:
@ -644,7 +644,7 @@ label chapter_2:
show fang:
easein_back .4 xalign -0.3
F "I. Am. Non.{fast} Binary."
I "How was I supposed to know something so trivial would set something like this off?!"
pause .5
@ -675,17 +675,17 @@ label chapter_2:
stop music fadeout 0.1
play sound 'audio/effects/slapstickSuperPunch.ogg'
# fuk u renpy, let me do more than one goddamn thing at once without resorting to this hacky bullshit
show fang shocked:
xalign -0.3
show farnsworth concerned:
easein_elastic 1 xalign 1.0
Drf "{b}FANG{/b}.{nw}" with Fade(.1, 0, .4, color="#fff")
Drf "{b}FANG{/b}.{nw}" with Fade(.1, 0, .4, color="#fff")
extend "" with vpunch
# show fang:
# xalign -0.3
# xalign -0.3
# show fang shocked with Dissolve(.2)
show dimmer_darker behind fang with Dissolve(.25)
@ -1195,7 +1195,7 @@ label chapter_2:
A "Y{w=.2}-yeah.{w=.4} {cps=*.2}Haha.{/cps}"
A "I{w=.1}-I mean,{w=.3} concert?"
show trish neutral flip with Dissolve(.25)
pause .5
@ -1310,7 +1310,7 @@ label chapter_2:
I "The bell announces lunchtime,{w=.4} and the rest of the students collectively rise and start shuffling out the door."
play music 'audio/OST/Those Other Two Weirdos.ogg' fadein 1
play music 'audio/OST/Those Other Two Weirdos.ogg' fadein 1
stop sound fadeout 1.0
A "Lunch hour,{w=.4} been a blast talking to you guys."
@ -1413,7 +1413,7 @@ label chapter_2:
I "I need to find Reed."
I "I double back to the classroom I just left and find it empty."
I "{i}Fuck.{/i}"
I "Maybe hes getting his lunch now.{w=.4} Cafeteria then."
@ -1716,10 +1716,10 @@ label chapter_2:
F "Wow.{w=.5} That is hilariously depressing."
show dimmer_light behind anon, trish, reed, fang
show anon sad flip
show anon sad flip
with Dissolve(.25)
I "I hate everyone here."
show anon neutral flip behind reed
show anon neutral flip behind reed
hide dimmer_light
with dissolve
@ -1740,7 +1740,7 @@ label chapter_2:
F "{cps=*.65}Uuuuuuuuuuuuuuuuurrrrrrrrrrggggghhhhhhh.{/cps}{w=.4} Trish?"
show fang neutral
show trish smug flip
show trish smug flip
with Dissolve(.25)
T "The morons swapped backpacks and now theyre best friends or something."
@ -1759,7 +1759,7 @@ label chapter_2:
F "Is he?"
show trish neutral flip
show anon neutral
show anon neutral
with Dissolve(.25)
A "{cps=*.1}...{/cps}Didnt you already grab your lunch,{w=.3} Reed?"
@ -1821,7 +1821,7 @@ label chapter_2:
show fang neutral
with Dissolve(.25)
F "No,{w=.3} fuck that.{w=.5} I would never wear something that retarded."
hide dimmer_lighter with dissolve
I "As for Reed{cps=*.1}...{/cps}"
@ -1850,7 +1850,7 @@ label chapter_2:
Re "I can."
show reed neutral
show anon neutral flip
show anon neutral flip
with Dissolve(.25)
A "Huh?"
@ -1892,7 +1892,7 @@ label chapter_2:
label .PostCheckLinkOut:
show reed explanatory
Re "Xrox is better anyways,{w=.4} you see the whole lineup they had prepared for{cps=*.1}...{/cps}"
@ -1902,14 +1902,14 @@ label chapter_2:
I "I thought he was just an airhead,{w=.4} but{cps=*.1}...{/cps}"
I "I totally cant get a read on this guy."
show reed neutral
hide dimmer_lighter
hide dimmer_lighter
with dissolve
F "Well,{w=.3} anyways."
show anon neutral
show anon neutral
show fang considering
with Dissolve(.25)
pause .25
@ -1928,7 +1928,7 @@ label chapter_2:
I "Trish and Fang babble to each other about their daily activities all through the lunch line."
I "Reed on the other hand has pulled out a tablet from his backpack to show me something."
scene cafeteria
show anon neutral:
xalign -0.2 yalign 0.1
@ -1939,7 +1939,7 @@ label chapter_2:
show trish neutral flip:
xalign 1.125 yalign 0.0
with fade
pause .5
pause .5
show reed explanatory flip
Re "So like,{w=.4} yknow we got a band,{w=.2} yeah?"
@ -1961,12 +1961,12 @@ label chapter_2:
play music 'audio/OST/The (audiophile edition).ogg'
with vpunch
pause .6
I "Even through the poor recording quality I can see and hear just how atrocious the band is."
I "I bite back the grimace threatening to come out as I give the video my full attention."
pause .5
F "W{w=.2}-well?"
show trish happy flip with Dissolve(.25)
@ -2002,7 +2002,7 @@ label chapter_2:
"Very nice ironic reference to Beethovens Für Elise.":
pass
pause .5
$ renpy.music.set_volume(0, 0.1, 'ambient')
@ -2031,7 +2031,7 @@ label chapter_2:
play music 'audio/OST/Bayside Bumming it.ogg'
show trish neutral flip
show reed explanatory flip
show reed explanatory flip
with Dissolve(.25)
Re "Jeez man,{w=.4} you got the ears of a bat?"
show reed neutral flip
@ -2223,7 +2223,7 @@ label chapter_2:
show naomi explanatory with Dissolve(.25)
N "What a great opportunity for real friendship Anon!{w=.5} Im so happy for you!"
show naomi neutral
show naser considering
with Dissolve(.25)
@ -2260,7 +2260,7 @@ label chapter_2:
pause 1
show naser considering flip
show naomi neutral
show naomi neutral
with dissolve
I "The bells loud sound rings on our ears"