1 files changed, 0 insertions, 70 deletions
diff --git a/src/components/item.rs b/src/components/item.rs
deleted file mode 100644
index 0cb2589..0000000
--- a/src/components/item.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-
-use std::collections::HashSet;
-use serde_json::{Value};
-use specs::{Component, DenseVecStorage};
-use crate::{
-	Template,
-	components::Flag
-};
-
-use super::equipment::Equippable;
-
-#[derive(Component, Debug, Clone)]
-pub struct Item {
-	pub ent: Template,
-	pub name: String,
-	pub action: ItemAction
-}
-
-
-
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum ItemAction {
-	Eat(i64),
-	Build(Template, HashSet<Flag>, HashSet<Flag>),
-	Equip(Equippable),
-	None
-}
-
-use ItemAction::{Eat, Build, Equip, None};
-
-impl ItemAction {
-	
-	pub fn from_json(val: &Value) -> Option<Self> {
-		let typ = val.get(0)?;
-		let arg = val.get(1)?;
-		Some(match typ.as_str()? {
-			"eat" => Eat(arg.as_i64()?),
-			"build" => Build(
-				Template::from_json(arg.get(0)?).ok()?,
-				arg.get(1)?.as_array()?.into_iter().map(|v| Flag::from_str(v.as_str()?)).collect::<Option<HashSet<Flag>>>()?,
-				arg.get(2)?.as_array()?.into_iter().map(|v| Flag::from_str(v.as_str()?)).collect::<Option<HashSet<Flag>>>()?
-			),
-			"none" => None,
-			"equip" => Equip(Equippable::from_json(arg)?),
-			_ => {return Option::None}
-		})
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::hashmap;
-	use super::super::equipment::*;
-	use serde_json::json;
-	
-	#[test]
-	fn equip_from_json() {
-		assert_eq!(
-			ItemAction::from_json(&json!(["equip", {"slot": "hand", "stats": {"strength": 10}}])),
-			Some(ItemAction::Equip(Equippable {slot: Slot::Hand, stats: hashmap!(Stat::Strength => 10)}))
-		);
-		assert_eq!(
-			ItemAction::from_json(&json!(["equip", {"slot": "hand", "stats": {"attack": 50}}])),
-			Option::None
-		);
-	}
-}
-