update graphics

scripts/extract_graphics.py

@@ -41,7 +41,7 @@ def export_objects(svg_file: str, object_ids: Iterable[str]) -> None:
             OUTPUT_DIR + "/" + obj[4:],
             svg_file,
         ]
-        print(f"exporting {obj[4:]}...", end="")
+        print(f"exporting {obj[4:]}...", end="", flush=True)
         res = subprocess.check_output(command)
         if res:
             print(f" An error might have occurred:\n{res}")

scripts/generate_layouts.py

@@ -63,17 +63,50 @@ ALT_BANNER_TEXT_X, ALT_BANNER_TEXT_Y = central_sym(BANNER_TEXT_X, BANNER_TEXT_Y)
 
 # Effects
 EFFECT_FRAME_WIDTH = SAFE_WIDTH - 2
-EFFECT_FRAME_HEIGHT = 6
+EFFECT_FRAME_HEIGHT = 7
 EFFECT_FRAME_RADIUS = 0.2
 EFFECT_FRAME_MARGIN_BOTTOM = 4.1
 EFFECT_FRAME_X = (TOTAL_WIDTH - EFFECT_FRAME_WIDTH) / 2.
 EFFECT_FRAME_Y = MAX_SAFE_Y - EFFECT_FRAME_MARGIN_BOTTOM - EFFECT_FRAME_HEIGHT
 
