Merge branch 'FF/Develop' into FF/Fox2

Moose Development/Moose/Wrapper/Client.lua

@@ -133,7 +133,8 @@ function CLIENT:FindByName( ClientName, ClientBriefing, Error )
 end
 
 function CLIENT:Register( ClientName )
-  local self = BASE:Inherit( self, UNIT:Register( ClientName ) )
+
+  local self = BASE:Inherit( self, UNIT:Register( ClientName ) ) -- #CLIENT
 
   self:F( ClientName )
   self.ClientName = ClientName
@@ -141,7 +142,7 @@ function CLIENT:Register( ClientName )
   self.ClientAlive2 = false
   
   --self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 )
-  self.AliveCheckScheduler = SCHEDULER:New( self, self._AliveCheckScheduler, { "Client Alive " .. ClientName }, 1, 5 )
+  self.AliveCheckScheduler = SCHEDULER:New( self, self._AliveCheckScheduler, { "Client Alive " .. ClientName }, 1, 5, 0.5 )
 
   self:F( self )
   return self

Moose Development/Moose/Wrapper/Controllable.lua

@@ -307,7 +307,6 @@ end
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE
 function CONTROLLABLE:ClearTasks()
-  self:E( "ClearTasks" )
 
   local DCSControllable = self:GetDCSObject()
 
@@ -444,7 +443,7 @@ end
 -- @param #CONTROLLABLE self
 -- @param DCS#Time time DCS mission time.
 -- @param #string userFlag Name of the user flag.
--- @param #boolean userFlagValue User flag value *true* or *false*. Could also be numeric, i.e. either 0=*false* or 1=*true*. Other numeric values don't work! 
+-- @param #boolean userFlagValue User flag value *true* or *false*. Could also be numeric, i.e. either 0=*false* or 1=*true*. Other numeric values don't work!
 -- @param #string condition Lua string.
 -- @param DCS#Time duration Duration in seconds.
 -- @param #number lastWayPoint Last waypoint.
@@ -944,7 +943,7 @@ end
 -- @param #boolean Divebomb (optional) Perform dive bombing. Default false.
 -- @return DCS#Task The DCS task structure.
 function CONTROLLABLE:TaskBombing( Vec2, GroupAttack, WeaponExpend, AttackQty, Direction, Altitude, WeaponType, Divebomb )
-  self:E( { self.ControllableName, Vec2, GroupAttack, WeaponExpend, AttackQty, Direction, Altitude, WeaponType, Divebomb } )
+  self:F( { self.ControllableName, Vec2, GroupAttack, WeaponExpend, AttackQty, Direction, Altitude, WeaponType, Divebomb } )
 
   local _groupattack=false
   if GroupAttack then
@@ -990,7 +989,7 @@ function CONTROLLABLE:TaskBombing( Vec2, GroupAttack, WeaponExpend, AttackQty, D
       },
   }
 
-  self:E( { TaskBombing=DCSTask } )
+  self:F( { TaskBombing=DCSTask } )
   return DCSTask
 end
 

Moose Development/Moose/Wrapper/Unit.lua

@@ -696,7 +696,9 @@ end
 
 
 --- Returns the Unit's A2G threat level on a scale from 1 to 10 ...
--- The following threat levels are foreseen:
+-- Depending on the era and the type of unit, the following threat levels are foreseen:
+-- 
+-- **Modern**:
 -- 
 --   * Threat level  0: Unit is unarmed.
 --   * Threat level  1: Unit is infantry.
@@ -709,13 +711,49 @@ end
 --   * Threat level  8: Unit is a Short Range SAM, radar guided.
 --   * Threat level  9: Unit is a Medium Range SAM, radar guided.
 --   * Threat level 10: Unit is a Long Range SAM, radar guided.
+-- 
+-- **Cold**:
+-- 
+--   * Threat level  0: Unit is unarmed.
+--   * Threat level  1: Unit is infantry.
+--   * Threat level  2: Unit is an infantry vehicle.
+--   * Threat level  3: Unit is ground artillery.
+--   * Threat level  4: Unit is a tank.
+--   * Threat level  5: Unit is a modern tank or ifv with ATGM.
+--   * Threat level  6: Unit is a AAA.
+--   * Threat level  7: Unit is a SAM or manpad, IR guided.
+--   * Threat level  8: Unit is a Short Range SAM, radar guided.
+--   * Threat level  10: Unit is a Medium Range SAM, radar guided.
+--  
+-- **Korea**:
+-- 
+--   * Threat level  0: Unit is unarmed.
+--   * Threat level  1: Unit is infantry.
+--   * Threat level  2: Unit is an infantry vehicle.
+--   * Threat level  3: Unit is ground artillery.
+--   * Threat level  5: Unit is a tank.
+--   * Threat level  6: Unit is a AAA.
+--   * Threat level  7: Unit is a SAM or manpad, IR guided.
+--   * Threat level  10: Unit is a Short Range SAM, radar guided.
+--  
+-- **WWII**:
+-- 
+--   * Threat level  0: Unit is unarmed.
+--   * Threat level  1: Unit is infantry.
+--   * Threat level  2: Unit is an infantry vehicle.
+--   * Threat level  3: Unit is ground artillery.
+--   * Threat level  5: Unit is a tank.
+--   * Threat level  7: Unit is FLAK.
+--   * Threat level  10: Unit is AAA.
+--  
+-- 
 --   @param #UNIT self
 function UNIT:GetThreatLevel()
 
 
   local ThreatLevel = 0
   local ThreatText = ""
-
+  
   local Descriptor = self:GetDesc()
   
   if Descriptor then