From b77f179accd738ededaf429695160bbb48fb8a9d Mon Sep 17 00:00:00 2001
From: Thomas <72444570+Applevangelist@users.noreply.github.com>
Date: Mon, 12 Aug 2024 09:44:13 +0200
Subject: [PATCH 1/3] Update Base.lua (#2159)

Performance tuning - the BASE:I, F, T calls rank very high in overall number of calls taken from Moose. Ensure only the minimum number of actions based on trace state and level is taken
---
 Moose Development/Moose/Core/Base.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Moose Development/Moose/Core/Base.lua b/Moose Development/Moose/Core/Base.lua
index 3cb847f54..30ba6d1a2 100644
--- a/Moose Development/Moose/Core/Base.lua	
+++ b/Moose Development/Moose/Core/Base.lua	
@@ -26,7 +26,7 @@
 -- @module Core.Base
 -- @image Core_Base.JPG
 
-local _TraceOnOff = true
+local _TraceOnOff = false -- default to no tracing
 local _TraceLevel = 1
 local _TraceAll = false
 local _TraceClass = {}
@@ -1191,7 +1191,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1206,7 +1206,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F2( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 2 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1221,7 +1221,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F3( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 3 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1265,7 +1265,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1280,7 +1280,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T2( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 2 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1295,7 +1295,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T3( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 3 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 

From bc9938d08a22168626db8727bc278c3b7fa96fc8 Mon Sep 17 00:00:00 2001
From: Thomas <72444570+Applevangelist@users.noreply.github.com>
Date: Mon, 12 Aug 2024 10:16:40 +0200
Subject: [PATCH 2/3] Update Spawn.lua (#2161)

Updating this class as it calls BASE I,F,T a lot. Making it less noisy for some performance tuning
---
 Moose Development/Moose/Core/Spawn.lua | 341 +++++++++++++------------
 1 file changed, 171 insertions(+), 170 deletions(-)

diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua
index 1c2610f27..345f24983 100644
--- a/Moose Development/Moose/Core/Spawn.lua	
+++ b/Moose Development/Moose/Core/Spawn.lua	
@@ -318,7 +318,7 @@ SPAWN.Takeoff = {
 -- @usage local Plane = SPAWN:New( "Plane" ) -- Creates a new local variable that can initiate new planes with the name "Plane#ddd" using the template "Plane" as defined within the ME.
 function SPAWN:New( SpawnTemplatePrefix )
   local self = BASE:Inherit( self, BASE:New() ) -- #SPAWN
-  self:F( { SpawnTemplatePrefix } )
+  --self:F( { SpawnTemplatePrefix } )
 
   local TemplateGroup = GROUP:FindByName( SpawnTemplatePrefix )
   if TemplateGroup then
@@ -374,7 +374,7 @@ end
 -- @usage local PlaneWithAlias = SPAWN:NewWithAlias( "Plane", "Bomber" ) -- Creates a new local variable that can instantiate new planes with the name "Bomber#ddd" using the template "Plane" as defined within the ME.
 function SPAWN:NewWithAlias( SpawnTemplatePrefix, SpawnAliasPrefix )
   local self = BASE:Inherit( self, BASE:New() )
-  self:F( { SpawnTemplatePrefix, SpawnAliasPrefix } )
+  --self:F( { SpawnTemplatePrefix, SpawnAliasPrefix } )
 
   local TemplateGroup = GROUP:FindByName( SpawnTemplatePrefix )
   if TemplateGroup then
@@ -527,7 +527,7 @@ end
 -- 
 function SPAWN:NewFromTemplate( SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPrefix, NoMooseNamingPostfix )
    local self = BASE:Inherit( self, BASE:New() )
-   self:F( { SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPrefix } )
+   --self:F( { SpawnTemplate, SpawnTemplatePrefix, SpawnAliasPrefix } )
    --if SpawnAliasPrefix == nil or SpawnAliasPrefix == "" then
      --BASE:I( "ERROR: in function NewFromTemplate, required parameter SpawnAliasPrefix is not set" )
      --return nil
@@ -603,7 +603,7 @@ end
 --   Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):InitLimit( 2, 24 )
 --
 function SPAWN:InitLimit( SpawnMaxUnitsAlive, SpawnMaxGroups )
-  self:F( { self.SpawnTemplatePrefix, SpawnMaxUnitsAlive, SpawnMaxGroups } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnMaxUnitsAlive, SpawnMaxGroups } )
 
   self.SpawnInitLimit = true
   self.SpawnMaxUnitsAlive = SpawnMaxUnitsAlive -- The maximum amount of groups that can be alive of SpawnTemplatePrefix at the same time.
@@ -624,7 +624,7 @@ end
 -- @param #boolean KeepUnitNames (optional) If true, the unit names are kept, false or not provided create new unit names.
 -- @return #SPAWN self
 function SPAWN:InitKeepUnitNames( KeepUnitNames )
-  self:F()
+  --self:F()
 
   self.SpawnInitKeepUnitNames = false
   
@@ -638,7 +638,7 @@ end
 -- @param #boolean LateActivated (optional) If true, the spawned groups are late activated.
 -- @return #SPAWN self
 function SPAWN:InitLateActivated( LateActivated )
-  self:F()
+  --self:F()
 
   self.LateActivated = LateActivated or true
 
@@ -652,7 +652,7 @@ end
 -- @param #number TerminalType (Optional) The terminal type.
 -- @return #SPAWN self
 function SPAWN:InitAirbase( AirbaseName, Takeoff, TerminalType )
-  self:F()
+  --self:F()
 
   self.SpawnInitAirbase = AIRBASE:FindByName( AirbaseName )
 
@@ -680,7 +680,7 @@ end
 --   Spawn:InitHeading( 100, 150 )
 --
 function SPAWN:InitHeading( HeadingMin, HeadingMax )
-  self:F()
+  --self:F()
 
   self.SpawnInitHeadingMin = HeadingMin
   self.SpawnInitHeadingMax = HeadingMax
@@ -748,7 +748,7 @@ end
 --
 -- @return #SPAWN self
 function SPAWN:InitCountry( Country )
-  self:F()
+  --self:F()
 
   self.SpawnInitCountry = Country
 
@@ -760,7 +760,7 @@ end
 -- @param #number Category Category id.
 -- @return #SPAWN self
 function SPAWN:InitCategory( Category )
-  self:F()
+  --self:F()
 
   self.SpawnInitCategory = Category
 
@@ -772,7 +772,7 @@ end
 -- @param #string Livery Livery name. Note that this is not necessarily the same name as displayed in the mission editor.
 -- @return #SPAWN self
 function SPAWN:InitLivery( Livery )
-  self:F( { livery = Livery } )
+  --self:F( { livery = Livery } )
 
   self.SpawnInitLivery = Livery
 
@@ -784,7 +784,7 @@ end
 -- @param #string Skill Skill, possible values "Average", "Good", "High", "Excellent" or "Random".
 -- @return #SPAWN self
 function SPAWN:InitSkill( Skill )
-  self:F( { skill = Skill } )
+  --self:F( { skill = Skill } )
   if Skill:lower() == "average" then
     self.SpawnInitSkill = "Average"
   elseif Skill:lower() == "good" then
@@ -805,7 +805,7 @@ end
 -- @param #number Octal The octal number (digits 1..7, max 5 digits, i.e. 1..77777) to set the STN to. Every STN needs to be unique!
 -- @return #SPAWN self
 function SPAWN:InitSTN(Octal)
-  self:F( { Octal = Octal } )
+  --self:F( { Octal = Octal } )
   self.SpawnInitSTN = Octal or 77777
   local num = UTILS.OctalToDecimal(Octal)
   if num == nil or num < 1 then
@@ -823,7 +823,7 @@ end
 -- @param #number Octal The octal number (digits 1..7, max 4 digits, i.e. 1..7777) to set the SADL to. Every SADL needs to be unique!
 -- @return #SPAWN self
 function SPAWN:InitSADL(Octal)
-  self:F( { Octal = Octal } )
+  --self:F( { Octal = Octal } )
   self.SpawnInitSADL = Octal or 7777
   local num = UTILS.OctalToDecimal(Octal)
   if num == nil or num < 1 then
@@ -841,7 +841,7 @@ end
 -- @param #number MPS The speed in MPS to use.
 -- @return #SPAWN self
 function SPAWN:InitSpeedMps(MPS)
-self:F( { MPS = MPS } )
+--self:F( { MPS = MPS } )
   if MPS == nil or tonumber(MPS)<0 then
     MPS=125
   end
@@ -854,7 +854,7 @@ end
 -- @param #number Knots The speed in knots to use.
 -- @return #SPAWN self
 function SPAWN:InitSpeedKnots(Knots)
-self:F( { Knots = Knots } )
+--self:F( { Knots = Knots } )
   if Knots == nil or tonumber(Knots)<0 then
     Knots=300
   end
@@ -867,7 +867,7 @@ end
 -- @param #number KPH The speed in KPH to use.
 -- @return #SPAWN self
 function SPAWN:InitSpeedKph(KPH)
-  self:F( { KPH = KPH } )
+  --self:F( { KPH = KPH } )
   if KPH == nil or tonumber(KPH)<0 then
     KPH=UTILS.KnotsToKmph(300)
   end
@@ -881,7 +881,7 @@ end
 -- @param #number switch If true (or nil), enables the radio communication. If false, disables the radio for the spawned group.
 -- @return #SPAWN self
 function SPAWN:InitRadioCommsOnOff( switch )
-  self:F( { switch = switch } )
+  --self:F( { switch = switch } )
   self.SpawnInitRadio = switch or true
   return self
 end
@@ -891,7 +891,7 @@ end
 -- @param #number frequency The frequency in MHz.
 -- @return #SPAWN self
 function SPAWN:InitRadioFrequency( frequency )
-  self:F( { frequency = frequency } )
+  --self:F( { frequency = frequency } )
 
   self.SpawnInitFreq = frequency
 
@@ -903,7 +903,7 @@ end
 -- @param #string modulation Either "FM" or "AM". If no value is given, modulation is set to AM.
 -- @return #SPAWN self
 function SPAWN:InitRadioModulation( modulation )
-  self:F( { modulation = modulation } )
+  --self:F( { modulation = modulation } )
   if modulation and modulation:lower() == "fm" then
     self.SpawnInitModu = radio.modulation.FM
   else
@@ -948,7 +948,7 @@ end
 --   Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):InitRandomizeRoute( 2, 2, 2000 )
 --
 function SPAWN:InitRandomizeRoute( SpawnStartPoint, SpawnEndPoint, SpawnRadius, SpawnHeight )
-  self:F( { self.SpawnTemplatePrefix, SpawnStartPoint, SpawnEndPoint, SpawnRadius, SpawnHeight } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnStartPoint, SpawnEndPoint, SpawnRadius, SpawnHeight } )
 
   self.SpawnRandomizeRoute = true
   self.SpawnRandomizeRouteStartPoint = SpawnStartPoint
@@ -970,7 +970,7 @@ end
 -- @param DCS#Distance InnerRadius (optional) The inner radius in meters where the new group will NOT be spawned.
 -- @return #SPAWN
 function SPAWN:InitRandomizePosition( RandomizePosition, OuterRadius, InnerRadius )
-  self:F( { self.SpawnTemplatePrefix, RandomizePosition, OuterRadius, InnerRadius } )
+  --self:F( { self.SpawnTemplatePrefix, RandomizePosition, OuterRadius, InnerRadius } )
 
   self.SpawnRandomizePosition = RandomizePosition or false
   self.SpawnRandomizePositionOuterRadius = OuterRadius or 0
@@ -996,7 +996,7 @@ end
 --   Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):InitRandomizeUnits( true, 500, 50 )
 --
 function SPAWN:InitRandomizeUnits( RandomizeUnits, OuterRadius, InnerRadius )
-  self:F( { self.SpawnTemplatePrefix, RandomizeUnits, OuterRadius, InnerRadius } )
+  --self:F( { self.SpawnTemplatePrefix, RandomizeUnits, OuterRadius, InnerRadius } )
 
   self.SpawnRandomizeUnits = RandomizeUnits or false
   self.SpawnOuterRadius = OuterRadius or 0
@@ -1021,7 +1021,7 @@ end
 --   Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):InitSetUnitRelativePositions(Positions)
 --
 function SPAWN:InitSetUnitRelativePositions(Positions)
-  self:F({self.SpawnTemplatePrefix, Positions})
+  --self:F({self.SpawnTemplatePrefix, Positions})
   
   self.SpawnUnitsWithRelativePositions = true
   self.UnitsRelativePositions = Positions
@@ -1041,7 +1041,7 @@ end
 --   Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):InitSetUnitAbsolutePositions(Positions)
 --
 function SPAWN:InitSetUnitAbsolutePositions(Positions)
