Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename tool strength/damage to power

Browse Source
This commit is contained in:
timokoesters 2019-08-26 20:05:13 +02:00
parent 269d179243
commit 869535e5a2
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/comp/inventory/item.rs
View File

@ -80,8 +80,7 @@ pub enum ConsumptionEffect {
pub enum Item { pub enum Item {
Tool { Tool {
kind: Tool, kind: Tool,
damage: i32, power: u32,
strength: i32,
}, },
Armor { Armor {
kind: Armor, kind: Armor,
@ -122,8 +121,7 @@ impl Default for Item {
fn default() -> Self { fn default() -> Self {
Item::Tool { Item::Tool {
kind: Tool::Hammer, kind: Tool::Hammer,
damage: 0, power: 0,
strength: 0,
} }
} }
} }

30
common/src/comp/inventory/mod.rs
View File

@ -2,7 +2,7 @@
pub mod item; pub mod item;
// Reexports // Reexports
pub use self::item::Item; pub use self::item::{Item, Tool};
use specs::{Component, HashMapStorage, NullStorage}; use specs::{Component, HashMapStorage, NullStorage};
use specs_idvs::IDVStorage; use specs_idvs::IDVStorage;
@ -56,15 +56,35 @@ impl Inventory {
impl Default for Inventory { impl Default for Inventory {
fn default() -> Inventory { fn default() -> Inventory {
let mut this = Inventory { let mut inventory = Inventory {
slots: vec![None; 24], slots: vec![None; 24],
}; };
for _ in 0..18 { inventory.insert(Item::Tool {
this.insert(Item::default()); 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
} }
} }