diff --git a/CHANGELOG.md b/CHANGELOG.md index fe970ee1ea..5a9ccd1962 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,6 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Projectiles now generally have a different arc because they no longer have their own gravity modifier - Increased agent system target search efficiency speeding up the server - Added more parallelization to terrain serialization and removed extra cloning speeding up the server +- Energy now recharges while gliding ### Removed diff --git a/common/src/comp/energy.rs b/common/src/comp/energy.rs index f1545675e1..e540cb6ad5 100644 --- a/common/src/comp/energy.rs +++ b/common/src/comp/energy.rs @@ -17,7 +17,6 @@ pub struct Energy { pub enum EnergySource { Ability, Climb, - Glide, LevelUp, HitEnemy, Regen, diff --git a/common/systems/src/stats.rs b/common/systems/src/stats.rs index c7da3ffd1a..5ae7f27457 100644 --- a/common/systems/src/stats.rs +++ b/common/systems/src/stats.rs @@ -190,6 +190,7 @@ impl<'a> System<'a> for Sys { | CharacterState::Sit { .. } | CharacterState::Dance { .. } | CharacterState::Sneak { .. } + | CharacterState::Glide { .. } | CharacterState::GlideWield { .. } | CharacterState::Wielding { .. } | CharacterState::Equipping { .. } @@ -232,9 +233,8 @@ impl<'a> System<'a> for Sys { poise.regen_rate = (poise.regen_rate + POISE_REGEN_ACCEL * dt).min(10.0); } }, - // Ability and glider use does not regen and sets the rate back to zero. - CharacterState::Glide { .. } - | CharacterState::BasicMelee { .. } + // Ability use does not regen and sets the rate back to zero. + CharacterState::BasicMelee { .. } | CharacterState::DashMelee { .. } | CharacterState::LeapMelee { .. } | CharacterState::SpinMelee { .. }