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

This commit is contained in:
2021-10-10 06:27:41 +11:00
57 changed files with 439 additions and 75 deletions

View File

@ -587,6 +587,59 @@ image fang nonxmas pendant flip off happy = Composite(
(0, 0), "amberpendant"
)
#phone gallery effect
image anoninsideship = "images/other/phonegallery/anoninsideship.png"
image anonmushroom = "images/other/phonegallery/anonmushroom.png"
image fanghugsanonbylake = "images/other/phonegallery/fanghugsanonbylake.png"
image fangrebel = "images/other/phonegallery/fangrebel.png"
image museumbones = "images/other/phonegallery/museumbones.png"
image peachesfangshy = "images/other/phonegallery/peachesfangshy.png"
image reeddoesscienceclass = "images/other/phonegallery/reeddoesscience class.png"
image rosastellacampsite = "images/other/phonegallery/rosastellacampsite.png"
image trishgarden = "images/other/phonegallery/trishflower garden.png"
image warship = "images/other/phonegallery/warship.png"
image fangreedbandroom = "images/other/phonegallery/tfangreedbandroom.png"
image fangtrishoutsideschool = "images/other/phonegallery/fangtrishoutside school.png"
image reedkingrexauditorium = "images/other/phonegallery/reedkingrexauditorium.png"
image reedtrishfanghallway = "images/other/phonegallery/reedtrishfanghallway.png"
image fangphonegallery1:
"peachesfangshy" with dissolve
pause 2.0
"anonmushroom" with dissolve
pause 2.0
"warship" with dissolve
pause 2.0
"anoninsideship" with dissolve
pause 2.0
"fangrebel" with dissolve
pause 2.0
"museumbones" with dissolve
pause 2.0
repeat
image fangphonegallery2:
"rosastellacampsite" with dissolve
pause 0.7
"reeddoesscienceclass" with dissolve
pause 0.7
"trishgarden" with dissolve
pause 0.7
"rosastellacampsite" with dissolve
pause 0.7
"reedkingrexauditorium" with dissolve
pause 0.7
"fangtrishoutsideschool" with dissolve
pause 0.7
"fangreedbandroom" with dissolve
pause 0.7
"reedtrishfanghallway" with dissolve
pause 0.7
repeat
#end of phone gallery effect
image chadshark flip = im.Flip("stella/chadshark.png", horizontal=True)
image chadshark = "stella/chadshark.png"
image naser tablehit = "naser/naser table hit.png"
@ -616,6 +669,8 @@ 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 photoviewfinder = 'images/other/photoviewfinder.png'
image projector9_blur:
"projector9 normal" with dissolve
pause 1
@ -637,7 +692,7 @@ image anonnight_videocall_bg = im.Crop(im.FactorScale("images/backgrounds/room a
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)
image caller_black = im.Scale("images/other/blackwtransp.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)
@ -654,13 +709,15 @@ image anonfangfor_phonebg = im.Crop(im.FactorScale("images/other/anon_fang_xmas.
#fangphone effect - video call with Anon mainly
layeredimage fangphonevideocall:
group midlayer:
# pos (370, -20)
pos (370, -20)
rotate 1
attribute blackmid default:
"fpvcblack"
group talkerbg:
pos (446, -35)
# pos (446, -35)
pos (440, -25)
rotate 1
# xzoom 1.3 #anon's cam is shitty?
attribute bgday default:
@ -673,10 +730,10 @@ layeredimage fangphonevideocall:
"fangphonebg"
attribute call_ended_bg_black:
"call_ended"
"caller_black"
group talker:
pos (410, 65)
pos (417, 65)
rotate 3
attribute anonneutral:
"anon_vc_neutral"
@ -706,7 +763,13 @@ layeredimage fangphonevideocall:
"anonfangfor_phonebg"
attribute call_ended_poff:
"call_ended"
"caller_black"
attribute galleryapp1:
"fangphonegallery1"
attribute galleryapp2:
"fangphonegallery2"
always:
"fangphonelayer1"
@ -718,6 +781,9 @@ layeredimage fangphonevideocall:
#Dual actor images
image fangcarriesanon = "images/anon/Other/fanganoncarry.png"
image fanganon_promdance = "images/anon/Other/dpromdance.png"
image fanganonhug = "images/fang/fullbody/fanganonhug.png"
image anon smiley = "images/anon/base set/anon face happy.png"
#additional CGs
image gold_fang_home_prom_stars = "images/cgs/stair3.png"
@ -725,9 +791,50 @@ 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"
#sepia effect for flashbacks
image grainf0 = "images/other/grain/frame_00.png"
image grainf1 = "images/other/grain/frame_01.png"
image grainf2 = "images/other/grain/frame_08.png"
image grainf3 = "images/other/grain/frame_09.png"
image grainf4 = "images/other/grain/frame_10.png"
image grainf5 = "images/other/grain/frame_13.png"
image grain_effect:
"grainf0" with dissolve
pause 0.2
"grainf1" with dissolve
pause 0.2
"grainf2" with dissolve
pause 0.2
"grainf3" with dissolve
pause 0.2
"grainf4" with dissolve
pause 0.2
"grainf5" with dissolve
pause 0.2
repeat
image sepiagarden = im.Sepia("images/backgrounds/garden.jpg")
image sepiaanon neutral = im.Sepia("images/anon/base set/anon neutral.png")
image sepiaanon concerned flip= im.Sepia(im.Flip("images/anon/base set/anon concerned.png", horizontal=True))
image sepiaanon neutral flip= im.Sepia(im.Flip("images/anon/base set/anon neutral.png", horizontal=True))
image sepiarosa neutral flip = im.Sepia(im.Flip("images/rosa/rosa neutral.png", horizontal=True))
image sepiastella explanatory flip = im.Sepia(im.Flip("images/stella/stella explanatory.png", horizontal=True))
image sepiastella unimpressed flip = im.Sepia(im.Flip("images/stella/stella unimpressed.png", horizontal=True))
image sepiastella neutral flip = im.Sepia(im.Flip("images/stella/stella neutral.png", horizontal=True))
image sepiafang happy = im.Sepia("images/fang/basic set/fang happy.png")
image sepiafang sad = im.Sepia("images/fang/basic set/fang sad.png")
image flashbacktitlecard = "images/other/grain/flashbacktitlecard.png"
image flashbackfincard = "images/other/grain/flashbackfincard.png"
#additional BGs
image park_night = "images/backgrounds/park night.jpg"
image home_fang_dim = "images/backgrounds/home fang dim.jpg"
image bus_stop = "images/backgrounds/Bus_Stop.jpg"
image hotel = "images/backgrounds/hotellobby.jpg"
image airport = "images/backgrounds/airport.jpg"
image fromairplane = "images/backgrounds/fromairplane.jpg"
#WAOH ITS THE TITLE SCREEN!!!!
label splashscreen: