[WIP] add crazyhouse pocket gif in sprites

may fix lichess-org#13
ryg-git · Feb 14, 2024 · 3dd8dde · 3dd8dde
1 parent 08c9c96
commit 3dd8dde
Show file tree

Hide file tree

Showing 47 changed files with 56 additions and 66 deletions.
diff --git a/theme/ch.py b/theme/ch.py
@@ -18,7 +18,7 @@ def make_ch_sprite(piece_set_name: str):
             "xmlns": "http://www.w3.org/2000/svg",
             "version": "1.1",
             "xmlns:xlink": "http://www.w3.org/1999/xlink",
-            "viewBox": f"0 0 {SQUARE_SIZE * 8} {SQUARE_SIZE * 9}",
+            "viewBox": f"0 0 {SQUARE_SIZE * 8} {SQUARE_SIZE * 8}",
         },
     )
 
@@ -76,7 +76,33 @@ def make_ch_sprite(piece_set_name: str):
                     },
                 )
 
-    for y in range(5, 9):
+    for x in range(8):
+        ET.SubElement(
+            svg,
+            "rect",
+            {
+                "x": str(SQUARE_SIZE * x),
+                "y": str(SQUARE_SIZE * 5),
+                "width": str(SQUARE_SIZE),
+                "height": str(SQUARE_SIZE),
+                "stroke": "none",
+                "fill": "#888888",
+            },
+        )
+
+        color = "w" if x >= 4 else "b"
+
+        ET.SubElement(
+            svg,
+            "use",
+            {
+                "xlink:href": f"#{color}{ms.PIECE_TYPES[0]}",
+                "transform": f"translate({SQUARE_SIZE * x}, {SQUARE_SIZE * 5})",
+                "opacity": "0.1",
+            },
+        )
+
+    for y in range(6, 8):
         for x in range(8):
             ET.SubElement(
                 svg,
@@ -91,40 +117,27 @@ def make_ch_sprite(piece_set_name: str):
                 },
             )
 
-            color = "w" if y % 2 == 0 else "b"
+            color = "w" if y == 7 else "b"
 
-            if y < 7:
-                ET.SubElement(
-                    svg,
-                    "use",
-                    {
-                        "xlink:href": f"#{color}{ms.PIECE_TYPES[0]}",
-                        "transform": f"translate({SQUARE_SIZE * x}, {SQUARE_SIZE * y})",
-                        "opacity": "0.1",
-                    },
-                )
-
-            else:
-                ET.SubElement(
-                    svg,
-                    "use",
-                    {
-                        "xlink:href": f"#{color}{ms.PIECE_TYPES[0]}",
-                        "transform": f"translate({SQUARE_SIZE * x}, {SQUARE_SIZE * y})",
-                    },
-                )
-
-                ET.SubElement(
-                    svg,
-                    "image",
-                    {
-                        "xlink:href": f"ch-numbers/ch{x + 1}.png",
-                        "transform": f"translate({SQUARE_SIZE * (x + 0.60)}, {SQUARE_SIZE * (y + 0.60)})",
-                        "width": "15",
-                        "height": "15"
-                    },
-                )
+            ET.SubElement(
+                svg,
+                "use",
+                {
+                    "xlink:href": f"#{color}{ms.PIECE_TYPES[0]}",
+                    "transform": f"translate({SQUARE_SIZE * x}, {SQUARE_SIZE * y})",
+                },
+            )
 
+            ET.SubElement(
+                svg,
+                "image",
+                {
+                    "xlink:href": f"ch-numbers/ch{x + 1}.png",
+                    "transform": f"translate({SQUARE_SIZE * (x + 0.60)}, {SQUARE_SIZE * (y + 0.60)})",
+                    "width": "15",
+                    "height": "15"
+                },
+            )
 
     resvg = subprocess.run(
         "resvg --resources-dir . --zoom 2 - -c",
@@ -136,8 +149,8 @@ def make_ch_sprite(piece_set_name: str):
     image = Image.open(io.BytesIO(resvg.stdout), formats=[
                        "PNG"]).quantize(64, dither=0)
 
-    print(f"sprites-ch/{piece_set_name}-ch.gif")
+    print(f"sprites/crazyhouse-{piece_set_name}.gif")
 
     image.save(
-        f"sprites-ch/{piece_set_name}-ch.gif", optimize=True, interlace=False
+        f"sprites/crazyhouse-{piece_set_name}.gif", optimize=True, interlace=False
     )
diff --git a/theme/make-sprites.py b/theme/make-sprites.py
@@ -43,6 +43,7 @@ def include_highlight_colors(theme: dict):
     "ic": include_highlight_colors({"light": "#ececec", "dark": "#c1c18e"}),
     "pink": include_highlight_colors({"light": "#f1f1c9", "dark": "#f07272"}),
     "purple": include_highlight_colors({"light": "#9f90b0", "dark": "#7d4a8d"}),
+    "crazyhouse": include_highlight_colors({"light": "#888888", "dark": "#888888"}),
 }
 
 
