equipment is now a part of the inventory

1 files changed, 2 insertions, 9 deletions

diff --git a/src/components/mod.rs b/src/components/mod.rs
index 5dd83bd..c3e8d5d 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -4,6 +4,7 @@ pub mod messages;
 pub mod faction;
 pub mod interactable;
 pub mod equipment;
+pub mod inventory;
 
 pub use item::Item;
 pub use messages::{
@@ -14,6 +15,7 @@ pub use messages::{
 pub use faction::Faction;
 pub use interactable::Interactable;
 pub use equipment::Equipment;
+pub use inventory::Inventory;
 
 use specs::{
 	DenseVecStorage,
@@ -102,15 +104,6 @@ impl Player {
 	}
 }
 
-#[derive(Debug, Clone, Default)]
-pub struct Inventory {
-	pub items: Vec<Item>,
-	pub capacity: usize
-}
-impl Component for Inventory {
-	type Storage = FlaggedStorage<Self, HashMapStorage<Self>>;
-}
-
 #[derive(Component, Debug, Clone)]
 pub struct Health {
 	pub health: i64,