Merge remote-tracking branch 'Nio/choreo_ch7andup_basedonBowies' into bowieniocombo

This commit is contained in:
2021-10-09 20:25:32 +11:00
154 changed files with 5679 additions and 1622 deletions

View File

@ -45,6 +45,8 @@ transform randPosition:
yalign random.uniform(0.2,0.8)
linear 0.6 alpha 1.0
linear 1.0 alpha 0.0
#python:
# def Walking( name ):
# show name:
@ -246,6 +248,7 @@ image naomi shocked flip = im.Flip("naomi/naomi shocked.png", horizontal=True)
image stella shock alt flip = im.Flip("stella/stella shock alt.png", horizontal=True)
image rosa shocked flip = im.Flip("rosa/rosa shocked.png", horizontal=True)
image trish shock flip = im.Flip("trish/trish shock.png", horizontal=True)
image fang prom d shocked flip = im.Flip("fang/prom sets/fang d prom shock.png", horizontal=True)
#considering flips
image fang considering flip = im.Flip("fang/basic set/fang considering.png", horizontal=True)
@ -332,6 +335,16 @@ image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=Tru
image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True)
image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
"""
double surprised
<<<<<<< B's
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
=======
image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
image naser surprised = "naser/naserintermediaryshocked.png"
>>>>>>> N's
"""
#other flips
image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)
@ -349,6 +362,7 @@ image farnsworth flip = im.Flip("other/farnsworth.png", horizontal=True)
image carldelewski flip = im.Flip("other/carldelewski.png", horizontal=True)
image fangdad unimpressed flip = im.Flip("fangparents/fangdad unimpressed.png", horizontal=True)
image naser handout flip = im.Flip("naser/naser handout.png", horizontal=True)
#b's
image naomi keikaku flip = im.Flip("naomi/naomi keikaku.png", horizontal=True)
image anon shrug flip = im.Flip("anon/emotive set/anon shrug.png", horizontal=True)
image fang hug flip = im.Flip("fang/emotive set/fang hug.png", horizontal=True)
@ -357,6 +371,9 @@ image anon concerned flip = im.Flip("anon/base set/anon concerned.png", horizont
image rosa excited flip = im.Flip("rosa/rosa excited.png", horizontal=True)
image fang anguish flip = im.Flip("fang/emotive set/fang anguish.png", horizontal=True)
image fang embarass flip = im.Flip("fang/emotive set/fang embarass.png", horizontal=True)
#n's
image fang adorable flip = im.Flip("fang/emotive set/fang adorable.png", horizontal=True)
image anon concerned flip = im.Flip("images/anon/base set/anon concerned.png", horizontal=True)
# trish fam flips
image chondra neutral flip = im.Flip("trishfam/chondra neutral.png", horizontal=True)
@ -375,11 +392,343 @@ image trevor awe flip = im.Flip("trishfam/trevor awe.png", horizontal=True)
image moes pizza mirrored = im.Flip("backgrounds/moes pizza.jpg", horizontal=True)
# vfx
image white = "#ffffff"
image black = "#000"
image white = "#FFF"
image blue = "#BECBFF"
image dimmer_lighter = "#00000033"
image dimmer_light = "#00000066"
image dimmer_darker = "#00000088"
image dimmer_darker2 = "#00000088"
image lighter_freeze = '#1E90FF05'
image light_freeze = '#1E90FF08' #11
image dark_freeze = '#1E90FF08'
image darker_freeze = '#1E90FF08'
#Images for effects
image door blurred flip = im.Flip(im.Blur("/images/other/door.png", 1.5), horizontal=True)
image guitarpick = "/images/other/pickthrown.png"
image projector9 blurred = im.Blur("images/cgs/projector9.jpg", 1.5)
image projector9 normal = "images/cgs/projector9.jpg"
image fangonamp = "images/cgs/finalamp.png"
image schooloutside normal = "images/backgrounds/outside school.jpg"
image schooloutside blurred = im.Blur("images/backgrounds/outside school.jpg", 1.8)
image sodacan blurred = im.Blur("images/other/sodacan.png", 1.8)
image fangdadlarge = "images/fangparents/fangdad neutral large.png"
image fangdadunimpressedlarge = "images/fangparents/fangdad unimpressed large.png"
image lighter = "images/other/lighter.png"
image amberpendant = "images/other/amberpendant1.png"
image fangphone = "images/other/fangphone.png"
image fangphonelayer1 = "images/other/fangphonelayer1.png"
image fangphonelayer2 = im.Alpha("images/other/fangphonelayer2.png", 0.4)
image nonalcoholic = "images/other/soda.png"
image amberpendant = "images/other/amberpendant1.png"
image amberpendant6veryhappy = 'images/other/amberpendant6veryhappy.png'
image amberpendant4shock = 'images/other/amberpendant4shock.png'
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'
#additional character images
#naser gets a stain
image naser rstained unimpressed = Composite(
(1412, 1500),
(0, 0), "naser unimpressed",
(0, 0), "ccf_rstain"
)
image naser rstained sad = Composite(
(1412, 1500),
(0, 0), "naser sad",
(0, 0), "ccf_rstain"
)
image naser rstained neutral = Composite(
(1412, 1500),
(0, 0), "naser neutral",
(0, 0), "ccf_rstain"
)
image naser rstained shocked = Composite(
(1412, 1500),
(0, 0), "naser shocked",
(-40, -20), "ccf_rstain"
)
image naser rstained explanatory = Composite(
(1412, 1500),
(0, 0), "naser explanatory",
(20, 0), "ccf_rstain"
)
#naser got two stains
image naser fullystained happy = Composite(
(1412, 1500),
(0, 0), "naser happy",
(0, 0), "ccf_rstain",
(-175, 0), "ccf_lstain"
)
image naser fullystained unimpressed = Composite(
(1412, 1500),
(0, 0), "naser unimpressed",
(0, 0), "ccf_rstain",
(-175, 0), "ccf_lstain"
)
image naser fullystained surprised = Composite(
(1412, 1500),
(0, 0), "naser surprised",
(-15, -15), "ccf_rstain",
(-235, -20), "ccf_lstain"
)
image naser fullystained explanatory = Composite(
(1412, 1500),
(0, 0), "naser explanatory",
(20, 0), "ccf_rstain",
(-175, 0), "ccf_lstain"
)
image naser fullystained sad = Composite(
(1412, 1500),
(0, 0), "naser sad",
(0, 0), "ccf_rstain",
(-175, 0), "ccf_lstain"
)
image naser fullystained considering = Composite(
(1412, 1500),
(0, 0), "naser considering",
(0, 0), "ccf_rstain",
(-175, 0), "ccf_lstain"
)
image naser fullystained shocked = Composite(
(1412, 1500),
(0, 0), "naser shocked",
(-280, -20), "ccf_lstain",
(-40, -20), "ccf_rstain"
)
#fang w pendant ending D
image fang nonxmas pendant happy = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang happy",
(0, 0), "amberpendant"
)
image fang nonxmas pendant sad = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang sad",
(0, 0), "amberpendant"
)
image fang nonxmas pendant unimpressed = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang unimpressed",
(0, 0), "amberpendant"
)
image fang nonxmas pendant surprised = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang surprised",
(0, 0), "amberpendant"
)
image fang nonxmas pendant angry = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang angry",
(0, 0), "amberpendant"
)
image fang nonxmas pendant neutral = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang neutral",
(0, 0), "amberpendant"
)
image fang nonxmas pendant considering = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang considering",
(0, 0), "amberpendant"
)
image fang nonxmas pendant very happy = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang very happy",
(0, 0), "amberpendant6veryhappy"
)
image fang nonxmas pendant very happy = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang very happy",
(0, 0), "amberpendant6veryhappy"
)
image fang nonxmas pendant shocked = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang shocked",
(0, 0), "amberpendant4shock"
)
image fang nonxmas pendant flip off happy = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), "fang flip off happy",
(0, 0), "amberpendant"
)
image chadshark flip = im.Flip("stella/chadshark.png", horizontal=True)
image chadshark = "stella/chadshark.png"
image naser tablehit = "naser/naser table hit.png"
image naser tablehit flip = im.Flip("naser/naser table hit.png", horizontal=True)
image naomi future flip = im.Flip('images/naomi/naomi future.png', horizontal=True)
image fang d happy flip = im.Flip('images/fang/future sets/fang d happy.png', horizontal=True)
image naser neckhold flip = im.Flip('images/naser/naserneckhold.png', horizontal=True)
image anon grin = 'images/anon/base set/anon grin.png'
image anon grin flip = im.Flip('images/anon/base set/anon grin.png', horizontal=True)
image tracy neutral flip = im.Flip('images/tracy/tracy neutral.png', horizontal=True)
image tracy tease flip = im.Flip('images/tracy/tracy tease.png', horizontal=True)
image tracy unimpressed flip = im.Flip('images/tracy/tracy unimpressed.png', horizontal=True)
#extra chapters other images
image home fang night blurred = im.Blur('images/backgrounds/home fang night.jpg', 2.0)
image home fang night lessblurred = im.Blur('images/backgrounds/home fang night.jpg', 1.5)
image home fang night barelyblurred = im.Blur('images/backgrounds/home fang night.jpg', 0.5)
image d01_blur = im.Blur('images/cgs/d01.jpg', 1.5)
image fangroomfuture = "images/backgrounds/fangroomfuture.png"
image livingroomdayalt = "images/backgrounds/livingroomdayalt.png"
image emptyroomnight = "images/backgrounds/emptyroomnight.png"
image naomifangcg = "images/cgs/naomifangcg.png"
image naomifangcg blur = im.Blur("images/cgs/naomifangcg.png", 1.5)
image naomiletter = 'images/cgs/naomiletter.png'
image ending_d_cg = 'images/cgs/golden ending.png'
image projector9_blur:
"projector9 normal" with dissolve
pause 1
"projector9 blurred" with dissolve
pause 1
repeat
image schooloutside_blur:
"schooloutside normal" with dissolve
pause 1
"schooloutside blurred" with dissolve
pause 1
repeat
#phone bgs for video calls
#caller bgs
image anonday_videocall_bg = im.Crop(im.FactorScale("images/backgrounds/foodcourt.jpg", 0.9),(0,40,576,920))
image anonnight_videocall_bg = im.Crop(im.FactorScale("images/backgrounds/room anon dark.jpg", 0.9),(100,40,576,920))
image fangphonebg = im.Crop(im.FactorScale("images/backgrounds/anonroomday2.png", 0.9),(400,40,576,920))
image fpvcblack = im.Scale("images/other/black.png", 565, 1100)
image call_ended = im.Scale("images/other/black.png", 656, 700)
#callers
image anon_vc_neutral = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon neutral.png", 2.0),(900,250,653,800)), horizontal=True)
image anon_vc_angry = im.Crop(im.FactorScale("images/anon/emotive set/anon angry.png", 2.0),(900,250,653,800))
image anon_vc_sad = im.Flip(im.Crop(im.FactorScale("images/anon/emotive set/anon sad.png", 2.0),(900,250,653,800)), horizontal=True)
image anon_vc_neutral_alt1 = im.Crop(im.FactorScale("images/anon/base set/anon neutral.png", 2.0),(800,250,653,800))
image anon_vc_concerned = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon concerned.png", 2.0),(900,250,653,800)), horizontal=True)
image anon_vc_happy = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon happy.png", 2.0),(900,250,653,800)), horizontal=True)
image anon_vc_grin = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon grin.png", 2.0),(900,250,653,800)), horizontal=True)
image anon_vc_unimpressed = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon unimpressed.png", 2.0),(900,250,653,800)), horizontal=True)
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))
#fangphone effect - video call with Anon mainly
layeredimage fangphonevideocall:
group midlayer:
pos (370, -20)
rotate 1
attribute blackmid default:
"fpvcblack"
group talkerbg:
pos (446, -35)
rotate 1
# xzoom 1.3 #anon's cam is shitty?
attribute bgday default:
"anonday_videocall_bg"
attribute bgnight:
"anonnight_videocall_bg"
attribute call_ended_bg:
"fangphonebg"
attribute call_ended_bg_black:
"call_ended"
group talker:
pos (410, 65)
rotate 3
attribute anonneutral:
"anon_vc_neutral"
attribute anonneutralalt1:
"anon_vc_neutral_alt1"
attribute anonconcerned:
"anon_vc_concerned"
attribute anonhappy:
"anon_vc_happy"
attribute anongrin:
"anon_vc_grin"
attribute anonsad:
"anon_vc_sad"
attribute anonangry:
"anon_vc_angry"
attribute anonunimpressed:
"anon_vc_unimpressed"
attribute call_ended:
"anonfangfor_phonebg"
attribute call_ended_poff:
"call_ended"
always:
"fangphonelayer1"
group toplayer:
attribute basic default:
"fangphonelayer2"
#Dual actor images
image fangcarriesanon = "images/anon/Other/fanganoncarry.png"
image fanganon_promdance = "images/anon/Other/dpromdance.png"
#additional CGs
image gold_fang_home_prom_stars = "images/cgs/stair3.png"
image good_fang_home_prom_stars = "images/cgs/stair2.png"
image other_fang_home_prom_stars = "images/cgs/stair1.png"
image anonfang_xmasmorningbed = "images/cgs/anonchristmasmorning.png"
#additional BGs
image park_night = "images/backgrounds/park night.jpg"
image home_fang_dim = "images/backgrounds/home fang dim.jpg"
#WAOH ITS THE TITLE SCREEN!!!!
label splashscreen:
@ -451,6 +800,29 @@ transform rleft:
transform rright:
xalign 1.7 yalign 0.1
#misc transforms
transform shudder:
subpixel True
around (.5, .5) alignaround (.5, .5) xalign .5 yalign .5
rotate 0
linear 0.0 rotate -0.75
block:
linear 0.04 rotate 0.75
linear 0.05 rotate -0.75
linear 0.07 rotate 0
transform turnaround:
linear 0.1 xzoom -1.0
transform wiggle:
subpixel True
block:
xpos 0.5 ypos 1.0 xanchor 0.5 yanchor 1.0 zoom 1.02
alignaround (.5, .5)
linear 10.0 yalign 1.0 clockwise circles 1
repeat
label start:
$ fangscore = 0
$ anonscore = 0