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

reset energy regen on ability use instead of wield

Browse Source
This commit is contained in:
scott-c 2020-06-13 11:45:03 +08:00
parent 8bcafa6f19
commit f2f79a1b3c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,13 @@ impl<'a> System<'a> for Sys {
// Accelerate recharging energy if not wielding.
match character_state {
CharacterState::Idle { .. } | CharacterState::Sit { .. } => {
CharacterState::Idle { .. }
| CharacterState::Sit { .. }
| CharacterState::Dance { .. }
| CharacterState::Glide { .. }
| CharacterState::Wielding { .. }
| CharacterState::Equipping { .. }
| CharacterState::Boost { .. } => {
let res = {
let energy = energy.get_unchecked();
energy.current() < energy.maximum()
@ -95,13 +101,18 @@ impl<'a> System<'a> for Sys {
(energy.regen_rate + ENERGY_REGEN_ACCEL * dt.0).min(100.0);
}
},
// Wield does not regen and sets the rate back to zero.
CharacterState::Wielding { .. } => {
// Ability use does not regen and sets the rate back to zero.
CharacterState::Roll { .. }
| CharacterState::BasicBlock { .. }
| CharacterState::Climb { .. }
| CharacterState::BasicMelee { .. }
| CharacterState::DashMelee { .. }
| CharacterState::TripleStrike { .. }
| CharacterState::BasicRanged { .. } => {
if energy.get_unchecked().regen_rate != 0.0 {
energy.get_mut_unchecked().regen_rate = 0.0
}
},
_ => {},
}
}
}