-  self:F({self.SpawnTemplatePrefix, Positions})
+  --self:F({self.SpawnTemplatePrefix, Positions})
   
   self.SpawnUnitsWithAbsolutePositions = true
   self.UnitsAbsolutePositions = Positions
@@ -1070,7 +1070,7 @@ end
 --   Spawn_US_Platoon_Middle = SPAWN:New( 'US Tank Platoon Middle' ):InitLimit( 12, 150 ):SpawnScheduled( 200, 0.4 ):InitRandomizeTemplate( Spawn_US_Platoon ):InitRandomizeRoute( 3, 3, 2000 )
 --   Spawn_US_Platoon_Right = SPAWN:New( 'US Tank Platoon Right' ):InitLimit( 12, 150 ):SpawnScheduled( 200, 0.4 ):InitRandomizeTemplate( Spawn_US_Platoon ):InitRandomizeRoute( 3, 3, 2000 )
 function SPAWN:InitRandomizeTemplate( SpawnTemplatePrefixTable )
-  self:F( { self.SpawnTemplatePrefix, SpawnTemplatePrefixTable } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnTemplatePrefixTable } )
   
   local temptable = {}
   for _,_temp in pairs(SpawnTemplatePrefixTable) do
@@ -1112,7 +1112,7 @@ end
 --   Spawn_US_Platoon_Right = SPAWN:New( 'US Tank Platoon Right' ):InitLimit( 12, 150 ):SpawnScheduled( 200, 0.4 ):InitRandomizeTemplateSet( Spawn_US_PlatoonSet ):InitRandomizeRoute( 3, 3, 2000 )
 --
 function SPAWN:InitRandomizeTemplateSet( SpawnTemplateSet )
-  self:F( { self.SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix } )
 
   local setnames = SpawnTemplateSet:GetSetNames()
   self:InitRandomizeTemplate(setnames)
@@ -1142,7 +1142,7 @@ end
 --   Spawn_US_Platoon_Right = SPAWN:New( 'US Tank Platoon Right' ):InitLimit( 12, 150 ):SpawnScheduled( 200, 0.4 ):InitRandomizeTemplatePrefixes( "US Tank Platoon Templates" ):InitRandomizeRoute( 3, 3, 2000 )
 --
 function SPAWN:InitRandomizeTemplatePrefixes( SpawnTemplatePrefixes ) -- R2.3
-  self:F( { self.SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix } )
 
   local SpawnTemplateSet = SET_GROUP:New():FilterPrefixes( SpawnTemplatePrefixes ):FilterOnce()
 
@@ -1156,7 +1156,7 @@ end
 -- @param #number Grouping Indicates the maximum amount of units in the group.
 -- @return #SPAWN
 function SPAWN:InitGrouping( Grouping ) -- R2.2
-  self:F( { self.SpawnTemplatePrefix, Grouping } )
+  --self:F( { self.SpawnTemplatePrefix, Grouping } )
 
   self.SpawnGrouping = Grouping
 
@@ -1179,7 +1179,7 @@ end
 --                           :SpawnScheduled( 5, .5 )
 --
 function SPAWN:InitRandomizeZones( SpawnZoneTable )
-  self:F( { self.SpawnTemplatePrefix, SpawnZoneTable } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnZoneTable } )
   
   local temptable = {}
   for _,_temp in pairs(SpawnZoneTable) do
@@ -1226,7 +1226,7 @@ end
 -- @param Core.Point#COORDINATE Coordinate The position to spawn from
 -- @return #SPAWN self
 function SPAWN:InitPositionCoordinate(Coordinate)
-  self:T( { self.SpawnTemplatePrefix, Coordinate:GetVec2()} )
+  self:T2( { self.SpawnTemplatePrefix, Coordinate:GetVec2()} )
   self:InitPositionVec2(Coordinate:GetVec2())
   return self
 end
@@ -1236,10 +1236,10 @@ end
 -- @param DCS#Vec2 Vec2 The position to spawn from
 -- @return #SPAWN self
 function SPAWN:InitPositionVec2(Vec2)
-  self:T( { self.SpawnTemplatePrefix, Vec2} )
+  self:T2( { self.SpawnTemplatePrefix, Vec2} )
   self.SpawnInitPosition = Vec2
   self.SpawnFromNewPosition = true
