From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Jun 2021 23:26:53 +0000 (+0100)
Subject: mao: Convert hands to use a macro
X-Git-Tag: otter-0.7.0~35
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4b2cbabcc6d3668b18a283990fb5db093e2b0eb1;p=otter.git

mao: Convert hands to use a macro

I have verified by messing about with otter -vv and diff that this
does not change the meaning.

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

diff --git a/specs/mao.game.toml b/specs/mao.game.toml
index ee3b57dc..ee4f6f9a 100644
--- a/specs/mao.game.toml
+++ b/specs/mao.game.toml
@@ -1,6 +1,23 @@
-# Copyright 2020-2021 Ian Jackson and contributors to Otter
-# SPDX-License-Identifier: AGPL-3.0-or-later
-# There is NO WARRANTY.
+{# Copyright 2020-2021 Ian Jackson and contributors to Otter
+   SPDX-License-Identifier: AGPL-3.0-or-later
+   There is NO WARRANTY. #}
+
+{% macro hand(pos, colour, lplace, edge="white", edge_width="0.75") %}
+
+[[pieces]]
+pos = {{pos}}
+colour = "{{colour}}"
+label.place = "{{lplace}}"
+label.colour = "black"
+
+type = "Hand"
+edge = "{{edge}}"
+edge_width = {{edge_width}}
+shape.type = "Rect"
+shape.xy = [93,25]
+
+{% endmacro hand %}
+
 
 table_size = [300, 200]
 table_colour = "#bbd"
@@ -10,7 +27,6 @@ type = "Lib"
 lib = "wikimedia"
 item = "card-plain-back-maroon"
 
-
 [[pieces]]
 pos = [136,115]
 type = "PickupDeck"
@@ -41,128 +57,18 @@ label.colour = "black"
 shape.type = "Rect"
 shape.xy = [25,30]
 
-
-[[pieces]]
-pos = [53, 25]
-colour = "brown"
-label.place = "BottomLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [150, 23]
-colour = "red"
-label.place = "BottomLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [247, 25]
-colour = "orange"
-label.place = "BottomLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [247, 70]
-colour = "yellow"
-label.place = "BottomLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "darkgrey"
-edge_width = 1.0
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [247, 130]
-colour = "green"
-label.place = "TopLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [247, 175]
-colour = "blue"
-label.place = "TopLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [150, 177]
-colour = "purple"
-label.place = "TopLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [53, 175]
-colour = "grey"
-label.place = "TopLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [53, 70]
-colour = "black"
-label.place = "BottomLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "white"
-edge_width = 0.75
-shape.type = "Rect"
-shape.xy = [93,25]
-
-[[pieces]]
-pos = [53, 130]
-colour = "white"
-label.place = "TopLeftOutside"
-label.colour = "black"
-
-type = "Hand"
-edge = "darkgrey"
-edge_width = 1.0
-shape.type = "Rect"
-shape.xy = [93,25]
-
-
+{{ m::hand(pos="[ 53,  25]", colour="brown" , lplace="BottomLeftOutside" )}}
+{{ m::hand(pos="[150,  23]", colour="red"   , lplace="BottomLeftOutside" )}}
+{{ m::hand(pos="[247,  25]", colour="orange", lplace="BottomLeftOutside" )}}
+{{ m::hand(pos="[247,  70]", colour="yellow", lplace="BottomLeftOutside",
+   edge="darkgrey", edge_width="1.0" )}}
+{{ m::hand(pos="[247, 130]", colour="green" , lplace="TopLeftOutside"    )}}
+{{ m::hand(pos="[247, 175]", colour="blue"  , lplace="TopLeftOutside"    )}}
+{{ m::hand(pos="[150, 177]", colour="purple", lplace="TopLeftOutside"    )}}
+{{ m::hand(pos="[ 53, 175]", colour="grey"  , lplace="TopLeftOutside"    )}}
+{{ m::hand(pos="[ 53,  70]", colour="black" , lplace="BottomLeftOutside" )}}
+{{ m::hand(pos="[ 53, 130]", colour="white" , lplace="TopLeftOutside"    ,
+   edge="darkgrey", edge_width="1.0" )}}
 
 [[pieces]]
 pos = [150, 84]