merge Patch7 into master #192

Merged
nutbuster merged 202 commits from Patch7 into master 2022-10-29 05:53:44 +00:00
2 changed files with 51 additions and 31 deletions
Showing only changes of commit 606ebcff5d - Show all commits

View File

@ -89,7 +89,7 @@ label chapter_7:
show anon neutral flip:
xalign 1.9 yalign 0.1
ease_cubic 1.6 xalign 1.0
with Dissolve(0.9)
with Dissolve(0.8)
window hide
window auto
@ -99,11 +99,11 @@ label chapter_7:
St "Im on time, right?"
show anon neutral flip at aright with Dissolve(.25)
# show stella neutral alt flip at stright with easeinright
show stella neutral alt:
xalign -0.5 yalign 0.1
ease_cubic 1.2 xalign 0.0 yalign 0.1
with Dissolve(0.9)
show stella neutral alt flip:
xalign -0.5 alpha 0.0
show stella:
easein_cubic 1 xalign 0.0 yalign 0.1 alpha 1.0
show stella neutral alt with dissolve
window hide
window auto
@ -337,12 +337,13 @@ label chapter_7:
window hide
window auto
show trish neutral flip with Dissolve(0.25):
xalign 1.6 alpha 0.0
show anon: #neutral
ease_quart 0.6 xalign 0.0
show trish natural flip: # neutral flip
xalign 1.6
ease_quart 1 xalign 1.0 yalign 0.1
show trish: # neutral flip
easein_quart 1 xalign 1.0 yalign 0.1 alpha 1.0
pause 0.0001
show anon neutral
show trish neutral flip
@ -464,9 +465,10 @@ label chapter_7:
pause 0.8
show fang surprised at sright:
ease 0.25 yalign 0.2
ease 0.25 yalign 0.1
pause 0.001
ease_quart 0.25 yalign 0.2
ease_quart 0.25 yalign 0.1
pause 0.5
show fang surprised flip at scenter with Dissolve(0.25)
"She jumps a little as I step back on stage. Her knuckles are bright white as they strangle the leather strap."
@ -537,6 +539,7 @@ label chapter_7:
ease_quart 0.5 xalign 0.6
F "Ladies, Ladies, please."
show trish unimpressed flip behind fang with Dissolve(0.25)
F "Shut the fuck up."
stop music fadeout 1.0
F "Weve got sweet music to play."
@ -677,12 +680,12 @@ label chapter_7:
show fang very happy behind anon:
xalign -0.5
ease_cubic 1.0 xalign 0.25 yalign 0.2
with dissolve
with Dissolve(0.25)
hide anon
hide fang
show fang hug at acenter:
yalign 0.1
with dissolve
with Dissolve(0.25)
"Fang wrapped her arms and wings around me and kept rocking back and forth."
@ -722,7 +725,7 @@ label chapter_7:
"Her face is beet red and the warmth in my own cheeks tells me I dont look far behind."
show trish unimpressed flip:
zoom 0.8
xalign 1.0 yalign 0.0
xalign 1.0 yalign -0.1
with dissolve
"Trish looks like shes sucked on a lemon with how twisted her face is."
@ -1072,7 +1075,7 @@ label chapter_7:
show reed neutral flip: #rright
xalign 2.1
ease_cubic 1.4 xalign 1.3
with dissolve
with Dissolve(1.2)
Re "Yooo, {w=.3} Anon!"
"Reed crosses right through the puddles, tracking grimy footprints without a care."
@ -1109,7 +1112,7 @@ label chapter_7:
A "Fang wasnt herself?"
show reed explanatory flip with Dissolve(0.25)
Re "Honestly... Thats probably something to be left for Fang and Fang alone to talk about Sorry."
Re "Honestly... Thats probably something to be left for Fang and Fang alone to talk about... Sorry."
A "Er... ri{cps=*0.65}iiiii{/cps}ght."
@ -1133,7 +1136,7 @@ label chapter_7:
"Before I even got a moment to picture what it might have been like not even a year ago, Trish appears behind Reed."
"She looks like shes about to snap both our necks."
show trish neutral flip with Dissolve(0.25)
T "Hey, Reed, what are you two talking about?"
Re "Just talking about some memories of the band, Trish."
@ -1141,7 +1144,7 @@ label chapter_7:
T "You didnt tell him anything about me, did you?"
A "Glasses."
show trish unimpressed flip with Dissolve(0.25)
T "Reed, you absolute ass."
"Reed just shrugs."
@ -1149,6 +1152,7 @@ label chapter_7:
"By this point the restaurant has been mostly cleaned up with only a few tables left to put back."
play music 'audio/OST/you need gopher chucks.ogg' fadein 1.0
show trish considering flip with Dissolve(0.25)
T "So Anon, we showed you ours, now its your turn to show us yours."
A "What, out here in public? Didnt peg you for the kinky type." #lol sex
@ -1267,9 +1271,9 @@ label chapter_7:
Re "Yooo, my man!"
show reed neutral flip with Dissolve(0.25)
show reed:
ease_quart 0.4 xalign 1.05
ease_quart 0.4 xalign 1.0
show anon:
ease_quart 0.4 xalign 0.35
ease_quart 0.4 xalign 0.4
pause 0.1
show reed:
ease_quart 0.4 xalign 1.2
@ -1292,7 +1296,10 @@ label chapter_7:
"Oh no."
A "Oh, uh, actually…"
show anon concerned with Dissolve(0.25)
show anon concerned
show dimmer_darker behind anon with Dissolve(0.25)
$ renpy.music.set_volume(0.35, 1, 'music')
play ambient 'audio/effects/heartbeat.ogg' volume 1.0 fadein 0.5
"{cps=*3.0}THINK OF SOMETHING{/cps}{w=0.1} {cps=*3.0}THINK OF SOMETHING{/cps}{w=0.1} {cps=*3.0}THINK OF SOMETHING!{/cps}"
A "I had to leave because of, uh…"
@ -1300,18 +1307,19 @@ label chapter_7:
"DONT SAY SOMETHING STUPID YOU ONLY GET ONE SHOT AT THIS."
A "Family issues."
stop sound fadeout 0.5
stop ambient fadeout 1.0
hide dimmer_darker with Dissolve(0.25)
# stop sound fadeout 0.5
show trish neutral flip
show anon neutral with Dissolve(0.25)
"Nailed it."
Re "Bummer man glad youre here instead."
Re "Bummer man... glad youre here instead."
stop music fadeout 5.0
A "Yeah, yeah, thanks man."
T "Sounds personal, guess we shouldnt pry."
stop music fadeout 1.0
T "Were all friends here, after all."
"Guess we are all friends at this point."
@ -1337,6 +1345,8 @@ label chapter_7:
Moe "I knew my lil Lucy could pull dis shindig off."
show moealt:
ease_cubic 1.0 xalign 0.4
with Dissolve(0.25)
pause 0.001
show fang embarrass flip:
xzoom -1.0
with Dissolve(.25)
@ -1348,7 +1358,8 @@ label chapter_7:
show moealt:
xzoom -1.0
show fang happy
show fang happy:
xzoom 1.0
with Dissolve(0.25)
Moe "Alas, Im expecting a late night visita, so I needs you punks to piss off."

View File

@ -28,15 +28,21 @@ label chapter_8:
F "Geez, {w=0.3} Anon, you look like youre dying right now."
show anon neutral flip at aright with dissolve
show anon sad flip at aright with dissolve
A "The sun… {w=0.5} can go… {w=0.5}fuck itself…"
A "The sun... {w=0.5} can go... {w=0.5}fuck itself..."
show fang behind anon:
ease_quart 1 xalign 0.5
pause 0.5
ease_quart 1 xalign 0.2
"Fang chuckles and pats my back as I lean over my desk."
"On second thought, tank tops seem cool. Reed is usually wearing one."
show jingo at sleft with easeinleft
show jingo:
easein_cubic 1 yalign 0.0 xalign 0.0 #at sleft with easeinleft
with dissolve
jingo "Alright class, the Principals got something to say, then youll be leavin early."
@ -96,7 +102,10 @@ label chapter_8:
window auto
hide carldelewski with dissolve
show spears neutral at scenter with easeinleft
show spears:
easein_cubic 1.0 xalign 0.5 yalign 0.0
show spears neutral with dissolve
# neutral at scenter with easeinleft
show spears angry with Dissolve(.25)
play sound 'audio/effects/spearYellRumbleVoice.ogg'