diff --git a/assets/common/abilities/sword/agile_perforate.ron b/assets/common/abilities/sword/agile_perforate.ron index 2abe0139ff..9d93bc3177 100644 --- a/assets/common/abilities/sword/agile_perforate.ron +++ b/assets/common/abilities/sword/agile_perforate.ron @@ -1,19 +1,19 @@ RapidMelee( buildup_duration: 0.2, - swing_duration: 0.1, + swing_duration: 0.15, recover_duration: 0.3, melee_constructor: ( kind: Slash( - damage: 3, + damage: 2.5, poise: 1, knockback: 0, energy_regen: 2, ), - range: 5.0, + range: 4.0, angle: 5.0, ), energy_cost: 0, max_strikes: None, - move_modifier: 0.35, - ori_modifier: 0.25, + move_modifier: 0.3, + ori_modifier: 0.2, ) diff --git a/assets/common/abilities/sword/cleaving_spiral_slash.ron b/assets/common/abilities/sword/cleaving_spiral_slash.ron index 47d7ef0007..dd5996d0fc 100644 --- a/assets/common/abilities/sword/cleaving_spiral_slash.ron +++ b/assets/common/abilities/sword/cleaving_spiral_slash.ron @@ -3,7 +3,7 @@ ChargedMelee( energy_drain: 0, melee_constructor: ( kind: Slash( - damage: 10, + damage: 5, poise: 0, knockback: 0, energy_regen: 0, diff --git a/assets/voxygen/element/skills/sword/agile_feint.png b/assets/voxygen/element/skills/sword/agile_feint.png index 5da18d6aa2..bd037c7a7e 100644 --- a/assets/voxygen/element/skills/sword/agile_feint.png +++ b/assets/voxygen/element/skills/sword/agile_feint.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:321bc14fcad300e30c3b86b16f7ac848f7abe888bea4f7035d38ccfa7b123aa8 -size 506 +oid sha256:651a2d34b2481f579e71ad8ebaf403b7a3eebed1da582d6afac3546f85957799 +size 439 diff --git a/assets/voxygen/element/skills/sword/agile_flurry.png b/assets/voxygen/element/skills/sword/agile_flurry.png index bf4ffd716a..c4b77149d2 100644 --- a/assets/voxygen/element/skills/sword/agile_flurry.png +++ b/assets/voxygen/element/skills/sword/agile_flurry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d20d593c69a2d93652dbf2758bff688086b08f78cba2abe5476128145e86b6 -size 495 +oid sha256:6cada94047c8cd0666259230ce0dcd72f46c47bde32a578e3873f55ea2c10fcc +size 476 diff --git a/assets/voxygen/element/skills/sword/agile_quick_draw.png b/assets/voxygen/element/skills/sword/agile_quick_draw.png index 770ebaa9b2..ce8c43c7c4 100644 --- a/assets/voxygen/element/skills/sword/agile_quick_draw.png +++ b/assets/voxygen/element/skills/sword/agile_quick_draw.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e35a590f5d306b42de6ca75ef57080673e7925a6836e64e24aa7b75d0df8533 -size 3433 +oid sha256:49adcc7dedabcac07fa2eb03af2da557254dca8397c5a76c8ba183a3b28e707d +size 414 diff --git a/assets/voxygen/element/skills/sword/cleaving_blade_fever.png b/assets/voxygen/element/skills/sword/cleaving_blade_fever.png index ebed6c8964..db1c7e3e42 100644 --- a/assets/voxygen/element/skills/sword/cleaving_blade_fever.png +++ b/assets/voxygen/element/skills/sword/cleaving_blade_fever.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3f3bf7093934cf8acea3cec6625eae6ab2b735808eeab068a963e7032eace5d -size 571 +oid sha256:2dc0a2b908d5a95fd00c11dffcc68a0bc9951e214e689d1f8b708e7cfa210bdb +size 371 diff --git a/server/agent/src/attack.rs b/server/agent/src/attack.rs index 9ee9b78960..bd80655591 100644 --- a/server/agent/src/attack.rs +++ b/server/agent/src/attack.rs @@ -814,9 +814,13 @@ impl<'a> AgentData<'a> { > agent.action_state.counters[FloatCounters::GuardedTimer as usize] { agent.action_state.timers[Timers::GuardedCycle as usize] = 0.0; - agent.action_state.counters[FloatCounters::GuardedTimer as usize] = - rng.gen_range(3.0..6.0); agent.action_state.conditions[Conditions::GuardedDefend as usize] ^= true; + agent.action_state.counters[FloatCounters::GuardedTimer as usize] = + if agent.action_state.conditions[Conditions::GuardedDefend as usize] { + rng.gen_range(3.0..6.0) + } else { + rng.gen_range(6.0..10.0) + }; } if let Some(pos) = agent.action_state.positions[Positions::GuardedCover as usize] { if pos.distance_squared(self.pos.0) < 3_f32.powi(2) {