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
Simplify generic CG code
2023-11-15 16:00:42 +01:00 · 2023-11-15 15:59:06 +01:00 · 2023-11-15 04:45:31 +01:00 · 2023-11-15 04:45:11 +01:00 · 2023-11-15 04:15:02 +01:00 · 2023-11-15 03:40:21 +01:00
57 changed files with 545 additions and 598 deletions
--- a/game/characters/genie/outfits/robes_beard.webp
+++ b/game/characters/genie/outfits/robes_beard.webp
--- a/game/images/characters/genie/genie_bbase.webp
+++ b/game/images/characters/genie/genie_bbase.webp
--- a/game/images/characters/genie/genie_face_angry.webp
+++ b/game/images/characters/genie/genie_face_angry.webp
--- a/game/images/characters/genie/genie_face_grin.webp
+++ b/game/images/characters/genie/genie_face_grin.webp
--- a/game/images/characters/genie/genie_face_open.webp
+++ b/game/images/characters/genie/genie_face_open.webp
--- a/game/images/characters/genie/genie_face_smile.webp
+++ b/game/images/characters/genie/genie_face_smile.webp
--- a/game/images/characters/genie/genie_goatee.webp
+++ b/game/images/characters/genie/genie_goatee.webp
--- a/game/images/characters/genie/genie_outfit_nude.webp
+++ b/game/images/characters/genie/genie_outfit_nude.webp
--- a/game/images/characters/genie/genie_outfit_robes.webp
+++ b/game/images/characters/genie/genie_outfit_robes.webp
--- a/game/images/characters/genie/genie_outfit_santa.webp
+++ b/game/images/characters/genie/genie_outfit_santa.webp
--- a/game/images/characters/genie/genie_santa_beard_angry.webp
+++ b/game/images/characters/genie/genie_santa_beard_angry.webp
--- a/game/images/characters/genie/genie_santa_beard_base.webp
+++ b/game/images/characters/genie/genie_santa_beard_base.webp
--- a/game/images/characters/genie/genie_santa_beard_grin.webp
+++ b/game/images/characters/genie/genie_santa_beard_grin.webp
--- a/game/images/characters/genie/genie_santa_beard_open.webp
+++ b/game/images/characters/genie/genie_santa_beard_open.webp
--- a/game/images/characters/genie/genie_santa_beard_smile.webp
+++ b/game/images/characters/genie/genie_santa_beard_smile.webp
--- a/game/scripts/animations/generator.rpy
+++ b/game/scripts/animations/generator.rpy
@ -1,8 +1,6 @@
-image object:
-    Null()
-
 transform OBJbutterfly(hue=random.randint(0, 359)):
    zoom random.uniform(0.4, 0.85)
+    matrixcolor HueMatrix(hue)

    choice:
        pause random.randint(1, 7)
@ -22,13 +20,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
            ease_circ 1.0 rotate 15
            repeat
        parallel:
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/0.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/2.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
            repeat
    choice:
@ -49,13 +47,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
            ease_circ 1.0 rotate -15
            repeat
        parallel:
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/0.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/2.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
            repeat
    repeat
--- a/game/scripts/cg/common.rpy
+++ b/game/scripts/cg/common.rpy
@ -1,4 +1,3 @@
-
 init 5 python:
    def her_cg_doll(st, at):
        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 sus_doll = DynamicDisplayable(sus_cg_doll)

-image CG luna = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG lun_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
+transform CG_masker(child):
+    contains:
+        "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(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG her_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
-
-image CG tonks = Fixed(
-    "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"),
-    )
+image CG luna = At("CG lun_doll", CG_masker)
+image CG hermione = At("CG her_doll", CG_masker)
+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 susan = At("CG sus_doll", CG_masker)

 # Snape CG
 screen snape_groping():
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
--- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
@ -712,7 +712,7 @@ label hufflepuff_match:
    her "Higher up, Cho seems to have caught an eye on the snitch and is chasing after it, directly followed by Cedric who..." ("open", "slit", "low", "stare", flip=True)
    her "Hold on a minute... Is Cho wearing a skirt?" ("scream", "wide", "worried", "stare")

-    show image "CG quidditch cho_flashing" as cg zorder 17
+    show expression "CG quidditch cho_flashing" as cg zorder 17
    with fade

    play sound "sounds/crowd_gasp.ogg"
@ -735,7 +735,7 @@ label hufflepuff_match:
    call ctc

    # Pack to stands.
-    hide image cg
+    hide expression cg
    with fade
    pause .1

--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@ -1344,7 +1344,7 @@ label slytherin_match:
    call gen_chibi("stand_alt", 300, 365, flip=False)
    call sna_chibi("stand", 215, 360, flip=True)

