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

Falling moving forward?

Browse source
This commit is contained in:
ScrawnyRonnie 2023-10-25 21:02:03 -04:00 • committed by GitHub
parent 8a5f5d8105
commit b806b3019d
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 {
def calculate(damage: Int, data: DamageInteraction, cause: CollisionReason): Int =
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 5
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 4
}
/**
@ -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) / 5
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 4
}
/**
@ -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))
(damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))) / 4
} else {
damage
damage / 4
}
}
}