From a20bcfed7d3b6aacc3211514d9804651a458e725 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 27 Sep 2020 15:33:09 +0200
Subject: better serialisation structure for encyclopediae

["list", [1, 2, 3]] is now just [1, 2, 3] and {"type": builtwall", "kwargs": {"health": 50}} is now {":template": "builtwall", "health": 50}
---
 src/fromtoparameter.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/fromtoparameter.rs')

diff --git a/src/fromtoparameter.rs b/src/fromtoparameter.rs
index 8d169d0..13483d7 100644
--- a/src/fromtoparameter.rs
+++ b/src/fromtoparameter.rs
@@ -76,7 +76,6 @@ tofrom!(i64: Int);
 tofrom!(f64: Float);
 tofrom!(bool:Bool);
 tofrom!(String: String);
-tofrom!(Pos: Pos);
 tofrom!(Template: Template);
 
 tofrom!(PlayerId(String));
@@ -177,3 +176,13 @@ where
 		Parameter::List(vec![self.0.to_parameter(), self.1.to_parameter(), self.2.to_parameter()])
 	}
 }
+
+impl FromToParameter for Pos {
+	fn from_parameter(p: Parameter) -> Option<Self>{
+		let (x, y) = <(i64, i64)>::from_parameter(p)?;
+		Some(Self{x, y})
+	}
+	fn to_parameter(self) -> Parameter {
+		(self.x, self.y).to_parameter()
+	}
+}
-- 
cgit