From b98ea15acbebe8815f9316b5a8ef3393fdd1c3e6 Mon Sep 17 00:00:00 2001 From: troido Date: Tue, 3 Mar 2020 16:28:19 +0100 Subject: monsters tend to stay around their home --- src/parameter.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/parameter.rs') diff --git a/src/parameter.rs b/src/parameter.rs index a1735da..9c72d69 100644 --- a/src/parameter.rs +++ b/src/parameter.rs @@ -1,7 +1,10 @@ use serde_json::{Value, json}; -use crate::Template; -use crate::components::item::ItemAction; +use crate::{ + Template, + components::item::ItemAction, + Pos +}; @@ -62,7 +65,7 @@ macro_rules! parameters { parameters!( String (String) string, v (v.as_str()?.to_string()) (json!(v)); Int (i64) int, v (v.as_i64()?) (json!(v)); -// Pos (Pos) pos, () (); + Pos (Pos) pos, v (Pos::from_json(v)?) (json!(v)); Float (f64) float, v (v.as_f64()?) (json!(v)); Template (Template) template, v (Template::from_json(v).ok()?) (v.to_json()); Action (ItemAction) action, v (ItemAction::from_json(v)?) (v.to_json()); -- cgit