Lots of optimizations

Moose Development/Moose/Wrapper/Client.lua

@@ -179,7 +179,7 @@ function CLIENT:ShowBriefing()
   if not self.ClientBriefingShown then
     self.ClientBriefingShown = true
     local Briefing = ""
-    if self.ClientBriefing then
+    if self.ClientBriefing and self.ClientBriefing ~= "" then
       Briefing = Briefing .. self.ClientBriefing
       self:Message( Briefing, 60, "Briefing" )
     end

Moose Development/Moose/Wrapper/Controllable.lua

@@ -2223,7 +2223,7 @@ function CONTROLLABLE:GetDetectedTargets( DetectVisual, DetectOptical, DetectRad
     local DetectionRWR = ( DetectRWR and DetectRWR == true ) and Controller.Detection.RWR or nil
     local DetectionDLINK = ( DetectDLINK and DetectDLINK == true ) and Controller.Detection.DLINK or nil
     
-    self:T( { DetectionVisual, DetectionOptical, DetectionRadar, DetectionIRST, DetectionRWR, DetectionDLINK } )
+    self:T2( { DetectionVisual, DetectionOptical, DetectionRadar, DetectionIRST, DetectionRWR, DetectionDLINK } )
     
     return self:_GetController():getDetectedTargets( DetectionVisual, DetectionOptical, DetectionRadar, DetectionIRST, DetectionRWR, DetectionDLINK )
   end

Moose Development/Moose/Wrapper/Group.lua

@@ -352,13 +352,39 @@ function GROUP:GetUnits()
 
   return nil
 end
+
+
+--- Returns a list of @{Unit} objects of the @{Group} that are occupied by a player.
+-- @param #GROUP self
+-- @return #list<Wrapper.Unit#UNIT> The list of player occupied @{Unit} objects of the @{Group}.
+function GROUP:GetPlayerUnits()
+  self:F2( { self.GroupName } )
+  local DCSGroup = self:GetDCSObject()
+
+  if DCSGroup then
+    local DCSUnits = DCSGroup:getUnits()
+    local Units = {}
+    for Index, UnitData in pairs( DCSUnits ) do
+      local PlayerUnit = UNIT:Find( UnitData )
+      if PlayerUnit:GetPlayerName() then
+        Units[#Units+1] = PlayerUnit
+      end
+    end
+    self:T3( Units )
+    return Units
+  end
+
+  return nil
+end
+
+
 --- Returns the UNIT wrapper class with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self
 -- @param #number UnitNumber The number of the UNIT wrapper class to be returned.
 -- @return Wrapper.Unit#UNIT The UNIT wrapper class.
 function GROUP:GetUnit( UnitNumber )
-  self:E( { self.GroupName, UnitNumber } )
+  self:F3( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSObject()
 
@@ -378,7 +404,7 @@ end
 -- @param #number UnitNumber The number of the DCS Unit to be returned.
 -- @return Dcs.DCSWrapper.Unit#Unit The DCS Unit.
 function GROUP:GetDCSUnit( UnitNumber )
-  self:F2( { self.GroupName, UnitNumber } )
+  self:F3( { self.GroupName, UnitNumber } )
 
   local DCSGroup = self:GetDCSObject()
 
@@ -396,7 +422,7 @@ end
 -- @param #GROUP self
 -- @return #number The DCS Group size.
 function GROUP:GetSize()
-  self:F2( { self.GroupName } )
+  self:F3( { self.GroupName } )
   local DCSGroup = self:GetDCSObject()
 
   if DCSGroup then
@@ -419,7 +445,7 @@ end
 -- @param #GROUP self
 -- @return #number The DCS Group initial size.
 function GROUP:GetInitialSize()
-  self:F2( { self.GroupName } )
+  self:F3( { self.GroupName } )
   local DCSGroup = self:GetDCSObject()
 
   if DCSGroup then
@@ -1382,6 +1408,8 @@ do -- Players
   -- @return #nil The group has no players
   function GROUP:GetPlayerNames()
   
+    local HasPlayers = false
+  
     local PlayerNames = {}
     
     local Units = self:GetUnits()
@@ -1391,11 +1419,16 @@ do -- Players
       if PlayerName and PlayerName ~= "" then
         PlayerNames = PlayerNames or {}
         table.insert( PlayerNames, PlayerName )
+        HasPlayers = true
       end   
     end
+
+    if HasPlayers == true then    
+      self:F2( PlayerNames )
+      return PlayerNames
+    end
     
-    self:F2( PlayerNames )
-    return PlayerNames
+    return nil
   end
   
 end

Moose Development/Moose/Wrapper/Unit.lua

@@ -349,9 +349,21 @@ function UNIT:GetPlayerName()
   if DCSUnit then
   
     local PlayerName = DCSUnit:getPlayerName()
+    -- TODO - Workaround for DCS-BUG-3
     if PlayerName == nil or PlayerName == "" then
-      PlayerName = "Player" .. DCSUnit:getID()
+      local PlayerCategory = DCSUnit:getDesc().category
+      if PlayerCategory == Unit.Category.GROUND_UNIT or PlayerCategory == Unit.Category.SHIP then
+        PlayerName = "Player" .. DCSUnit:getID()
+      end
     end
+--    -- Good code
+--    if PlayerName == nil then 
+--      PlayerName = nil
+--    else
+--      if PlayerName == "" then
+--        PlayerName = "Player" .. DCSUnit:getID()
+--      end
+--    end
     return PlayerName
   end
 
@@ -638,12 +650,9 @@ function UNIT:GetThreatLevel()
   if Descriptor then 
   
     local Attributes = Descriptor.attributes
-    self:T( Attributes )
   
     if self:IsGround() then
     
-      self:T( "Ground" )
-    
       local ThreatLevels = {
         "Unarmed", 
         "Infantry", 
@@ -680,8 +689,6 @@ function UNIT:GetThreatLevel()
     
     if self:IsAir() then
     
-      self:T( "Air" )
-  
       local ThreatLevels = {
         "Unarmed", 
         "Tanker", 
@@ -714,8 +721,6 @@ function UNIT:GetThreatLevel()
     
     if self:IsShip() then
   
-      self:T( "Ship" )
-  
   --["Aircraft Carriers"] = {"Heavy armed ships",},
   --["Cruisers"] = {"Heavy armed ships",},
   --["Destroyers"] = {"Heavy armed ships",},
@@ -753,7 +758,6 @@ function UNIT:GetThreatLevel()
     end
   end
 
-  self:T2( ThreatLevel )
   return ThreatLevel, ThreatText
 
 end