-    call quidditch_stands(crowd=[], crowd_react=[None, None, None])
+    call quidditch_stands(crowd=(), crowd_react=(None, None, None))

    stop background fadeout 4
    stop music fadeout 2
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gouvernathor	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
Gouvernathor	4bec8dfb24	Simplify generic CG code	2023-11-15 15:59:06 +01:00
Gouvernathor	508a88b4b6	Better animation	2023-11-15 04:45:31 +01:00
Gouvernathor	d6ef320c5d	Simplify some code	2023-11-15 04:45:11 +01:00
Gouvernathor	0381093229	Reform genie layeredimage	2023-11-15 04:15:02 +01:00
Gouvernathor	1ee74a61ac	Repr instead of adding quotes	2023-11-15 03:40:21 +01:00
Gouvernathor	6ff3d39940	Simplify hide/show expression	2023-11-15 03:33:37 +01:00
Gouvernathor	f8130fdb4d	Fix test call it raised an exception in my case, and I'm fairly sure this is how it's supposed to work also adds a complimentary hidden reset at the end	2023-11-15 03:18:07 +01:00
Gouvernathor	9b96c5572c	Remove now-unused reset_variables relying on implem details It is used in a txt draft which I didn't change, it can be done if deemed necessary I think this function should be kept off, as it is both more dangerous and slower than the workarounds	2023-11-15 03:16:00 +01:00
Gouvernathor	757a39d782	Avoid using reset_variables	2023-11-15 03:13:55 +01:00
Gouvernathor	bde6a30acc	Avoid using lists	2023-11-15 03:12:24 +01:00
Gouvernathor	c24f2e25f0	Use childful transforms as displayable that's not explicitly documented, but it won't change any time soon also deletes a placeholder image	2023-11-15 02:23:15 +01:00
Gouvernathor	a13dac8f93	Upgrade other uses of image manipulators	2023-11-15 02:02:50 +01:00
Gouvernathor	0cc22f413c	Modernize use of matrixcolor	2023-11-15 02:00:18 +01:00
Gouvernathor	9a8fdf7450	Hasten ConditionSwitch-es	2023-11-15 01:17:07 +01:00
Gouvernathor	80b32a05fc	Use expression instead of image the only documented lingua this is AST-equivalent	2023-11-15 01:14:33 +01:00
Gouvernathor	c11891bf11	Factorize jumps in the elif	2023-11-15 01:07:16 +01:00
Gouvernathor	b2d1b66b05	Hasten elif chain avoid reevaluating the choice equality	2023-11-15 01:03:03 +01:00
Gouvernathor	65ae5ce797	Use renpy statement instead of python equivalent	2023-11-15 00:57:25 +01:00
Gouvernathor	a39641f5cb	Use dynamic variable and condense menu-label syntax The label is jumped to and not called, but the variable will still clean itself up eventually	2023-11-15 00:57:00 +01:00
Gouvernathor	f9cf059f16	Convert ball_hint to a screen variable no leak	2023-11-15 00:17:26 +01:00
Gouvernathor	39fc0c8a76	Use the call screen statement in this case this particular syntax is very precisely documented in the screens page	2023-11-14 23:53:14 +01:00
Gouvernathor	5925a9298c	Better None syntax	2023-11-14 23:52:38 +01:00
Gouvernathor	85bf97bdf9	Simpler inline conditional	2023-11-14 23:39:33 +01:00
Gouvernathor	95b3db770e	Avoid extraneous bool call	2023-11-14 23:35:10 +01:00
Gouvernathor	0d4a309898	Sort in-place to save time	2023-11-14 23:34:14 +01:00
Gouvernathor	9d61a4c583	Use python hide instead of a single-use function	2023-11-14 23:24:15 +01:00
Gouvernathor	5a2434df5e	Fix indent	2023-11-14 23:21:10 +01:00
Gouvernathor	06b4da76f6	Weird variable setting	2023-11-14 23:16:40 +01:00
Gouvernathor	a2665c15fe	Fix misuse of variable - don't use a reserved name (starting with an underscore) - use a file-local mangled name (starting with two underscores - use renpy.dynamx to cleanup the variable automatically	2023-11-14 23:16:26 +01:00
Gouvernathor	710400f2ce	Repr instead of adding simple quotes manually it's a tad slower but it's a better general practice and we're in an error handling branch anyway	2023-11-14 23:14:33 +01:00
Gouvernathor	a3ccbf60ce	Sirt in-place to save time not the first time, so that we can still pass it iterators	2023-11-14 22:55:53 +01:00
Gouvernathor	07d0c7b151	Simplify that call	2023-11-14 22:55:30 +01:00
Gouvernathor	49fe8f4902	skip unnecessary lambda	2023-11-14 22:54:02 +01:00