merge Patch7 into master #192

Merged
nutbuster merged 202 commits from Patch7 into master 2022-10-29 05:53:44 +00:00
1 changed files with 107 additions and 54 deletions
Showing only changes of commit 7d78114eea - Show all commits

View File

@ -1,3 +1,46 @@
#high res flip - i hate this
image anon neutral megatex flip = im.Flip("highres/anon neutral megatex.png", horizontal=True)
image anon shrug megatex flip = im.Flip("highres/anon shrug megatex.png", horizontal=True)
image anond neutral megatex flip = im.Flip("highres/anond neutral megatex.png", horizontal=True)
image fang neutral megatex flip = im.Flip("highres/fang neutral megatex.png", horizontal=True)
image fang flip off happy megatex flip = im.Flip("highres/afng flip off happy megatex.png", horizontal=True)
image fang very sad megatex flip = im.Flip("highres/fang very sad megatex.png", horizontal=True)
image naomi neutral megatex flip = im.Flip("highres/naomi neutral megatex.png", horizontal=True)
"""
show fang pbird happy flip with dissolve
show fang pneutral flip with Dissolve(1)
"""
#pENdant - wait what the fuck there's PBIRD AND FLIP OFF?
image fang pneutral megatex = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), "highres/fang neutral megatex.png",
(0, 0), "highres/amberpendant1 megatex.png"
)
image fang pbird happy megatex = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), "highres/fang flip off happy megatex.png",
(0, 0), "highres/amberpendant1 megatex.png"
)
image fang pneutral megatex flip = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), im.Flip("highres/fang neutral megatex.png", horizontal=True),
(0, 0), im.Flip("highres/amberpendant1 megatex.png", horizontal=True)
)
image fang pbird happy megatex flip = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), im.Flip("highres/fang flip off happy megatex.png", horizontal=True),
(0, 0), im.Flip("highres/amberpendant1 megatex.png", horizontal=True)
)
image raymba2 flip = im.Flip("raymba/raymba2.png", horizontal=True)
image raymba4 flip = im.Flip("raymba/raymba4.png", horizontal=True)
image raymbashadow flip = im.Flip("raymba/raymbashadow.png", horizontal=True)
@ -63,19 +106,22 @@ label chapter_x10:
play music 'audio/ost/she_fucks_human_men.ogg' fadein 3
scene little troodon:
blur 5 zoom 1.5 xoffset -600 yoffset -300
show fritatta:
xcenter 0.8 yalign 0.4 zoom 2
blur 5
show fang neutral:
xcenter 0.3 yalign 0.45 zoom 2
blur 5
show anon neutral:
xcenter 0.0 yalign 0.5 zoom 2
blur 5
zoom 1.5 xoffset -600 yoffset -300
#image fangfog = im.Blur(im.MatrixColor("fang/emotive set/fang anguish.png",im.matrix.brightness(-1)), 1.5)
show fritatta megatex unblur:
xcenter 0.8 yalign 0.4 xsize 1135*2 ysize 1500*2
show fang neutral megatex unblur:
xcenter 0.3 yalign 0.45 xsize 1412*2 ysize 1500*2
show anon neutral megatex unblur:
#xcenter 0.0 yalign 0.5 zoom 2
xcenter 0.0 yalign 0.5
xsize 1061*2 ysize 1500*2
with Fade(1, 0, 1, color='#fff')
pause 1
"Observation:{w=.4} I am pulled from the darkness and placed on a brightly lit surface."
"My sensors indicate that this unit is currently being displayed for potential sale."
@ -152,9 +198,9 @@ label chapter_x10:
play music 'audio/ost/the hunt for more (you)s.ogg' fadein 3 noloop
scene room anon day:
blur 8 zoom 1.5 xoffset -100 yoffset -400
show anon neutral:
xcenter 0.2 yalign 0.5 zoom 2
blur 5
show anon neutral megatex:
#xcenter 0.2 yalign 0.5 zoom 2
xcenter 0.2 yalign 0.5 xsize 1061*2 ysize 1500*2
show raymbabox
show raymba1:
xcenter 0.6 ycenter 0.385 zoom 0.5
@ -177,7 +223,9 @@ label chapter_x10:
A "Naaaah. They arent really a thing anymore."
show anon:
ease_cubic 1.5 xpos 0.1
show anon neutral flip with Dissolve(1)
show anon neutral megatex flip with Dissolve(1)
#show anon neutral flip with Dissolve(1)
A "Hmmmm{cps=*.1}...{/cps}"
pause .5
@ -273,9 +321,8 @@ label chapter_x10:
A "Yeah{cps=*.1}...{/cps} Two or three will do."
pause .5
show fang neutral behind raymbabox:
xcenter -0.5 yalign 0.45 zoom 2
blur 5
show fang neutral megatex behind raymbabox:
xcenter -0.5 yalign 0.45 xsize 1412*2 ysize 1500*2
show fang:
easein_cubic 1.5 xpos 0.3
with dissolve
@ -299,7 +346,7 @@ label chapter_x10:
pause 3.5
stop music fadeout 6
show fang neutral flip with Dissolve(1)
show fang neutral megatex flip with Dissolve(1):
F "You are such a dweeb, Anon."
pause 1
@ -338,12 +385,14 @@ label chapter_x10:
play music 'audio/ost/its_footloose_now.ogg' fadein 4
scene room anon day:
blur 8 zoom 1.5 xoffset -100 yoffset -400
show anon neutral:
xcenter 0.2 yalign 0.5 zoom 2
blur 5
show fang neutral flip:
xcenter 0.8 yalign 0.45 zoom 2
blur 5
show anon neutral megatex:
xzoom 1.0
xcenter 0.2 yalign 0.5
xsize 1061*2 ysize 1500*2
show fang neutral megatex:
xzoom -1.0
xcenter 0.8 yalign 0.45
xsize 1412*2 ysize 1500*2
show raymbabox
show raymba2:
xcenter 0.6 ycenter 0.385 zoom 0.5
@ -357,9 +406,10 @@ label chapter_x10:
"One such object he lays out on the floor."
show anon shrug with dissolve
show anon shrug megatex with dissolve:
A "See? It really ties the room together."
show anon neutral with dissolve
show anon neutral megatex with dissolve:
"Owner has opened another of the boxes he brought in, laid the contents on top."
@ -379,11 +429,11 @@ label chapter_x10:
"Confirmed.{w=.4} Response to new unit designated Mark 2."
pause .5
show anon:
show anon neutral megatex:
easeout_cubic 1 xpos 1.5
block:
pause 2
"anon neutral flip"
"anon neutral megatex flip"
easein_cubic 0.5 xpos 0.9
pause 1
easeout_cubic 0.5 xpos -0.5
@ -391,7 +441,8 @@ label chapter_x10:
show fang:
pause 1
ease_cubic 0.5 xpos 0.3
"fang neutral" with dissolve
"fang neutral megatex" with dissolve
xzoom 1.0
pause 1
easeout_cubic 0.75 xpos 1.5
@ -476,12 +527,14 @@ label chapter_x10:
play music 'audio/ost/appreciating her company.ogg' fadein 4
scene fangroom:
blur 8 zoom 1.5 xoffset -900 yoffset -400
show anon neutral flip:
xcenter 0.8 yalign 0.5 zoom 2
blur 5
show fang neutral:
xcenter 0.2 yalign 0.45 zoom 2
blur 5
show anon neutral megatex:
xzoom -1.0
xcenter 0.8 yalign 0.5 #zoom 2
xsize 1061*2 ysize 1500*2
show fang neutral megatex:
xzoom 1.0
xcenter 0.2 yalign 0.45 #zoom 2
xsize 1412*2 ysize 1500*2
show raymbabox
show raymba2:
xcenter 0.6 ycenter 0.385 zoom 0.5
@ -507,20 +560,19 @@ label chapter_x10:
"Response from Mark 2:{w=.4} Observation noted.{w=.4} Current owner and Fang are currently in need of repair.{w=.4} Conclusion:{w=.4} will ensure that this units new owner receives necessary repairs."
pause .5
show anon:
show anon neutral megatex:
ease_cubic 1.5 xpos 0.75
A "Well{cps=*.1}...{/cps} This is it{cps=*.1}...{/cps}"
show fang:
ease_cubic 1.5 xpos 0.25
pause .5
show fang very sad with Dissolve(1)
show fang very sad megatex with Dissolve(1):
F "Anon{cps=*.1}...{/cps}"
pause .5
A "Hey, its only a few years.{w=.4} And its not like we wont talk."
show fang neutral with Dissolve(1)
show fang neutral megatex with Dissolve(1)
F "I know. And I know I said a break and all{cps=*.1}...{/cps}"
pause .5
show anon:
@ -528,7 +580,7 @@ label chapter_x10:
show fang:
ease_cubic 1.5 xpos 0.4
pause .5
show fang adorable with dissolve
show fang adorable megatex with dissolve
pause 1
"Observation:{w=.4} Current owner and Fang appear to be attempting to clean each others brush units again."
@ -612,9 +664,9 @@ label chapter_x10:
N "Whats this in the box over here?"
show naomi neutral behind raymbabox:
xcenter -0.5 yalign 0.45 zoom 2
blur 5
show naomi neutral megatex behind raymbabox:
xcenter -0.5 yalign 0.45 #zoom 2
xsize 1036*2 ysize 1500*2
show naomi:
easein_cubic 1.5 xpos 0.25
pause 1.5
@ -624,8 +676,8 @@ label chapter_x10:
F "Hey, dont touch him. Thats RAYmba, Im keeping him safe for a while."
show fang pneutral flip behind raymbabox:
xcenter 1.5 yalign 0.45 zoom 2
blur 5
xcenter 1.5 yalign 0.45 # zoom 2
xsize 1412*2 ysize 1500*2
show fang:
easein_cubic 1.5 xpos 0.75
pause .5
@ -655,17 +707,17 @@ label chapter_x10:
show naomi:
easeout_cubic 1.5 xpos -0.5
pause .5
show naomi neutral flip with dissolve
show naomi neutral megatex flip with dissolve
pause .5
"Observation:{w=.4} Unknown guest has left the room."
pause .5
show fang pbird happy flip with dissolve
show fang pbird happy megatex flip with dissolve
stop music fadeout 6
F "{cps=*.1}...{/cps}Bitch{cps=*.1}...{/cps}"
show fang pneutral flip with Dissolve(1)
show fang pneutral megatex flip with Dissolve(1)
"Unknown guest designation confirmed."
pause 1
@ -748,9 +800,10 @@ label chapter_x10:
F "Theres the flakes in a little cup next to the box there."
show anond neutral behind raymbabox:
xcenter -0.5 yalign 0.5 zoom 2
blur 5
show anond neutral megatex behind raymbabox:
xcenter -0.5 yalign 0.5# zoom 2
xsize 1061*2 ysize 1500*2
show anond:
easein_cubic 1.5 xpos 0.25
pause 1.5
@ -919,9 +972,9 @@ label chapter_x10:
show raymbashadow as footshadow behind raymba4s:
ypos -0.7 xcenter 0.05 blur 3
easein_cubic 1 xpos 0.1
show anond neutral behind raymba4s:
xcenter 0.05 yanchor 1.0 ypos 0.85 zoom 3.5
blur 5
show anond neutral megatex behind raymba4s:
xcenter 0.05 yanchor 1.0 ypos 0.85 # zoom 3.5
xsize 1061*3.5 ysize 1500*3.5
easein_cubic 1 xpos 0.1
with Dissolve(1)
pause .5