diff --git a/assets/common/abilities/sword/agile_crescent_slash.ron b/assets/common/abilities/sword/agile_crescent_slash.ron index 364c4188cb..4c52afa163 100644 --- a/assets/common/abilities/sword/agile_crescent_slash.ron +++ b/assets/common/abilities/sword/agile_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 9, + damage: 8, poise: 5, knockback: 0, energy_regen: 0, @@ -11,7 +11,7 @@ ComboMelee2( range: 3.0, angle: 60.0, ), - buildup_duration: 0.05, + buildup_duration: 0.1, swing_duration: 0.05, hit_timing: 0.5, recover_duration: 0.1, diff --git a/assets/common/abilities/sword/agile_fell_strike.ron b/assets/common/abilities/sword/agile_fell_strike.ron index 71827ae572..a52e5b0764 100644 --- a/assets/common/abilities/sword/agile_fell_strike.ron +++ b/assets/common/abilities/sword/agile_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 12, + damage: 10, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/basic_crescent_slash.ron b/assets/common/abilities/sword/basic_crescent_slash.ron index 87f54a8d33..4e4ca1869d 100644 --- a/assets/common/abilities/sword/basic_crescent_slash.ron +++ b/assets/common/abilities/sword/basic_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 18, + damage: 16, poise: 5, knockback: 0, energy_regen: 0, @@ -11,7 +11,7 @@ ComboMelee2( range: 3.0, angle: 60.0, ), - buildup_duration: 0.1, + buildup_duration: 0.2, swing_duration: 0.1, hit_timing: 0.5, recover_duration: 0.2, diff --git a/assets/common/abilities/sword/basic_fell_strike.ron b/assets/common/abilities/sword/basic_fell_strike.ron index b586fc7a7e..77f2ee8053 100644 --- a/assets/common/abilities/sword/basic_fell_strike.ron +++ b/assets/common/abilities/sword/basic_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 24, + damage: 20, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/cleaving_crescent_slash.ron b/assets/common/abilities/sword/cleaving_crescent_slash.ron index 260967c30f..99325c5909 100644 --- a/assets/common/abilities/sword/cleaving_crescent_slash.ron +++ b/assets/common/abilities/sword/cleaving_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 18, + damage: 16, poise: 5, knockback: 0, energy_regen: 0, @@ -12,7 +12,7 @@ ComboMelee2( angle: 60.0, multi_target: Some(Normal), ), - buildup_duration: 0.15, + buildup_duration: 0.25, swing_duration: 0.15, hit_timing: 0.5, recover_duration: 0.25, diff --git a/assets/common/abilities/sword/cleaving_fell_strike.ron b/assets/common/abilities/sword/cleaving_fell_strike.ron index 11d87db46e..9f3af352ca 100644 --- a/assets/common/abilities/sword/cleaving_fell_strike.ron +++ b/assets/common/abilities/sword/cleaving_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 24, + damage: 20, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/crippling_crescent_slash.ron b/assets/common/abilities/sword/crippling_crescent_slash.ron index 32e619fa8a..a7cd2ed29f 100644 --- a/assets/common/abilities/sword/crippling_crescent_slash.ron +++ b/assets/common/abilities/sword/crippling_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 15, + damage: 13, poise: 5, knockback: 0, energy_regen: 0, @@ -17,7 +17,7 @@ ComboMelee2( chance: 1.0, ))), ), - buildup_duration: 0.1, + buildup_duration: 0.2, swing_duration: 0.1, hit_timing: 0.5, recover_duration: 0.2, diff --git a/assets/common/abilities/sword/crippling_fell_strike.ron b/assets/common/abilities/sword/crippling_fell_strike.ron index e4d9180491..9a7b67068a 100644 --- a/assets/common/abilities/sword/crippling_fell_strike.ron +++ b/assets/common/abilities/sword/crippling_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 20, + damage: 17, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/defensive_crescent_slash.ron b/assets/common/abilities/sword/defensive_crescent_slash.ron index cd2b1915b2..140e143ad4 100644 --- a/assets/common/abilities/sword/defensive_crescent_slash.ron +++ b/assets/common/abilities/sword/defensive_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 13, + damage: 11, poise: 5, knockback: 0, energy_regen: 0, @@ -12,7 +12,7 @@ ComboMelee2( angle: 60.0, damage_effect: Some(BuffsVulnerable(0.5, Parried)), ), - buildup_duration: 0.1, + buildup_duration: 0.2, swing_duration: 0.1, hit_timing: 0.5, recover_duration: 0.2, diff --git a/assets/common/abilities/sword/defensive_fell_strike.ron b/assets/common/abilities/sword/defensive_fell_strike.ron index 2dff6cc8d1..309f3997ac 100644 --- a/assets/common/abilities/sword/defensive_fell_strike.ron +++ b/assets/common/abilities/sword/defensive_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 18, + damage: 15, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/heavy_crescent_slash.ron b/assets/common/abilities/sword/heavy_crescent_slash.ron index c988f87f3d..f239847c05 100644 --- a/assets/common/abilities/sword/heavy_crescent_slash.ron +++ b/assets/common/abilities/sword/heavy_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 23, + damage: 20, poise: 15, knockback: 0, energy_regen: 0, @@ -12,7 +12,7 @@ ComboMelee2( angle: 60.0, damage_effect: Some(StunnedVulnerable(0.5)), ), - buildup_duration: 0.15, + buildup_duration: 0.25, swing_duration: 0.15, hit_timing: 0.5, recover_duration: 0.25, diff --git a/assets/common/abilities/sword/heavy_fell_strike.ron b/assets/common/abilities/sword/heavy_fell_strike.ron index 83988839ac..7d6518b418 100644 --- a/assets/common/abilities/sword/heavy_fell_strike.ron +++ b/assets/common/abilities/sword/heavy_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 30, + damage: 25, poise: 15, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/heavy_pillar_thrust.ron b/assets/common/abilities/sword/heavy_pillar_thrust.ron index 74450363c8..1737675f89 100644 --- a/assets/common/abilities/sword/heavy_pillar_thrust.ron +++ b/assets/common/abilities/sword/heavy_pillar_thrust.ron @@ -7,13 +7,13 @@ DiveMelee( recover_duration: 0.3, melee_constructor: ( kind: Slash( - damage: 20, + damage: 30, poise: 40, knockback: 0, energy_regen: 0, ), scaled: Some(Slash( - damage: 5, + damage: 10, poise: 10, knockback: 0, energy_regen: 0, @@ -23,7 +23,7 @@ DiveMelee( multi_target: Some(Normal), damage_effect: Some(StunnedVulnerable(0.5)), ), - max_scaling: 6, + max_scaling: 3, meta: ( requirements: (stance: Some(Sword(Heavy))), ), diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 3a438f36f6..338961a50f 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -5,14 +5,14 @@ ItemDef( kind: Sword, hands: Two, stats: ( - equip_time_secs: 1.0, - power: 4.0, - effect_power: 1.0, - speed: 0.5, - crit_chance: 0.3, + equip_time_secs: 3.0, + power: 3.0, + effect_power: 1.5, + speed: 0.6, + crit_chance: 0.05, range: 1.0, - energy_efficiency: 0.5, - buff_strength: 1.0, + energy_efficiency: 0.8, + buff_strength: 1.5, ), )), quality: Legendary,