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

Addressed review comments.

Browse Source
This commit is contained in:
Sam
2022-01-12 22:18:26 -05:00
parent c8f8ccdc55
commit 8c2a484ee5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/comp/health.rs
View File

@ -17,7 +17,7 @@ use std::ops::Mul;
pub struct HealthChange { pub struct HealthChange {
/// The amount of the health change, negative is damage, positive is healing /// The amount of the health change, negative is damage, positive is healing
pub amount: f32, pub amount: f32,
/// The the individual or group who caused the health change (None if the /// The individual or group who caused the health change (None if the
/// damage wasn't caused by an entity) /// damage wasn't caused by an entity)
pub by: Option<DamageContributor>, pub by: Option<DamageContributor>,
/// The category of action that resulted in the health change /// The category of action that resulted in the health change

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

@ -22,7 +22,7 @@ pub struct PoiseChange {
/// The direction that the poise change came from, used for when the target /// The direction that the poise change came from, used for when the target
/// is knocked down /// is knocked down
pub impulse: Vec3<f32>, pub impulse: Vec3<f32>,
/// The the individual or group who caused the poise change (None if the /// The individual or group who caused the poise change (None if the
/// damage wasn't caused by an entity) /// damage wasn't caused by an entity)
pub by: Option<DamageContributor>, pub by: Option<DamageContributor>,
/// The category of action that resulted in the poise change /// The category of action that resulted in the poise change
@ -55,7 +55,7 @@ pub struct Poise {
/// Rate of poise regeneration per tick. Starts at zero and accelerates. /// Rate of poise regeneration per tick. Starts at zero and accelerates.
pub regen_rate: f32, pub regen_rate: f32,
/// Time that entity was last in a poise state /// Time that entity was last in a poise state
time_last_poise: Option<Time>, last_stun_time: Option<Time>,
} }
/// States to define effects of a poise change /// States to define effects of a poise change
@ -187,12 +187,12 @@ impl Poise {
maximum: poise, maximum: poise,
last_change: Dir::default(), last_change: Dir::default(),
regen_rate: 0.0, regen_rate: 0.0,
time_last_poise: None, last_stun_time: None,
} }
} }
pub fn change(&mut self, change: PoiseChange) { pub fn change(&mut self, change: PoiseChange) {
match self.time_last_poise { match self.last_stun_time {
Some(last_time) if last_time.0 + Poise::POISE_BUFFER_TIME > change.time.0 => {}, Some(last_time) if last_time.0 + Poise::POISE_BUFFER_TIME > change.time.0 => {},
_ => { _ => {
self.current = (((self.current() + change.amount) self.current = (((self.current() + change.amount)
@ -206,7 +206,7 @@ impl Poise {
pub fn reset(&mut self, time: Time, poise_state_time: f64) { pub fn reset(&mut self, time: Time, poise_state_time: f64) {
self.current = self.maximum; self.current = self.maximum;
self.time_last_poise = Some(Time(time.0 + poise_state_time)); self.last_stun_time = Some(Time(time.0 + poise_state_time));
} }
/// Returns knockback as a Dir /// Returns knockback as a Dir