From d1d4f9145416fe11bd16daccb42a7fa3d6e488dc Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Mon, 26 Feb 2024 14:06:29 -0500 Subject: [PATCH] AEGIS and AMS cloak bubbles more proactive --- .../net/psforever/objects/equipment/EffectTarget.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala index 39aee6313..101b1cc5a 100644 --- a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala +++ b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala @@ -364,7 +364,13 @@ object EffectTarget { def AutoTurretBlankVehicleTarget(target: PlanetSideGameObject): Boolean = target match { case v: Vehicle => - (v.Definition == GlobalDefinitions.ams && v.DeploymentState == DriveState.Deployed) || v.MountedIn.nonEmpty || v.Cloaked + val pos = v.Position + lazy val sector = v.Zone.blockMap.sector(pos, range = 51f) + (v.Definition == GlobalDefinitions.ams && v.DeploymentState == DriveState.Deployed) || + v.MountedIn.nonEmpty || + v.Cloaked || + radarCloakedAms(sector, pos) || + radarCloakedAegis(sector, pos) case _ => false }