Merge branch 'sam/small-fix' into 'master'

Combat Fix

See merge request veloren/veloren!2309
This commit is contained in:
Samuel Keiffer 2021-05-15 16:13:44 +00:00
commit 9060e1ea71

View File

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 100,
base_damage: 80,
scaled_damage: 160,
base_poise_damage: 60,
scaled_poise_damage: 0,
base_poise_damage: 0,
scaled_poise_damage: 60,
base_knockback: 8.0,
scaled_knockback: 7.0,
range: 4.0,