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

Quick poise fix

Browse Source
This commit is contained in:
jiminycrick 2021-01-29 15:40:40 -08:00
parent 76a575da8d
commit ea13f75427
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@ impl Default for CharacterAbility {
swing_duration: 250,
recover_duration: 500,
base_damage: 10,
base_poise_damage: 10,
base_poise_damage: 0,
knockback: 0.0,
range: 3.5,
max_angle: 15.0,

11
common/src/comp/body.rs
View File

@ -181,8 +181,8 @@ impl Body {
theropod::Species::Snowraptor => 1.5,
theropod::Species::Sandraptor => 1.5,
theropod::Species::Woodraptor => 1.5,
theropod::Species::Archaeos => 4.5,
theropod::Species::Odonto => 4.5,
theropod::Species::Archaeos => 3.5,
theropod::Species::Odonto => 3.5,
_ => 1.8,
},
Body::BirdMedium(_) => 1.0,
@ -610,12 +610,7 @@ impl Body {
}
}
pub fn base_poise_dmg(&self) -> u32 {
match self {
Body::Humanoid(_) => 5,
_ => 10,
}
}
pub fn base_poise_dmg(&self) -> u32 { 0 }
pub fn base_range(&self) -> f32 {
match self {

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

@ -111,13 +111,13 @@ impl Poise {
/// Defines the poise states based on fraction of maximum poise
pub fn poise_state(&self) -> PoiseState {
if self.current >= 8 * self.maximum / 10 {
if self.current >= 5 * self.maximum / 10 {
PoiseState::Normal
} else if self.current >= 7 * self.maximum / 10 {
PoiseState::Interrupted
} else if self.current >= 6 * self.maximum / 10 {
PoiseState::Stunned
} else if self.current >= 4 * self.maximum / 10 {
PoiseState::Interrupted
} else if self.current >= 3 * self.maximum / 10 {
PoiseState::Stunned
} else if self.current >= 2 * self.maximum / 10 {
PoiseState::Dazed
} else {
PoiseState::KnockedDown

10
common/sys/src/character_behavior.rs
View File

@ -171,7 +171,7 @@ impl<'a> System<'a> for Sys {
CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(500),
recover_duration: Duration::from_millis(500),
recover_duration: Duration::from_millis(300),
movement_speed: 0.1,
poise_state,
},
@ -189,8 +189,8 @@ impl<'a> System<'a> for Sys {
*tuple.2.get_mut_unchecked() =
CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(1000),
recover_duration: Duration::from_millis(1000),
buildup_duration: Duration::from_millis(800),
recover_duration: Duration::from_millis(250),
movement_speed: 0.0,
poise_state,
},
@ -208,8 +208,8 @@ impl<'a> System<'a> for Sys {
*tuple.2.get_mut_unchecked() =
CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(3000),
recover_duration: Duration::from_millis(500),
buildup_duration: Duration::from_millis(1000),
recover_duration: Duration::from_millis(750),
movement_speed: 0.0,
poise_state,
},