This commit is contained in:
Nio 2021-10-07 02:20:35 +11:00
parent ab14c790d2
commit 5036fa8987
7 changed files with 1227 additions and 1097 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View file

@ -320,6 +320,8 @@ 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/naserintermediaryshocked.png", horizontal=True)
image naser surprised = "naser/naserintermediaryshocked.png"
#other flips
image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)
@ -372,8 +374,92 @@ 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 pendant happy = Composite(
# (1412, 1500),
(1412, 1500),
@ -460,6 +546,10 @@ image fang d happy flip = im.Flip('images/fang/future sets/fang d happy.png', ho
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)

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1135,10 +1135,10 @@ label chapter_9:
"My field of vision is filled with a soda can, and I freeze up like a deer in headlights."
show sodacan blurred:
yalign -0.1
yalign -0.2
xalign -0.1
zoom 0.25
ease_cubic 0.1 xalign 0.15 yalign 0.15 rotate 60
ease_cubic 0.1 xalign 0.15 yalign 0.12 rotate 60
menu:
"Duck.":
"The can smacks me in the forehead while I was mid-stride, and I shift my footing to try and regain balance."
@ -1149,15 +1149,21 @@ label chapter_9:
play sound "audio/effects/slapstickPunch.ogg"
show sodacan blurred:
linear 0.1 xalign 0.3 yalign 0.25 rotate 90
ease_cubic 0.3 xalign 0.5 yalign 0.7 rotate 60
ease_cubic 0.1 xalign 0.3 yalign 0.22 rotate 90
ease_cubic 0.5 xalign 0.5 yalign 1.7 rotate 60
hide sodacan blurred with dissolve
show fang shocked flip with dissolve
"Except my foot catches on the edge of the stairlip and slips."
hide fang with dissolve
show anon with easeinleft:
ease_cubic 0.5 rotate 90 yalign -0.5
parallel:
ease_cubic 1.0 rotate 90
parallel:
ease_cubic 0.1 yalign 0.0
ease_cubic 0.3 yalign -0.1
ease_cubic 0.3 yalign -0.2
ease_cubic 0.3 yalign -0.2
scene outside school with vpunch
pause 0.5