From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 8 Jun 2021 11:51:48 +0000 (+0100)
Subject: mao: Use macro for main decks of 52
X-Git-Tag: otter-0.7.0~27
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3dabb0e2f0229d849eea7c2f7f26242ed33b539a;p=otter.git

mao: Use macro for main decks of 52

This changes the order: now it's CDHS CDHS CDHS J9 rather than
CCC DDD HHH SSS J9 (bottom to top)

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

diff --git a/specs/mao.game.toml b/specs/mao.game.toml
index 526029a0..e4b5969e 100644
--- a/specs/mao.game.toml
+++ b/specs/mao.game.toml
@@ -27,6 +27,21 @@ shape.type = "Rect"
 shape.xy = [25,30]
 {% endmacro deck %}
 
+{% macro deck52() %}
+{% for suffix in ["c","d","h","s"] %}
+[[pieces]]
+pos = [150, 84]
+type = "LibList"
+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 %}
+
 
 table_size = [300, 200]
 table_colour = "#bbd"
@@ -54,57 +69,11 @@ item = "card-plain-back-maroon"
 {{ m::hand(pos="[ 53, 130]", colour="white" , lplace="TopLeftOutside"    ,
    edge="darkgrey", edge_width="1.0" )}}
 
-[[pieces]]
-pos = [150, 84]
-type = "LibList"
-lib = "cards-oxymoron"
-prefix = "card-oxymoron-"
-suffix = "-c"
-items = [
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-]
-posd = [0, 0]
 
-[[pieces]]
-pos = [150, 84]
-type = "LibList"
-lib = "cards-oxymoron"
-prefix = "card-oxymoron-"
-suffix = "-d"
-items = [
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-]
-posd = [0, 0]
+{{ m::deck52() }}
+{{ m::deck52() }}
+{{ m::deck52() }}
 
-[[pieces]]
-pos = [150, 84]
-type = "LibList"
-lib = "cards-oxymoron"
-prefix = "card-oxymoron-"
-suffix = "-h"
-items = [
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-]
-posd = [0, 0]
-
-[[pieces]]
-pos = [150, 84]
-type = "LibList"
-lib = "cards-oxymoron"
-prefix = "card-oxymoron-"
-suffix = "-s"
-items = [
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-    "2","3","4","5","6","7","8","9","T","J","Q","K","A",
-]
-posd = [0, 0]
 
 [[pieces]]
 pos = [150, 84]