merge Patch7 into master #192

Merged
nutbuster merged 202 commits from Patch7 into master 2022-10-29 05:53:44 +00:00
5 changed files with 27 additions and 8 deletions
Showing only changes of commit 246074bc1a - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

View File

@ -442,7 +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)
image vvurm_drama_poster = im.FactorScale('images/other/vvurm_drama_poster.jpg', 0.9)
image mask_thing = "images/other/mask_thing.png"
#additional character images
#naser gets a stain
@ -917,8 +918,6 @@ layeredimage layeredanonphone:
attribute coverbasic default:
"anonphonetoplayer"
#Dual actor images
image fangcarriesanon = "images/anon/Other/fanganoncarry.png"
image fanganon_promdance = "images/anon/Other/dpromdance.png"

View File

@ -356,13 +356,33 @@ label chapter_4:
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
window hide
window auto
show dimmer_light:
alpha 0
linear 0.5 alpha 1.0
transform expand_vertical:
xcenter 0.5 ycenter 0.5 yzoom 0.0
ease_cubic 2 yzoom 2
show expression AlphaMask("vvurm_drama_poster", At("mask_thing", expand_vertical)) as mask2:
rotate 10
xalign 0.5 yalign 0.15
pause
transform rollup_vertical:
xcenter 0.5 ycenter 0.5 yzoom 2
ease_cubic 2 yzoom 0.0
show expression AlphaMask("vvurm_drama_poster", At("mask_thing", rollup_vertical)) as mask3:
rotate 10
xalign 0.5 yalign 0.15
hide mask2
pause 2
hide mask3
hide dimmer_light with Dissolve(.25)
# hide mask3
show fang surprised with Dissolve(.25)
pause .5