PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Another tweak/guess

Browse source
This commit is contained in:
ScrawnyRonnie 2023-10-25 20:39:32 -04:00 • committed by GitHub
parent aee8a7d091
commit 8a5f5d8105
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala
View file

@ -11,7 +11,7 @@ import net.psforever.types.Vector3
*/ */
case object GroundImpact extends CollisionDamageModifiers.Mod { case object GroundImpact extends CollisionDamageModifiers.Mod {
def calculate(damage: Int, data: DamageInteraction, cause: CollisionReason): Int = 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 { case object GroundImpactWith extends CollisionWithDamageModifiers.Mod {
def calculate(damage: Int, data: DamageInteraction, cause: CollisionWithReason): Int = 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 val fall = cause.fall
if (fall.toInt != 0) { if (fall.toInt != 0) {
val z = data.target.Definition.collision.z 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 { } else {
damage / 3 damage
} }
} }
} }