-EFFECT_TEXT_MARGIN = 1
-EFFECT_TEXT_X = EFFECT_FRAME_X + EFFECT_TEXT_MARGIN
-EFFECT_TEXT_Y = EFFECT_FRAME_Y + EFFECT_TEXT_MARGIN
-EFFECT_TEXT_WIDTH = EFFECT_FRAME_WIDTH - 2 * EFFECT_TEXT_MARGIN
-EFFECT_TEXT_HEIGHT = EFFECT_FRAME_HEIGHT - 2 * EFFECT_TEXT_MARGIN
+EFFECT_ICON_MARGIN = .5
+EFFECT_ICON_SIZE = 1.5
+EFFECT_ICON_X = EFFECT_FRAME_X + EFFECT_ICON_MARGIN + (EFFECT_ICON_SIZE / 2.)
+
+EFFECT_TEXT_MARGIN = .2
+
+EFFECT_SEPARATOR_HEIGHT = 1.
+EFFECT_SEPARATOR_MARGIN = .05
+TOTAL_SEPARATOR_HEIGHT = EFFECT_SEPARATOR_HEIGHT + (2 * EFFECT_SEPARATOR_MARGIN)
+
+EFFECT_SEPARATOR_X = EFFECT_FRAME_X + (EFFECT_FRAME_WIDTH / 2.)
+EFFECT_SEPARATOR_Y_2 = EFFECT_FRAME_Y + (EFFECT_FRAME_HEIGHT / 2.)
+EFFECT_SEPARATOR_Y_3_0 = EFFECT_FRAME_Y + EFFECT_TEXT_MARGIN + (EFFECT_FRAME_HEIGHT - (2 * EFFECT_TEXT_MARGIN)) / 3.
+EFFECT_SEPARATOR_Y_3_1 = EFFECT_FRAME_Y + EFFECT_TEXT_MARGIN + 2 * (EFFECT_FRAME_HEIGHT - (2 * EFFECT_TEXT_MARGIN)) / 3.
+
+EFFECT_TEXT_X = EFFECT_FRAME_X + EFFECT_ICON_MARGIN + EFFECT_ICON_SIZE + EFFECT_TEXT_MARGIN
+
+EFFECT_TEXT_HEIGHT_1 = EFFECT_FRAME_HEIGHT - 2 * EFFECT_TEXT_MARGIN
+EFFECT_TEXT_Y_1 = EFFECT_FRAME_Y + EFFECT_TEXT_MARGIN
+
+EFFECT_TEXT_HEIGHT_2 = (EFFECT_FRAME_HEIGHT - (2 * EFFECT_TEXT_MARGIN) - TOTAL_SEPARATOR_HEIGHT) / 2.
+EFFECT_TEXT_Y_2_0 = EFFECT_TEXT_Y_1
+EFFECT_TEXT_Y_2_1 = EFFECT_TEXT_Y_2_0 + EFFECT_TEXT_HEIGHT_2 + TOTAL_SEPARATOR_HEIGHT
+
+EFFECT_TEXT_HEIGHT_3 = (EFFECT_FRAME_HEIGHT - (2 * EFFECT_TEXT_MARGIN) - (2 * TOTAL_SEPARATOR_HEIGHT)) / 2.
+EFFECT_TEXT_Y_3_0 = EFFECT_TEXT_Y_1
+EFFECT_TEXT_Y_3_1 = EFFECT_TEXT_Y_3_0 + EFFECT_TEXT_HEIGHT_3 + TOTAL_SEPARATOR_HEIGHT
+EFFECT_TEXT_Y_3_2 = EFFECT_TEXT_Y_3_1 + EFFECT_TEXT_HEIGHT_3 + TOTAL_SEPARATOR_HEIGHT
+
+EFFECT_TEXT_WIDTH = EFFECT_FRAME_X + EFFECT_FRAME_WIDTH - EFFECT_TEXT_X - EFFECT_TEXT_MARGIN
+
+EFFECT_ICON_Y_1 = EFFECT_FRAME_Y + (EFFECT_FRAME_HEIGHT / 2.)
+EFFECT_ICON_Y_2_0 = EFFECT_TEXT_Y_2_0 + (EFFECT_TEXT_HEIGHT_2 / 2.)
+EFFECT_ICON_Y_2_1 = EFFECT_TEXT_Y_2_1 + (EFFECT_TEXT_HEIGHT_2 / 2.)
+EFFECT_ICON_Y_3_0 = EFFECT_TEXT_Y_3_0 + (EFFECT_TEXT_HEIGHT_2 / 2.)
+EFFECT_ICON_Y_3_1 = EFFECT_TEXT_Y_3_1 + (EFFECT_TEXT_HEIGHT_2 / 2.)
+EFFECT_ICON_Y_3_2 = EFFECT_TEXT_Y_3_2 + (EFFECT_TEXT_HEIGHT_2 / 2.)
+
 
 POKER_LAYOUT: str = f"""
 background:
@@ -165,15 +198,91 @@ effect_frame:
   radius: {EFFECT_FRAME_RADIUS}c
   stroke_width: 0.3mm
 
+effect_icon:
+  x: {EFFECT_ICON_X}c
+  width: {EFFECT_ICON_SIZE}c
+  height: {EFFECT_ICON_SIZE}c
+  anchor: :center
+
+effect_icon_1_0:
+  extends: effect_icon
+  y: {EFFECT_ICON_Y_1}c
+
+effect_icon_2_0:
+  extends: effect_icon
+  y: {EFFECT_ICON_Y_2_0}c
+
+effect_icon_2_1:
+  extends: effect_icon
+  y: {EFFECT_ICON_Y_2_1}c
+
+effect_icon_3_0:
+  extends: effect_icon
+  y: {EFFECT_ICON_Y_3_0}c
+
+effect_icon_3_1:
+  extends: effect_icon
+  y: {EFFECT_ICON_Y_3_1}c
+
+effect_icon_3_2:
+  extends: effect_icon
+  y: {EFFECT_ICON_Y_3_2}c
+
+effect_separator:
+  x: {EFFECT_SEPARATOR_X}c
+  anchor: :center
+  height: {EFFECT_SEPARATOR_HEIGHT}c
+  width: :scale
+
+effect_separator_2_0:
+  extends: effect_separator
+  y: {EFFECT_SEPARATOR_Y_2}c
+
+effect_separator_3_0:
+  extends: effect_separator
+  y: {EFFECT_SEPARATOR_Y_3_0}c
+
+effect_separator_3_1:
+  extends: effect_separator
+  y: {EFFECT_SEPARATOR_Y_3_1}c
+
 effect_text:
   x: {EFFECT_TEXT_X}c
-  y: {EFFECT_TEXT_Y}c
   width: {EFFECT_TEXT_WIDTH}c
-  height: {EFFECT_TEXT_HEIGHT}c
   align: center
   valign: middle
   markup: true
 
+effect_text_1_0:
+  extends: effect_text
+  y: {EFFECT_TEXT_Y_1}c
+  height: {EFFECT_TEXT_HEIGHT_1}c
+
+effect_text_2_0:
+  extends: effect_text
+  y: {EFFECT_TEXT_Y_2_0}c
+  height: {EFFECT_TEXT_HEIGHT_2}c
+
+effect_text_2_1:
+  extends: effect_text
+  y: {EFFECT_TEXT_Y_2_1}c
+  height: {EFFECT_TEXT_HEIGHT_2}c
+
+effect_text_3_0:
+  extends: effect_text
+  y: {EFFECT_TEXT_Y_3_0}c
+  height: {EFFECT_TEXT_HEIGHT_3}c
+
+effect_text_3_1:
+  extends: effect_text
+  y: {EFFECT_TEXT_Y_3_1}c
+  height: {EFFECT_TEXT_HEIGHT_3}c
+
+effect_text_3_2:
+  extends: effect_text
+  y: {EFFECT_TEXT_Y_3_2}c
+  height: {EFFECT_TEXT_HEIGHT_3}c
+
 paparazzo:
   x: {PAPARAZZO_X}c
   y: {PAPARAZZO_Y}c