-  self:T("MaxGroups:"..self.SpawnMaxGroups)
+  self:T2("MaxGroups:"..self.SpawnMaxGroups)
   for SpawnGroupID = 1, self.SpawnMaxGroups do
     self:_SetInitialPosition( SpawnGroupID )
   end
@@ -1264,7 +1264,7 @@ end
 --                       :InitRepeatOnEngineShutDown()
 --
 function SPAWN:InitRepeat()
-  self:F( { self.SpawnTemplatePrefix, self.SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnIndex } )
 
   self.Repeat = true
   self.RepeatOnEngineShutDown = false
@@ -1286,7 +1286,7 @@ end
 --                       :Spawn()
 --
 function SPAWN:InitRepeatOnLanding()
-  self:F( { self.SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix } )
 
   self:InitRepeat()
   self.RepeatOnEngineShutDown = false
@@ -1308,7 +1308,7 @@ end
 --                       :InitRepeatOnEngineShutDown()
 --                       :Spawn()
 function SPAWN:InitRepeatOnEngineShutDown()
-  self:F( { self.SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix } )
 
   self:InitRepeat()
   self.RepeatOnEngineShutDown = true
@@ -1328,13 +1328,13 @@ end
 --   Spawn_Helicopter:InitCleanUp( 20 )  -- CleanUp the spawning of the helicopters every 20 seconds when they become inactive.
 --
 function SPAWN:InitCleanUp( SpawnCleanUpInterval )
-  self:F( { self.SpawnTemplatePrefix, SpawnCleanUpInterval } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnCleanUpInterval } )
 
   self.SpawnCleanUpInterval = SpawnCleanUpInterval
   self.SpawnCleanUpTimeStamps = {}
 
   local SpawnGroup, SpawnCursor = self:GetFirstAliveGroup()
-  self:T( { "CleanUp Scheduler:", SpawnGroup } )
+  self:T2( { "CleanUp Scheduler:", SpawnGroup } )
 
   self.CleanUpScheduler = SCHEDULER:New( self, self._SpawnCleanUpScheduler, {}, 1, SpawnCleanUpInterval, 0.2 )
   return self
@@ -1357,7 +1357,7 @@ end
 --                          :InitArray( 90, 10, 100, 50 )
 --
 function SPAWN:InitArray( SpawnAngle, SpawnWidth, SpawnDeltaX, SpawnDeltaY )
-  self:F( { self.SpawnTemplatePrefix, SpawnAngle, SpawnWidth, SpawnDeltaX, SpawnDeltaY } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnAngle, SpawnWidth, SpawnDeltaX, SpawnDeltaY } )
 
   self.SpawnVisible = true -- When the first Spawn executes, all the Groups need to be made visible before start.
 
@@ -1367,7 +1367,7 @@ function SPAWN:InitArray( SpawnAngle, SpawnWidth, SpawnDeltaX, SpawnDeltaY )
   local SpawnYIndex = 0
 
   for SpawnGroupID = 1, self.SpawnMaxGroups do
-    self:T( { SpawnX, SpawnY, SpawnXIndex, SpawnYIndex } )
+    self:T2( { SpawnX, SpawnY, SpawnXIndex, SpawnYIndex } )
 
     self.SpawnGroups[SpawnGroupID].Visible = true
     self.SpawnGroups[SpawnGroupID].Spawned = false
@@ -1499,9 +1499,10 @@ end -- Delay methods
 
 --- Hide the group on the map view (visible to game master slots!).
 -- @param #SPAWN self
+-- @param #boolean OnOff Defaults to true
 -- @return #SPAWN The SPAWN object
-function SPAWN:InitHiddenOnMap()
-  self.SpawnHiddenOnMap = true
+function SPAWN:InitHiddenOnMap(OnOff)
+  self.SpawnHiddenOnMap = OnOff == false and false or true
   return self
 end
 
@@ -1526,7 +1527,7 @@ end
 -- @param #SPAWN self
 -- @return Wrapper.Group#GROUP The group that was spawned. You can use this group for further actions.
 function SPAWN:Spawn()
-  self:F( { self.SpawnTemplatePrefix, self.SpawnIndex, self.AliveUnits } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnIndex, self.AliveUnits } )
 
   if self.SpawnInitAirbase then
     return self:SpawnAtAirbase( self.SpawnInitAirbase, self.SpawnInitTakeoff, nil, self.SpawnInitTerminalType )
