AWACS - 0.0.12

Moose Development/Moose/Core/Zone.lua

@@ -176,6 +176,7 @@ end
 -- @param DCS#Vec3 Vec3 The point to test.
 -- @return #boolean true if the Vec3 is within the zone.
 function ZONE_BASE:IsVec3InZone( Vec3 )
+  if not Vec3 then return false end
   local InZone = self:IsVec2InZone( { x = Vec3.x, y = Vec3.z } )
   return InZone
 end
@@ -2004,7 +2005,9 @@ end
 -- @return #boolean true if the point is within the zone.
 function ZONE_POLYGON_BASE:IsVec3InZone( Vec3 )
   self:F2( Vec3 )
-
+  
+  if not Vec3 then return false end 
+    
   local InZone = self:IsVec2InZone( { x = Vec3.x, y = Vec3.z } )
 
   return InZone

Moose Development/Moose/Ops/Intelligence.lua

@@ -1661,13 +1661,16 @@ end
 function INTEL:CalcClusterDirection(cluster)
 
   local direction = 0
+  local speedsum = 0
   local n=0
   for _,_contact in pairs(cluster.Contacts) do
     local contact=_contact --#INTEL.Contact
 
     if (not contact.isStatic) and contact.group:IsAlive() then
-      direction = direction + contact.group:GetHeading()
+      local speed = contact.group:GetVelocityKNOTS()
+      direction = direction + (contact.group:GetHeading()*speed)
       n=n+1
+      speedsum = speedsum + speed
     end
   end
 
@@ -1678,13 +1681,14 @@ function INTEL:CalcClusterDirection(cluster)
   -- Total is 360/2=180, i.e. South!
   -- It should not go anywhere as the two movements cancel each other.
   -- Correct, edge case for N=2^x, but when 2 pairs of groups drive in exact opposite directions, the cluster will split at some point?
-  -- maybe add the speed as weight to get a factor
+  -- maybe add the speed as weight to get a weighted factor
 
   if n==0 then
     return 0
   else
-    return math.floor(direction / n)
+    return math.floor(direction / (speedsum * n ))
   end
+  
 end
 
 --- Calculate cluster speed.