(generic) grf-py-0.3.0 support

ahyangyi · Jan 1, 2024 · 61b94d1 · 61b94d1
1 parent 179f740
commit 61b94d1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/agrf/actions.py b/agrf/actions.py
@@ -2,7 +2,7 @@
 from copy import deepcopy
 
 
-class FakeReferencedAction(grf.LazyAction, grf.ReferenceableAction):
+class FakeReferencedAction(grf.FakeAction, grf.ReferenceableAction):
     def __init__(self, action, feature, ref_id=None):
         super().__init__()
         self.action = action

diff --git a/agrf/graphics/spritesheet.py b/agrf/graphics/spritesheet.py
@@ -73,20 +73,27 @@ def get_rels(direction, diff, scale):
 
         return int(xrel + 0.5), int(yrel + 0.5)
 
+    def with_optional_mask(sprite, mask):
+        if mask is None:
+            return sprite
+        return grf.WithMask(sprite, mask)
+
     return [
         grf.AlternativeSprites(
             *(
-                grf.FileSprite(
-                    grf.ImageFile(f"{path}_{scale}x_{bpp}bpp.png"),
-                    (sum(guessed_dimens[j][0] for j in range(i)) + i * 8) * scale,
-                    0,
-                    guessed_dimens[i][0] * scale,
-                    guessed_dimens[i][1] * scale,
-                    xofs=get_rels(i, diff, scale)[0],
-                    yofs=get_rels(i, diff, scale)[1],
-                    bpp=bpp,
-                    zoom=scale_to_zoom[scale],
-                    mask=grf.FileMask(
+                with_optional_mask(
+                    grf.FileSprite(
+                        grf.ImageFile(f"{path}_{scale}x_{bpp}bpp.png"),
+                        (sum(guessed_dimens[j][0] for j in range(i)) + i * 8) * scale,
+                        0,
+                        guessed_dimens[i][0] * scale,
+                        guessed_dimens[i][1] * scale,
+                        xofs=get_rels(i, diff, scale)[0],
+                        yofs=get_rels(i, diff, scale)[1],
+                        bpp=bpp,
+                        zoom=scale_to_zoom[scale],
+                    ),
+                    grf.FileSprite(
                         grf.ImageFile(f"{path}_{scale}x_mask.png"),
                         (sum(guessed_dimens[j][0] for j in range(i)) + i * 8) * scale,
                         0,