game/scripts/animations/ani_astoria.rpy

@@ -88,11 +88,11 @@ image ch_ast wand_imperio:
         random_blink("characters/astoria/chibis/wand_imperio/ag_head_02.webp", "characters/astoria/chibis/wand_imperio/ag_head_01.webp")
 
     contains:
-        Null()
+        "blank"
         pause.12
         "characters/astoria/chibis/wand_imperio/ag_head_03.webp"
         pause 1
-        Null()
+        "blank"
 
     contains:
         xpos 78
@@ -113,7 +113,7 @@ image ch_ast wand_imperio:
         alpha 1.0
         "characters/astoria/chibis/wand_imperio/smoke.webp"
         linear 1.0 xzoom 1.0 xpos -34 ypos 37
-        Null()
+        "blank"
 
     contains:
         xpos -34

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():