From 4f9932074a8f0390d5cb6072b4e419c7ab08ffed Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 2 Apr 2020 14:13:18 +0200 Subject: added flags component, and conditions for building --- src/parameter.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/parameter.rs') diff --git a/src/parameter.rs b/src/parameter.rs index 829c5cf..2ac9be1 100644 --- a/src/parameter.rs +++ b/src/parameter.rs @@ -68,13 +68,18 @@ parameters!( 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()); + Action (ItemAction) action, v (ItemAction::from_json(v)?) (panic!("item actions can't be serialized")); Bool (bool) bool, v (v.as_bool()?) (json!(v)); LootList (Vec<(Template, f64)>) lootlist, v (v.as_array()?.iter().map(|item| Some((Template::from_json(item.get(0)?).ok()?, item.get(1)?.as_f64()?)) ).collect::>>()?) ({json!(v.iter().map(|(t, c)| (t.to_json(), *c)).collect::>())}); + Strings (Vec) strings, v + (v.as_array()?.iter().map(|item| + Some(item.as_str()?.to_string()) + ).collect::>>()?) + ({json!(v)}); ); -- cgit