From 326ae1e674711f25dbb8ad2aa3a94f1df998ec75 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Fri, 27 Oct 2023 12:20:35 -0400 Subject: [PATCH] Fall damage reduced --- .../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 f4a67557..78b2912d 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) / 4 + CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 3 } /** @@ -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) / 4 + CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 3 } /** @@ -33,9 +33,9 @@ case object HeadonImpact extends CollisionDamageModifiers.Mod { if (vel > 0.05f) { val definition = data.target.Definition val xy = definition.collision.xy - (damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))) / 4 + (damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))) / 2 } else { - damage / 4 + damage / 2 } } }