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 'crabman/dependency-fix' into 'master'

Browse Source 
Update outdated dependency

See merge request veloren/veloren!4393
This commit is contained in:
crabman
2024-03-23 20:37:19 +00:00
parent e22cbab7ce a8bd0ade13
commit 7afadf5b56
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/combat.rs
View File

@ -229,7 +229,12 @@ impl Attack {
.clamp(0.0, 1.0);
let raw_damage_reduction =
Damage::compute_damage_reduction(Some(damage), target.inventory, target.stats, msm);
(1.0 - attacker_penetration) * raw_damage_reduction
if raw_damage_reduction >= 1.0 {
raw_damage_reduction
} else {
(1.0 - attacker_penetration) * raw_damage_reduction
}
} else {
0.0
}