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 9b3b46b1b3b4d9972c75b6c47ffe9bc73b6a15de..df5b4db72b0792b911bffa88160cb0b0ee1d7472 100644 (file)
--- 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 b938d61cba9838e82130a92b726d5c88a0db0bbe..d6034ec28da9c11b94c9a191433f2b799e8d8bbe 100644 (file)
--- 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 cad206c28c1ab6bd4b15bfaa733579e18938529d..2346340c3bd020ac866aabbf562e924b79fef698 100644 (file)
--- 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"