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

Refactor energy and poise regen

Browse Source
This commit is contained in:
James Melkonian 2023-02-07 18:02:26 +00:00 committed by Marcel
parent 5fb74ea1d2
commit 21a2a4ac46
3 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,8 @@ pub struct Energy {
/// Maximum is the amount of energy the entity has after temporary modifiers
/// are considered
maximum: u32,
pub regen_rate: f32,
/// Rate of regeneration per tick. Starts at zero and accelerates.
regen_rate: f32,
}
impl Energy {
@ -94,6 +95,24 @@ impl Energy {
}
}
/// Returns `true` if the current value is less than the maximum
pub fn needs_regen(&self) -> bool { self.current < self.maximum }
/// Regenerates energy based on the provided acceleration
pub fn regen(&mut self, accel: f32, dt: f32) {
if self.current < self.maximum {
self.change_by(self.regen_rate * dt);
self.regen_rate = (self.regen_rate + accel * dt).min(10.0);
}
}
/// Checks whether the `regen_rate` is zero or not. Returns true if the
/// value is anything other than `0.0`.
pub fn needs_regen_rate_reset(&self) -> bool { self.regen_rate != 0.0 }
/// Resets the energy regeneration rate to zero
pub fn reset_regen_rate(&mut self) { self.regen_rate = 0.0 }
pub fn change_by(&mut self, change: f32) {
self.current = (((self.current() + change).clamp(0.0, f32::from(Self::MAX_ENERGY))
* Self::SCALING_FACTOR_FLOAT) as u32)

22
common/src/comp/poise.rs
View File

@ -52,8 +52,8 @@ pub struct Poise {
maximum: u32,
/// Direction that the last poise change came from
pub last_change: Dir,
/// Rate of poise regeneration per tick. Starts at zero and accelerates.
pub regen_rate: f32,
/// Rate of regeneration per tick. Starts at zero and accelerates.
regen_rate: f32,
/// Time that entity was last in a poise state
last_stun_time: Option<Time>,
/// The previous poise state
@ -217,6 +217,24 @@ impl Poise {
}
}
/// Returns `true` if the current value is less than the maximum
pub fn needs_regen(&self) -> bool { self.current < self.maximum }
/// Regenerates poise based on a provided acceleration
pub fn regen(&mut self, accel: f32, dt: f32, now: Time) {
if self.current < self.maximum {
let poise_change = PoiseChange {
amount: self.regen_rate * dt,
impulse: Vec3::zero(),
by: None,
cause: None,
time: now,
};
self.change(poise_change);
self.regen_rate = (self.regen_rate + accel * dt).min(10.0);
}
}
pub fn reset(&mut self, time: Time, poise_state_time: f64) {
self.current = self.maximum;
self.last_stun_time = Some(Time(time.0 + poise_state_time));

53
common/systems/src/stats.rs
View File

@ -4,8 +4,8 @@ use common::{
self,
item::MaterialStatManifest,
skills::{GeneralSkill, Skill},
Body, CharacterState, Combo, Energy, Health, Inventory, Poise, PoiseChange, Pos, SkillSet,
Stats, StatsModifier,
Body, CharacterState, Combo, Energy, Health, Inventory, Poise, Pos, SkillSet, Stats,
StatsModifier,
},
event::{EventBus, ServerEvent},
resources::{DeltaTime, EntitiesDiedLastTick, Time},
@ -16,9 +16,9 @@ use specs::{
shred::ResourceId, Entities, Join, Read, ReadExpect, ReadStorage, SystemData, World, Write,
WriteStorage,
};
use vek::Vec3;
const ENERGY_REGEN_ACCEL: f32 = 1.0;
const SIT_ENERGY_REGEN_ACCEL: f32 = 2.5;
const POISE_REGEN_ACCEL: f32 = 2.0;
#[derive(SystemData)]
@ -145,10 +145,18 @@ impl<'a> System<'a> for Sys {
(&read_data.char_states, &mut energies, &mut poises).join()
{
match character_state {
// Sitting accelerates recharging energy the most
CharacterState::Sit => {
if energy.needs_regen() {
energy.regen(SIT_ENERGY_REGEN_ACCEL, dt);
}
if poise.needs_regen() {
poise.regen(POISE_REGEN_ACCEL, dt, *read_data.time);
}
},
// Accelerate recharging energy.
CharacterState::Idle(_)
| CharacterState::Talk
| CharacterState::Sit
| CharacterState::Dance
| CharacterState::Glide(_)
| CharacterState::Skate(_)
@ -160,34 +168,11 @@ impl<'a> System<'a> for Sys {
stage_section: None,
..
}) => {
let res = { energy.current() < energy.maximum() };
if res {
let energy = &mut *energy;
energy.change_by(energy.regen_rate * dt);
if matches!(character_state, CharacterState::Sit) {
// Higher Energy-regeneration while sitting
energy.regen_rate =
(energy.regen_rate + ENERGY_REGEN_ACCEL * dt * 1.5).min(25.0);
} else {
energy.regen_rate =
(energy.regen_rate + ENERGY_REGEN_ACCEL * dt).min(10.0);
}
if energy.needs_regen() {
energy.regen(ENERGY_REGEN_ACCEL, dt);
}
let res_poise = { poise.current() < poise.maximum() };
if res_poise {
let poise = &mut *poise;
let poise_change = PoiseChange {
amount: poise.regen_rate * dt,
impulse: Vec3::zero(),
by: None,
cause: None,
time: *read_data.time,
};
poise.change(poise_change);
poise.regen_rate = (poise.regen_rate + POISE_REGEN_ACCEL * dt).min(10.0);
if poise.needs_regen() {
poise.regen(POISE_REGEN_ACCEL, dt, *read_data.time);
}
},
// Ability use does not regen and sets the rate back to zero.
@ -206,6 +191,7 @@ impl<'a> System<'a> for Sys {
| CharacterState::BasicBeam(_)
| CharacterState::BasicAura(_)
| CharacterState::Blink(_)
| CharacterState::Climb(_)
| CharacterState::BasicSummon(_)
| CharacterState::SelfBuff(_)
| CharacterState::SpriteSummon(_)
@ -213,14 +199,13 @@ impl<'a> System<'a> for Sys {
| CharacterState::DiveMelee(_)
| CharacterState::RiposteMelee(_)
| CharacterState::RapidMelee(_) => {
if energy.regen_rate != 0.0 {
energy.regen_rate = 0.0
if energy.needs_regen_rate_reset() {
energy.reset_regen_rate();
}
},
// Abilities that temporarily stall energy gain, but preserve regen_rate.
CharacterState::Roll(_)
| CharacterState::Wallrun(_)
| CharacterState::Climb(_)
| CharacterState::Stunned(_)
| CharacterState::BasicBlock(_)
| CharacterState::UseItem(_)