From 2e2e56661f418a6b5433fa62c0cbb15081b09ec7 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 7 Jan 2022 10:56:41 -0500 Subject: [PATCH] Tweaked poise effects and thresholds. --- common/src/comp/poise.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index 184fab66f0..a6836b03cd 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -79,19 +79,19 @@ impl PoiseState { let (charstate_parameters, impulse) = match self { PoiseState::Normal => (None, None), PoiseState::Interrupted => ( - Some((Duration::from_millis(125), Duration::from_millis(125), 0.80)), + Some((Duration::from_millis(200), Duration::from_millis(200), 0.8)), None, ), PoiseState::Stunned => ( - Some((Duration::from_millis(300), Duration::from_millis(300), 0.65)), - Some(5.0), + Some((Duration::from_millis(400), Duration::from_millis(400), 0.5)), + None, ), PoiseState::Dazed => ( - Some((Duration::from_millis(600), Duration::from_millis(250), 0.45)), - Some(10.0), + Some((Duration::from_millis(750), Duration::from_millis(450), 0.2)), + None, ), PoiseState::KnockedDown => ( - Some((Duration::from_millis(750), Duration::from_millis(500), 0.4)), + Some((Duration::from_millis(900), Duration::from_millis(700), 0.0)), Some(10.0), ), }; @@ -181,10 +181,10 @@ impl Poise { /// Defines the poise states based on current poise value pub fn poise_state(&self) -> PoiseState { match self.current() { - x if x > 70.0 => PoiseState::Normal, - x if x > 50.0 => PoiseState::Interrupted, - x if x > 40.0 => PoiseState::Stunned, - x if x > 20.0 => PoiseState::Dazed, + x if x > 50.0 => PoiseState::Normal, + x if x > 30.0 => PoiseState::Interrupted, + x if x > 15.0 => PoiseState::Stunned, + x if x > 5.0 => PoiseState::Dazed, _ => PoiseState::KnockedDown, } }