@@ -1542,7 +1543,7 @@ end
 -- @param #string SpawnIndex The index of the group to be spawned.
 -- @return Wrapper.Group#GROUP The group that was spawned. You can use this group for further actions.
 function SPAWN:ReSpawn( SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
 
   if not SpawnIndex then
     SpawnIndex = 1
@@ -1601,12 +1602,12 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
   
   if aliveunits ~= self.AliveUnits then 
     self.AliveUnits = aliveunits
-    self:T("***** self.AliveUnits accounting failure! Corrected! *****") 
+    self:T2("***** self.AliveUnits accounting failure! Corrected! *****") 
   end
   
   set= nil
   
-  self:T( { SpawnTemplatePrefix = self.SpawnTemplatePrefix, SpawnIndex = SpawnIndex, AliveUnits = self.AliveUnits, SpawnMaxGroups = self.SpawnMaxGroups } )
+  self:T2( { SpawnTemplatePrefix = self.SpawnTemplatePrefix, SpawnIndex = SpawnIndex, AliveUnits = self.AliveUnits, SpawnMaxGroups = self.SpawnMaxGroups } )
   
   if self:_GetSpawnIndex( SpawnIndex ) then
     
@@ -1621,12 +1622,12 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
 
       local SpawnTemplate = self.SpawnGroups[self.SpawnIndex].SpawnTemplate
       local SpawnZone = self.SpawnGroups[self.SpawnIndex].SpawnZone
-      self:T( SpawnTemplate.name )
+      self:T2( SpawnTemplate.name )
 
       if SpawnTemplate then
 
         local PointVec3 = POINT_VEC3:New( SpawnTemplate.route.points[1].x, SpawnTemplate.route.points[1].alt, SpawnTemplate.route.points[1].y )
-        self:T( { "Current point of ", self.SpawnTemplatePrefix, PointVec3 } )
+        self:T2( { "Current point of ", self.SpawnTemplatePrefix, PointVec3 } )
 
         -- If RandomizePosition, then Randomize the formation in the zone band, keeping the template.
         if self.SpawnRandomizePosition then
@@ -1638,7 +1639,7 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
           for UnitID = 1, #SpawnTemplate.units do
             SpawnTemplate.units[UnitID].x = SpawnTemplate.units[UnitID].x + (RandomVec2.x - CurrentX)
             SpawnTemplate.units[UnitID].y = SpawnTemplate.units[UnitID].y + (RandomVec2.y - CurrentY)
-            self:T( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
+            self:T2( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
           end
         end
 
@@ -1654,18 +1655,18 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
                   RandomVec2 = PointVec3:GetRandomVec2InRadius( self.SpawnOuterRadius, self.SpawnInnerRadius )
                   numTries = numTries + 1
                   inZone = SpawnZone:IsVec2InZone(RandomVec2)
-                  --self:T("Retrying " .. numTries .. "spawn " .. SpawnTemplate.name .. " in Zone " .. SpawnZone:GetName() .. "!")
-                  --self:T(SpawnZone)
+                  --self:T2("Retrying " .. numTries .. "spawn " .. SpawnTemplate.name .. " in Zone " .. SpawnZone:GetName() .. "!")
+                  --self:T2(SpawnZone)
                 end
               end
               if (not inZone) then
-                self:T("Could not place unit within zone and within radius!")
+                self:T2("Could not place unit within zone and within radius!")
                 RandomVec2 = SpawnZone:GetRandomVec2()
               end
             end
             SpawnTemplate.units[UnitID].x = RandomVec2.x
             SpawnTemplate.units[UnitID].y = RandomVec2.y
-            self:T( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
+            self:T2( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
           end
         end
 
@@ -1821,7 +1822,7 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
         end
         
         if self.SpawnHiddenOnMap then
-          SpawnTemplate.hidden=true
+          SpawnTemplate.hidden=self.SpawnHiddenOnMap
         end
         
         -- Set country, coalition and category.
@@ -1903,7 +1904,7 @@ end
 -- -- Between these two values, a random amount of seconds will be chosen for each new spawn of the helicopters.
 -- Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):SpawnScheduled( 600, 0.5 )
 function SPAWN:SpawnScheduled( SpawnTime, SpawnTimeVariation, WithDelay )
-  self:F( { SpawnTime, SpawnTimeVariation } )
+  --self:F( { SpawnTime, SpawnTimeVariation } )
   
   local SpawnTime = SpawnTime or 60
   local SpawnTimeVariation = SpawnTimeVariation or 0.5
@@ -1924,7 +1925,7 @@ end
 -- @param #SPAWN self
 -- @return #SPAWN
 function SPAWN:SpawnScheduleStart()
-  self:F( { self.SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix } )
 
   self.SpawnScheduler:Start()
   return self
@@ -1934,7 +1935,7 @@ end
 -- @param #SPAWN self
 -- @return #SPAWN
 function SPAWN:SpawnScheduleStop()
-  self:F( { self.SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix } )
 
   self.SpawnScheduler:Stop()
   return self
@@ -1959,7 +1960,7 @@ end
 --                             :SpawnScheduled( 300, 0.3 )
 --
 function SPAWN:OnSpawnGroup( SpawnCallBackFunction, ... )
-  self:F( "OnSpawnGroup" )
+  --self:F( "OnSpawnGroup" )
 
   self.SpawnFunctionHook = SpawnCallBackFunction
   self.SpawnFunctionArguments = {}
@@ -2019,7 +2020,7 @@ end
 --   Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Cold, nil, AIRBASE.TerminalType.OpenBig )
 --
 function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalType, EmergencyAirSpawn, Parkingdata ) -- R2.2, R2.4
-  self:F( { self.SpawnTemplatePrefix, SpawnAirbase, Takeoff, TakeoffAltitude, TerminalType } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnAirbase, Takeoff, TakeoffAltitude, TerminalType } )
 
   -- Get position of airbase.
   local PointVec3 = SpawnAirbase:GetCoordinate()
@@ -2033,14 +2034,14 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
     EmergencyAirSpawn = true
   end
 
-  self:F( { SpawnIndex = self.SpawnIndex } )
+  --self:F( { SpawnIndex = self.SpawnIndex } )
 
   if self:_GetSpawnIndex( self.SpawnIndex + 1 ) then
 
     -- Get group template.
     local SpawnTemplate = self.SpawnGroups[self.SpawnIndex].SpawnTemplate
 
-    self:F( { SpawnTemplate = SpawnTemplate } )
+    --self:F( { SpawnTemplate = SpawnTemplate } )
 
     if SpawnTemplate then
 
@@ -2049,10 +2050,10 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
 
       local GroupAlive = self:GetGroupFromIndex( self.SpawnIndex )
 
-      self:F( { GroupAlive = GroupAlive } )
+      --self:F( { GroupAlive = GroupAlive } )
 
       -- Debug output
-      self:T( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
+      self:T2( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
 
       -- Template group, unit and its attributes.
       local TemplateGroup = GROUP:FindByName( self.SpawnTemplatePrefix )
@@ -2081,7 +2082,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
       -- Get airbase ID and category.
       local AirbaseID = SpawnAirbase:GetID()
       local AirbaseCategory = SpawnAirbase:GetAirbaseCategory()
-      self:F( { AirbaseCategory = AirbaseCategory } )
+      --self:F( { AirbaseCategory = AirbaseCategory } )
 
       -- Set airdromeId.
       if AirbaseCategory == Airbase.Category.SHIP then
@@ -2101,7 +2102,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
 
       -- Check if we spawn on ground. 
       local spawnonground = not (Takeoff == SPAWN.Takeoff.Air)
-      self:T( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
+      self:T2( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
 
       -- Check where we actually spawn if we spawn on ground.
       local spawnonship = false
@@ -2155,7 +2156,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
         -- Number of free parking spots at the airbase.
         if spawnonship or spawnonfarp or spawnonrunway then
           -- These places work procedural and have some kind of build in queue ==> Less effort.
-          self:T( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
+          self:T2( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
           nfree = SpawnAirbase:GetFreeParkingSpotsNumber( termtype, true )
           spots = SpawnAirbase:GetFreeParkingSpotsTable( termtype, true )
           --[[
@@ -2168,18 +2169,18 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
           if ishelo then
             if termtype == nil then
               -- Helo is spawned. Try exclusive helo spots first.
-              self:T( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
+              self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
               spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterOnly, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
               nfree = #spots
               if nfree < nunits then
                 -- Not enough helo ports. Let's try also other terminal types.
-                self:T( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
+                self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
                 spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterUsable, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
                 nfree = #spots
               end
             else
               -- No terminal type specified. We try all spots except shelters.
-              self:T( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
+              self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
               spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
               nfree = #spots
             end
@@ -2188,23 +2189,23 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
             if termtype == nil then
               if isbomber or istransport or istanker or isawacs then
                 -- First we fill the potentially bigger spots.
-                self:T( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
+                self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
                 spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
                 nfree = #spots
                 if nfree < nunits then
                   -- Now we try the smaller ones.
-                  self:T( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
+                  self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
                   spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenMedOrBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
                   nfree = #spots
                 end
               else
-                self:T( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
+                self:T2( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
                 spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.FighterAircraft, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
                 nfree = #spots
               end
             else
               -- Terminal type explicitly given.
-              self:T( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
+              self:T2( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
               spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
               nfree = #spots
             end
@@ -2214,12 +2215,12 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
         -- Debug: Get parking data.
         --[[
         local parkingdata=SpawnAirbase:GetParkingSpotsTable(termtype)
-        self:T(string.format("Parking at %s, terminal type %s:", SpawnAirbase:GetName(), tostring(termtype)))
+        self:T2(string.format("Parking at %s, terminal type %s:", SpawnAirbase:GetName(), tostring(termtype)))
         for _,_spot in pairs(parkingdata) do
-          self:T(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
+          self:T2(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
           SpawnAirbase:GetName(), _spot.TerminalID, _spot.TerminalType,tostring(_spot.Free),tostring(_spot.TOAC),_spot.TerminalID0,_spot.DistToRwy))
         end
-        self:T(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
+        self:T2(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
         ]]
 
         -- Set this to true if not enough spots are available for emergency air start.
@@ -2332,7 +2333,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
             -- Ships and FARPS seem to have a build in queue.
             if spawnonship or spawnonfarp or spawnonrunway then
 
-              self:T( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
+              self:T2( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
 
               -- Spawn on ship. We take only the position of the ship.
               SpawnTemplate.units[UnitID].x = PointVec3.x -- TX
@@ -2341,7 +2342,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
 
             else
 
-              self:T( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
+              self:T2( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
 
               -- Get coordinates of parking spot.
               SpawnTemplate.units[UnitID].x = parkingspots[UnitID].x
@@ -2353,7 +2354,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
 
           else
 
-            self:T( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
+            self:T2( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
 
             -- Spawn in air as requested initially. Original template orientation is perserved, altitude is already correctly set.
             SpawnTemplate.units[UnitID].x = TX
@@ -2370,8 +2371,8 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
           end
 
           -- Debug output.
-          self:T( string.format( "Group %s unit number %d: Parking    = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking ) ) )
-          self:T( string.format( "Group %s unit number %d: Parking ID = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking_id ) ) )
+          self:T2( string.format( "Group %s unit number %d: Parking    = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking ) ) )
+          self:T2( string.format( "Group %s unit number %d: Parking ID = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking_id ) ) )
           self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
         end
       end
@@ -2415,7 +2416,7 @@ end
 -- @param #SPAWN.Takeoff Takeoff (Optional) Takeoff type, i.e. either SPAWN.Takeoff.Cold or SPAWN.Takeoff.Hot. Default is Hot.
 -- @return Wrapper.Group#GROUP The group that was spawned or nil when nothing was spawned.
 function SPAWN:SpawnAtParkingSpot( Airbase, Spots, Takeoff )
-  self:F( { Airbase = Airbase, Spots = Spots, Takeoff = Takeoff } )
+  --self:F( { Airbase = Airbase, Spots = Spots, Takeoff = Takeoff } )
   
   -- Ensure that Spots parameter is a table.
   if type( Spots ) ~= "table" then
@@ -2453,7 +2454,7 @@ function SPAWN:SpawnAtParkingSpot( Airbase, Spots, Takeoff )
       self:T2( { spot = spot } )
 
       if spot and spot.Free then
-        self:T( string.format( "Adding parking spot ID=%d TermType=%d", spot.TerminalID, spot.TerminalType ) )
+        self:T2( string.format( "Adding parking spot ID=%d TermType=%d", spot.TerminalID, spot.TerminalType ) )
         table.insert( Parkingdata, spot )
       end
 
@@ -2481,7 +2482,7 @@ end
 -- @return #nil Nothing is returned!
 function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex )
 
-  self:F( { SpawnIndex = SpawnIndex, SpawnMaxGroups = self.SpawnMaxGroups } )
+  --self:F( { SpawnIndex = SpawnIndex, SpawnMaxGroups = self.SpawnMaxGroups } )
 
   -- Get position of airbase.
   local PointVec3 = SpawnAirbase:GetCoordinate()
@@ -2501,7 +2502,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
     local GroupAlive = self:GetGroupFromIndex( SpawnIndex )
 
     -- Debug output
-    self:T( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
+    self:T2( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
 
     -- Template group, unit and its attributes.
     local TemplateGroup = GROUP:FindByName( self.SpawnTemplatePrefix )
@@ -2525,7 +2526,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
     -- Get airbase ID and category.
     local AirbaseID = SpawnAirbase:GetID()
     local AirbaseCategory = SpawnAirbase:GetAirbaseCategory()
-    self:F( { AirbaseCategory = AirbaseCategory } )
+    --self:F( { AirbaseCategory = AirbaseCategory } )
 
     -- Set airdromeId.
     if AirbaseCategory == Airbase.Category.SHIP then
@@ -2545,7 +2546,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
 
     -- Check if we spawn on ground. 
     local spawnonground = not (Takeoff == SPAWN.Takeoff.Air)
-    self:T( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
+    self:T2( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
 
     -- Check where we actually spawn if we spawn on ground.
     local spawnonship = false
@@ -2587,7 +2588,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
       -- Number of free parking spots at the airbase.
       if spawnonship or spawnonfarp or spawnonrunway then
         -- These places work procedural and have some kind of build in queue ==> Less effort.
-        self:T( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
+        self:T2( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
         nfree = SpawnAirbase:GetFreeParkingSpotsNumber( termtype, true )
         spots = SpawnAirbase:GetFreeParkingSpotsTable( termtype, true )
         --[[
@@ -2600,18 +2601,18 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
         if ishelo then
           if termtype == nil then
             -- Helo is spawned. Try exclusive helo spots first.
-            self:T( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
+            self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
             spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterOnly, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
             nfree = #spots
             if nfree < nunits then
               -- Not enough helo ports. Let's try also other terminal types.
-              self:T( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
+              self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
               spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterUsable, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
               nfree = #spots
             end
           else
             -- No terminal type specified. We try all spots except shelters.
-            self:T( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
+            self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
             spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
             nfree = #spots
           end
@@ -2623,23 +2624,23 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
             -- TODO: Some attributes are "Helicopters", "Bombers", "Transports", "Battleplanes". Need to check it out.
             if isbomber or istransport then
               -- First we fill the potentially bigger spots.
-              self:T( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
+              self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
               spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
               nfree = #spots
               if nfree < nunits then
                 -- Now we try the smaller ones.
-                self:T( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
+                self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
                 spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenMedOrBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
                 nfree = #spots
               end
             else
-              self:T( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
+              self:T2( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
               spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.FighterAircraft, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
               nfree = #spots
             end
           else
             -- Terminal type explicitly given.
-            self:T( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
+            self:T2( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
             spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
             nfree = #spots
           end
@@ -2654,7 +2655,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
         self:T2(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
         SpawnAirbase:GetName(), _spot.TerminalID, _spot.TerminalType,tostring(_spot.Free),tostring(_spot.TOAC),_spot.TerminalID0,_spot.DistToRwy))
       end
-      self:T(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
+      self:T2(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
       ]]
 
       -- Set this to true if not enough spots are available for emergency air start.
@@ -2714,7 +2715,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
       SpawnTemplate.parked = true
 
       for UnitID = 1, nunits do
-        self:F( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
+        --self:F( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
 
         -- Template of the current unit.
         local UnitTemplate = SpawnTemplate.units[UnitID]
@@ -2732,7 +2733,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
           -- Ships and FARPS seem to have a build in queue.
           if spawnonship or spawnonfarp or spawnonrunway then
 
-            self:T( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
+            self:T2( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
 
             -- Spawn on ship. We take only the position of the ship.
             SpawnTemplate.units[UnitID].x = PointVec3.x -- TX
@@ -2741,7 +2742,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
 
           else
 
-            self:T( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
+            self:T2( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
 
             -- Get coordinates of parking spot.
             SpawnTemplate.units[UnitID].x = parkingspots[UnitID].x
@@ -2753,7 +2754,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
 
         else
 
-          self:T( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
+          self:T2( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
 
           -- Spawn in air as requested initially. Original template orientation is perserved, altitude is already correctly set.
           SpawnTemplate.units[UnitID].x = TX
@@ -2844,7 +2845,7 @@ end
 --   Spawn_Plane:ParkAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), AIRBASE.TerminalType.OpenBig )
 --
 function SPAWN:ParkAtAirbase( SpawnAirbase, TerminalType, Parkingdata ) -- R2.2, R2.4, R2.5
-  self:F( { self.SpawnTemplatePrefix, SpawnAirbase, TerminalType } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnAirbase, TerminalType } )
 
   self:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, 1 )
 
@@ -2867,7 +2868,7 @@ end
 -- @param #number SpawnIndex (optional) The index which group to spawn within the given zone.
 -- @return Wrapper.Group#GROUP that was spawned or #nil if nothing was spawned.
 function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, Vec3, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, Vec3, SpawnIndex } )
 
   local PointVec3 = POINT_VEC3:NewFromVec3( Vec3 )
   self:T2( PointVec3 )
@@ -2883,7 +2884,7 @@ function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
 
     if SpawnTemplate then
 
-      self:T( { "Current point of ", self.SpawnTemplatePrefix, Vec3 } )
+      self:T2( { "Current point of ", self.SpawnTemplatePrefix, Vec3 } )
 
       local TemplateHeight = SpawnTemplate.route and SpawnTemplate.route.points[1].alt or nil
 
@@ -2895,7 +2896,7 @@ function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
 
       -- Translate the position of the Group Template to the Vec3.
       for UnitID = 1, #SpawnTemplate.units do
-        -- self:T( 'Before Translation SpawnTemplate.units['..UnitID..'].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units['..UnitID..'].y = ' .. SpawnTemplate.units[UnitID].y )
+        -- self:T2( 'Before Translation SpawnTemplate.units['..UnitID..'].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units['..UnitID..'].y = ' .. SpawnTemplate.units[UnitID].y )
         local UnitTemplate = SpawnTemplate.units[UnitID]
         local SX = UnitTemplate.x or 0
         local SY = UnitTemplate.y or 0
@@ -2908,7 +2909,7 @@ function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
         if SpawnTemplate.CategoryID ~= Group.Category.SHIP then
           SpawnTemplate.units[UnitID].alt = Vec3.y or TemplateHeight
         end
-        self:T( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
+        self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
       end
       SpawnTemplate.route.points[1].x = Vec3.x
       SpawnTemplate.route.points[1].y = Vec3.z
@@ -2935,7 +2936,7 @@ end
 -- @param #number SpawnIndex (optional) The index which group to spawn within the given zone.
 -- @return Wrapper.Group#GROUP that was spawned or #nil if nothing was spawned.
 function SPAWN:SpawnFromCoordinate( Coordinate, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
 
   return self:SpawnFromVec3( Coordinate:GetVec3(), SpawnIndex )
 end
@@ -2956,7 +2957,7 @@ end
 --   SpawnAirplanes:SpawnFromPointVec3( SpawnPointVec3 )
 --
 function SPAWN:SpawnFromPointVec3( PointVec3, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
 
   return self:SpawnFromVec3( PointVec3:GetVec3(), SpawnIndex )
 end
@@ -2982,7 +2983,7 @@ end
 --   SpawnAirplanes:SpawnFromVec2( SpawnVec2, 2000, 4000 )
 --
 function SPAWN:SpawnFromVec2( Vec2, MinHeight, MaxHeight, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, self.SpawnIndex, Vec2, MinHeight, MaxHeight, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnIndex, Vec2, MinHeight, MaxHeight, SpawnIndex } )
 
   local Height = nil
 
@@ -3014,7 +3015,7 @@ end
 --   SpawnAirplanes:SpawnFromPointVec2( SpawnPointVec2, 2000, 4000 )
 --
 function SPAWN:SpawnFromPointVec2( PointVec2, MinHeight, MaxHeight, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, self.SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnIndex } )
 
   return self:SpawnFromVec2( PointVec2:GetVec2(), MinHeight, MaxHeight, SpawnIndex )
 end
@@ -3040,7 +3041,7 @@ end
 --   SpawnAirplanes:SpawnFromUnit( SpawnStatic, 2000, 4000 )
 --
 function SPAWN:SpawnFromUnit( HostUnit, MinHeight, MaxHeight, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, HostUnit, MinHeight, MaxHeight, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, HostUnit, MinHeight, MaxHeight, SpawnIndex } )
 
   if HostUnit and HostUnit:IsAlive() ~= nil then -- and HostUnit:getUnit(1):inAir() == false then
     return self:SpawnFromVec2( HostUnit:GetVec2(), MinHeight, MaxHeight, SpawnIndex )
@@ -3068,7 +3069,7 @@ end
 --   SpawnAirplanes:SpawnFromStatic( SpawnStatic, 2000, 4000 )
 --
 function SPAWN:SpawnFromStatic( HostStatic, MinHeight, MaxHeight, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, HostStatic, MinHeight, MaxHeight, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, HostStatic, MinHeight, MaxHeight, SpawnIndex } )
 
   if HostStatic and HostStatic:IsAlive() then
     return self:SpawnFromVec2( HostStatic:GetVec2(), MinHeight, MaxHeight, SpawnIndex )
@@ -3108,7 +3109,7 @@ end
 --   SpawnAirplanes:SpawnInZone( SpawnZone, nil, 2000, 4000 )
 --
 function SPAWN:SpawnInZone( Zone, RandomizeGroup, MinHeight, MaxHeight, SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, Zone, RandomizeGroup, MinHeight, MaxHeight, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, Zone, RandomizeGroup, MinHeight, MaxHeight, SpawnIndex } )
 
   if Zone then
     if RandomizeGroup then
@@ -3158,7 +3159,7 @@ end
 -- @param #number SpawnIndex Is the number of the Group that is to be spawned.
 -- @return #string SpawnGroupName
 function SPAWN:SpawnGroupName( SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
 
   local SpawnPrefix = self.SpawnTemplatePrefix
   if self.SpawnAliasPrefix then
@@ -3167,10 +3168,10 @@ function SPAWN:SpawnGroupName( SpawnIndex )
 
   if SpawnIndex then
     local SpawnName = string.format( '%s#%03d', SpawnPrefix, SpawnIndex )
-    self:T( SpawnName )
+    self:T2( SpawnName )
     return SpawnName
   else
-    self:T( SpawnPrefix )
+    self:T2( SpawnPrefix )
     return SpawnPrefix
   end
 
@@ -3190,7 +3191,7 @@ end
 --   end
 --
 function SPAWN:GetFirstAliveGroup()
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
 
   for SpawnIndex = 1, self.SpawnCount do
     local SpawnGroup = self:GetGroupFromIndex( SpawnIndex )
@@ -3217,7 +3218,7 @@ end
 --   end
 --
 function SPAWN:GetNextAliveGroup( SpawnIndexStart )
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndexStart } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndexStart } )
 
   SpawnIndexStart = SpawnIndexStart + 1
   for SpawnIndex = SpawnIndexStart, self.SpawnCount do
@@ -3243,7 +3244,7 @@ end
 --   end
 --
 function SPAWN:GetLastAliveGroup()
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
 
   for SpawnIndex = self.SpawnCount, 1, -1 do -- Added
     local SpawnGroup = self:GetGroupFromIndex( SpawnIndex )
@@ -3264,7 +3265,7 @@ end
 -- @param #number SpawnIndex The index of the group to return.
 -- @return Wrapper.Group#GROUP self
 function SPAWN:GetGroupFromIndex( SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndex } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndex } )
 
   if not SpawnIndex then
     SpawnIndex = 1
@@ -3322,7 +3323,7 @@ end
 --- Get the index from a given group.
 -- The function will search the name of the group for a #, and will return the number behind the #-mark.
 function SPAWN:GetSpawnIndexFromGroup( SpawnGroup )
-  self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnGroup } )
+  --self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnGroup } )
 
   local IndexString = string.match( SpawnGroup:GetName(), "#(%d*)$" ):sub( 2 )
   local Index = tonumber( IndexString )
@@ -3334,7 +3335,7 @@ end
 
 --- Return the last maximum index that can be used.
 function SPAWN:_GetLastIndex()
-  self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
+  --self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
 
   return self.SpawnMaxGroups
 end
@@ -3342,7 +3343,7 @@ end
 --- Initalize the SpawnGroups collection.
 -- @param #SPAWN self
 function SPAWN:_InitializeSpawnGroups( SpawnIndex )
-  self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndex } )
+  --self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndex } )
 
   if not self.SpawnGroups[SpawnIndex] then
     self.SpawnGroups[SpawnIndex] = {}
@@ -3386,7 +3387,7 @@ end
 
 --- Gets the CountryID of the Group with the given SpawnPrefix
 function SPAWN:_GetGroupCountryID( SpawnPrefix )
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnPrefix } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnPrefix } )
 
   local TemplateGroup = Group.getByName( SpawnPrefix )
 
@@ -3404,7 +3405,7 @@ end
 -- @param #string SpawnTemplatePrefix
 -- @return @SPAWN self
 function SPAWN:_GetTemplate( SpawnTemplatePrefix )
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnTemplatePrefix } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnTemplatePrefix } )
 
   local SpawnTemplate = nil
   
@@ -3413,7 +3414,7 @@ function SPAWN:_GetTemplate( SpawnTemplatePrefix )
   end
   
   local Template = _DATABASE.Templates.Groups[SpawnTemplatePrefix].Template
-  self:F( { Template = Template } )
+  --self:F( { Template = Template } )
 
   SpawnTemplate = UTILS.DeepCopy( _DATABASE.Templates.Groups[SpawnTemplatePrefix].Template )
 
@@ -3435,7 +3436,7 @@ end
 -- @param #number SpawnIndex
 -- @return #SPAWN self
 function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
+  --self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
 
   --  if not self.SpawnTemplate then
   --    self.SpawnTemplate = self:_GetTemplate( SpawnTemplatePrefix )
@@ -3466,7 +3467,7 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
 
   if self.SpawnGrouping then
     local UnitAmount = #SpawnTemplate.units
-    self:F( { UnitAmount = UnitAmount, SpawnGrouping = self.SpawnGrouping } )
+    --self:F( { UnitAmount = UnitAmount, SpawnGrouping = self.SpawnGrouping } )
     if UnitAmount > self.SpawnGrouping then
       for UnitID = self.SpawnGrouping + 1, UnitAmount do
         SpawnTemplate.units[UnitID] = nil
@@ -3498,7 +3499,7 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
       if SpawnInitKeepUnitIFF == false then       
         UnitPrefix, Rest = string.match( SpawnTemplate.units[UnitID].name, "^([^#]+)#?" ):gsub( "^%s*(.-)%s*$", "%1" )
         SpawnTemplate.units[UnitID].name = string.format( '%s#%03d-%02d', UnitPrefix, SpawnIndex, UnitID )       
-        self:T( { UnitPrefix, Rest } )
+        self:T2( { UnitPrefix, Rest } )
       --else
        --UnitPrefix=SpawnTemplate.units[UnitID].name
       end
@@ -3692,7 +3693,7 @@ end
 -- @param #number SpawnIndex The index of the group to be spawned.
 -- @return #SPAWN
 function SPAWN:_RandomizeRoute( SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeRoute, self.SpawnRandomizeRouteStartPoint, self.SpawnRandomizeRouteEndPoint, self.SpawnRandomizeRouteRadius } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeRoute, self.SpawnRandomizeRouteStartPoint, self.SpawnRandomizeRouteEndPoint, self.SpawnRandomizeRouteRadius } )
 
   if self.SpawnRandomizeRoute then
     local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
@@ -3712,7 +3713,7 @@ function SPAWN:_RandomizeRoute( SpawnIndex )
         SpawnTemplate.route.points[t].alt = nil
       end
 
-      self:T( 'SpawnTemplate.route.points[' .. t .. '].x = ' .. SpawnTemplate.route.points[t].x .. ', SpawnTemplate.route.points[' .. t .. '].y = ' .. SpawnTemplate.route.points[t].y )
+      self:T2( 'SpawnTemplate.route.points[' .. t .. '].x = ' .. SpawnTemplate.route.points[t].x .. ', SpawnTemplate.route.points[' .. t .. '].y = ' .. SpawnTemplate.route.points[t].y )
     end
   end
 
@@ -3726,7 +3727,7 @@ end
 -- @param #number SpawnIndex
 -- @return #SPAWN self
 function SPAWN:_RandomizeTemplate( SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeTemplate } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeTemplate } )
 
   if self.SpawnRandomizeTemplate then
     self.SpawnGroups[SpawnIndex].SpawnTemplatePrefix = self.SpawnTemplatePrefixTable[math.random( 1, #self.SpawnTemplatePrefixTable )]
@@ -3755,15 +3756,15 @@ end
 -- @param #number SpawnIndex
 -- @return #SPAWN self
 function SPAWN:_SetInitialPosition( SpawnIndex )
-  self:T( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
+  self:T2( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
   
   if self.SpawnFromNewPosition then
     
-    self:T( "Preparing Spawn at Vec2 ", self.SpawnInitPosition )
+    self:T2( "Preparing Spawn at Vec2 ", self.SpawnInitPosition )
 
     local SpawnVec2 = self.SpawnInitPosition
 
-    self:T( { SpawnVec2 = SpawnVec2 } )
+    self:T2( { SpawnVec2 = SpawnVec2 } )
 
     local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
 
@@ -3773,11 +3774,11 @@ function SPAWN:_SetInitialPosition( SpawnIndex )
     SpawnTemplate.route.points[1].x = SpawnTemplate.route.points[1].x or 0
     SpawnTemplate.route.points[1].y = SpawnTemplate.route.points[1].y or 0
       
-    self:T( { Route = SpawnTemplate.route } )
+    self:T2( { Route = SpawnTemplate.route } )
 
     for UnitID = 1, #SpawnTemplate.units do
       local UnitTemplate = SpawnTemplate.units[UnitID]
-      self:T( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
+      self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
       local SX = UnitTemplate.x
       local SY = UnitTemplate.y
       local BX = SpawnTemplate.route.points[1].x
@@ -3788,7 +3789,7 @@ function SPAWN:_SetInitialPosition( SpawnIndex )
       UnitTemplate.y = TY
       -- TODO: Manage altitude based on landheight...
       -- SpawnTemplate.units[UnitID].alt = SpawnVec2:
-      self:T( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
+      self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
     end
     
     SpawnTemplate.route.points[1].x = SpawnVec2.x
@@ -3806,31 +3807,31 @@ end
 -- @param #number SpawnIndex
 -- @return #SPAWN self
 function SPAWN:_RandomizeZones( SpawnIndex )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
 
   if self.SpawnRandomizeZones then
     local SpawnZone = nil -- Core.Zone#ZONE_BASE
     while not SpawnZone do
-      self:T( { SpawnZoneTableCount = #self.SpawnZoneTable, self.SpawnZoneTable } )
+      self:T2( { SpawnZoneTableCount = #self.SpawnZoneTable, self.SpawnZoneTable } )
       local ZoneID = math.random( #self.SpawnZoneTable )
-      self:T( ZoneID )
+      self:T2( ZoneID )
       SpawnZone = self.SpawnZoneTable[ZoneID]:GetZoneMaybe()
     end
 
-    self:T( "Preparing Spawn in Zone", SpawnZone:GetName() )
+    self:T2( "Preparing Spawn in Zone", SpawnZone:GetName() )
 
     local SpawnVec2 = SpawnZone:GetRandomVec2()
 
-    self:T( { SpawnVec2 = SpawnVec2 } )
+    self:T2( { SpawnVec2 = SpawnVec2 } )
 
     local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
     self.SpawnGroups[SpawnIndex].SpawnZone = SpawnZone
 
-    self:T( { Route = SpawnTemplate.route } )
+    self:T2( { Route = SpawnTemplate.route } )
 
     for UnitID = 1, #SpawnTemplate.units do
       local UnitTemplate = SpawnTemplate.units[UnitID]
-      self:T( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
+      self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
       local SX = UnitTemplate.x
       local SY = UnitTemplate.y
       local BX = SpawnTemplate.route.points[1].x
@@ -3841,7 +3842,7 @@ function SPAWN:_RandomizeZones( SpawnIndex )
       UnitTemplate.y = TY
       -- TODO: Manage altitude based on landheight...
       -- SpawnTemplate.units[UnitID].alt = SpawnVec2:
-      self:T( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
+      self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
     end
     SpawnTemplate.x = SpawnVec2.x
     SpawnTemplate.y = SpawnVec2.y
@@ -3854,7 +3855,7 @@ function SPAWN:_RandomizeZones( SpawnIndex )
 end
 
 function SPAWN:_TranslateRotate( SpawnIndex, SpawnRootX, SpawnRootY, SpawnX, SpawnY, SpawnAngle )
-  self:F( { self.SpawnTemplatePrefix, SpawnIndex, SpawnRootX, SpawnRootY, SpawnX, SpawnY, SpawnAngle } )
+  --self:F( { self.SpawnTemplatePrefix, SpawnIndex, SpawnRootX, SpawnRootY, SpawnX, SpawnY, SpawnAngle } )
 
   -- Translate
   local TranslatedX = SpawnX
@@ -3896,11 +3897,11 @@ end
 -- @param #number SpawnIndex Spawn index.
 -- @return #number self.SpawnIndex
 function SPAWN:_GetSpawnIndex( SpawnIndex )
-  self:T( { template=self.SpawnTemplatePrefix, SpawnIndex=SpawnIndex, SpawnMaxGroups=self.SpawnMaxGroups, SpawnMaxUnitsAlive=self.SpawnMaxUnitsAlive, AliveUnits=self.AliveUnits, TemplateUnits=#self.SpawnTemplate.units } )
+  self:T2( { template=self.SpawnTemplatePrefix, SpawnIndex=SpawnIndex, SpawnMaxGroups=self.SpawnMaxGroups, SpawnMaxUnitsAlive=self.SpawnMaxUnitsAlive, AliveUnits=self.AliveUnits, TemplateUnits=#self.SpawnTemplate.units } )
 
   if (self.SpawnMaxGroups == 0) or (SpawnIndex <= self.SpawnMaxGroups) then
     if (self.SpawnMaxUnitsAlive == 0) or (self.AliveUnits + #self.SpawnTemplate.units <= self.SpawnMaxUnitsAlive) or self.UnControlled == true then
-      self:T( { SpawnCount = self.SpawnCount, SpawnIndex = SpawnIndex } )
+      self:T2( { SpawnCount = self.SpawnCount, SpawnIndex = SpawnIndex } )
       if SpawnIndex and SpawnIndex >= self.SpawnCount + 1 then
         self.SpawnCount = self.SpawnCount + 1
         SpawnIndex = self.SpawnCount
@@ -3924,17 +3925,17 @@ end
 -- @param #SPAWN self 
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnBirth( EventData )
-  self:F( self.SpawnTemplatePrefix )
+  --self:F( self.SpawnTemplatePrefix )
 
   local SpawnGroup = EventData.IniGroup
 
   if SpawnGroup then
     local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
     if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
-      self:T( { "Birth Event:", EventPrefix, self.SpawnTemplatePrefix } )
+      self:T2( { "Birth Event:", EventPrefix, self.SpawnTemplatePrefix } )
       if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
         self.AliveUnits = self.AliveUnits + 1
-        self:T( "Alive Units: " .. self.AliveUnits )
+        self:T2( "Alive Units: " .. self.AliveUnits )
       end
     end
   end
@@ -3945,8 +3946,8 @@ end
 -- @param #SPAWN self 
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnDeadOrCrash( EventData )
-  self:T( "Dead or crash event ID "..tostring(EventData.id or 0))
-  self:T( "Dead or crash event for "..tostring(EventData.IniUnitName or "none") )
+  self:T2( "Dead or crash event ID "..tostring(EventData.id or 0))
+  self:T2( "Dead or crash event for "..tostring(EventData.IniUnitName or "none") )
   
   --if EventData.id == EVENTS.Dead then return end
   
@@ -3958,12 +3959,12 @@ function SPAWN:_OnDeadOrCrash( EventData )
     local EventPrefix = self:_GetPrefixFromGroupName(unit.GroupName)
    
     if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
-      self:T( { "Dead event: " .. EventPrefix } )
-      self:T(string.format("EventPrefix = %s | SpawnAliasPrefix = %s  | Old AliveUnits = %d",EventPrefix or "",self.SpawnAliasPrefix or "",self.AliveUnits or 0))
+      self:T2( { "Dead event: " .. EventPrefix } )
+      self:T2(string.format("EventPrefix = %s | SpawnAliasPrefix = %s  | Old AliveUnits = %d",EventPrefix or "",self.SpawnAliasPrefix or "",self.AliveUnits or 0))
       if EventPrefix == self.SpawnTemplatePrefix or ( self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix ) and self.AliveUnits > 0 then
        self.AliveUnits = self.AliveUnits - 1   
       end
-      self:T( "New Alive Units: " .. self.AliveUnits ) 
+      self:T2( "New Alive Units: " .. self.AliveUnits ) 
     end
   end
 end
@@ -3973,15 +3974,15 @@ end
 -- @param #SPAWN self
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnTakeOff( EventData )
-  self:F( self.SpawnTemplatePrefix )
+  --self:F( self.SpawnTemplatePrefix )
 
   local SpawnGroup = EventData.IniGroup
   if SpawnGroup then
     local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
     if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
-      self:T( { "TakeOff event: " .. EventPrefix } )
+      self:T2( { "TakeOff event: " .. EventPrefix } )
       if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
-        self:T( "self.Landed = false" )
+        self:T2( "self.Landed = false" )
         SpawnGroup:SetState( SpawnGroup, "Spawn_Landed", false )
       end
     end
@@ -3993,19 +3994,19 @@ end
 -- @param #SPAWN self
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnLand( EventData )
-  self:F( self.SpawnTemplatePrefix )
+  --self:F( self.SpawnTemplatePrefix )
 
   local SpawnGroup = EventData.IniGroup
   if SpawnGroup then
     local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
     if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
-      self:T( { "Land event: " .. EventPrefix } )
+      self:T2( { "Land event: " .. EventPrefix } )
       if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
         -- TODO: Check if this is the last unit of the group that lands.
         SpawnGroup:SetState( SpawnGroup, "Spawn_Landed", true )
         if self.RepeatOnLanding then
           local SpawnGroupIndex = self:GetSpawnIndexFromGroup( SpawnGroup )
-          self:T( { "Landed:", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
+          self:T2( { "Landed:", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
           -- self:ReSpawn( SpawnGroupIndex )
           -- Delay respawn by three seconds due to DCS 2.5.4.26368 OB bug https://github.com/FlightControl-Master/MOOSE/issues/1076
           -- Bug was initially only for engine shutdown event but after ED "fixed" it, it now happens on landing events.
@@ -4022,19 +4023,19 @@ end
 -- @param #SPAWN self
 -- @param Core.Event#EVENTDATA EventData
 function SPAWN:_OnEngineShutDown( EventData )
-  self:F( self.SpawnTemplatePrefix )
+  --self:F( self.SpawnTemplatePrefix )
 
   local SpawnGroup = EventData.IniGroup
   if SpawnGroup then
     local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
     if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
-      self:T( { "EngineShutdown event: " .. EventPrefix } )
+      self:T2( { "EngineShutdown event: " .. EventPrefix } )
       if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
         -- todo: test if on the runway
         local Landed = SpawnGroup:GetState( SpawnGroup, "Spawn_Landed" )
         if Landed and self.RepeatOnEngineShutDown then
           local SpawnGroupIndex = self:GetSpawnIndexFromGroup( SpawnGroup )
-          self:T( { "EngineShutDown: ", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
+          self:T2( { "EngineShutDown: ", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
           -- self:ReSpawn( SpawnGroupIndex )
           -- Delay respawn by three seconds due to DCS 2.5.4 OB bug https://github.com/FlightControl-Master/MOOSE/issues/1076
           SCHEDULER:New( nil, self.ReSpawn, { self, SpawnGroupIndex }, 3 )
@@ -4060,10 +4061,10 @@ end
 -- @param #SPAWN self
 -- @return #boolean True = Continue Scheduler
 function SPAWN:_SpawnCleanUpScheduler()
-  self:F( { "CleanUp Scheduler:", self.SpawnTemplatePrefix } )
+  --self:F( { "CleanUp Scheduler:", self.SpawnTemplatePrefix } )
   
   local SpawnGroup, SpawnCursor = self:GetFirstAliveGroup()
-  self:T( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
+  self:T2( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
 
   local IsHelo = false
   
@@ -4080,7 +4081,7 @@ function SPAWN:_SpawnCleanUpScheduler()
 
       self.SpawnCleanUpTimeStamps[SpawnUnitName] = self.SpawnCleanUpTimeStamps[SpawnUnitName] or {}
       local Stamp = self.SpawnCleanUpTimeStamps[SpawnUnitName]
-      self:T( { SpawnUnitName, Stamp } )
+      self:T2( { SpawnUnitName, Stamp } )
 
       if Stamp.Vec2 then
         if (SpawnUnit:InAir() == false and SpawnUnit:GetVelocityKMH() < 1) or IsHelo then
@@ -4088,7 +4089,7 @@ function SPAWN:_SpawnCleanUpScheduler()
           if (Stamp.Vec2.x == NewVec2.x and Stamp.Vec2.y == NewVec2.y) or (SpawnUnit:GetLife() <= 1) then
             -- If the plane is not moving or dead , and is on the ground, assign it with a timestamp...
             if Stamp.Time + self.SpawnCleanUpInterval < timer.getTime() then
-              self:T( { "CleanUp Scheduler:", "ReSpawning:", SpawnGroup:GetName() } )
+              self:T2( { "CleanUp Scheduler:", "ReSpawning:", SpawnGroup:GetName() } )
               --self:ReSpawn( SpawnCursor )
               SCHEDULER:New( nil, self.ReSpawn, { self, SpawnCursor }, 3 )
               Stamp.Vec2 = nil
@@ -4117,7 +4118,7 @@ function SPAWN:_SpawnCleanUpScheduler()
 
     SpawnGroup, SpawnCursor = self:GetNextAliveGroup( SpawnCursor )
 
-    self:T( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
+    self:T2( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
 
   end
 

From a54944b0214abee2fc0206e8a246bbe9f36c41d3 Mon Sep 17 00:00:00 2001
From: Thomas <72444570+Applevangelist@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:39:03 +0200
Subject: [PATCH 3/3] Update CTLD.lua (#2164)

#CTLD
* Fix for helo being no Chinook not finding crates e.g. on a ship or FARP
* `nil` check for static cargo position check
---
 Moose Development/Moose/Ops/CTLD.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua
index 5a15650a5..93b9e7013 100644
--- a/Moose Development/Moose/Ops/CTLD.lua	
+++ b/Moose Development/Moose/Ops/CTLD.lua	
@@ -2817,6 +2817,7 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
   local capabilities = {}
   local maxmass = 2000
   local maxloadable = 2000
+  local IsNoHook = not self:IsHook(_unit)
   if not _ignoreweight then
     maxloadable = self:_GetMaxLoadableMass(_unit)
   end
@@ -2830,14 +2831,14 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
     local cargoalive = false -- TODO dyn cargo spawn workaround
     local dcsunit = nil
     local dcsunitpos = nil
-    if static.DCSCargoObject then
+    if static and static.DCSCargoObject then
       dcsunit = Unit.getByName(static.StaticName)
       if dcsunit then
         cargoalive = dcsunit:isExist() ~= nil and true or false
       end
       if cargoalive == true then
         local dcsvec3 = dcsunit:getPoint() or dcsunit:getPosition().p or {x=0,y=0,z=0}
-        self:I({dcsvec3 = dcsunit:getPoint(), dcspos = dcsunit:getPosition().p})
+        self:T({dcsvec3 = dcsunit:getPoint(), dcspos = dcsunit:getPosition().p})
         if dcsvec3 then
           dcsunitpos = COORDINATE:New(dcsvec3.x,dcsvec3.z,dcsvec3.y)
         end
@@ -2850,9 +2851,10 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
       local agl = staticpos.y-landheight
       agl = UTILS.Round(agl,2)
       local GCloaded = agl > 0 and true or false
+	 if IsNoHook == true then GCloaded = false end
       --- Testing
       local distance = self:_GetDistance(location,staticpos)
-      self:I({name=static:GetName(),agl=agl,GCloaded=GCloaded,distance=string.format("%.2f",distance or 0)})
+      self:T({name=static:GetName(),IsNoHook=IsNoHook,agl=agl,GCloaded=GCloaded,distance=string.format("%.2f",distance or 0)})
       if (not GCloaded) and distance <= finddist and static and (weight <= maxloadable or _ignoreweight) then 
         index = index + 1
         table.insert(found, staticid, cargo)