Replace even more magnitude checks with new functions

Author: fourZK

Data/Base.rte/AI/CrabBehaviors.lua

@@ -609,8 +609,8 @@ function CrabBehaviors.ShootArea(AI, Owner, Abort)
 
 		-- check if we can fire at the AimPoint
 		local Trace = SceneMan:ShortestDistance(Owner.EyePos, AimPoint, false);
-		local rayLenght = SceneMan:CastObstacleRay(Owner.EyePos, Trace, Vector(), Vector(), rte.NoMOID, Owner.IgnoresWhichTeam, rte.grassID, 11);
-		if Trace.Magnitude * 0.67 < rayLenght then
+		local rayLength = SceneMan:CastObstacleRay(Owner.EyePos, Trace, Vector(), Vector(), rte.NoMOID, Owner.IgnoresWhichTeam, rte.grassID, 11);
+		if Trace:MagnitudeIsLessThan(rayLength * 1.5)  then
 			break; -- the AimPoint is close enough to the target, start shooting
 		end
 

Data/Base.rte/AI/HumanBehaviors.lua

@@ -235,11 +235,10 @@ end
 
 function HumanBehaviors.GetGrenadeAngle(AimPoint, TargetVel, StartPos, muzVel)
 	local Dist = SceneMan:ShortestDistance(StartPos, AimPoint, false);
-	local range = Dist.Magnitude;
 
 	-- compensate for gravity if the point we are trying to hit is more than 2m away
-	if range > 40 then
-		local timeToTarget = range / muzVel;
+	if Dist:MagnitudeIsGreaterThan(40) then
+		local timeToTarget = Dist.Magnitude / muzVel;
 
 		-- lead the target if target speed and projectile TTT is above the threshold
 		if (timeToTarget * TargetVel.Magnitude) > 0.5 then
@@ -1452,8 +1451,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 					local RandomWpt = WptList[test];
 					if RandomWpt then
 						Dist = SceneMan:ShortestDistance(Owner.Pos, RandomWpt.Pos, false);
-						local mag = Dist.Magnitude;
-						if mag < 50 and mag < SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false).Magnitude/3 then
+						if Dist:MagnitudeIsLessThan(50) and Dist:MagnitudeIsLessThan(SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false).Magnitude * 0.33) then
 							-- this waypoint is closer, check LOS
 							if -1 == SceneMan:CastObstacleRay(Owner.Pos, Dist, Vector(), Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 4) then
 								Waypoint = RandomWpt; -- go here instead
@@ -2993,8 +2991,8 @@ function HumanBehaviors.ShootArea(AI, Owner, Abort)
 
 		-- check if we can fire at the AimPoint
 		local Trace = SceneMan:ShortestDistance(Owner.EyePos, AimPoint, false);
-		local rayLenght = SceneMan:CastObstacleRay(Owner.EyePos, Trace, Vector(), Vector(), rte.NoMOID, Owner.IgnoresWhichTeam, rte.grassID, 11);
-		if Trace.Magnitude * 0.67 < rayLenght then
+		local rayLength = SceneMan:CastObstacleRay(Owner.EyePos, Trace, Vector(), Vector(), rte.NoMOID, Owner.IgnoresWhichTeam, rte.grassID, 11);
+		if Trace:MagnitudeIsLessThan(rayLength * 1.5) then
 			break; -- the AimPoint is close enough to the target, start shooting
 		end
 

Data/Base.rte/AI/NativeDropShipAI.lua

@@ -165,15 +165,15 @@ function NativeDropShipAI:Update(Owner)
 				self.Waypoint.Y = -500; -- Go to orbit
 			end
 		else
