game/scripts/animations/generator.rpy

@@ -1,6 +1,8 @@
+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)
@@ -20,13 +22,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
             ease_circ 1.0 rotate 15
             repeat
         parallel:
-            "images/rooms/quidditch_pitch/butterfly/0.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
             pause .3
-            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
             pause .3
-            "images/rooms/quidditch_pitch/butterfly/2.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
             pause .3
-            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
             pause .3
             repeat
     choice:
@@ -47,13 +49,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
             ease_circ 1.0 rotate -15
             repeat
         parallel:
-            "images/rooms/quidditch_pitch/butterfly/0.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
             pause .3
-            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
             pause .3
-            "images/rooms/quidditch_pitch/butterfly/2.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
             pause .3
-            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
+            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
             pause .3
             repeat
     repeat

game/scripts/cg/common.rpy

@@ -1,3 +1,4 @@
+
 init 5 python:
     def her_cg_doll(st, at):
         return hermione.image, None
@@ -24,21 +25,35 @@ image CG cho_doll = DynamicDisplayable(cho_cg_doll)
 image CG ast_doll = DynamicDisplayable(ast_cg_doll)
 image CG sus_doll = DynamicDisplayable(sus_cg_doll)
 
-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 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"),
     )
 
-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)
+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"),
+    )
 
 # Snape CG
 screen snape_groping():

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 expression "CG quidditch cho_flashing" as cg zorder 17
+    show image "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 expression cg
+    hide image cg
     with fade
     pause .1
 

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