Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Ambien/combat_issues' into 'master'

Browse Source 
fixing #944 - LeapMelee fall damage fix & adjustments

Closes #944

See merge request veloren/veloren!1751
This commit is contained in:
Samuel Keiffer 2021-02-02 16:51:04 +00:00
commit 3bfcf02e85
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/hammer/leap.ron
View File

@ -9,6 +9,6 @@ LeapMelee(
knockback: 25.0,
range: 4.5,
max_angle: 360.0,
forward_leap_strength: 28.0,
forward_leap_strength: 24.0,
vertical_leap_strength: 8.0,
)

2
common/src/comp/ability.rs
View File

@ -408,7 +408,6 @@ impl CharacterAbility {
},
LeapMelee {
ref mut buildup_duration,
ref mut movement_duration,
ref mut swing_duration,
ref mut recover_duration,
ref mut base_damage,
@ -416,7 +415,6 @@ impl CharacterAbility {
..
} => {
*buildup_duration = (*buildup_duration as f32 / speed) as u64;
*movement_duration = (*movement_duration as f32 / speed) as u64;
*swing_duration = (*swing_duration as f32 / speed) as u64;
*recover_duration = (*recover_duration as f32 / speed) as u64;
*base_damage = (*base_damage as f32 * power) as u32;