-			local dist = SceneMan:ShortestDistance(Owner.Pos, self.Waypoint, false).Magnitude;
-			if dist < Owner.Radius and math.abs(change) < 3 and math.abs(Owner.Vel.X) < 4 then	-- If we passed the hover check, check if we can start unloading
+			local dist = SceneMan:ShortestDistance(Owner.Pos, self.Waypoint, false);
+			if dist:MagnitudeIsLessThan(Owner.Radius) and math.abs(change) < 3 and math.abs(Owner.Vel.X) < 4 then	-- If we passed the hover check, check if we can start unloading
 				local WptL = SceneMan:MovePointToGround(Owner.Pos+Vector(-Owner.Radius, -Owner.Radius), self.hoverAlt, 12);
 				local WptC = SceneMan:MovePointToGround(Owner.Pos+Vector(0, -Owner.Radius), self.hoverAlt, 12);
 				local WptR = SceneMan:MovePointToGround(Owner.Pos+Vector(Owner.Radius, -Owner.Radius), self.hoverAlt, 12);
 				self.Waypoint = Vector(Owner.Pos.X, math.min(WptL.Y, WptC.Y, WptR.Y));
 
-				dist = SceneMan:ShortestDistance(Owner.Pos, self.Waypoint, false).Magnitude;
-				if dist < Owner.Diameter then
+				dist = SceneMan:ShortestDistance(Owner.Pos, self.Waypoint, false);
+				if dist:MagnitudeIsLessThan(Owner.Diameter) then
 					-- We are close enough to our waypoint
 					if Owner.AIMode == Actor.AIMODE_STAY then
 						self.DeliveryState = ACraft.STANDBY;

Data/Base.rte/AI/RocketAI.lua

@@ -140,11 +140,8 @@ function UpdateAI(self)
 				self.LZpos = SceneMan:MovePointToGround(self.Pos, self.groundDist, 6);
 			end
 
-			if self.AIMode ~= Actor.AIMODE_STAY then
-				local dist = SceneMan:ShortestDistance(self.Pos, self.LZpos, false).Magnitude;
-				if dist < 25 then	-- If we passed the check, start unloading
-					self.DeliveryState = ACraft.UNLOAD;
-				end
+			if self.AIMode ~= Actor.AIMODE_STAY and SceneMan:ShortestDistance(self.Pos, self.LZpos, false):MagnitudeIsLessThan(25) then
+				self.DeliveryState = ACraft.UNLOAD;
 			end
 		end
 	elseif self.DeliveryState == ACraft.UNLOAD then

Data/Base.rte/Actors/Mecha/Medic/Medic.lua

@@ -45,7 +45,7 @@ function Update(self)
 			for _, healTarget in pairs(self.healTargets) do
 				if healTarget and IsActor(healTarget) and (healTarget.Health < healTarget.MaxHealth or healTarget.WoundCount > 0) and healTarget.Vel.Largest < 10 then
 					local trace = SceneMan:ShortestDistance(self.Pos, healTarget.Pos, false);
-					if (trace.Magnitude - healTarget.Radius) < healRange and SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.grassID, 5) < 0 then
+					if trace:MagnitudeIsLessThan(healRange + healTarget.Radius) and SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.grassID, 5) < 0 then
 						healTarget.Health = math.min(healTarget.Health + self.healStrength, healTarget.MaxHealth);
 						if self.crossTimer:IsPastSimTimeLimit() then
 							local cross = CreateMOSParticle("Particle Heal Effect", "Base.rte");
@@ -65,7 +65,7 @@ function Update(self)
 			for actor in MovableMan.Actors do
 				if actor.Team == parent.Team and actor.ID ~= parent.ID and (actor.Health < actor.MaxHealth or actor.WoundCount > 0) and actor.Vel.Largest < 5 then
 					local trace = SceneMan:ShortestDistance(self.Pos, actor.Pos, false);
-					if (trace.Magnitude - actor.Radius) < (healRange * 0.9) then
+					if trace:MagnitudeIsLessThan(healRange * 0.9 + actor.Radius) then
 						if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.airID, 3) < 0 then
 							table.insert(self.healTargets, actor);
 						end