PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-12 15:04:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added a check called no double lash that should stop players from suffering double lash

Browse source
This commit is contained in:
Jason_DiDonato@yahoo.com 2021-02-09 01:56:17 -05:00
parent e9a7eb3d78
commit f41de41d5a
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala
View file

@ -6,9 +6,11 @@ import net.psforever.objects.ballistics.{PlayerSource, SourceEntry}
import net.psforever.objects.ce.ComplexDeployable import net.psforever.objects.ce.ComplexDeployable
import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.affinity.FactionAffinity
import net.psforever.objects.serverobject.damage.Damageable import net.psforever.objects.serverobject.damage.Damageable
import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.DamageResolution
import net.psforever.objects.vital.{DamagingActivity, Vitality, VitalsHistory}
import net.psforever.objects.vital.damage.DamageCalculations import net.psforever.objects.vital.damage.DamageCalculations
import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult}
import net.psforever.objects.vital.projectile.ProjectileReason
import net.psforever.objects.vital.resistance.ResistanceSelection import net.psforever.objects.vital.resistance.ResistanceSelection
import net.psforever.types.{ExoSuitType, ImplantType} import net.psforever.types.{ExoSuitType, ImplantType}
@ -153,7 +155,7 @@ object ResolutionCalculations {
def InfantryApplication(damageValues: (Int, Int), data: DamageInteraction)(target: PlanetSideGameObject with FactionAffinity): DamageResult = { def InfantryApplication(damageValues: (Int, Int), data: DamageInteraction)(target: PlanetSideGameObject with FactionAffinity): DamageResult = {
val targetBefore = SourceEntry(target) val targetBefore = SourceEntry(target)
target match { target match {
case player: Player => case player: Player if noDoubleLash(player, data) =>
var (a, b) = damageValues var (a, b) = damageValues
if (player.isAlive && !(a == 0 && b == 0)) { if (player.isAlive && !(a == 0 && b == 0)) {
val originalHealth = player.Health val originalHealth = player.Health
@ -323,4 +325,17 @@ object ResolutionCalculations {
SimpleApplication(dam, data)(target) SimpleApplication(dam, data)(target)
} }
} }
private def noDoubleLash(target: PlanetSideGameObject with VitalsHistory, data: DamageInteraction): Boolean = {
data.cause match {
case reason: ProjectileReason if reason.resolution == DamageResolution.Lash =>
val curr = System.currentTimeMillis()
!target.History.exists {
case dam: DamagingActivity => curr - dam.time < 1000 && reason.same(dam.data.interaction.cause)
case _ => false
}
case _ =>
true
}
}
} }