From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 8 Jun 2021 12:02:19 +0000 (+0100)
Subject: mao: Introduce some_cards macro
X-Git-Tag: otter-0.7.0~24
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a2429c1e9b092685a84c4c8b60772e16ad92add8;p=otter.git

mao: Introduce some_cards macro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/specs/mao.game.toml b/specs/mao.game.toml
index 120972b1..dbba3434 100644
--- a/specs/mao.game.toml
+++ b/specs/mao.game.toml
@@ -27,19 +27,23 @@ shape.type = "Rect"
 shape.xy = [25,30]
 {% endmacro deck %}
 
-{% macro deck52() %}
-{% set suits = "c d h s" | split(pat=" ") %}
-{% for suffix in suits %}
+{% macro some_cards() %}
 [[pieces]]
 pos = [150, 84]
+posd = [0, 0]
 type = "LibList"
+{% endmacro some_cards %}
+
+{% macro deck52() %}
+{% set suits = "c d h s" | split(pat=" ") %}
+{% for suffix in suits %}
+{{ self::some_cards() }}
 lib = "cards-oxymoron"
 prefix = "card-oxymoron-"
 suffix = "-{{suffix}}"
 items = [
     "2","3","4","5","6","7","8","9","T","J","Q","K","A",
 ]
-posd = [0, 0]
 {% endfor %}
 {% endmacro suit %}
 
@@ -76,9 +80,7 @@ item = "card-plain-back-maroon"
 {{ m::deck52() }}
 {% endfor %}
 
-[[pieces]]
-pos = [150, 84]
-type = "LibList"
+{{ m::some_cards() }}
 lib = "wikimedia"
 prefix = "card-"
 items = [
@@ -86,4 +88,3 @@ items = [
  "bellot-joker-black", "rainbow", "bellot-joker-black",
  "bellot-joker-black", "rainbow", "bellot-joker-black",
 ]
-posd = [0, 0]