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

Moose Development/Moose/Core/Zone.lua

@@ -927,7 +927,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
   local ZoneCoord = self:GetCoordinate()
   local ZoneRadius = self:GetRadius()
 
-  self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})
+  --self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})
 
   local SphereSearch = {
     id = world.VolumeType.SPHERE,
@@ -2924,7 +2924,7 @@ do -- ZONE_ELASTIC
 
   --- Add a set of groups. Positions of the group will be considered as polygon vertices when contructing the convex hull.
   -- @param #ZONE_ELASTIC self
-  -- @param Core.Set#SET_GROUP SetGroup Set of groups.
+  -- @param Core.Set#SET_GROUP GroupSet Set of groups.
   -- @return #ZONE_ELASTIC self
   function ZONE_ELASTIC:AddSetGroup(GroupSet)
   

Moose Development/Moose/Utilities/Utils.lua

@@ -2040,9 +2040,9 @@ function UTILS.GenerateUHFrequencies()
     local _start = 220000000
 
     while _start < 399000000 do
-		if _start ~= 243000000 then
+    if _start ~= 243000000 then
-			table.insert(FreeUHFFrequencies, _start)
+      table.insert(FreeUHFFrequencies, _start)
-		end
+    end
         _start = _start + 500000
     end
 

Moose Development/Moose/Wrapper/Positionable.lua

@@ -703,11 +703,11 @@ function POSITIONABLE:IsSubmarine()
 
   if DCSUnit then
     local UnitDescriptor = DCSUnit:getDesc()
-		if UnitDescriptor.attributes["Submarines"] == true then
+    if UnitDescriptor.attributes["Submarines"] == true then
-			return true
+      return true
-		else
+    else
-			return false
+      return false
-		end
+    end
   end
 
   self:E( { "Cannot check IsSubmarine", Positionable = self, Alive = self:IsAlive() } )

Moose Development/Moose/Wrapper/Unit.lua

@@ -89,9 +89,9 @@
 -- 
 -- @field #UNIT
 UNIT = {
-	ClassName="UNIT",
+  ClassName="UNIT",
-	UnitName=nil,
+  UnitName=nil,
-	GroupName=nil,
+  GroupName=nil,
 }
 
 
@@ -325,14 +325,19 @@ function UNIT:IsAlive()
   local DCSUnit = self:GetDCSObject() -- DCS#Unit
   
   if DCSUnit then
-    local UnitIsAlive  = DCSUnit:isExist() and DCSUnit:isActive()
+    local UnitIsAlive  = DCSUnit:isExist() and DCSUnit:isActive() -- and DCSUnit:getLife() > 1
     return UnitIsAlive
   end 
   
   return nil
 end
 
-
+--- Returns if the Unit is dead.
+-- @param #UNIT self  
+-- @return #boolean `true` if Unit is dead, else false or nil if the unit does not exist
+function UNIT:IsDead()
+  return not self:IsAlive()
+end
 
 --- Returns the Unit's callsign - the localized string.
 -- @param #UNIT self
@@ -626,7 +631,7 @@ function UNIT:IsFuelSupply()
   return false
 end
 
---- Returns the unit's group if it exist and nil otherwise.
+--- Returns the unit's group if it exists and nil otherwise.
 -- @param Wrapper.Unit#UNIT self
 -- @return Wrapper.Group#GROUP The Group of the Unit or `nil` if the unit does not exist.  
 function UNIT:GetGroup()