PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from ScrawnyRonnie/Misc_tweaks_and_fixes

Browse source 
Fall damage reduced
This commit is contained in:
ScrawnyRonnie 2023-10-27 12:25:49 -04:00 committed by GitHub
parent e7850fb612 326ae1e674
commit d1bd6fb055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats 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) / 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
}
}
}