PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-25 14:59:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mechanism for server-driven emp caused by projectiles with emp properties; finalization of geometry elements and tests for geometric tests

Browse source
This commit is contained in:
Jason_DiDonato@yahoo.com 2021-02-08 00:20:17 -05:00
parent e41e7e7cfa
commit 6e81ee7e95
11 changed files with 706 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/scala/net/psforever/objects/ExplosiveDeployable.scala
View file

@ -82,7 +82,7 @@ class ExplosiveDeployableControl(mine: ExplosiveDeployable) extends Actor with D
mine,
DamageInteraction(
SourceEntry(mine),
TriggerUsedReason(PlayerSource(player), trigger),
TriggerUsedReason(PlayerSource(player), trigger.GUID),
mine.Position
).calculate()(mine),
damage = 0
@ -239,6 +239,10 @@ object ExplosiveDeployableControl {
val scalar = Vector3.ScalarProjection(dir, up)
val point1 = g1.pointOnOutside(dir).asVector3
val point2 = g2.pointOnOutside(Vector3.neg(dir)).asVector3
(scalar >= 0 || Vector3.MagnitudeSquared(up * scalar) < 0.35f) && Vector3.DistanceSquared(point1, point2) <= maxDistance
(scalar >= 0 || Vector3.MagnitudeSquared(up * scalar) < 0.35f) &&
math.min(
Vector3.DistanceSquared(g1.center.asVector3, g2.center.asVector3),
Vector3.DistanceSquared(point1, point2)
) <= maxDistance
}
}