mirror of
https://git.cavemanon.xyz/Cavemanon/SnootGame.git
synced 2025-02-24 18:48:55 +01:00
Merge remote-tracking branch 'Nio/pl_2' into p7_naomi_choreo
This commit is contained in:
nutbuster
commit
87f6c6a838
16 changed files with 112 additions and 61 deletions
BIN
game/images/other/elliot_raptor.png
Normal file
BIN
game/images/other/elliot_raptor.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 221 KiB |
BIN
game/images/other/phoneshitpost/anonphonetoplayer.png
Normal file
BIN
game/images/other/phoneshitpost/anonphonetoplayer.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost.png
Normal file
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 238 KiB |
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost1.png
Normal file
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 241 KiB |
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost_suc.png
Normal file
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost_suc.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 131 KiB |
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost_wait.png
Normal file
BIN
game/images/other/phoneshitpost/elliot_raptor_shitpost_wait.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 257 KiB |
BIN
game/images/other/vvurm_drama_poster.jpg
Normal file
BIN
game/images/other/vvurm_drama_poster.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
|
|
@ -442,6 +442,8 @@ image chillicheesefries = 'images/other/chilli cheese fries.png'
|
|||
image ccf_rstain = 'images/other/rstain base set for composites.png'
|
||||
image ccf_lstain = 'images/other/lstain base set for composites.png'
|
||||
|
||||
image vvurm_drama_poster = im.FactorScale('images/other/vvurm_drama_poster.jpg', 0.6)
|
||||
|
||||
#additional character images
|
||||
#naser gets a stain
|
||||
image naser rstained unimpressed = Composite(
|
||||
|
|
@ -682,6 +684,8 @@ image fangphonegallery1:
|
|||
pause 2.0
|
||||
"museumbones" with dissolve
|
||||
pause 2.0
|
||||
"fanghugsanonbylake" with dissolve
|
||||
pause 2.0
|
||||
repeat
|
||||
|
||||
image fangphonegallery2:
|
||||
|
|
@ -793,6 +797,15 @@ image anon_vc_unimpressed = im.Flip(im.Crop(im.FactorScale("images/anon/base set
|
|||
image no_caller = im.Alpha('images/other/black.png', 0)
|
||||
image anonfangfor_phonebg = im.Crop(im.FactorScale("images/other/anon_fang_xmas.png", 1.0),(650,140,653,800))
|
||||
|
||||
#stuff for Anon's phone
|
||||
image elliot_raptor_buttonpress = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost.png", 1.0),(737,200,440,655)), 0.692)
|
||||
image elliot_raptor_success = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost_suc.png", 1.0),(737,200,440,655)), 0.692)
|
||||
image elliot_raptor_wait = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost_wait.png", 1.0),(737,200,440,655)), 0.692)
|
||||
image elliot_raptor = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost1.png", 1.0),(737,200,440,655)), 0.692)
|
||||
image anonphonetoplayer = "images/other/phoneshitpost/anonphonetoplayer.png"
|
||||
image baseanonphone = "images/anon/Other/anonphone.png"
|
||||
image anonblack_mid = im.Crop("images/other/black.png",740,200,300,450)
|
||||
|
||||
#fangphone effect - video call with Anon mainly
|
||||
layeredimage fangphonevideocall:
|
||||
group midlayer:
|
||||
|
|
@ -865,6 +878,47 @@ layeredimage fangphonevideocall:
|
|||
attribute basic default:
|
||||
"fangphonelayer2"
|
||||
|
||||
|
||||
#Anon's phone
|
||||
layeredimage layeredanonphone:
|
||||
always:
|
||||
"baseanonphone"
|
||||
|
||||
group botlayer:
|
||||
# pos (314, 159)
|
||||
# pos (197, 112)
|
||||
pos (194, 115)
|
||||
rotate -1.0
|
||||
attribute blackmid default:
|
||||
"anonblack_mid"
|
||||
|
||||
group screenlayer:
|
||||
# pos (314, 159)
|
||||
# pos (197, 112)
|
||||
pos (194, 115)
|
||||
rotate -1.0
|
||||
|
||||
attribute noscreen default:
|
||||
"anonblack_mid"
|
||||
|
||||
attribute shitpost_elliot:
|
||||
"elliot_raptor"
|
||||
|
||||
attribute shitpost_elliotbp:
|
||||
"elliot_raptor_buttonpress"
|
||||
|
||||
attribute shitpost_elliotsuccess:
|
||||
"elliot_raptor_success"
|
||||
|
||||
attribute shitpost_elliotwait:
|
||||
"elliot_raptor_wait"
|
||||
|
||||
group coverlayer:
|
||||
attribute coverbasic default:
|
||||
"anonphonetoplayer"
|
||||
|
||||
|
||||
|
||||
#Dual actor images
|
||||
image fangcarriesanon = "images/anon/Other/fanganoncarry.png"
|
||||
image fanganon_promdance = "images/anon/Other/dpromdance.png"
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ label chapter_12D:
|
|||
#confirmed that fang has autism
|
||||
Attendant "Ma’am, please refrain from-"
|
||||
|
||||
show fang adorable at sleft with dissolve
|
||||
show fang adorable at sleft with dissolve #at sleft
|
||||
|
||||
F "{cps=*1.5}OmigoshAnonlookatit.{/cps}"
|
||||
|
||||
|
|
@ -133,28 +133,11 @@ label chapter_12D:
|
|||
window hide
|
||||
window auto
|
||||
|
||||
#old method
|
||||
# show fang adorable at sleft with dissolve: #maybe try this with a block: statement? removed: at sleft - no change
|
||||
# ease_cubic 0.5 zoom 0.75 ypos 0.1 xpos 0.6 #OK
|
||||
# pause 1.0
|
||||
# linear 0.1 xzoom -1.0 #maybe the xzoom is causing the issue? tried removing it, didn't help
|
||||
# ease_cubic 0.3 zoom 0.8 ypos 0.1 xpos -0.2 #ok
|
||||
# pause 1.0
|
||||
# linear 0.1 xzoom -1.0
|
||||
# ease_cubic 0.5 zoom 0.4 xpos 0.15 ypos 0.3
|
||||
# pause 1.0
|
||||
# linear 0.1 xzoom 1.0
|
||||
# ease_cubic 0.3 zoom 1.0 xpos 0.35 ypos 0.1 #ok
|
||||
# pause 1.0
|
||||
# linear 0.1 xzoom 1.0
|
||||
# ease_cubic 0.5 zoom 0.3 xpos 0.6 ypos 0.33
|
||||
# pause 1.0
|
||||
# linear 0.1 xzoom -1.0
|
||||
# pause 0.1
|
||||
# repeat
|
||||
|
||||
|
||||
#new method
|
||||
show fang:
|
||||
# yalign 0.0 xcenter 0.4
|
||||
block:
|
||||
parallel:
|
||||
ease_cubic 0.25 xzoom 1.0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
label chapter_13C:
|
||||
|
||||
#Prom is Suprising
|
||||
|
|
|
|||
|
|
@ -924,17 +924,26 @@ label chapter_3:
|
|||
window hide
|
||||
window auto
|
||||
|
||||
show anonphone with easeinbottom
|
||||
# show layeredanonphone anonneutral at scenter with easeinbottom
|
||||
show layeredanonphone with easeinbottom
|
||||
pause .5
|
||||
|
||||
# TODO: phone overlay with Elliot Raptor, and the text ‘he made some valid points :^)’
|
||||
|
||||
"Ah yes, perfect. Click post {cps=*.3}aaaand{/cps} now to wait."
|
||||
show layeredanonphone shitpost_elliot with dissolve
|
||||
"Ah yes, perfect."
|
||||
show layeredanonphone shitpost_elliotbp with dissolve
|
||||
"Click post."
|
||||
pause .5
|
||||
show layeredanonphone shitpost_elliotsuccess with dissolve
|
||||
pause .5
|
||||
show layeredanonphone shitpost_elliotwait with dissolve
|
||||
"{cps=*.3}Aaaand{/cps} now to wait."
|
||||
pause .5
|
||||
|
||||
window hide
|
||||
window auto
|
||||
|
||||
hide anonphone with easeoutbottom
|
||||
hide layeredanonphone with easeoutbottom
|
||||
|
||||
"Nefarious deed for the day done, I look around the room out of boredom."
|
||||
pause .5
|
||||
|
|
|
|||
|
|
@ -355,8 +355,14 @@ label chapter_4:
|
|||
"She pops the top of the tube open and pulls a rolled up poster out and unfurls it."
|
||||
|
||||
show trish happy flip
|
||||
pause 0.5
|
||||
show vvurm_drama_poster at acenter:
|
||||
yalign 0.2
|
||||
with wipeup
|
||||
pause 1.0
|
||||
T "This! Tada!{w=.4} Our first poster!"
|
||||
|
||||
hide vvurm_drama_poster with wipedown
|
||||
show fang surprised with Dissolve(.25)
|
||||
|
||||
pause .5
|
||||
|
|
|
|||
|
|
@ -2541,7 +2541,7 @@ label chapter_6:
|
|||
scene troodonconvergence1 with Dissolve(1)
|
||||
pause .5
|
||||
|
||||
"Fang reaches into her pocket and withdraws a crumpled back of cigarettes."
|
||||
"Fang reaches into her pocket and withdraws a crumpled pack of cigarettes."
|
||||
pause .5
|
||||
|
||||
A "Got a spare?"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ label chapter_x4:
|
|||
"I deserve it after all the shit I deal with at school. Not to mention the tiny terrors at home{cps=*.1}...{/cps}"
|
||||
pause .5
|
||||
|
||||
"A part of me wants to feel bad that I left Fang on her own the other day."
|
||||
"A part of me wants to feel bad that I left Fang on their own the other day."
|
||||
|
||||
"Especially with that useless skinnie."
|
||||
|
||||
|
|
@ -182,7 +182,7 @@ label chapter_x4:
|
|||
show fang:
|
||||
easein_back 1.5 xalign -0.05
|
||||
show fang unimpressed with dissolve
|
||||
"I hear Fang sigh and lean back in her chair."
|
||||
"I hear Fang sigh and lean back in their chair."
|
||||
|
||||
F "Maybe{cps=*.1}...{/cps}"
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ label chapter_x6:
|
|||
yalign 0.1 xalign 0.75
|
||||
show rosa neutral:
|
||||
yalign 0.2 xalign 0.4
|
||||
show fang nonxmas pendant neutral:
|
||||
show fang neutral:
|
||||
yalign 0.0 xalign -0.05
|
||||
show anon neutral:
|
||||
yalign 0.1 xalign -0.25
|
||||
|
|
@ -56,7 +56,7 @@ label chapter_x6:
|
|||
|
||||
"A feathered elbow pierces my side."
|
||||
|
||||
show fang nonxmas pendant considering with Dissolve(.25)
|
||||
show fang considering with Dissolve(.25)
|
||||
F "Her mother works two jobs overtime just so Trish can go to school with us instead of Reef City Continuation."
|
||||
|
||||
show anon shrug with dissolve
|
||||
|
|
@ -96,10 +96,10 @@ label chapter_x6:
|
|||
show anon concerned with Dissolve(.25)
|
||||
A "Oh no."
|
||||
|
||||
show fang nonxmas pendant unimpressed with Dissolve(.25)
|
||||
show fang unimpressed with Dissolve(.25)
|
||||
F "I went there for a week last September because Spears caught me slashing tires."
|
||||
|
||||
show fang nonxmas pendant sad with dissolve
|
||||
show fang sad with dissolve
|
||||
F "It’s hell."
|
||||
|
||||
show reed considering flip with Dissolve(.25)
|
||||
|
|
@ -116,7 +116,7 @@ label chapter_x6:
|
|||
Ro "We’re getting close to Trish’s place, no?"
|
||||
|
||||
show anon neutral
|
||||
show fang nonxmas pendant neutral
|
||||
show fang neutral
|
||||
show reed neutral flip
|
||||
show stella considering flip
|
||||
show rosa considering flip
|
||||
|
|
@ -130,12 +130,12 @@ label chapter_x6:
|
|||
|
||||
A "Why’s that?"
|
||||
|
||||
show fang nonxmas pendant considering with Dissolve(.25)
|
||||
show fang considering with Dissolve(.25)
|
||||
F "It’s summer vacation."
|
||||
|
||||
A "{cps=*.1}...{/cps}And?"
|
||||
|
||||
show fang nonxmas pendant happy with dissolve
|
||||
show fang happy with dissolve
|
||||
F "You’ll see."
|
||||
pause .5
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ label chapter_x6:
|
|||
yalign 0.1 xalign 0.2
|
||||
show stella neutral:
|
||||
yalign 0.1 xalign 0.2
|
||||
show fang nonxmas pendant neutral:
|
||||
show fang neutral:
|
||||
yalign 0.0 xalign -0.525
|
||||
show rosa considering:
|
||||
yalign 0.2 xalign -0.55
|
||||
|
|
@ -260,7 +260,7 @@ label chapter_x6:
|
|||
show rosa neutral with Dissolve(.25)
|
||||
Ro "He’s so cute! Trish why did you not tell us you had a kid brother?"
|
||||
|
||||
show fang nonxmas pendant considering with Dissolve(.25)
|
||||
show fang considering with Dissolve(.25)
|
||||
F "Because-"
|
||||
|
||||
show trish unimpressed flip with Dissolve(.25)
|
||||
|
|
@ -289,7 +289,7 @@ label chapter_x6:
|
|||
show trish annoyed flip with dissolve
|
||||
T "Riley, I swear to fuck-"
|
||||
|
||||
show fang nonxmas pendant happy with Dissolve(.25)
|
||||
show fang happy with Dissolve(.25)
|
||||
F "Hooookay, how about we get this party started!"
|
||||
|
||||
show stella neutral
|
||||
|
|
@ -306,7 +306,7 @@ label chapter_x6:
|
|||
stop music fadeout 4
|
||||
play ambient 'audio/effects/outdoorloop.ogg' fadein 5
|
||||
scene courtyard
|
||||
show fang nonxmas pendant neutral:
|
||||
show fang neutral:
|
||||
yalign 0.0 xalign -0.3
|
||||
show anon neutral:
|
||||
yalign 0.1 xalign -0.3
|
||||
|
|
@ -330,13 +330,13 @@ label chapter_x6:
|
|||
|
||||
"He flips the latches open to reveal a charcoal tray."
|
||||
|
||||
show fang nonxmas pendant surprised
|
||||
show fang surprised
|
||||
with Dissolve(.25)
|
||||
A "What the?"
|
||||
|
||||
Re "Made this last week, just for the occasion."
|
||||
|
||||
show fang nonxmas pendant neutral with Dissolve(.25)
|
||||
show fang neutral with Dissolve(.25)
|
||||
F "An entire grill in a briefcase? Why?"
|
||||
pause .5
|
||||
|
||||
|
|
@ -383,7 +383,7 @@ label chapter_x6:
|
|||
show trish considering with Dissolve(.25)
|
||||
T "There’s always at least one running around screeching."
|
||||
|
||||
show fang nonxmas pendant happy with Dissolve(.25)
|
||||
show fang happy with Dissolve(.25)
|
||||
F "Trish, why don’t you invite us over more often?"
|
||||
|
||||
F "I’d be glad to help when I don’t have classes{cps=*.1}...{/cps}"
|
||||
|
|
@ -404,7 +404,7 @@ label chapter_x6:
|
|||
Re "Fang, you wanna help a bit?"
|
||||
|
||||
show reed neutral flip
|
||||
show fang nonxmas pendant neutral
|
||||
show fang neutral
|
||||
with Dissolve(.25)
|
||||
|
||||
F "Me? Uh{cps=*.1}...{/cps} Sure?"
|
||||
|
|
@ -421,7 +421,7 @@ label chapter_x6:
|
|||
|
||||
F "I only wish I came up with the idea for a party sooner, I didn’t have much time to get everything together."
|
||||
|
||||
show fang nonxmas pendant happy with Dissolve(.25)
|
||||
show fang happy with Dissolve(.25)
|
||||
F "Like, imagine if we rented a bouncy house?"
|
||||
pause .5
|
||||
|
||||
|
|
@ -453,7 +453,7 @@ label chapter_x6:
|
|||
|
||||
show fang:
|
||||
easein_quart 1 xalign -0.25
|
||||
show fang nonxmas pendant surprised with Dissolve(.25)
|
||||
show fang surprised with Dissolve(.25)
|
||||
F "Crap!"
|
||||
|
||||
"Fang returns her attention to the grill."
|
||||
|
|
@ -468,7 +468,7 @@ label chapter_x6:
|
|||
|
||||
show anon:
|
||||
easein_cubic 1.5 xalign 0.6
|
||||
show fang nonxmas pendant:
|
||||
show fang:
|
||||
easein_cubic 1.5 xalign 1.4
|
||||
show trish:
|
||||
easein_cubic 1.5 xalign 1.15
|
||||
|
|
@ -487,7 +487,7 @@ label chapter_x6:
|
|||
easein_cubic 1.5 xalign 0.2
|
||||
show tana:
|
||||
easein_cubic 1.5 xalign 0.0
|
||||
show fang nonxmas pendant neutral
|
||||
show fang neutral
|
||||
hide reed
|
||||
hide rosa
|
||||
hide stella
|
||||
|
|
@ -509,7 +509,7 @@ label chapter_x6:
|
|||
|
||||
Tana "Is it true you can light things on fire with your hands?"
|
||||
|
||||
show fang pneutral flip behind trish
|
||||
show fang neutral flip behind trish
|
||||
show trish neutral flip
|
||||
with dissolve
|
||||
pause .5
|
||||
|
|
@ -592,7 +592,7 @@ label chapter_x6:
|
|||
with None
|
||||
show tana cheer
|
||||
show trevor awe
|
||||
show fang phappy flip
|
||||
show fang happy flip
|
||||
with dissolve
|
||||
pause 1
|
||||
|
||||
|
|
@ -670,7 +670,7 @@ label chapter_x6:
|
|||
show reed:
|
||||
easein_cubic 1.5 xalign 0.95
|
||||
with None
|
||||
show fang nonxmas pendant happy behind anon
|
||||
show fang happy behind anon
|
||||
show trish neutral behind fang
|
||||
show anon neutral
|
||||
with Dissolve(1)
|
||||
|
|
@ -703,7 +703,7 @@ label chapter_x6:
|
|||
yalign 0.1 xalign 0.1
|
||||
show reed neutral:
|
||||
yalign 0.1 xalign -0.6
|
||||
show fang pneutral flip:
|
||||
show fang neutral flip:
|
||||
yalign 0.0 xalign 0.45
|
||||
show anon neutral flip:
|
||||
yalign 0.1 xalign 0.8
|
||||
|
|
@ -729,7 +729,7 @@ label chapter_x6:
|
|||
|
||||
"She’s entirely focused on her greasy prey."
|
||||
|
||||
show fang phappy flip with dissolve
|
||||
show fang happy flip with dissolve
|
||||
|
||||
"After a few test bites she throws the whole thing in the air{cps=*.1}...{/cps}"
|
||||
|
||||
|
|
@ -753,7 +753,7 @@ label chapter_x6:
|
|||
with dissolve
|
||||
pause .5
|
||||
|
||||
show fang pshocked flip with dissolve
|
||||
show fang shocked flip with dissolve
|
||||
"Only then does she remember others are watching."
|
||||
|
||||
show anon grin flip with dissolve
|
||||
|
|
@ -789,7 +789,7 @@ label chapter_x6:
|
|||
|
||||
show fang behind stella:
|
||||
ease_cubic 1 xalign 0.3
|
||||
show fang nonxmas pendant surprised with dissolve
|
||||
show fang surprised with dissolve
|
||||
pause .5
|
||||
|
||||
A "If you’d all follow me back out front of the building{cps=*.1}...{/cps}"
|
||||
|
|
@ -821,7 +821,7 @@ label chapter_x6:
|
|||
yalign 0.1 xalign 0.9
|
||||
show rosa considering flip:
|
||||
yalign 0.2 xalign 1.5
|
||||
show fang pneutral flip:
|
||||
show fang neutral flip:
|
||||
yalign 0.0 xalign -0.1
|
||||
show reed neutral flip:
|
||||
yalign 0.1 xalign 0.55
|
||||
|
|
@ -870,7 +870,7 @@ label chapter_x6:
|
|||
easein_quart 1.5 xalign 0.65 #0.65
|
||||
with None
|
||||
show trish surprised flip
|
||||
show fang psurprised flip
|
||||
show fang surprised flip
|
||||
show reed shocked flip
|
||||
with dissolve
|
||||
show rosa neutral flip
|
||||
|
|
@ -892,7 +892,7 @@ label chapter_x6:
|
|||
|
||||
show fang:
|
||||
easein_quart 1 xalign -0.15
|
||||
show fang pshocked flip with Dissolve(.25)
|
||||
show fang shocked flip with Dissolve(.25)
|
||||
F "How did you-?"
|
||||
|
||||
show reed:
|
||||
|
|
@ -920,7 +920,7 @@ label chapter_x6:
|
|||
parallel:
|
||||
pause 0.5
|
||||
easeout_cubic 1 xalign -1.5
|
||||
show fang pvhappy flip with dissolve
|
||||
show fang very happy flip with dissolve
|
||||
pause .5
|
||||
hide fang with dissolve
|
||||
|
||||
|
|
@ -1110,7 +1110,7 @@ label chapter_x6:
|
|||
pause .5
|
||||
|
||||
scene trishhome
|
||||
show fang phappy flip:
|
||||
show fang happy flip:
|
||||
yalign 0.0 xalign 0.8
|
||||
show anon neutral flip:
|
||||
yalign 0.1 xalign 1.0
|
||||
|
|
@ -1361,7 +1361,7 @@ label chapter_x6:
|
|||
easein_back 2 xalign 0.6 yalign 0.05
|
||||
with None
|
||||
show anon fear
|
||||
show fang nonxmas pendant shocked
|
||||
show fang shocked
|
||||
show trish surprised
|
||||
show tali happy flip
|
||||
show chondra happy flip
|
||||
|
|
|
|||
Loading…
Reference in a new issue