PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 23:44:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert radial damage calculations

Browse source
This commit is contained in:
FateJH 2020-08-28 00:30:23 -04:00
parent 37af460a89
commit 2b6ec727f2
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala
View file

@ -101,7 +101,8 @@ object DamageModifiers {
val distance = Vector3.Distance(data.hit_pos, data.target.Position) val distance = Vector3.Distance(data.hit_pos, data.target.Position)
val radius = profile.DamageRadius val radius = profile.DamageRadius
if (distance <= radius) { if (distance <= radius) {
damage - (damage * profile.DamageAtEdge * distance / radius).toInt val base: Float = profile.DamageAtEdge
(damage * ((1 - base) * ((radius - distance) / radius) + base)).toInt
} else { } else {
0 0
} }