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

Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat

Browse Source
This commit is contained in:
Pfauenauge90 2020-03-16 19:56:20 +01:00
commit da91ce0640
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,23 +46,23 @@ impl ToolData {
BasicMelee {
buildup_duration: Duration::from_millis(100),
recover_duration: Duration::from_millis(500),
base_damage: 60,
base_damage: 6,
},
DashMelee {
buildup_duration: Duration::from_millis(500),
recover_duration: Duration::from_millis(500),
base_damage: 200,
base_damage: 20,
},
],
Axe => vec![BasicMelee {
buildup_duration: Duration::from_millis(700),
recover_duration: Duration::from_millis(100),
base_damage: 80,
base_damage: 8,
}],
Hammer => vec![BasicMelee {
buildup_duration: Duration::from_millis(700),
recover_duration: Duration::from_millis(300),
base_damage: 100,
base_damage: 10,
}],
Bow => vec![BasicRanged {
projectile: Projectile {
@ -85,12 +85,12 @@ impl ToolData {
Dagger => vec![BasicMelee {
buildup_duration: Duration::from_millis(100),
recover_duration: Duration::from_millis(400),
base_damage: 50,
base_damage: 5,
}],
Staff => vec![BasicMelee {
buildup_duration: Duration::from_millis(400),
recover_duration: Duration::from_millis(300),
base_damage: 70,
base_damage: 7,
}],
Shield => vec![BasicBlock],
Debug(kind) => match kind {

2
common/src/comp/stats.rs
View File

@ -134,7 +134,7 @@ impl Stats {
}
// TODO: Delete this once stat points will be a thing
pub fn update_max_hp(&mut self) { self.health.set_maximum(200 + 47 * self.level.amount); }
pub fn update_max_hp(&mut self) { self.health.set_maximum(21 + 3 * self.level.amount); }
}
impl Stats {