Compare commits

..

2 Commits

Author SHA1 Message Date
953d58dee3 Improve ATL syntax
use the dedicated xycenter property
avoid setting the previous end-interpolation values before starting the new one, to avoid a jump if the player advances too quickly (also shortens the code)
add subpixel True, even though it doesn't seem very effective
prepare improvement in next renpy version
2023-11-15 16:00:42 +01:00
4bec8dfb24 Simplify generic CG code 2023-11-15 15:59:06 +01:00
2 changed files with 18 additions and 36 deletions

View File

@ -1,4 +1,3 @@
init 5 python: init 5 python:
def her_cg_doll(st, at): def her_cg_doll(st, at):
return hermione.image, None return hermione.image, None
@ -25,35 +24,21 @@ image CG cho_doll = DynamicDisplayable(cho_cg_doll)
image CG ast_doll = DynamicDisplayable(ast_cg_doll) image CG ast_doll = DynamicDisplayable(ast_cg_doll)
image CG sus_doll = DynamicDisplayable(sus_cg_doll) image CG sus_doll = DynamicDisplayable(sus_cg_doll)
image CG luna = Fixed( transform CG_masker(child):
"images/CG/common/bg.webp", contains:
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG lun_doll", zoom=1.2)), "images/CG/common/mask.webp"), "images/CG/common/bg.webp"
contains:
AlphaMask(
Fixed(Transform(child, zoom=1.2, pos=(880, -180)), xfit=True, yfit=True),
"images/CG/common/mask.webp",
) )
image CG hermione = Fixed( image CG luna = At("CG lun_doll", CG_masker)
"images/CG/common/bg.webp", image CG hermione = At("CG her_doll", CG_masker)
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG her_doll", zoom=1.2)), "images/CG/common/mask.webp"), image CG tonks = At("CG ton_doll", CG_masker)
) image CG cho = At("CG cho_doll", CG_masker)
image CG astoria = At("CG ast_doll", CG_masker)
image CG tonks = Fixed( image CG susan = At("CG sus_doll", CG_masker)
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG ton_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
image CG cho = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG cho_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
image CG astoria = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG ast_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
image CG susan = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG sus_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
# Snape CG # Snape CG
screen snape_groping(): screen snape_groping():

View File

@ -71,24 +71,21 @@ label luna_intro_E1:
$ luna.set_face(mouth="soft", eyes="closed", eyebrows="low", pupils="mid") $ luna.set_face(mouth="soft", eyes="closed", eyebrows="low", pupils="mid")
show CG luna as cg zorder 17: show CG luna as cg zorder 17:
align (0.5, 0.5) xycenter (-520, -300)
pos (-520, -300)
with fade with fade
gen "Who is--" gen "Who is--"
show CG luna as cg zorder 17: show CG luna as cg zorder 17:
align (0.5, 0.5) subpixel True
pos (-520, -300)
easein_quad 5.0 pos (-520, 150) easein_quad 5.0 pos (-520, 150)
gen "... A girl?" gen "... A girl?"
lun "*Mmh*" lun "*Mmh*"
show CG luna as cg zorder 17: show CG luna as cg zorder 17:
subpixel True
zoom 1.0 zoom 1.0
align (0.5, 0.5) easein_quad 3.0 align (.0, .0) pos (0, 0) zoom 0.5 # pos (0, 0) not necessary in next renpy version
pos (-520, 150)
easein_quad 3.0 align (0.0, 0.0) pos (0, 0) zoom 0.5
gen "What are you doing in my office?" gen "What are you doing in my office?"
gen "Did Snape send you here? Surely--" gen "Did Snape send you here? Surely--"