From 2b6ec727f2a0ed034f949feb1b0f7ec15ce78878 Mon Sep 17 00:00:00 2001 From: FateJH Date: Fri, 28 Aug 2020 00:30:23 -0400 Subject: [PATCH] revert radial damage calculations --- .../net/psforever/objects/vital/damage/DamageModifiers.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala b/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala index 8c7ed433..82a874ea 100644 --- a/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala +++ b/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala @@ -101,7 +101,8 @@ object DamageModifiers { val distance = Vector3.Distance(data.hit_pos, data.target.Position) val radius = profile.DamageRadius if (distance <= radius) { - damage - (damage * profile.DamageAtEdge * distance / radius).toInt + val base: Float = profile.DamageAtEdge + (damage * ((1 - base) * ((radius - distance) / radius) + base)).toInt } else { 0 }