equipent now kinda works

1 files changed, 4 insertions, 17 deletions

diff --git a/src/components/mod.rs b/src/components/mod.rs
index ac6c9e6..5dd83bd 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -2,6 +2,8 @@
 pub mod item;
 pub mod messages;
 pub mod faction;
+pub mod interactable;
+pub mod equipment;
 
 pub use item::Item;
 pub use messages::{
@@ -10,6 +12,8 @@ pub use messages::{
 	AttackType
 };
 pub use faction::Faction;
+pub use interactable::Interactable;
+pub use equipment::Equipment;
 
 use specs::{
 	DenseVecStorage,
@@ -216,20 +220,6 @@ pub struct Clan {
 	pub name: String,
 }
 
-#[derive(Component, Debug, Clone, PartialEq, Eq)]
-#[storage(HashMapStorage)]
-pub enum Interactable {
-	Harvest
-}
-
-impl Interactable {
-	pub fn from_str(txt: &str) -> Option<Interactable> {
-		match txt {
-			"harvest" => Some(Interactable::Harvest),
-			_ => None
-		}
-	}
-}
 
 #[derive(Component, Debug, Clone)]
 #[storage(HashMapStorage)]
@@ -247,6 +237,3 @@ pub struct Grow {
 }
 
 
-
-
-