From 66a3d3131f32e7bae2f0f7c4fd0b0c876eb3e8a0 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Mon, 6 Apr 2020 16:01:00 +0200
Subject: shortcut or defining some entities like crops

---
 src/componentwrapper.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/componentwrapper.rs')

diff --git a/src/componentwrapper.rs b/src/componentwrapper.rs
index d00b592..4b9401a 100644
--- a/src/componentwrapper.rs
+++ b/src/componentwrapper.rs
@@ -189,18 +189,18 @@ components!(
 			loot
 			.iter()
 			.map(|param| {match param {
-				Parameter::Template(template) => Some((template.clone(), 1.0)),
+				Parameter::Template(template) => Ok((template.clone(), 1.0)),
 				Parameter::List(l) => {
 					if l.len() == 2 {
 						if let (Parameter::Template(template), Parameter::Float(chance)) = (l[0].clone(), l[1].clone()) {
-							return Some((template.clone(), chance))
+							return Ok((template.clone(), chance))
 						}
 					}
-					None?
+					Err(aerr!("loot list elements as list must only contain a template and a float: {:?}", l))?
 				},
-				_ => None?
+				_ => Err(aerr!("loot list elements must be a template or a list: {:?}", param))?
 			}})
-			.collect::<Option<Vec<(Template, f64)>>>().ok_or(aerr!("invalid loot definition"))?
+			.collect::<Result<Vec<(Template, f64)>>>()?
 		}
 	};
 	Grow (
-- 
cgit