From 8a5f5d810512fab7071c3d4e274ef764858c20eb Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie <73139382+ScrawnyRonnie@users.noreply.github.com> Date: Wed, 25 Oct 2023 20:39:32 -0400 Subject: [PATCH] Another tweak/guess --- .../collision/CollisionDamageModifierFunctions.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala b/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala index a16e88125..e08aa9f5e 100644 --- a/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala +++ b/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala @@ -11,7 +11,7 @@ import net.psforever.types.Vector3 */ case object GroundImpact extends CollisionDamageModifiers.Mod { def calculate(damage: Int, data: DamageInteraction, cause: CollisionReason): Int = - CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) + CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 5 } /** @@ -19,7 +19,7 @@ case object GroundImpact extends CollisionDamageModifiers.Mod { */ case object GroundImpactWith extends CollisionWithDamageModifiers.Mod { def calculate(damage: Int, data: DamageInteraction, cause: CollisionWithReason): Int = - CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) + CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 5 } /** @@ -124,9 +124,9 @@ object CollisionDamageModifierFunctions { val fall = cause.fall if (fall.toInt != 0) { val z = data.target.Definition.collision.z - (damage + z.hp(z.height(fall + 0.5f))) / 3 + damage + z.hp(z.height(fall + 0.5f)) } else { - damage / 3 + damage } } }