From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 8 Jun 2021 11:33:49 +0000 (+0100)
Subject: mao: Use macros for deck
X-Git-Tag: otter-0.7.0~30
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=80be9972b358f987eb4656184a0d481a57332083;p=otter.git

mao: Use macros for deck

No functional change, verified with

  target/debug/otter -vv --account server: --config tmp/at-otter/server-config.toml -g server::dummy reset ~ian/Rustup/Game/server/specs/mao.game.toml | sed -n 's/^spec out [0-9][0-9]* //p' >t

and same for u with modified mao.game.toml and then

  diff -Bu [tu] |less

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

diff --git a/specs/mao.game.toml b/specs/mao.game.toml
index e72845e8..40ff55b0 100644
--- a/specs/mao.game.toml
+++ b/specs/mao.game.toml
@@ -15,6 +15,18 @@ shape.type = "Rect"
 shape.xy = [93,25]
 {% endmacro hand %}
 
+{% macro deck(pos, lplace) %}
+[[pieces]]
+pos = {{pos}}
+type = "PickupDeck"
+faces = ["lightblue", "grey"]
+edges = ["black", "white"]
+label.colour = "black"
+label.place = "{{lplace}}"
+shape.type = "Rect"
+shape.xy = [25,30]
+{% endmacro deck %}
+
 
 table_size = [300, 200]
 table_colour = "#bbd"
@@ -24,35 +36,10 @@ type = "Lib"
 lib = "wikimedia"
 item = "card-plain-back-maroon"
 
-[[pieces]]
-pos = [136,115]
-type = "PickupDeck"
-faces = ["lightblue", "grey"]
-edges = ["black", "white"]
-label.colour = "black"
-label.place = "BottomLeftOutside"
-shape.type = "Rect"
-shape.xy = [25,30]
-
-[[pieces]]
-pos = [162,115]
-type = "PickupDeck"
-faces = ["lightblue", "grey"]
-edges = ["black", "white"]
-label.colour = "black"
-label.place = "BottomLeftOutside"
-shape.type = "Rect"
-shape.xy = [25,30]
 
-[[pieces]]
-pos = [150,84]
-type = "PickupDeck"
-faces = ["lightblue", "grey"]
-edges = ["black", "white"]
-label.place = "TopLeftOutside"
-label.colour = "black"
-shape.type = "Rect"
-shape.xy = [25,30]
+{{ m::deck(pos=[136,115], lplace="BottomLeftOutside" )}}
+{{ m::deck(pos=[162,115], lplace="BottomLeftOutside" )}}
+{{ m::deck(pos=[150, 84], lplace="TopLeftOutside"    )}}
 
 {{ m::hand(pos="[ 53,  25]", colour="brown" , lplace="BottomLeftOutside" )}}
 {{ m::hand(pos="[150,  23]", colour="red"   , lplace="BottomLeftOutside" )}}