diff --git a/assets/common/abilities/axe/cleave.ron b/assets/common/abilities/axe/cleave.ron index 73cadff3f0..6f965e3d5c 100644 --- a/assets/common/abilities/axe/cleave.ron +++ b/assets/common/abilities/axe/cleave.ron @@ -13,7 +13,7 @@ ChargedMelee( damage: 20, poise: 5, knockback: 0, - energy_regen: 15, + energy_regen: 20, ))), range: 4.5, angle: 10.0, diff --git a/assets/common/abilities/axe/triple_chop.ron b/assets/common/abilities/axe/triple_chop.ron index 3d07c92885..90881d4149 100644 --- a/assets/common/abilities/axe/triple_chop.ron +++ b/assets/common/abilities/axe/triple_chop.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 4, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 7, ), range: 3.0, angle: 30.0, @@ -23,7 +23,7 @@ ComboMelee2( damage: 4, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 7, ), range: 3.0, angle: 30.0, @@ -40,7 +40,7 @@ ComboMelee2( damage: 8, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 7, ), range: 3.0, angle: 10.0, diff --git a/assets/common/abilities/sword/agile_double_slash.ron b/assets/common/abilities/sword/agile_double_slash.ron index da678eefee..3a282def79 100644 --- a/assets/common/abilities/sword/agile_double_slash.ron +++ b/assets/common/abilities/sword/agile_double_slash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 2, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 7, ), range: 3.0, angle: 45.0, @@ -23,7 +23,7 @@ ComboMelee2( damage: 3, poise: 5, knockback: 0, - energy_regen: 10, + energy_regen: 7, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/agile_perforate.ron b/assets/common/abilities/sword/agile_perforate.ron index e25f86db76..1e9bea9879 100644 --- a/assets/common/abilities/sword/agile_perforate.ron +++ b/assets/common/abilities/sword/agile_perforate.ron @@ -7,7 +7,7 @@ RapidMelee( damage: 2, poise: 1, knockback: 0, - energy_regen: 2, + energy_regen: 4, ), range: 4.0, angle: 5.0, diff --git a/assets/common/abilities/sword/basic_double_slash.ron b/assets/common/abilities/sword/basic_double_slash.ron index 9a814b5868..ee2e957513 100644 --- a/assets/common/abilities/sword/basic_double_slash.ron +++ b/assets/common/abilities/sword/basic_double_slash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 4, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 10, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/basic_thrust.ron b/assets/common/abilities/sword/basic_thrust.ron index 44ccf7e1b0..441647d8d2 100644 --- a/assets/common/abilities/sword/basic_thrust.ron +++ b/assets/common/abilities/sword/basic_thrust.ron @@ -13,7 +13,7 @@ ChargedMelee( damage: 15, poise: 5, knockback: 0, - energy_regen: 15, + energy_regen: 20, ))), range: 4.5, angle: 10.0, diff --git a/assets/common/abilities/sword/cleaving_double_slash.ron b/assets/common/abilities/sword/cleaving_double_slash.ron index 4d2ed0b2f3..b328f29986 100644 --- a/assets/common/abilities/sword/cleaving_double_slash.ron +++ b/assets/common/abilities/sword/cleaving_double_slash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 4, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 7, ), range: 3.0, angle: 45.0, @@ -24,7 +24,7 @@ ComboMelee2( damage: 7, poise: 5, knockback: 0, - energy_regen: 10, + energy_regen: 7, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/crippling_bloody_gash.ron b/assets/common/abilities/sword/crippling_bloody_gash.ron index 293517ab57..5db5a4c71a 100644 --- a/assets/common/abilities/sword/crippling_bloody_gash.ron +++ b/assets/common/abilities/sword/crippling_bloody_gash.ron @@ -15,7 +15,7 @@ ComboMelee2( buildup_duration: 0.2, swing_duration: 0.1, hit_timing: 0.5, - recover_duration: 0.35, + recover_duration: 0.2, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/crippling_deep_rend.ron b/assets/common/abilities/sword/crippling_deep_rend.ron index 0e397b98c5..388c60ecdb 100644 --- a/assets/common/abilities/sword/crippling_deep_rend.ron +++ b/assets/common/abilities/sword/crippling_deep_rend.ron @@ -13,7 +13,7 @@ ChargedMelee( damage: 15, poise: 5, knockback: 0, - energy_regen: 10, + energy_regen: 15, ))), damage_effect: Some(BuffsVulnerable(0.5, Bleeding)), range: 4.5, diff --git a/assets/common/abilities/sword/crippling_double_slash.ron b/assets/common/abilities/sword/crippling_double_slash.ron index be78731749..a6e21cf9f6 100644 --- a/assets/common/abilities/sword/crippling_double_slash.ron +++ b/assets/common/abilities/sword/crippling_double_slash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 4, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 10, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/crippling_eviscerate.ron b/assets/common/abilities/sword/crippling_eviscerate.ron index 90e0b831a2..75612fb93c 100644 --- a/assets/common/abilities/sword/crippling_eviscerate.ron +++ b/assets/common/abilities/sword/crippling_eviscerate.ron @@ -15,7 +15,7 @@ ComboMelee2( buildup_duration: 0.2, swing_duration: 0.15, hit_timing: 0.5, - recover_duration: 0.35, + recover_duration: 0.2, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/defensive_double_slash.ron b/assets/common/abilities/sword/defensive_double_slash.ron index 57e1c89fd1..af120951ee 100644 --- a/assets/common/abilities/sword/defensive_double_slash.ron +++ b/assets/common/abilities/sword/defensive_double_slash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 4, poise: 5, knockback: 0, - energy_regen: 5, + energy_regen: 10, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/defensive_vital_jab.ron b/assets/common/abilities/sword/defensive_vital_jab.ron index efe8adc232..3e3f62d3cc 100644 --- a/assets/common/abilities/sword/defensive_vital_jab.ron +++ b/assets/common/abilities/sword/defensive_vital_jab.ron @@ -13,7 +13,7 @@ ChargedMelee( damage: 12, poise: 5, knockback: 0, - energy_regen: 15, + energy_regen: 20, ))), range: 4.5, angle: 10.0, diff --git a/assets/common/abilities/sword/heavy_double_slash.ron b/assets/common/abilities/sword/heavy_double_slash.ron index eb93690e82..ab04f4b6b9 100644 --- a/assets/common/abilities/sword/heavy_double_slash.ron +++ b/assets/common/abilities/sword/heavy_double_slash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 5, poise: 10, knockback: 0, - energy_regen: 5, + energy_regen: 10, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/heavy_sweep.ron b/assets/common/abilities/sword/heavy_sweep.ron index 28a9b679b3..e1e6be16b6 100644 --- a/assets/common/abilities/sword/heavy_sweep.ron +++ b/assets/common/abilities/sword/heavy_sweep.ron @@ -15,7 +15,7 @@ ComboMelee2( buildup_duration: 0.3, swing_duration: 0.2, hit_timing: 0.5, - recover_duration: 0.3, + recover_duration: 0.2, ori_modifier: 0.6, ), ],