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

Fixup energy regen math to properly account for acceleration at any

Browse Source 
framerate.
This commit is contained in:
Joseph Gerardot 2020-01-19 14:44:44 -05:00 committed by Pfauenauge90
parent 6e651eb659
commit 454aa82669
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/sys/stats.rs
View File

@ -5,7 +5,7 @@ use crate::{
}; };
use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage}; use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
const ENERGY_REGEN_ACCEL: f32 = 0.5; const ENERGY_REGEN_ACCEL: f32 = 20.0;
/// This system kills players, levels them up, and regenerates energy. /// This system kills players, levels them up, and regenerates energy.
pub struct Sys; pub struct Sys;
@ -80,8 +80,9 @@ impl<'a> System<'a> for Sys {
energy.current() < energy.maximum() energy.current() < energy.maximum()
} { } {
let mut energy = energy.get_mut_unchecked(); let mut energy = energy.get_mut_unchecked();
// Have to account for Calc I differential equations due to acceleration
energy.change_by((energy.regen_rate * dt.0 + ENERGY_REGEN_ACCEL * dt.0.powf(2.0) / 2.0) as i32, EnergySource::Regen);
energy.regen_rate += ENERGY_REGEN_ACCEL * dt.0; energy.regen_rate += ENERGY_REGEN_ACCEL * dt.0;
energy.change_by(energy.regen_rate as i32, EnergySource::Regen);
} }
} }
// All other states do not regen and set the rate back to zero. // All other states do not regen and set the rate back to zero.