@@ -210,32 +211,6 @@ def make_sprite(theme_name: str, piece_set_name: str):
                 },
             )
 
-    for x in range(8):
-        ET.SubElement(
-            svg,
-            "rect",
-            {
-                "x": str(SQUARE_SIZE * x),
-                "y": str(SQUARE_SIZE * 8),
-                "width": str(SQUARE_SIZE),
-                "height": str(SQUARE_SIZE),
-                "stroke": "none",
-                "fill": "#888888",
-            },
-        )
-
-        color = "w" if x >= 4 else "b"
-
-        ET.SubElement(
-            svg,
-            "use",
-            {
-                "xlink:href": f"#{color}{PIECE_TYPES[min(x, 6) - 1]}",
-                "transform": f"translate({SQUARE_SIZE * x}, {SQUARE_SIZE * 8})",
-                "opacity": "0.3",
-            },
-        )
-
     resvg = subprocess.run(
         "resvg --resources-dir . --zoom 2 - -c",
         shell=True,
@@ -255,11 +230,13 @@ def make_crazyhouse_sprite(piece_set_name):
     make_ch_sprite(piece_set_name)
 
 def make_all_sprites():
-    for piece_set_name in get_piece_set_names():
-        for theme_name in THEMES.keys():
-            make_sprite(theme_name, piece_set_name)
+    for theme_name in THEMES.keys():
+        for piece_set_name in get_piece_set_names():
+            if theme_name == "crazyhouse":
+                make_crazyhouse_sprite(piece_set_name)
+            else:
+                make_sprite(theme_name, piece_set_name)
 
-        make_crazyhouse_sprite(piece_set_name)
 
 
 if __name__ == "__main__":

diff --git a/theme/sprites-ch/dubrovny-ch.gif b/theme/sprites-ch/dubrovny-ch.gif
diff --git a/theme/sprites-ch/fresca-ch.gif b/theme/sprites-ch/fresca-ch.gif
diff --git a/theme/sprites-ch/gioco-ch.gif b/theme/sprites-ch/gioco-ch.gif
diff --git a/theme/sprites-ch/governor-ch.gif b/theme/sprites-ch/governor-ch.gif
diff --git a/theme/sprites-ch/kosal-ch.gif b/theme/sprites-ch/kosal-ch.gif
diff --git a/theme/sprites-ch/maestro-ch.gif b/theme/sprites-ch/maestro-ch.gif
diff --git a/theme/sprites-ch/merida-ch.gif b/theme/sprites-ch/merida-ch.gif
diff --git a/theme/sprites-ch/reillycraig-ch.gif b/theme/sprites-ch/reillycraig-ch.gif
diff --git a/theme/sprites-ch/riohacha-ch.gif b/theme/sprites-ch/riohacha-ch.gif
diff --git a/theme/sprites-ch/spatial-ch.gif b/theme/sprites-ch/spatial-ch.gif
diff --git a/theme/sprites-ch/tatiana-ch.gif b/theme/sprites-ch/tatiana-ch.gif
diff --git a/theme/sprites-ch/alpha-ch.gif → theme/sprites/crazyhouse-alpha.gif b/theme/sprites-ch/alpha-ch.gif → theme/sprites/crazyhouse-alpha.gif
diff --git a/theme/sprites-ch/anarcandy-ch.gif → theme/sprites/crazyhouse-anarcandy.gif b/theme/sprites-ch/anarcandy-ch.gif → theme/sprites/crazyhouse-anarcandy.gif
diff --git a/theme/sprites-ch/caliente-ch.gif → theme/sprites/crazyhouse-caliente.gif b/theme/sprites-ch/caliente-ch.gif → theme/sprites/crazyhouse-caliente.gif
diff --git a/theme/sprites-ch/california-ch.gif → theme/sprites/crazyhouse-california.gif b/theme/sprites-ch/california-ch.gif → theme/sprites/crazyhouse-california.gif
diff --git a/theme/sprites-ch/cardinal-ch.gif → theme/sprites/crazyhouse-cardinal.gif b/theme/sprites-ch/cardinal-ch.gif → theme/sprites/crazyhouse-cardinal.gif
diff --git a/theme/sprites-ch/cburnett-ch.gif → theme/sprites/crazyhouse-cburnett.gif b/theme/sprites-ch/cburnett-ch.gif → theme/sprites/crazyhouse-cburnett.gif
diff --git a/theme/sprites-ch/celtic-ch.gif → theme/sprites/crazyhouse-celtic.gif b/theme/sprites-ch/celtic-ch.gif → theme/sprites/crazyhouse-celtic.gif
diff --git a/theme/sprites-ch/chess7-ch.gif → theme/sprites/crazyhouse-chess7.gif b/theme/sprites-ch/chess7-ch.gif → theme/sprites/crazyhouse-chess7.gif
diff --git a/theme/sprites-ch/chessnut-ch.gif → theme/sprites/crazyhouse-chessnut.gif b/theme/sprites-ch/chessnut-ch.gif → theme/sprites/crazyhouse-chessnut.gif
diff --git a/theme/sprites-ch/companion-ch.gif → theme/sprites/crazyhouse-companion.gif b/theme/sprites-ch/companion-ch.gif → theme/sprites/crazyhouse-companion.gif
diff --git a/theme/sprites-ch/disguised-ch.gif → theme/sprites/crazyhouse-disguised.gif b/theme/sprites-ch/disguised-ch.gif → theme/sprites/crazyhouse-disguised.gif
diff --git a/theme/sprites/crazyhouse-dubrovny.gif b/theme/sprites/crazyhouse-dubrovny.gif
diff --git a/theme/sprites-ch/fantasy-ch.gif → theme/sprites/crazyhouse-fantasy.gif b/theme/sprites-ch/fantasy-ch.gif → theme/sprites/crazyhouse-fantasy.gif
diff --git a/theme/sprites/crazyhouse-fresca.gif b/theme/sprites/crazyhouse-fresca.gif
diff --git a/theme/sprites/crazyhouse-gioco.gif b/theme/sprites/crazyhouse-gioco.gif
diff --git a/theme/sprites/crazyhouse-governor.gif b/theme/sprites/crazyhouse-governor.gif
diff --git a/theme/sprites-ch/horsey-ch.gif → theme/sprites/crazyhouse-horsey.gif b/theme/sprites-ch/horsey-ch.gif → theme/sprites/crazyhouse-horsey.gif
diff --git a/theme/sprites-ch/icpieces-ch.gif → theme/sprites/crazyhouse-icpieces.gif b/theme/sprites-ch/icpieces-ch.gif → theme/sprites/crazyhouse-icpieces.gif
diff --git a/theme/sprites-ch/kiwen-suwi-ch.gif → theme/sprites/crazyhouse-kiwen-suwi.gif b/theme/sprites-ch/kiwen-suwi-ch.gif → theme/sprites/crazyhouse-kiwen-suwi.gif
diff --git a/theme/sprites/crazyhouse-kosal.gif b/theme/sprites/crazyhouse-kosal.gif
diff --git a/theme/sprites-ch/leipzig-ch.gif → theme/sprites/crazyhouse-leipzig.gif b/theme/sprites-ch/leipzig-ch.gif → theme/sprites/crazyhouse-leipzig.gif
diff --git a/theme/sprites-ch/letter-ch.gif → theme/sprites/crazyhouse-letter.gif b/theme/sprites-ch/letter-ch.gif → theme/sprites/crazyhouse-letter.gif
diff --git a/theme/sprites-ch/libra-ch.gif → theme/sprites/crazyhouse-libra.gif b/theme/sprites-ch/libra-ch.gif → theme/sprites/crazyhouse-libra.gif
diff --git a/theme/sprites/crazyhouse-maestro.gif b/theme/sprites/crazyhouse-maestro.gif
diff --git a/theme/sprites/crazyhouse-merida.gif b/theme/sprites/crazyhouse-merida.gif
diff --git a/theme/sprites-ch/mpchess-ch.gif → theme/sprites/crazyhouse-mpchess.gif b/theme/sprites-ch/mpchess-ch.gif → theme/sprites/crazyhouse-mpchess.gif
diff --git a/theme/sprites-ch/pirouetti-ch.gif → theme/sprites/crazyhouse-pirouetti.gif b/theme/sprites-ch/pirouetti-ch.gif → theme/sprites/crazyhouse-pirouetti.gif
diff --git a/theme/sprites-ch/pixel-ch.gif → theme/sprites/crazyhouse-pixel.gif b/theme/sprites-ch/pixel-ch.gif → theme/sprites/crazyhouse-pixel.gif
diff --git a/theme/sprites/crazyhouse-reillycraig.gif b/theme/sprites/crazyhouse-reillycraig.gif
diff --git a/theme/sprites/crazyhouse-riohacha.gif b/theme/sprites/crazyhouse-riohacha.gif
diff --git a/theme/sprites-ch/shapes-ch.gif → theme/sprites/crazyhouse-shapes.gif b/theme/sprites-ch/shapes-ch.gif → theme/sprites/crazyhouse-shapes.gif
diff --git a/theme/sprites/crazyhouse-spatial.gif b/theme/sprites/crazyhouse-spatial.gif
diff --git a/theme/sprites-ch/staunty-ch.gif → theme/sprites/crazyhouse-staunty.gif b/theme/sprites-ch/staunty-ch.gif → theme/sprites/crazyhouse-staunty.gif
diff --git a/theme/sprites/crazyhouse-tatiana.gif b/theme/sprites/crazyhouse-tatiana.gif