piece aliases: Define the new aliases, according to the game spec

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 0d36043cbac99c2bfc91b3579512cfb9b841d630..304456d44af4ae9ee5caee1e0eed09057a938e4a 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -667,6 +667,7 @@ mod reset_game {
       table_size,
       pieces,
       table_colour,
+      pcaliases,
     } = read_spec(&ma, &args.game_file)?;
 
     let mut insns = vec![];
@@ -695,6 +696,10 @@ mod reset_game {
       insns.push(MgmtGameInstruction::DeletePieceAlias(p));
     }
 
+    for (alias, target) in pcaliases.into_iter() {
+      insns.push(MGI::DefinePieceAlias{ alias, target });
+    }
+
     if let Some(table_size) = table_size {
       insns.push(MGI::SetTableSize(table_size));
     }

diff --git a/src/spec.rs b/src/spec.rs
index 41a1b528d919e9b62eff4d1d44d8e8af086e1227..7da64d575a258440f5c80baa381baf187ca668a7 100644 (file)
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -163,6 +163,7 @@ pub struct GameSpec {
   pub table_size: Option<Pos>,
   pub pieces: Vec<PiecesSpec>,
   pub table_colour: Option<ColourSpec>,
+  #[serde(default)] pub pcaliases: HashMap<String, Box<dyn PieceSpec>>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]