diff --git a/assets/common/abilities/hammer/judgement.ron b/assets/common/abilities/hammer/judgement.ron index fae769ad46..6322a2d1ac 100644 --- a/assets/common/abilities/hammer/judgement.ron +++ b/assets/common/abilities/hammer/judgement.ron @@ -12,10 +12,10 @@ FinisherMelee( ), range: 4.0, angle: 15.0, - damage_effect: Some(StunnedVulnerable(3.0)), + damage_effect: Some(StunnedVulnerable(2.5)), ), minimum_combo: 20, meta: ( - contextual_stats: Some((context: PoiseResilience(60.0), field: Power)), + contextual_stats: Some((context: PoiseResilience(80.0), field: Power)), ), ) \ No newline at end of file diff --git a/assets/common/abilities/hammer/retaliate.ron b/assets/common/abilities/hammer/retaliate.ron index d6f5d99c77..8a06ff66df 100644 --- a/assets/common/abilities/hammer/retaliate.ron +++ b/assets/common/abilities/hammer/retaliate.ron @@ -6,8 +6,8 @@ RiposteMelee( block_strength: 5.0, melee_constructor: ( kind: Bash( - damage: 20, - poise: 30, + damage: 8, + poise: 15, knockback: 5, energy_regen: 0, ), diff --git a/assets/common/abilities/hammer/thunderclap.ron b/assets/common/abilities/hammer/thunderclap.ron index e4f5092f6f..2643b7159c 100644 --- a/assets/common/abilities/hammer/thunderclap.ron +++ b/assets/common/abilities/hammer/thunderclap.ron @@ -5,7 +5,7 @@ FinisherMelee( recover_duration: 0.7, melee_constructor: ( kind: Bash( - damage: 80, + damage: 60, poise: 100, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/hammer/vigorous_bash.ron b/assets/common/abilities/hammer/vigorous_bash.ron index 4480190618..afcfa8903d 100644 --- a/assets/common/abilities/hammer/vigorous_bash.ron +++ b/assets/common/abilities/hammer/vigorous_bash.ron @@ -20,7 +20,7 @@ ComboMelee2( swing: Some(Forward(0.3)), ), ori_modifier: 0.6, - custom_combo: Some((additional: 9, requirement: Some(TargetPoised))), + custom_combo: Some((additional: 4, requirement: Some(TargetPoised))), ), ], energy_cost_per_strike: 10, diff --git a/assets/common/abilities/hammer/wide_wallop.ron b/assets/common/abilities/hammer/wide_wallop.ron index fe3a2587a2..fe8325577c 100644 --- a/assets/common/abilities/hammer/wide_wallop.ron +++ b/assets/common/abilities/hammer/wide_wallop.ron @@ -11,12 +11,12 @@ ChargedMelee( scaled: Some(( kind: Bash( damage: 40, - poise: 100, + poise: 70, knockback: 2, energy_regen: 30, ))), range: 4.5, - angle: 15.0, + angle: 24.0, ), charge_duration: 1.4, swing_duration: 0.2,