diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index f8a38794ef..7ad0a229fc 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -80,8 +80,7 @@ pub enum ConsumptionEffect { pub enum Item { Tool { kind: Tool, - damage: i32, - strength: i32, + power: u32, }, Armor { kind: Armor, @@ -122,8 +121,7 @@ impl Default for Item { fn default() -> Self { Item::Tool { kind: Tool::Hammer, - damage: 0, - strength: 0, + power: 0, } } } diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index 598e2f681f..808fb1b9f2 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -2,7 +2,7 @@ pub mod item; // Reexports -pub use self::item::Item; +pub use self::item::{Item, Tool}; use specs::{Component, HashMapStorage, NullStorage}; use specs_idvs::IDVStorage; @@ -56,15 +56,35 @@ impl Inventory { impl Default for Inventory { fn default() -> Inventory { - let mut this = Inventory { + let mut inventory = Inventory { slots: vec![None; 24], }; - for _ in 0..18 { - this.insert(Item::default()); + inventory.insert(Item::Tool { + kind: Tool::Daggers, + power: 10, + }); + inventory.insert(Item::Tool { + kind: Tool::Sword, + power: 10, + }); + inventory.insert(Item::Tool { + kind: Tool::Axe, + power: 10, + }); + inventory.insert(Item::Tool { + kind: Tool::Hammer, + power: 10, + }); + inventory.insert(Item::Tool { + kind: Tool::Bow, + power: 10, + }); + for _ in 0..10 { + inventory.insert(Item::default()); } - this + inventory } }