From dc5a38f1e85c2e2b6d754904aff7c3f6cadbe816 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 29 Apr 2021 22:59:29 -0400 Subject: [PATCH 1/3] ori addition to combomelee --- assets/common/abilities/axe/doublestrike.ron | 1 + assets/common/abilities/axesimple/doublestrike.ron | 1 + assets/common/abilities/hammer/singlestrike.ron | 1 + assets/common/abilities/hammersimple/doublestrike.ron | 1 + assets/common/abilities/spear/doublestrike.ron | 1 + assets/common/abilities/sword/triplestrike.ron | 1 + assets/common/abilities/swordsimple/doublestrike.ron | 1 + .../abilities/unique/birdlargebreathe/triplestrike.ron | 1 + .../abilities/unique/birdlargefire/triplestrike.ron | 1 + assets/common/abilities/unique/husk/singlestrike.ron | 1 + assets/common/abilities/unique/husk/triplestrike.ron | 1 + .../abilities/unique/quadlowbasic/singlestrike.ron | 1 + .../abilities/unique/quadlowbasic/triplestrike.ron | 1 + .../abilities/unique/quadlowbreathe/triplestrike.ron | 1 + .../abilities/unique/quadlowquick/quadstrike.ron | 1 + .../abilities/unique/quadlowranged/singlestrike.ron | 1 + .../abilities/unique/quadlowtail/triplestrike.ron | 1 + .../abilities/unique/quadmedbasic/singlestrike.ron | 1 + .../abilities/unique/quadmedbasic/triplestrike.ron | 1 + .../abilities/unique/quadmedcharge/doublestrike.ron | 1 + .../abilities/unique/quadmedjump/doublestrike.ron | 1 + .../abilities/unique/quadmedquick/triplestrike.ron | 1 + .../abilities/unique/quadsmallbasic/singlestrike.ron | 1 + .../abilities/unique/stonegolemfist/singlestrike.ron | 1 + .../abilities/unique/theropodbasic/singlestrike.ron | 1 + .../abilities/unique/theropodbasic/triplestrike.ron | 1 + .../abilities/unique/theropodbird/singlestrike.ron | 1 + .../abilities/unique/theropodbird/triplestrike.ron | 1 + .../abilities/unique/wendigomagic/singlestrike.ron | 1 + common/src/comp/ability.rs | 3 +++ common/src/states/basic_melee.rs | 1 + common/src/states/combo_melee.rs | 8 +++++++- common/src/states/utils.rs | 10 +++++----- voxygen/src/audio/sfx/event_mapper/combat/tests.rs | 2 ++ 34 files changed, 47 insertions(+), 6 deletions(-) diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index cb5e3cb35c..a128d8b9ef 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.6, scales_from_combo: 2, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/axesimple/doublestrike.ron b/assets/common/abilities/axesimple/doublestrike.ron index a48212625a..dd98038074 100644 --- a/assets/common/abilities/axesimple/doublestrike.ron +++ b/assets/common/abilities/axesimple/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) \ No newline at end of file diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index e6bc548538..33ce8d94fd 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -20,4 +20,5 @@ ComboMelee( max_speed_increase: 0.4, scales_from_combo: 2, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/hammersimple/doublestrike.ron b/assets/common/abilities/hammersimple/doublestrike.ron index 90116affea..c07c2dc304 100644 --- a/assets/common/abilities/hammersimple/doublestrike.ron +++ b/assets/common/abilities/hammersimple/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) \ No newline at end of file diff --git a/assets/common/abilities/spear/doublestrike.ron b/assets/common/abilities/spear/doublestrike.ron index 2501d5b044..f01ba5c5c2 100644 --- a/assets/common/abilities/spear/doublestrike.ron +++ b/assets/common/abilities/spear/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 2, is_interruptible: false, + ori_modifier: 1.0, ) \ No newline at end of file diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index a9a9683a9f..d2c1848bc2 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.8, scales_from_combo: 2, is_interruptible: true, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/swordsimple/doublestrike.ron b/assets/common/abilities/swordsimple/doublestrike.ron index bb55bd6505..d1867ce98e 100644 --- a/assets/common/abilities/swordsimple/doublestrike.ron +++ b/assets/common/abilities/swordsimple/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) \ No newline at end of file diff --git a/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron b/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron index 2eaa09c043..1fa914bbfb 100644 --- a/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron +++ b/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/birdlargefire/triplestrike.ron b/assets/common/abilities/unique/birdlargefire/triplestrike.ron index 2eaa09c043..1fa914bbfb 100644 --- a/assets/common/abilities/unique/birdlargefire/triplestrike.ron +++ b/assets/common/abilities/unique/birdlargefire/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/husk/singlestrike.ron b/assets/common/abilities/unique/husk/singlestrike.ron index 3e6c6ba13e..4a86ed217a 100644 --- a/assets/common/abilities/unique/husk/singlestrike.ron +++ b/assets/common/abilities/unique/husk/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/husk/triplestrike.ron b/assets/common/abilities/unique/husk/triplestrike.ron index cccb53cb4a..84996a33ba 100644 --- a/assets/common/abilities/unique/husk/triplestrike.ron +++ b/assets/common/abilities/unique/husk/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron index f073998ccd..81e89cc33b 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron index 2f9b7235e1..57dd26d526 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron index 48f2cac272..1f7c1760e2 100644 --- a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadlowquick/quadstrike.ron b/assets/common/abilities/unique/quadlowquick/quadstrike.ron index 2551009e94..494c0216e6 100644 --- a/assets/common/abilities/unique/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/unique/quadlowquick/quadstrike.ron @@ -64,4 +64,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadlowranged/singlestrike.ron b/assets/common/abilities/unique/quadlowranged/singlestrike.ron index 8f5bd08b47..aad30f45ab 100644 --- a/assets/common/abilities/unique/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowranged/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadlowtail/triplestrike.ron b/assets/common/abilities/unique/quadlowtail/triplestrike.ron index 3eb48d0d6d..c2962667ca 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron index 23b68ba22a..23385404f3 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron index 2cb36d3087..836157a2bb 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron index d6f7e75280..b4518a2d18 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadmedjump/doublestrike.ron b/assets/common/abilities/unique/quadmedjump/doublestrike.ron index b7461fc10b..b9f59ad6d3 100644 --- a/assets/common/abilities/unique/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedjump/doublestrike.ron @@ -36,4 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadmedquick/triplestrike.ron b/assets/common/abilities/unique/quadmedquick/triplestrike.ron index 0772444a59..1bd0149eac 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron index 999909eb44..37addd9651 100644 --- a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/stonegolemfist/singlestrike.ron b/assets/common/abilities/unique/stonegolemfist/singlestrike.ron index b090c2d514..d4446fcd84 100644 --- a/assets/common/abilities/unique/stonegolemfist/singlestrike.ron +++ b/assets/common/abilities/unique/stonegolemfist/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/theropodbasic/singlestrike.ron b/assets/common/abilities/unique/theropodbasic/singlestrike.ron index 428e07b482..f5ffcf8dc2 100644 --- a/assets/common/abilities/unique/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/theropodbasic/triplestrike.ron b/assets/common/abilities/unique/theropodbasic/triplestrike.ron index 653f154098..a4364aa18e 100644 --- a/assets/common/abilities/unique/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/theropodbird/singlestrike.ron b/assets/common/abilities/unique/theropodbird/singlestrike.ron index 07d5e1b04b..37f1cc1a85 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/theropodbird/triplestrike.ron b/assets/common/abilities/unique/theropodbird/triplestrike.ron index 6dcb11f250..dd6e03f521 100644 --- a/assets/common/abilities/unique/theropodbird/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbird/triplestrike.ron @@ -50,4 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/assets/common/abilities/unique/wendigomagic/singlestrike.ron b/assets/common/abilities/unique/wendigomagic/singlestrike.ron index e9a5f6ca4d..64f066707c 100644 --- a/assets/common/abilities/unique/wendigomagic/singlestrike.ron +++ b/assets/common/abilities/unique/wendigomagic/singlestrike.ron @@ -22,4 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, + ori_modifier: 1.0, ) diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index aecb1775dd..e9a1de7c2c 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -138,6 +138,7 @@ pub enum CharacterAbility { max_speed_increase: f32, scales_from_combo: u32, is_interruptible: bool, + ori_modifier: f32, }, LeapMelee { energy_cost: f32, @@ -1309,6 +1310,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { max_speed_increase, scales_from_combo, is_interruptible, + ori_modifier, } => CharacterState::ComboMelee(combo_melee::Data { static_data: combo_melee::StaticData { num_stages: stage_data.len() as u32, @@ -1320,6 +1322,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState { max_speed_increase: *max_speed_increase, scales_from_combo: *scales_from_combo, is_interruptible: *is_interruptible, + ori_modifier: *ori_modifier as f32, ability_info, }, stage: 1, diff --git a/common/src/states/basic_melee.rs b/common/src/states/basic_melee.rs index e27f5fec23..7346190829 100644 --- a/common/src/states/basic_melee.rs +++ b/common/src/states/basic_melee.rs @@ -52,6 +52,7 @@ impl CharacterBehavior for Data { handle_move(data, &mut update, 0.7); handle_jump(data, &mut update, 1.0); + handle_orientation(data, &mut update, 0.35); match self.stage_section { StageSection::Buildup => { diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index 5045ffbbf7..b97a822736 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -97,6 +97,8 @@ pub struct StaticData { pub scales_from_combo: u32, /// Whether the state can be interrupted by other abilities pub is_interruptible: bool, + /// xxx + pub ori_modifier: f32, /// What key is used to press ability pub ability_info: AbilityInfo, } @@ -120,7 +122,6 @@ impl CharacterBehavior for Data { let mut update = StateUpdate::from(data); handle_move(data, &mut update, 0.6); - handle_orientation(data, &mut update, 0.2); let stage_index = (self.stage - 1) as usize; @@ -135,6 +136,8 @@ impl CharacterBehavior for Data { match self.stage_section { StageSection::Buildup => { if self.timer < self.static_data.stage_data[stage_index].base_buildup_duration { + handle_orientation(data, &mut update, 0.35*self.static_data.ori_modifier); + // Build up update.character = CharacterState::ComboMelee(Data { static_data: self.static_data.clone(), @@ -228,6 +231,8 @@ impl CharacterBehavior for Data { }, StageSection::Swing => { if self.timer < self.static_data.stage_data[stage_index].base_swing_duration { + handle_orientation(data, &mut update, 0.35*self.static_data.ori_modifier); + // Forward movement handle_forced_movement( data, @@ -259,6 +264,7 @@ impl CharacterBehavior for Data { }, StageSection::Recover => { if self.timer < self.static_data.stage_data[stage_index].base_recover_duration { + handle_orientation(data, &mut update, 0.60*self.static_data.ori_modifier); // Recovers update.character = CharacterState::ComboMelee(Data { static_data: self.static_data.clone(), diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index e43ecc461f..716242a648 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -138,14 +138,14 @@ impl Body { Body::BirdLarge(_) => 7.0, Body::FishSmall(_) => 7.0, Body::BipedLarge(_) => 1.6, - Body::BipedSmall(_) => 2.4, + Body::BipedSmall(_) => 3.0, Body::Object(_) => 2.0, Body::Golem(_) => 0.8, Body::Theropod(theropod) => match theropod.species { - theropod::Species::Archaeos => 0.5, - theropod::Species::Odonto => 0.5, - theropod::Species::Ntouka => 0.5, - _ => 1.4, + theropod::Species::Archaeos => 1.0, + theropod::Species::Odonto => 1.0, + theropod::Species::Ntouka => 1.0, + _ => 2.0, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { quadruped_low::Species::Monitor => 1.8, diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 41eb872eb7..0247bf85c3 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -132,6 +132,7 @@ fn matches_ability_stage() { max_speed_increase: 0.8, scales_from_combo: 2, is_interruptible: true, + ori_modifier: 1.0, ability_info: empty_ability_info(), }, stage: 1, @@ -189,6 +190,7 @@ fn ignores_different_ability_stage() { max_speed_increase: 0.8, scales_from_combo: 2, is_interruptible: true, + ori_modifier: 1.0, ability_info: empty_ability_info(), }, stage: 1, From 769e21104e1cf04db11005830756d9731d9e878b Mon Sep 17 00:00:00 2001 From: jshipsey Date: Fri, 30 Apr 2021 20:11:07 -0400 Subject: [PATCH 2/3] higher health lower damage --- .../abilities/axesimple/doublestrike.ron | 2 +- assets/common/abilities/bowsimple/basic.ron | 2 +- .../abilities/hammersimple/doublestrike.ron | 2 +- assets/common/abilities/spear/dash.ron | 4 +- .../common/abilities/spear/doublestrike.ron | 10 +- .../common/abilities/staffsimple/firebomb.ron | 2 +- .../abilities/staffsimple/flamethrower.ron | 2 +- assets/common/abilities/swordsimple/dash.ron | 2 +- .../abilities/swordsimple/doublestrike.ron | 6 +- .../unique/birdlargebreathe/triplestrike.ron | 2 +- .../unique/birdlargefire/triplestrike.ron | 2 +- .../abilities/unique/husk/singlestrike.ron | 2 +- .../abilities/unique/husk/triplestrike.ron | 2 +- .../unique/quadlowbasic/singlestrike.ron | 2 +- .../unique/quadlowbasic/triplestrike.ron | 6 +- .../abilities/unique/quadlowbreathe/dash.ron | 4 +- .../unique/quadlowbreathe/flamethrower.ron | 2 +- .../unique/quadlowbreathe/triplestrike.ron | 8 +- .../abilities/unique/quadlowquick/dash.ron | 4 +- .../unique/quadlowquick/quadstrike.ron | 10 +- .../unique/quadlowranged/singlestrike.ron | 4 +- .../abilities/unique/quadlowtail/charged.ron | 4 +- .../unique/quadlowtail/triplestrike.ron | 8 +- .../unique/quadmedbasic/singlestrike.ron | 4 +- .../unique/quadmedbasic/triplestrike.ron | 16 +-- .../abilities/unique/quadmedcharge/dash.ron | 4 +- .../unique/quadmedcharge/doublestrike.ron | 6 +- .../abilities/unique/quadmedhoof/basic.ron | 2 +- .../unique/quadmedjump/doublestrike.ron | 4 +- .../abilities/unique/quadmedjump/leap.ron | 2 +- .../unique/quadmedjump/quickleap.ron | 2 +- .../abilities/unique/quadmedquick/dash.ron | 2 +- .../unique/quadmedquick/triplestrike.ron | 8 +- .../unique/quadsmallbasic/singlestrike.ron | 2 +- .../unique/stonegolemfist/singlestrike.ron | 2 +- .../unique/theropodbasic/singlestrike.ron | 4 +- .../unique/theropodbasic/triplestrike.ron | 8 +- .../unique/theropodbird/singlestrike.ron | 4 +- .../unique/theropodbird/triplestrike.ron | 8 +- .../unique/wendigomagic/singlestrike.ron | 6 +- common/src/comp/body.rs | 100 +++++++++--------- common/src/states/combo_melee.rs | 6 +- common/src/states/repeater_ranged.rs | 2 +- common/src/states/roll.rs | 2 +- common/src/states/utils.rs | 2 +- 45 files changed, 143 insertions(+), 145 deletions(-) diff --git a/assets/common/abilities/axesimple/doublestrike.ron b/assets/common/abilities/axesimple/doublestrike.ron index dd98038074..05df0249cd 100644 --- a/assets/common/abilities/axesimple/doublestrike.ron +++ b/assets/common/abilities/axesimple/doublestrike.ron @@ -36,5 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.6, ) \ No newline at end of file diff --git a/assets/common/abilities/bowsimple/basic.ron b/assets/common/abilities/bowsimple/basic.ron index 84534ca1df..91d4231346 100644 --- a/assets/common/abilities/bowsimple/basic.ron +++ b/assets/common/abilities/bowsimple/basic.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.3, projectile: Arrow( - damage: 70.0, + damage: 35.0, knockback: 5.0, energy_regen: 40, ), diff --git a/assets/common/abilities/hammersimple/doublestrike.ron b/assets/common/abilities/hammersimple/doublestrike.ron index c07c2dc304..a8ca1b7c13 100644 --- a/assets/common/abilities/hammersimple/doublestrike.ron +++ b/assets/common/abilities/hammersimple/doublestrike.ron @@ -36,5 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.6, ) \ No newline at end of file diff --git a/assets/common/abilities/spear/dash.ron b/assets/common/abilities/spear/dash.ron index d21c8c776c..cdfb6f93cb 100644 --- a/assets/common/abilities/spear/dash.ron +++ b/assets/common/abilities/spear/dash.ron @@ -1,7 +1,7 @@ DashMelee( energy_cost: 100, - base_damage: 80, - scaled_damage: 160, + base_damage: 60, + scaled_damage: 100, base_poise_damage: 45, scaled_poise_damage: 0, base_knockback: 8.0, diff --git a/assets/common/abilities/spear/doublestrike.ron b/assets/common/abilities/spear/doublestrike.ron index f01ba5c5c2..1bb7d2b346 100644 --- a/assets/common/abilities/spear/doublestrike.ron +++ b/assets/common/abilities/spear/doublestrike.ron @@ -2,8 +2,8 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 90, - damage_increase: 10, + base_damage: 65, + damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, knockback: 4.0, @@ -16,8 +16,8 @@ ComboMelee( ), ( stage: 2, - base_damage: 130, - damage_increase: 20, + base_damage: 80, + damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, knockback: 7.0, @@ -36,5 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 2, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.75, ) \ No newline at end of file diff --git a/assets/common/abilities/staffsimple/firebomb.ron b/assets/common/abilities/staffsimple/firebomb.ron index ced62b3e95..33c14f0f0f 100644 --- a/assets/common/abilities/staffsimple/firebomb.ron +++ b/assets/common/abilities/staffsimple/firebomb.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.35, projectile: Fireball( - damage: 80.0, + damage: 60.0, radius: 5.0, energy_regen: 50, ), diff --git a/assets/common/abilities/staffsimple/flamethrower.ron b/assets/common/abilities/staffsimple/flamethrower.ron index b6c65fc6d4..4842fdd20f 100644 --- a/assets/common/abilities/staffsimple/flamethrower.ron +++ b/assets/common/abilities/staffsimple/flamethrower.ron @@ -2,7 +2,7 @@ BasicBeam( buildup_duration: 0.5, recover_duration: 0.5, beam_duration: 1.0, - damage: 50, + damage: 35, tick_rate: 3.0, range: 20.0, max_angle: 15.0, diff --git a/assets/common/abilities/swordsimple/dash.ron b/assets/common/abilities/swordsimple/dash.ron index f22e4723d2..8ca171dc87 100644 --- a/assets/common/abilities/swordsimple/dash.ron +++ b/assets/common/abilities/swordsimple/dash.ron @@ -1,6 +1,6 @@ DashMelee( energy_cost: 100, - base_damage: 80, + base_damage: 90, scaled_damage: 160, base_poise_damage: 40, scaled_poise_damage: 0, diff --git a/assets/common/abilities/swordsimple/doublestrike.ron b/assets/common/abilities/swordsimple/doublestrike.ron index d1867ce98e..0149a1d010 100644 --- a/assets/common/abilities/swordsimple/doublestrike.ron +++ b/assets/common/abilities/swordsimple/doublestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 90, + base_damage: 80, damage_increase: 10, base_poise_damage: 15, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 130, + base_damage: 100, damage_increase: 15, base_poise_damage: 20, poise_damage_increase: 0, @@ -36,5 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) \ No newline at end of file diff --git a/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron b/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron index 1fa914bbfb..52dd0df667 100644 --- a/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron +++ b/assets/common/abilities/unique/birdlargebreathe/triplestrike.ron @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/birdlargefire/triplestrike.ron b/assets/common/abilities/unique/birdlargefire/triplestrike.ron index 1fa914bbfb..52dd0df667 100644 --- a/assets/common/abilities/unique/birdlargefire/triplestrike.ron +++ b/assets/common/abilities/unique/birdlargefire/triplestrike.ron @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/husk/singlestrike.ron b/assets/common/abilities/unique/husk/singlestrike.ron index 4a86ed217a..ffa369593d 100644 --- a/assets/common/abilities/unique/husk/singlestrike.ron +++ b/assets/common/abilities/unique/husk/singlestrike.ron @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.6, ) diff --git a/assets/common/abilities/unique/husk/triplestrike.ron b/assets/common/abilities/unique/husk/triplestrike.ron index 84996a33ba..304a5f4194 100644 --- a/assets/common/abilities/unique/husk/triplestrike.ron +++ b/assets/common/abilities/unique/husk/triplestrike.ron @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.6, ) diff --git a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron index 81e89cc33b..0cca84c302 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.6, ) diff --git a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron index 57dd26d526..c96ef1e8b1 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 120, + base_damage: 80, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 130, + base_damage: 80, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.65, ) diff --git a/assets/common/abilities/unique/quadlowbreathe/dash.ron b/assets/common/abilities/unique/quadlowbreathe/dash.ron index b441542ed7..969ec277cd 100644 --- a/assets/common/abilities/unique/quadlowbreathe/dash.ron +++ b/assets/common/abilities/unique/quadlowbreathe/dash.ron @@ -1,7 +1,7 @@ DashMelee( energy_cost: 0, - base_damage: 150, - scaled_damage: 110, + base_damage: 50, + scaled_damage: 100, base_poise_damage: 25, scaled_poise_damage: 0, base_knockback: 4.0, diff --git a/assets/common/abilities/unique/quadlowbreathe/flamethrower.ron b/assets/common/abilities/unique/quadlowbreathe/flamethrower.ron index 4bf507fa86..6a24929f17 100644 --- a/assets/common/abilities/unique/quadlowbreathe/flamethrower.ron +++ b/assets/common/abilities/unique/quadlowbreathe/flamethrower.ron @@ -2,7 +2,7 @@ BasicBeam( buildup_duration: 0.4, recover_duration: 0.25, beam_duration: 0.5, - damage: 50, + damage: 40, tick_rate: 3.0, range: 15.0, max_angle: 22.5, diff --git a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron index 1f7c1760e2..30e46dfb89 100644 --- a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 75, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 80, + base_damage: 75, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 130, + base_damage: 75, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/quadlowquick/dash.ron b/assets/common/abilities/unique/quadlowquick/dash.ron index de5ff5824d..3527c0f0a1 100644 --- a/assets/common/abilities/unique/quadlowquick/dash.ron +++ b/assets/common/abilities/unique/quadlowquick/dash.ron @@ -1,7 +1,7 @@ DashMelee( energy_cost: 0, - base_damage: 30, - scaled_damage: 10, + base_damage: 40, + scaled_damage: 80, base_poise_damage: 30, scaled_poise_damage: 0, base_knockback: 2.0, diff --git a/assets/common/abilities/unique/quadlowquick/quadstrike.ron b/assets/common/abilities/unique/quadlowquick/quadstrike.ron index 494c0216e6..6c44c33fc0 100644 --- a/assets/common/abilities/unique/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/unique/quadlowquick/quadstrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 60, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 130, + base_damage: 60, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 130, + base_damage: 60, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, @@ -44,7 +44,7 @@ ComboMelee( ), ( stage: 4, - base_damage: 130, + base_damage: 60, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, @@ -64,5 +64,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.8, ) diff --git a/assets/common/abilities/unique/quadlowranged/singlestrike.ron b/assets/common/abilities/unique/quadlowranged/singlestrike.ron index aad30f45ab..0491b36f0d 100644 --- a/assets/common/abilities/unique/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowranged/singlestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 60, + base_damage: 80, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.65, ) diff --git a/assets/common/abilities/unique/quadlowtail/charged.ron b/assets/common/abilities/unique/quadlowtail/charged.ron index 03d15c4aed..afba4713eb 100644 --- a/assets/common/abilities/unique/quadlowtail/charged.ron +++ b/assets/common/abilities/unique/quadlowtail/charged.ron @@ -1,8 +1,8 @@ ChargedMelee( energy_cost: 0, energy_drain: 0, - initial_damage: 160, - scaled_damage: 40, + initial_damage: 40, + scaled_damage: 200, initial_poise_damage: 30, scaled_poise_damage: 80, initial_knockback: 10.0, diff --git a/assets/common/abilities/unique/quadlowtail/triplestrike.ron b/assets/common/abilities/unique/quadlowtail/triplestrike.ron index c2962667ca..949f800633 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 80, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 22, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 120, + base_damage: 80, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 130, + base_damage: 80, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron index 23385404f3..263f03c309 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 120, + base_damage: 100, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron index 836157a2bb..56c1e30549 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -2,42 +2,42 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 120, + base_damage: 50, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.45, base_swing_duration: 0.07, - base_recover_duration: 0.4, + base_recover_duration: 0.2, forward_movement: 1.0, ), ( stage: 2, - base_damage: 120, + base_damage: 50, damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.25, + base_buildup_duration: 0.4, base_swing_duration: 0.07, base_recover_duration: 0.2, forward_movement: 0.0, ), ( stage: 3, - base_damage: 120, + base_damage: 50, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.25, + base_buildup_duration: 0.4, base_swing_duration: 0.07, base_recover_duration: 0.2, forward_movement: 1.0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/quadmedcharge/dash.ron b/assets/common/abilities/unique/quadmedcharge/dash.ron index 5248bf9350..a50f750c6a 100644 --- a/assets/common/abilities/unique/quadmedcharge/dash.ron +++ b/assets/common/abilities/unique/quadmedcharge/dash.ron @@ -1,7 +1,7 @@ DashMelee( energy_cost: 0, - base_damage: 150, - scaled_damage: 40, + base_damage: 50, + scaled_damage: 150, base_poise_damage: 28, scaled_poise_damage: 40, base_knockback: 8.0, diff --git a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron index b4518a2d18..53baad2121 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 75, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 80, + base_damage: 75, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 22, @@ -36,5 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/quadmedhoof/basic.ron b/assets/common/abilities/unique/quadmedhoof/basic.ron index 1852ca80f9..a50e87fce5 100644 --- a/assets/common/abilities/unique/quadmedhoof/basic.ron +++ b/assets/common/abilities/unique/quadmedhoof/basic.ron @@ -3,7 +3,7 @@ BasicMelee( buildup_duration: 0.45, swing_duration: 0.5, recover_duration: 0.35, - base_damage: 130, + base_damage: 100, base_poise_damage: 28, knockback: 25.0, range: 3.0, diff --git a/assets/common/abilities/unique/quadmedjump/doublestrike.ron b/assets/common/abilities/unique/quadmedjump/doublestrike.ron index b9f59ad6d3..afa2b9983e 100644 --- a/assets/common/abilities/unique/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedjump/doublestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 80, damage_increase: 0, base_poise_damage: 30, poise_damage_increase: 0, @@ -36,5 +36,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.8, ) diff --git a/assets/common/abilities/unique/quadmedjump/leap.ron b/assets/common/abilities/unique/quadmedjump/leap.ron index cecfe5b597..436316738f 100644 --- a/assets/common/abilities/unique/quadmedjump/leap.ron +++ b/assets/common/abilities/unique/quadmedjump/leap.ron @@ -4,7 +4,7 @@ LeapMelee( movement_duration: 0.4, swing_duration: 0.075, recover_duration: 0.2, - base_damage: 240, + base_damage: 120, base_poise_damage: 60, knockback: 4.0, range: 4.5, diff --git a/assets/common/abilities/unique/quadmedjump/quickleap.ron b/assets/common/abilities/unique/quadmedjump/quickleap.ron index 57ed67d56c..242a1ab31e 100644 --- a/assets/common/abilities/unique/quadmedjump/quickleap.ron +++ b/assets/common/abilities/unique/quadmedjump/quickleap.ron @@ -4,7 +4,7 @@ LeapMelee( movement_duration: 0.3, swing_duration: 0.075, recover_duration: 0.125, - base_damage: 120, + base_damage: 80, base_poise_damage: 30, knockback: 2.0, range: 4.5, diff --git a/assets/common/abilities/unique/quadmedquick/dash.ron b/assets/common/abilities/unique/quadmedquick/dash.ron index 32417b9055..c0601cda52 100644 --- a/assets/common/abilities/unique/quadmedquick/dash.ron +++ b/assets/common/abilities/unique/quadmedquick/dash.ron @@ -1,6 +1,6 @@ DashMelee( energy_cost: 0, - base_damage: 130, + base_damage: 75, scaled_damage: 20, base_poise_damage: 28, scaled_poise_damage: 28, diff --git a/assets/common/abilities/unique/quadmedquick/triplestrike.ron b/assets/common/abilities/unique/quadmedquick/triplestrike.ron index 1bd0149eac..b9e3d8986a 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 150, + base_damage: 100, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 150, + base_damage: 100, damage_increase: 0, base_poise_damage: 17, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 150, + base_damage: 100, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.8, ) diff --git a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron index 37addd9651..fcbdc34f2f 100644 --- a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/stonegolemfist/singlestrike.ron b/assets/common/abilities/unique/stonegolemfist/singlestrike.ron index d4446fcd84..71203402ee 100644 --- a/assets/common/abilities/unique/stonegolemfist/singlestrike.ron +++ b/assets/common/abilities/unique/stonegolemfist/singlestrike.ron @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/theropodbasic/singlestrike.ron b/assets/common/abilities/unique/theropodbasic/singlestrike.ron index f5ffcf8dc2..d382808d7a 100644 --- a/assets/common/abilities/unique/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/singlestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 150, + base_damage: 130, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/theropodbasic/triplestrike.ron b/assets/common/abilities/unique/theropodbasic/triplestrike.ron index a4364aa18e..2cb48e34bb 100644 --- a/assets/common/abilities/unique/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbasic/triplestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 170, + base_damage: 140, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 190, + base_damage: 160, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 230, + base_damage: 200, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/theropodbird/singlestrike.ron b/assets/common/abilities/unique/theropodbird/singlestrike.ron index 37f1cc1a85..d068cb222a 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 150, + base_damage: 110, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.8, ) diff --git a/assets/common/abilities/unique/theropodbird/triplestrike.ron b/assets/common/abilities/unique/theropodbird/triplestrike.ron index dd6e03f521..a2b45165fa 100644 --- a/assets/common/abilities/unique/theropodbird/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbird/triplestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 170, + base_damage: 110, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, @@ -16,7 +16,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 190, + base_damage: 150, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, @@ -30,7 +30,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 230, + base_damage: 180, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.75, ) diff --git a/assets/common/abilities/unique/wendigomagic/singlestrike.ron b/assets/common/abilities/unique/wendigomagic/singlestrike.ron index 64f066707c..c6667ccfab 100644 --- a/assets/common/abilities/unique/wendigomagic/singlestrike.ron +++ b/assets/common/abilities/unique/wendigomagic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 120, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, knockback: 3.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.6, base_swing_duration: 0.2, base_recover_duration: 0.4, forward_movement: 5.0, @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 1.0, + ori_modifier: 0.7, ) diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 1fe48767b6..398ab83d37 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -385,31 +385,29 @@ impl Body { match self { Body::Humanoid(_) => 500, Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { - quadruped_small::Species::Boar => 360, - quadruped_small::Species::Batfox => 200, - quadruped_small::Species::Dodarock => 640, - quadruped_small::Species::Holladon => 500, - quadruped_small::Species::Hyena => 300, - quadruped_small::Species::Truffler => 360, - _ => 200, + quadruped_small::Species::Boar => 600, + quadruped_small::Species::Batfox => 400, + quadruped_small::Species::Dodarock => 900, + quadruped_small::Species::Holladon => 700, + quadruped_small::Species::Hyena => 450, + quadruped_small::Species::Truffler => 450, + _ => 350, }, Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species { - quadruped_medium::Species::Grolgar => 600, - quadruped_medium::Species::Saber => 400, - quadruped_medium::Species::Tiger => 400, - quadruped_medium::Species::Tuskram => 600, + quadruped_medium::Species::Grolgar => 800, + quadruped_medium::Species::Saber => 500, + quadruped_medium::Species::Tiger => 500, quadruped_medium::Species::Lion => 800, quadruped_medium::Species::Tarasque => 1200, - quadruped_medium::Species::Wolf => 400, + quadruped_medium::Species::Wolf => 500, quadruped_medium::Species::Frostfang => 400, quadruped_medium::Species::Mouflon => 500, quadruped_medium::Species::Catoblepas => 1000, quadruped_medium::Species::Bonerattler => 400, - quadruped_medium::Species::Deer => 300, + quadruped_medium::Species::Deer => 450, quadruped_medium::Species::Hirdrasil => 500, quadruped_medium::Species::Roshwalr => 600, quadruped_medium::Species::Donkey => 500, - quadruped_medium::Species::Camel => 600, quadruped_medium::Species::Zebra => 500, quadruped_medium::Species::Antelope => 300, quadruped_medium::Species::Kelpie => 600, @@ -422,42 +420,42 @@ impl Body { quadruped_medium::Species::Bear => 800, quadruped_medium::Species::Moose => 600, quadruped_medium::Species::Dreadhorn => 1100, - _ => 400, + _ => 600, }, Body::BirdMedium(bird_medium) => match bird_medium.species { - bird_medium::Species::Chicken => 50, - bird_medium::Species::Duck => 50, - bird_medium::Species::Goose => 60, - bird_medium::Species::Parrot => 60, - bird_medium::Species::Peacock => 60, + bird_medium::Species::Chicken => 200, + bird_medium::Species::Duck => 200, + bird_medium::Species::Goose => 200, + bird_medium::Species::Parrot => 200, + bird_medium::Species::Peacock => 250, bird_medium::Species::Eagle => 400, - _ => 100, + _ => 250, }, - Body::FishMedium(_) => 50, + Body::FishMedium(_) => 250, Body::Dragon(_) => 5000, Body::BirdLarge(_) => 3000, Body::FishSmall(_) => 20, Body::BipedLarge(biped_large) => match biped_large.species { - biped_large::Species::Ogre => 2500, - biped_large::Species::Cyclops => 2000, - biped_large::Species::Wendigo => 2000, - biped_large::Species::Troll => 1500, - biped_large::Species::Dullahan => 2000, + biped_large::Species::Ogre => 3000, + biped_large::Species::Cyclops => 3000, + biped_large::Species::Wendigo => 2800, + biped_large::Species::Troll => 2200, + biped_large::Species::Dullahan => 3000, biped_large::Species::Mindflayer => 8000, biped_large::Species::Tidalwarrior => 2500, - biped_large::Species::Yeti => 2000, + biped_large::Species::Yeti => 4000, biped_large::Species::Minotaur => 5000, - biped_large::Species::Harvester => 2000, + biped_large::Species::Harvester => 3000, biped_large::Species::Blueoni => 2300, biped_large::Species::Redoni => 2300, - _ => 1000, + _ => 1200, }, Body::BipedSmall(biped_small) => match biped_small.species { - biped_small::Species::Gnarling => 300, - biped_small::Species::Adlet => 400, - biped_small::Species::Sahagin => 500, - biped_small::Species::Haniwa => 700, - biped_small::Species::Myrmidon => 800, + biped_small::Species::Gnarling => 500, + biped_small::Species::Adlet => 600, + biped_small::Species::Sahagin => 800, + biped_small::Species::Haniwa => 900, + biped_small::Species::Myrmidon => 900, biped_small::Species::Husk => 200, _ => 600, }, @@ -468,25 +466,25 @@ impl Body { }, Body::Golem(_) => 2740, Body::Theropod(theropod) => match theropod.species { - theropod::Species::Archaeos => 3000, - theropod::Species::Odonto => 2700, + theropod::Species::Archaeos => 3500, + theropod::Species::Odonto => 3000, _ => 1100, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { - quadruped_low::Species::Crocodile => 600, - quadruped_low::Species::Alligator => 600, - quadruped_low::Species::Salamander => 400, - quadruped_low::Species::Monitor => 150, - quadruped_low::Species::Asp => 400, - quadruped_low::Species::Tortoise => 600, - quadruped_low::Species::Rocksnapper => 1000, - quadruped_low::Species::Pangolin => 80, - quadruped_low::Species::Maneater => 400, - quadruped_low::Species::Sandshark => 800, - quadruped_low::Species::Hakulaq => 400, - quadruped_low::Species::Lavadrake => 900, - quadruped_low::Species::Deadwood => 600, - _ => 200, + quadruped_low::Species::Crocodile => 800, + quadruped_low::Species::Alligator => 900, + quadruped_low::Species::Monitor => 600, + quadruped_low::Species::Asp => 750, + quadruped_low::Species::Tortoise => 900, + quadruped_low::Species::Rocksnapper => 1200, + quadruped_low::Species::Pangolin => 400, + quadruped_low::Species::Maneater => 700, + quadruped_low::Species::Sandshark => 900, + quadruped_low::Species::Hakulaq => 500, + quadruped_low::Species::Lavadrake => 1000, + quadruped_low::Species::Basilisk => 1000, + quadruped_low::Species::Deadwood => 700, + _ => 700, }, Body::Ship(_) => 10000, } diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index b97a822736..bcf912d26c 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -136,7 +136,7 @@ impl CharacterBehavior for Data { match self.stage_section { StageSection::Buildup => { if self.timer < self.static_data.stage_data[stage_index].base_buildup_duration { - handle_orientation(data, &mut update, 0.35*self.static_data.ori_modifier); + handle_orientation(data, &mut update, 0.4*self.static_data.ori_modifier); // Build up update.character = CharacterState::ComboMelee(Data { @@ -231,7 +231,7 @@ impl CharacterBehavior for Data { }, StageSection::Swing => { if self.timer < self.static_data.stage_data[stage_index].base_swing_duration { - handle_orientation(data, &mut update, 0.35*self.static_data.ori_modifier); + handle_orientation(data, &mut update, 0.4*self.static_data.ori_modifier); // Forward movement handle_forced_movement( @@ -264,7 +264,7 @@ impl CharacterBehavior for Data { }, StageSection::Recover => { if self.timer < self.static_data.stage_data[stage_index].base_recover_duration { - handle_orientation(data, &mut update, 0.60*self.static_data.ori_modifier); + handle_orientation(data, &mut update, 0.8*self.static_data.ori_modifier); // Recovers update.character = CharacterState::ComboMelee(Data { static_data: self.static_data.clone(), diff --git a/common/src/states/repeater_ranged.rs b/common/src/states/repeater_ranged.rs index 9c298fc1a0..ef385edcdb 100644 --- a/common/src/states/repeater_ranged.rs +++ b/common/src/states/repeater_ranged.rs @@ -49,7 +49,7 @@ pub struct Data { impl CharacterBehavior for Data { fn behavior(&self, data: &JoinData) -> StateUpdate { let mut update = StateUpdate::from(data); - + handle_orientation(data, &mut update, 1.0); handle_move(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0); diff --git a/common/src/states/roll.rs b/common/src/states/roll.rs index 71e62c54bc..547a703499 100644 --- a/common/src/states/roll.rs +++ b/common/src/states/roll.rs @@ -47,7 +47,7 @@ impl CharacterBehavior for Data { let mut update = StateUpdate::from(data); // Smooth orientation - handle_orientation(data, &mut update, 1.3); + handle_orientation(data, &mut update, 2.5); match self.stage_section { StageSection::Buildup => { diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 716242a648..d9631d1897 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -129,7 +129,7 @@ impl Body { /// The turn rate in 180°/s (or (rotations per second)/2) pub fn base_ori_rate(&self) -> f32 { match self { - Body::Humanoid(_) => 4.0, + Body::Humanoid(_) => 800.0, Body::QuadrupedSmall(_) => 3.0, Body::QuadrupedMedium(_) => 1.6, Body::BirdMedium(_) => 6.0, From 63fdc4f5901e6c85b1cf80bf938f8875dbc384d4 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 1 May 2021 12:29:01 -0400 Subject: [PATCH 3/3] animal adjustments --- .../unique/quadlowbasic/singlestrike.ron | 2 +- .../unique/quadlowbasic/triplestrike.ron | 6 +- .../abilities/unique/quadlowbreathe/dash.ron | 2 +- .../unique/quadlowbreathe/triplestrike.ron | 6 +- .../unique/quadlowquick/quadstrike.ron | 8 +-- .../unique/quadlowtail/triplestrike.ron | 6 +- .../unique/quadmedbasic/singlestrike.ron | 2 +- .../unique/quadmedbasic/triplestrike.ron | 6 +- .../abilities/unique/quadmedcharge/dash.ron | 2 +- .../unique/quadmedcharge/doublestrike.ron | 4 +- .../abilities/unique/quadmedhoof/basic.ron | 4 +- .../unique/quadmedjump/doublestrike.ron | 4 +- .../unique/quadmedquick/triplestrike.ron | 12 ++-- .../unique/quadsmallbasic/singlestrike.ron | 4 +- .../unique/theropodbird/singlestrike.ron | 6 +- .../unique/theropodbird/triplestrike.ron | 14 ++-- common/src/comp/body.rs | 66 +++++++++---------- common/src/states/basic_block.rs | 1 + common/src/states/combo_melee.rs | 10 +-- common/src/states/leap_melee.rs | 1 + common/src/states/utils.rs | 30 ++++----- 21 files changed, 98 insertions(+), 98 deletions(-) diff --git a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron index 0cca84c302..319d99ca6d 100644 --- a/assets/common/abilities/unique/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/singlestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, - range: 3.5, + range: 2.0, angle: 60.0, base_buildup_duration: 0.4, base_swing_duration: 0.07, diff --git a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron index c96ef1e8b1..826a07f2f7 100644 --- a/assets/common/abilities/unique/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbasic/triplestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 7.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.65, base_swing_duration: 0.07, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 18, poise_damage_increase: 0, knockback: 7.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.07, @@ -35,7 +35,7 @@ ComboMelee( base_poise_damage: 20, poise_damage_increase: 0, knockback: 7.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.07, diff --git a/assets/common/abilities/unique/quadlowbreathe/dash.ron b/assets/common/abilities/unique/quadlowbreathe/dash.ron index 969ec277cd..e4c80e1829 100644 --- a/assets/common/abilities/unique/quadlowbreathe/dash.ron +++ b/assets/common/abilities/unique/quadlowbreathe/dash.ron @@ -6,7 +6,7 @@ DashMelee( scaled_poise_damage: 0, base_knockback: 4.0, scaled_knockback: 17.0, - range: 5.0, + range: 2.5, angle: 45.0, energy_drain: 0, forward_speed: 4.0, diff --git a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron index 30e46dfb89..c59cce365b 100644 --- a/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowbreathe/triplestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 0, poise_damage_increase: 0, knockback: 10.0, - range: 4.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.65, base_swing_duration: 0.1, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 0, poise_damage_increase: 0, knockback: 10.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.1, @@ -35,7 +35,7 @@ ComboMelee( base_poise_damage: 0, poise_damage_increase: 0, knockback: 10.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.1, diff --git a/assets/common/abilities/unique/quadlowquick/quadstrike.ron b/assets/common/abilities/unique/quadlowquick/quadstrike.ron index 6c44c33fc0..31f339d8d4 100644 --- a/assets/common/abilities/unique/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/unique/quadlowquick/quadstrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 2.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.6, base_swing_duration: 0.1, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 2.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.15, base_swing_duration: 0.07, @@ -35,7 +35,7 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 2.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.2, base_swing_duration: 0.07, @@ -49,7 +49,7 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 8.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.2, base_swing_duration: 0.07, diff --git a/assets/common/abilities/unique/quadlowtail/triplestrike.ron b/assets/common/abilities/unique/quadlowtail/triplestrike.ron index 949f800633..968461e069 100644 --- a/assets/common/abilities/unique/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/unique/quadlowtail/triplestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 0, poise_damage_increase: 22, knockback: 10.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.65, base_swing_duration: 0.1, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 22, poise_damage_increase: 0, knockback: 10.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.2, base_swing_duration: 0.1, @@ -35,7 +35,7 @@ ComboMelee( base_poise_damage: 22, poise_damage_increase: 0, knockback: 10.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.2, base_swing_duration: 0.1, diff --git a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron index 263f03c309..ec5e118f31 100644 --- a/assets/common/abilities/unique/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/singlestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 28, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, + range: 2.7, angle: 60.0, base_buildup_duration: 0.4, base_swing_duration: 0.1, diff --git a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron index 56c1e30549..b4727b9941 100644 --- a/assets/common/abilities/unique/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedbasic/triplestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.45, base_swing_duration: 0.07, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 18, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.07, @@ -35,7 +35,7 @@ ComboMelee( base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.07, diff --git a/assets/common/abilities/unique/quadmedcharge/dash.ron b/assets/common/abilities/unique/quadmedcharge/dash.ron index a50f750c6a..d6399d7e22 100644 --- a/assets/common/abilities/unique/quadmedcharge/dash.ron +++ b/assets/common/abilities/unique/quadmedcharge/dash.ron @@ -6,7 +6,7 @@ DashMelee( scaled_poise_damage: 40, base_knockback: 8.0, scaled_knockback: 17.0, - range: 4.0, + range: 2.5, angle: 45.0, energy_drain: 0, forward_speed: 2.0, diff --git a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron index 53baad2121..a8215e41c9 100644 --- a/assets/common/abilities/unique/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedcharge/doublestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 22, poise_damage_increase: 0, knockback: 10.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.65, base_swing_duration: 0.1, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 0, poise_damage_increase: 22, knockback: 10.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.1, diff --git a/assets/common/abilities/unique/quadmedhoof/basic.ron b/assets/common/abilities/unique/quadmedhoof/basic.ron index a50e87fce5..a451c250e0 100644 --- a/assets/common/abilities/unique/quadmedhoof/basic.ron +++ b/assets/common/abilities/unique/quadmedhoof/basic.ron @@ -6,6 +6,6 @@ BasicMelee( base_damage: 100, base_poise_damage: 28, knockback: 25.0, - range: 3.0, - max_angle: 120.0, + range: 1.2, + max_angle: 50.0, ) diff --git a/assets/common/abilities/unique/quadmedjump/doublestrike.ron b/assets/common/abilities/unique/quadmedjump/doublestrike.ron index afa2b9983e..251b3d789d 100644 --- a/assets/common/abilities/unique/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/unique/quadmedjump/doublestrike.ron @@ -7,7 +7,7 @@ ComboMelee( base_poise_damage: 30, poise_damage_increase: 0, knockback: 4.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.65, base_swing_duration: 0.1, @@ -21,7 +21,7 @@ ComboMelee( base_poise_damage: 30, poise_damage_increase: 0, knockback: 4.0, - range: 3.5, + range: 2.2, angle: 30.0, base_buildup_duration: 0.4, base_swing_duration: 0.1, diff --git a/assets/common/abilities/unique/quadmedquick/triplestrike.ron b/assets/common/abilities/unique/quadmedquick/triplestrike.ron index b9e3d8986a..aa51ae76f4 100644 --- a/assets/common/abilities/unique/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/unique/quadmedquick/triplestrike.ron @@ -7,8 +7,8 @@ ComboMelee( base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, - angle: 60.0, + range: 2.2, + angle: 40.0, base_buildup_duration: 0.6, base_swing_duration: 0.15, base_recover_duration: 0.4, @@ -21,8 +21,8 @@ ComboMelee( base_poise_damage: 17, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, - angle: 60.0, + range: 2.2, + angle: 40.0, base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.3, @@ -35,8 +35,8 @@ ComboMelee( base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, - angle: 60.0, + range: 2.2, + angle: 40.0, base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.3, diff --git a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron index fcbdc34f2f..76a8b37fae 100644 --- a/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/unique/quadsmallbasic/singlestrike.ron @@ -7,8 +7,8 @@ ComboMelee( base_poise_damage: 10, poise_damage_increase: 0, knockback: 3.0, - range: 3.5, - angle: 60.0, + range: 1.5, + angle: 50.0, base_buildup_duration: 0.3, base_swing_duration: 0.15, base_recover_duration: 0.3, diff --git a/assets/common/abilities/unique/theropodbird/singlestrike.ron b/assets/common/abilities/unique/theropodbird/singlestrike.ron index d068cb222a..80450f2269 100644 --- a/assets/common/abilities/unique/theropodbird/singlestrike.ron +++ b/assets/common/abilities/unique/theropodbird/singlestrike.ron @@ -7,8 +7,8 @@ ComboMelee( base_poise_damage: 28, poise_damage_increase: 0, knockback: 2.0, - range: 5.5, - angle: 5.0, + range: 3.0, + angle: 15.0, base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.4, @@ -22,5 +22,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 0.8, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/unique/theropodbird/triplestrike.ron b/assets/common/abilities/unique/theropodbird/triplestrike.ron index a2b45165fa..be2a5f623c 100644 --- a/assets/common/abilities/unique/theropodbird/triplestrike.ron +++ b/assets/common/abilities/unique/theropodbird/triplestrike.ron @@ -7,8 +7,8 @@ ComboMelee( base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, - range: 4.5, - angle: 5.0, + range: 3.0, + angle: 15.0, base_buildup_duration: 0.65, base_swing_duration: 0.15, base_recover_duration: 0.3, @@ -21,8 +21,8 @@ ComboMelee( base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, - range: 4.0, - angle: 10.0, + range: 3.0, + angle: 15.0, base_buildup_duration: 0.4, base_swing_duration: 0.15, base_recover_duration: 0.15, @@ -35,8 +35,8 @@ ComboMelee( base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, - range: 4.0, - angle: 10.0, + range: 3.0, + angle: 15.0, base_buildup_duration: 0.35, base_swing_duration: 0.125, base_recover_duration: 0.9, @@ -50,5 +50,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 0.75, + ori_modifier: 0.6, ) diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 398ab83d37..d40719d958 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -385,50 +385,50 @@ impl Body { match self { Body::Humanoid(_) => 500, Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { - quadruped_small::Species::Boar => 600, + quadruped_small::Species::Boar => 700, quadruped_small::Species::Batfox => 400, - quadruped_small::Species::Dodarock => 900, - quadruped_small::Species::Holladon => 700, + quadruped_small::Species::Dodarock => 1000, + quadruped_small::Species::Holladon => 800, quadruped_small::Species::Hyena => 450, quadruped_small::Species::Truffler => 450, - _ => 350, + _ => 400, }, Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species { - quadruped_medium::Species::Grolgar => 800, - quadruped_medium::Species::Saber => 500, - quadruped_medium::Species::Tiger => 500, - quadruped_medium::Species::Lion => 800, - quadruped_medium::Species::Tarasque => 1200, - quadruped_medium::Species::Wolf => 500, + quadruped_medium::Species::Grolgar => 900, + quadruped_medium::Species::Saber => 600, + quadruped_medium::Species::Tiger => 700, + quadruped_medium::Species::Lion => 900, + quadruped_medium::Species::Tarasque => 1500, + quadruped_medium::Species::Wolf => 550, quadruped_medium::Species::Frostfang => 400, quadruped_medium::Species::Mouflon => 500, quadruped_medium::Species::Catoblepas => 1000, - quadruped_medium::Species::Bonerattler => 400, - quadruped_medium::Species::Deer => 450, - quadruped_medium::Species::Hirdrasil => 500, - quadruped_medium::Species::Roshwalr => 600, - quadruped_medium::Species::Donkey => 500, - quadruped_medium::Species::Zebra => 500, - quadruped_medium::Species::Antelope => 300, + quadruped_medium::Species::Bonerattler => 500, + quadruped_medium::Species::Deer => 500, + quadruped_medium::Species::Hirdrasil => 700, + quadruped_medium::Species::Roshwalr => 800, + quadruped_medium::Species::Donkey => 550, + quadruped_medium::Species::Zebra => 550, + quadruped_medium::Species::Antelope => 450, quadruped_medium::Species::Kelpie => 600, quadruped_medium::Species::Horse => 600, quadruped_medium::Species::Barghest => 1700, quadruped_medium::Species::Cattle => 1000, quadruped_medium::Species::Highland => 1200, - quadruped_medium::Species::Yak => 1000, - quadruped_medium::Species::Panda => 800, - quadruped_medium::Species::Bear => 800, - quadruped_medium::Species::Moose => 600, + quadruped_medium::Species::Yak => 1100, + quadruped_medium::Species::Panda => 900, + quadruped_medium::Species::Bear => 900, + quadruped_medium::Species::Moose => 800, quadruped_medium::Species::Dreadhorn => 1100, - _ => 600, + _ => 700, }, Body::BirdMedium(bird_medium) => match bird_medium.species { - bird_medium::Species::Chicken => 200, - bird_medium::Species::Duck => 200, - bird_medium::Species::Goose => 200, - bird_medium::Species::Parrot => 200, - bird_medium::Species::Peacock => 250, - bird_medium::Species::Eagle => 400, + bird_medium::Species::Chicken => 300, + bird_medium::Species::Duck => 300, + bird_medium::Species::Goose => 300, + bird_medium::Species::Parrot => 250, + bird_medium::Species::Peacock => 350, + bird_medium::Species::Eagle => 450, _ => 250, }, Body::FishMedium(_) => 250, @@ -436,18 +436,18 @@ impl Body { Body::BirdLarge(_) => 3000, Body::FishSmall(_) => 20, Body::BipedLarge(biped_large) => match biped_large.species { - biped_large::Species::Ogre => 3000, - biped_large::Species::Cyclops => 3000, + biped_large::Species::Ogre => 3200, + biped_large::Species::Cyclops => 3200, biped_large::Species::Wendigo => 2800, - biped_large::Species::Troll => 2200, + biped_large::Species::Troll => 2400, biped_large::Species::Dullahan => 3000, biped_large::Species::Mindflayer => 8000, biped_large::Species::Tidalwarrior => 2500, biped_large::Species::Yeti => 4000, biped_large::Species::Minotaur => 5000, biped_large::Species::Harvester => 3000, - biped_large::Species::Blueoni => 2300, - biped_large::Species::Redoni => 2300, + biped_large::Species::Blueoni => 2400, + biped_large::Species::Redoni => 2400, _ => 1200, }, Body::BipedSmall(biped_small) => match biped_small.species { diff --git a/common/src/states/basic_block.rs b/common/src/states/basic_block.rs index dffe356fe8..9df5057703 100644 --- a/common/src/states/basic_block.rs +++ b/common/src/states/basic_block.rs @@ -36,6 +36,7 @@ impl CharacterBehavior for Data { fn behavior(&self, data: &JoinData) -> StateUpdate { let mut update = StateUpdate::from(data); + handle_orientation(data, &mut update, 1.0); handle_move(&data, &mut update, 0.4); match self.stage_section { diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index bcf912d26c..c42df5dd34 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -97,7 +97,7 @@ pub struct StaticData { pub scales_from_combo: u32, /// Whether the state can be interrupted by other abilities pub is_interruptible: bool, - /// xxx + /// Adjusts turning rate during the attack pub ori_modifier: f32, /// What key is used to press ability pub ability_info: AbilityInfo, @@ -121,7 +121,7 @@ impl CharacterBehavior for Data { fn behavior(&self, data: &JoinData) -> StateUpdate { let mut update = StateUpdate::from(data); - handle_move(data, &mut update, 0.6); + handle_move(data, &mut update, 0.4); let stage_index = (self.stage - 1) as usize; @@ -136,7 +136,7 @@ impl CharacterBehavior for Data { match self.stage_section { StageSection::Buildup => { if self.timer < self.static_data.stage_data[stage_index].base_buildup_duration { - handle_orientation(data, &mut update, 0.4*self.static_data.ori_modifier); + handle_orientation(data, &mut update, 0.4 * self.static_data.ori_modifier); // Build up update.character = CharacterState::ComboMelee(Data { @@ -231,7 +231,7 @@ impl CharacterBehavior for Data { }, StageSection::Swing => { if self.timer < self.static_data.stage_data[stage_index].base_swing_duration { - handle_orientation(data, &mut update, 0.4*self.static_data.ori_modifier); + handle_orientation(data, &mut update, 0.4 * self.static_data.ori_modifier); // Forward movement handle_forced_movement( @@ -264,7 +264,7 @@ impl CharacterBehavior for Data { }, StageSection::Recover => { if self.timer < self.static_data.stage_data[stage_index].base_recover_duration { - handle_orientation(data, &mut update, 0.8*self.static_data.ori_modifier); + handle_orientation(data, &mut update, 0.8 * self.static_data.ori_modifier); // Recovers update.character = CharacterState::ComboMelee(Data { static_data: self.static_data.clone(), diff --git a/common/src/states/leap_melee.rs b/common/src/states/leap_melee.rs index cba0fd7718..7231ab45c3 100644 --- a/common/src/states/leap_melee.rs +++ b/common/src/states/leap_melee.rs @@ -56,6 +56,7 @@ impl CharacterBehavior for Data { fn behavior(&self, data: &JoinData) -> StateUpdate { let mut update = StateUpdate::from(data); + handle_orientation(data, &mut update, 1.0); handle_move(data, &mut update, 0.3); handle_jump(data, &mut update, 1.0); diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index d9631d1897..b8fadff6c0 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -129,32 +129,30 @@ impl Body { /// The turn rate in 180°/s (or (rotations per second)/2) pub fn base_ori_rate(&self) -> f32 { match self { - Body::Humanoid(_) => 800.0, + Body::Humanoid(_) => 3.5, Body::QuadrupedSmall(_) => 3.0, - Body::QuadrupedMedium(_) => 1.6, + Body::QuadrupedMedium(_) => 2.8, Body::BirdMedium(_) => 6.0, Body::FishMedium(_) => 6.0, Body::Dragon(_) => 1.0, Body::BirdLarge(_) => 7.0, Body::FishSmall(_) => 7.0, - Body::BipedLarge(_) => 1.6, - Body::BipedSmall(_) => 3.0, + Body::BipedLarge(_) => 2.7, + Body::BipedSmall(_) => 3.5, Body::Object(_) => 2.0, - Body::Golem(_) => 0.8, + Body::Golem(_) => 2.0, Body::Theropod(theropod) => match theropod.species { - theropod::Species::Archaeos => 1.0, - theropod::Species::Odonto => 1.0, - theropod::Species::Ntouka => 1.0, - _ => 2.0, + theropod::Species::Archaeos => 2.3, + theropod::Species::Odonto => 2.3, + theropod::Species::Ntouka => 2.3, + _ => 2.5, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { - quadruped_low::Species::Monitor => 1.8, - quadruped_low::Species::Asp => 1.6, - quadruped_low::Species::Tortoise => 0.6, - quadruped_low::Species::Rocksnapper => 0.8, - quadruped_low::Species::Maneater => 1.0, - quadruped_low::Species::Lavadrake => 0.8, - _ => 1.2, + quadruped_low::Species::Asp => 2.2, + quadruped_low::Species::Tortoise => 1.5, + quadruped_low::Species::Rocksnapper => 1.8, + quadruped_low::Species::Lavadrake => 1.7, + _ => 2.0, }, Body::Ship(_) => 0.035, }