From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 25 Mar 2021 19:23:55 +0000 (+0000)
Subject: piece aliases: Use new alias machiner
X-Git-Tag: otter-0.5.0~400
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ca7cbecf6061c80eac9f495c604d95f9118247dc;p=otter.git

piece aliases: Use new alias machiner

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

diff --git a/library/cards-oxymoron.toml b/library/cards-oxymoron.toml
index 9b3b46b1..df5b4db7 100644
--- a/library/cards-oxymoron.toml
+++ b/library/cards-oxymoron.toml
@@ -38,9 +38,8 @@ A	-	ace
 """
 
 [group.clubs.back]
-type = "Lib"
-lib = "wikimedia"
-item = "card-chequeredge-back"
+type = "Alias"
+target = "card-back"
 
 [group.diamonds]
 inherit = "clubs"
diff --git a/library/wikimedia.toml b/library/wikimedia.toml
index b938d61c..d6034ec2 100644
--- a/library/wikimedia.toml
+++ b/library/wikimedia.toml
@@ -122,27 +122,33 @@ mgmt-library-load-marker   Box_with_polygons	a library load area marker
 
 [group.card-backs]
 outline = "Rect"
-size = [73, 97]
-
-# sizes to match cards-oxymoron:
-orig_size = [208, 303]
+size = [73, 97] # size to match cards-oxymoron:
 scale = 0.25
+orig_size = [208, 303]
 
 files = """
 card-stripe-back-red	Card_back_03a	a card with a red-striped back
 card-stripe-back-blue	Card_back_03b	a card with a blue-striped back
 card-plain-back-maroon	Card_back_15	a card with a maroon back
 card-chequeredge-back	Card_back_04	a card (with a chequered edged back)
+"""
+
+[group.cards-misc]
+inherit = "card-backs"
+back.type = "Alias"
+back.target = "card-back"
+
+files = """
 card-rainbow		Card_back_13	a rainbow card
 """
 
 [group.cards-bellot]
 outline = "Rect"
-size = [73, 97]
-
-# sizes to match cards-oxymoron:
-orig_size = [167, 243]
+size = [73, 97] # size to match cards-oxymoron:
 scale = 0.25
+orig_size = [167, 243]
+back.type = "Alias"
+back.target = "card-back"
 
 files = """
 card-bellot-joker-black		Joker_black_02	a joker
diff --git a/specs/mao.game.toml b/specs/mao.game.toml
index cad206c2..2346340c 100644
--- a/specs/mao.game.toml
+++ b/specs/mao.game.toml
@@ -5,6 +5,12 @@
 table_size = [300, 200]
 table_colour = "#bbd"
 
+[pcaliases.card-back]
+type = "Lib"
+lib = "wikimedia"
+item = "card-plain-back-maroon"
+
+
 [[pieces]]
 pos = [136,115]
 type = "PickupDeck"