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

Adjust character state's energy regen

Browse Source
This commit is contained in:
scott-c 2020-06-13 19:35:31 +08:00
parent 0b9cae84de
commit b2cbf3ee8f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,8 +75,8 @@ impl<'a> System<'a> for Sys {
.set_to(stat.health.maximum(), HealthSource::LevelUp); .set_to(stat.health.maximum(), HealthSource::LevelUp);
} }
// Accelerate recharging energy if not wielding.
match character_state { match character_state {
// Accelerate recharging energy.
CharacterState::Idle { .. } CharacterState::Idle { .. }
| CharacterState::Sit { .. } | CharacterState::Sit { .. }
| CharacterState::Dance { .. } | CharacterState::Dance { .. }
@ -102,17 +102,18 @@ impl<'a> System<'a> for Sys {
} }
}, },
// Ability use does not regen and sets the rate back to zero. // Ability use does not regen and sets the rate back to zero.
CharacterState::Roll { .. } CharacterState::BasicMelee { .. }
| CharacterState::BasicBlock { .. }
| CharacterState::Climb { .. }
| CharacterState::BasicMelee { .. }
| CharacterState::DashMelee { .. } | CharacterState::DashMelee { .. }
| CharacterState::TripleStrike { .. } | CharacterState::TripleStrike { .. }
| CharacterState::BasicRanged { .. } => { | CharacterState::BasicRanged { .. }
| CharacterState::BasicBlock { .. } => {
if energy.get_unchecked().regen_rate != 0.0 { if energy.get_unchecked().regen_rate != 0.0 {
energy.get_mut_unchecked().regen_rate = 0.0 energy.get_mut_unchecked().regen_rate = 0.0
} }
}, },
// Non-combat abilities that consume energy;
// temporarily stall energy gain, but preserve regen_rate.
CharacterState::Roll { .. } | CharacterState::Climb { .. } => {},
} }
} }
} }