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 'sam/energy-fix' into 'master'

Browse Source 
Fixed base energy being 0.

See merge request veloren/veloren!1738
This commit is contained in:
Samuel Keiffer 2021-01-27 02:25:22 +00:00
commit e6620c21db
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/comp/energy.rs
View File

@ -99,7 +99,12 @@ impl Energy {
pub fn update_max_energy(&mut self, body: Option<Body>, level: u16) {
if let Some(body) = body {
self.set_base_max(body.base_energy() + 50 * level as u32);
self.set_maximum(body.base_energy() + 50 * level as u32);
self.change_by(EnergyChange {
amount: 50,
source: EnergySource::LevelUp,
});
}
}
@ -110,6 +115,12 @@ impl Energy {
self.last_max = self.base_max;
}
}
// This is private because max energy is based on the level
fn set_base_max(&mut self, amount: u32) {
self.base_max = amount;
self.current = self.current.min(self.maximum);
}
}
pub struct EnergyChange {