Merge remote-tracking branch 'origin/master' into branch

Moose Development/Moose/Core/Database.lua

@@ -1112,7 +1112,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
           self:E("WARNING: Invalid STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
         else
           self.STNS[stn] = UnitTemplate.name
-          self:I("Register STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
+          self:T("Register STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
         end
       end
       if UnitTemplate.AddPropAircraft.SADL_TN then
@@ -1121,7 +1121,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
           self:E("WARNING: Invalid SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
         else
           self.SADL[sadl] = UnitTemplate.name
-          self:I("Register SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
+          self:T("Register SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
         end
       end  
     end
@@ -1382,7 +1382,7 @@ function DATABASE:GetCoalitionFromClientTemplate( ClientName )
   if self.Templates.ClientsByName[ClientName] then  
     return self.Templates.ClientsByName[ClientName].CoalitionID
   end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  self:T("WARNING: Template does not exist for client "..tostring(ClientName))
   return nil
 end
 
@@ -1394,7 +1394,7 @@ function DATABASE:GetCategoryFromClientTemplate( ClientName )
   if self.Templates.ClientsByName[ClientName] then  
     return self.Templates.ClientsByName[ClientName].CategoryID
   end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  self:T("WARNING: Template does not exist for client "..tostring(ClientName))
   return nil
 end
 
@@ -1406,7 +1406,7 @@ function DATABASE:GetCountryFromClientTemplate( ClientName )
   if self.Templates.ClientsByName[ClientName] then  
     return self.Templates.ClientsByName[ClientName].CountryID
   end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  self:T("WARNING: Template does not exist for client "..tostring(ClientName))
   return nil  
 end
 

Moose Development/Moose/Core/Point.lua

@@ -3803,15 +3803,18 @@ do -- COORDINATE
 -- @param #number SearchRadius Radius of the search area.
 -- @param #number PosRadius Required clear radius around each position.
 -- @param #number NumPositions Number of positions to find.
--- @return #table A table of Core.Point#COORDINATE that are clear of map objects within the given PosRadius.
+-- @return #table A table of Core.Point#COORDINATE that are clear of map objects within the given PosRadius. nil if no positions are found.
   function COORDINATE:GetSimpleZones(SearchRadius, PosRadius, NumPositions)
     local clearPositions = UTILS.GetSimpleZones(self:GetVec3(), SearchRadius, PosRadius, NumPositions)
-    local coords = {}
+    if clearPositions and #clearPositions > 0 then
-    for _, pos in ipairs(clearPositions) do
+        local coords = {}
-      local coord = COORDINATE:NewFromVec2(pos)
+        for _, pos in pairs(clearPositions) do
-      table.insert(coords, coord)
+          local coord = COORDINATE:NewFromVec2(pos)
+          table.insert(coords, coord)
+        end
+        return coords
     end
-    return coords
+    return nil
   end
 
 end

Moose Development/Moose/Core/Zone.lua

@@ -1515,7 +1515,7 @@ end
 -- @return #table A table of DCS#Vec2 positions that are clear of map objects within the given PosRadius. nil if no clear positions are found.
 function ZONE_RADIUS:GetClearZonePositions(PosRadius, NumPositions)
     local clearPositions = UTILS.GetSimpleZones(self:GetVec3(), self:GetRadius(), PosRadius, NumPositions)
-    if clearPositions or #clearPositions > 0 then
+    if clearPositions and #clearPositions > 0 then
         local validZones = {}
         for _, vec2 in pairs(clearPositions) do
             if self:IsVec2InZone(vec2) then
@@ -1538,7 +1538,7 @@ end
 function ZONE_RADIUS:GetRandomClearZoneCoordinate(PosRadius, NumPositions)
     local radius = PosRadius or math.min(self.Radius/10, 200)
     local clearPositions = self:GetClearZonePositions(radius, NumPositions or 50)
-    if clearPositions or #clearPositions > 0 then
+    if clearPositions and #clearPositions > 0 then
         local randomPosition = clearPositions[math.random(1, #clearPositions)]
         return COORDINATE:NewFromVec2(randomPosition), radius
     end