@jtff/miztemplate-lib 3.4.8 → 3.4.10

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2024-08-29T10:25:13+02:00-f531fdaa7055bd56bd3afb8a03857833d7c3122b ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-09-08T13:24:09+02:00-051286acd119752bf389e7fc1bb685ffdee767a1 ***')
 if not MOOSE_DEVELOPMENT_FOLDER then
 MOOSE_DEVELOPMENT_FOLDER='Scripts'
 end
@@ -14157,6 +14157,10 @@ end
 end
 MStaticInclude=MStaticInclude and MStaticZone
 end
+if self.Filter.Functions and MStaticInclude then
+local MClientFunc=self:_EvalFilterFunctions(MStatic)
+MStaticInclude=MStaticInclude and MClientFunc
+end
 return MStaticInclude
 end
 function SET_STATIC:GetTypeNames(Delimiter)
@@ -14383,6 +14387,7 @@ if _DATABASE then
 self:UnHandleEvent(EVENTS.Birth)
 self:UnHandleEvent(EVENTS.Dead)
 self:UnHandleEvent(EVENTS.Crash)
+self:UnHandleEvent(EVENTS.PlayerLeaveUnit)
 if self.Filter.Zones and self.ZoneTimer and self.ZoneTimer:IsRunning()then
 self.ZoneTimer:Stop()
 end
@@ -14394,6 +14399,7 @@ if _DATABASE then
 self:HandleEvent(EVENTS.Birth,self._EventOnBirth)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventPlayerLeaveUnit)
 if self.Filter.Zones then
 self.ZoneTimer=TIMER:New(self._ContinousZoneFilter,self)
 local timing=self.ZoneTimerInterval or 30
@@ -14416,7 +14422,7 @@ return self
 end
 function SET_CLIENT:_EventPlayerLeaveUnit(Event)
 if Event.IniDCSUnit then
-if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround()then
+if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup then
 local ObjectName,Object=self:FindInDatabase(Event)
 if ObjectName then
 self:Remove(ObjectName)
@@ -14722,6 +14728,7 @@ self:_FilterStart()
 self:HandleEvent(EVENTS.Birth,self._EventOnBirth)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventOnDeadOrCrash)
 end
 return self
 end
@@ -14831,6 +14838,10 @@ end
 end
 MClientInclude=MClientInclude and MClientZone
 end
+if self.Filter.Functions and MClientInclude then
+local MClientFunc=self:_EvalFilterFunctions(MClient)
+MClientInclude=MClientInclude and MClientFunc
+end
 return MClientInclude
 end
 end
@@ -14988,6 +14999,10 @@ end
 MAirbaseInclude=MAirbaseInclude and MAirbaseCategory
 end
 end
+if self.Filter.Functions and MAirbaseInclude then
+local MClientFunc=self:_EvalFilterFunctions(MAirbase)
+MAirbaseInclude=MAirbaseInclude and MClientFunc
+end
 return MAirbaseInclude
 end
 end
@@ -15179,6 +15194,10 @@ end
 MCargoInclude=MCargoInclude and MCargoPrefix
 end
 end
+if self.Filter.Functions and MCargoInclude then
+local MClientFunc=self:_EvalFilterFunctions(MCargo)
+MCargoInclude=MCargoInclude and MClientFunc
+end
 return MCargoInclude
 end
 function SET_CARGO:OnEventNewCargo(EventData)
@@ -15337,6 +15356,10 @@ end
 MZoneInclude=MZoneInclude and MZonePrefix
 end
 end
+if self.Filter.Functions and MZoneInclude then
+local MClientFunc=self:_EvalFilterFunctions(MZone)
+MZoneInclude=MZoneInclude and MClientFunc
+end
 return MZoneInclude
 end
 function SET_ZONE:OnEventNewZone(EventData)
@@ -15549,6 +15572,10 @@ end
 MZoneInclude=MZoneInclude and MZonePrefix
 end
 end
+if self.Filter.Functions and MZoneInclude then
+local MClientFunc=self:_EvalFilterFunctions(MZone)
+MZoneInclude=MZoneInclude and MClientFunc
+end
 return MZoneInclude
 end
 function SET_ZONE_GOAL:OnEventNewZoneGoal(EventData)
@@ -15720,6 +15747,10 @@ end
 MZoneInclude=MZoneInclude and MGroupCoalition
 end
 end
+if self.Filter.Functions and MZoneInclude then
+local MClientFunc=self:_EvalFilterFunctions(MZone)
+MZoneInclude=MZoneInclude and MClientFunc
+end
 return MZoneInclude
 end
 function SET_OPSZONE:OnEventNewZoneGoal(EventData)
@@ -16056,6 +16087,10 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupPrefix
 end
+if self.Filter.Functions and MGroupInclude then
+local MClientFunc=self:_EvalFilterFunctions(MGroup)
+MGroupInclude=MGroupInclude and MClientFunc
+end
 return MGroupInclude
 end
 end
@@ -16241,6 +16276,10 @@ end
 MSceneryInclude=MSceneryInclude and MSceneryRole
 end
 end
+if self.Filter.Functions and MSceneryInclude then
+local MClientFunc=self:_EvalFilterFunctions(MScenery)
+MSceneryInclude=MSceneryInclude and MClientFunc
+end
 return MSceneryInclude
 end
 function SET_SCENERY:FilterOnce()
@@ -16357,6 +16396,10 @@ end
 end
 DCargoInclude=DCargoInclude and DCargoZone
 end
+if self.Filter.Functions and DCargoInclude then
+local MClientFunc=self:_EvalFilterFunctions(DCargo)
+DCargoInclude=DCargoInclude and MClientFunc
+end
 return DCargoInclude
 end
 function SET_DYNAMICCARGO:FilterCoalitions(Coalitions)
@@ -19560,15 +19603,12 @@ self.SpawnInitCallSignName=string.lower(Name):gsub("^%l",string.upper)
 return self
 end
 function SPAWN:InitPositionCoordinate(Coordinate)
-self:T2({self.SpawnTemplatePrefix,Coordinate:GetVec2()})
 self:InitPositionVec2(Coordinate:GetVec2())
 return self
 end
 function SPAWN:InitPositionVec2(Vec2)
-self:T2({self.SpawnTemplatePrefix,Vec2})
 self.SpawnInitPosition=Vec2
 self.SpawnFromNewPosition=true
-self:T2("MaxGroups:"..self.SpawnMaxGroups)
 for SpawnGroupID=1,self.SpawnMaxGroups do
 self:_SetInitialPosition(SpawnGroupID)
 end
@@ -19596,7 +19636,6 @@ function SPAWN:InitCleanUp(SpawnCleanUpInterval)
 self.SpawnCleanUpInterval=SpawnCleanUpInterval
 self.SpawnCleanUpTimeStamps={}
 local SpawnGroup,SpawnCursor=self:GetFirstAliveGroup()
-self:T2({"CleanUp Scheduler:",SpawnGroup})
 self.CleanUpScheduler=SCHEDULER:New(self,self._SpawnCleanUpScheduler,{},1,SpawnCleanUpInterval,0.2)
 return self
 end
@@ -19607,7 +19646,6 @@ local SpawnY=0
 local SpawnXIndex=0
 local SpawnYIndex=0
 for SpawnGroupID=1,self.SpawnMaxGroups do
-self:T2({SpawnX,SpawnY,SpawnXIndex,SpawnYIndex})
 self.SpawnGroups[SpawnGroupID].Visible=true
 self.SpawnGroups[SpawnGroupID].Spawned=false
 SpawnXIndex=SpawnXIndex+1
@@ -19624,6 +19662,7 @@ self.SpawnGroups[SpawnGroupID].SpawnTemplate.lateActivation=true
 self.SpawnGroups[SpawnGroupID].SpawnTemplate.visible=true
 self.SpawnGroups[SpawnGroupID].Visible=true
 self:HandleEvent(EVENTS.Birth,self._OnBirth)
+self:HandleEvent(EVENTS.Dead,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.UnitLost,self._OnDeadOrCrash)
@@ -19723,19 +19762,6 @@ function SPAWN:SetSpawnIndex(SpawnIndex)
 self.SpawnIndex=SpawnIndex or 0
 end
 function SPAWN:SpawnWithIndex(SpawnIndex,NoBirth)
-local set=SET_GROUP:New():FilterAlive():FilterPrefixes({self.SpawnTemplatePrefix,self.SpawnAliasPrefix}):FilterOnce()
-local aliveunits=0
-set:ForEachGroupAlive(
-function(grp)
-aliveunits=aliveunits+grp:CountAliveUnits()
-end
-)
-if aliveunits~=self.AliveUnits then
-self.AliveUnits=aliveunits
-self:T2("***** self.AliveUnits accounting failure! Corrected! *****")
-end
-set=nil
-self:T2({SpawnTemplatePrefix=self.SpawnTemplatePrefix,SpawnIndex=SpawnIndex,AliveUnits=self.AliveUnits,SpawnMaxGroups=self.SpawnMaxGroups})
 if self:_GetSpawnIndex(SpawnIndex)then
 if self.SpawnFromNewPosition then
 self:_SetInitialPosition(SpawnIndex)
@@ -19745,10 +19771,8 @@ self.SpawnGroups[self.SpawnIndex].Group:Activate()
 else
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
 local SpawnZone=self.SpawnGroups[self.SpawnIndex].SpawnZone
-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:T2({"Current point of ",self.SpawnTemplatePrefix,PointVec3})
 if self.SpawnRandomizePosition then
 local RandomVec2=PointVec3:GetRandomVec2InRadius(self.SpawnRandomizePositionOuterRadius,self.SpawnRandomizePositionInnerRadius)
 local CurrentX=SpawnTemplate.units[1].x
@@ -19758,7 +19782,6 @@ SpawnTemplate.y=RandomVec2.y
 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:T2('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 end
 end
 if self.SpawnRandomizeUnits then
@@ -19775,13 +19798,11 @@ inZone=SpawnZone:IsVec2InZone(RandomVec2)
 end
 end
 if(not inZone)then
-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:T2('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 end
 end
 local function _Heading(courseDeg)
@@ -19935,6 +19956,11 @@ end
 function SPAWN:SpawnScheduled(SpawnTime,SpawnTimeVariation,WithDelay)
 local SpawnTime=SpawnTime or 60
 local SpawnTimeVariation=SpawnTimeVariation or 0.5
+if SpawnTime<15 then
+self:E("****SPAWN SCHEDULED****\nWARNING - Setting a very low SpawnTime heavily impacts your mission performance and CPU time, it is NOT useful to check the alive state of an object every "..tostring(SpawnTime).." seconds.\nSetting to 15 second intervals.\n*****")
+SpawnTime=15
+end
+if SpawnTimeVariation>1 or SpawnTimeVariation<0 then SpawnTimeVariation=0.5 end
 if SpawnTime~=nil and SpawnTimeVariation~=nil then
 local InitialDelay=0
 if WithDelay or self.DelayOnOff==true then
@@ -19962,7 +19988,6 @@ return self
 end
 function SPAWN:SpawnAtAirbase(SpawnAirbase,Takeoff,TakeoffAltitude,TerminalType,EmergencyAirSpawn,Parkingdata)
 local PointVec3=SpawnAirbase:GetCoordinate()
-self:T2(PointVec3)
 Takeoff=Takeoff or SPAWN.Takeoff.Hot
 if EmergencyAirSpawn==nil then
 EmergencyAirSpawn=true
@@ -19971,7 +19996,6 @@ if self:_GetSpawnIndex(self.SpawnIndex+1)then
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
 if SpawnTemplate then
 local GroupAlive=self:GetGroupFromIndex(self.SpawnIndex)
-self:T2({"Current point of ",self.SpawnTemplatePrefix,SpawnAirbase})
 local TemplateGroup=GROUP:FindByName(self.SpawnTemplatePrefix)
 local TemplateUnit=TemplateGroup:GetUnit(1)
 local group=TemplateGroup
@@ -20001,7 +20025,6 @@ SpawnPoint.alt=0
 SpawnPoint.type=GROUPTEMPLATE.Takeoff[Takeoff][1]
 SpawnPoint.action=GROUPTEMPLATE.Takeoff[Takeoff][2]
 local spawnonground=not(Takeoff==SPAWN.Takeoff.Air)
-self:T2({spawnonground=spawnonground,TOtype=Takeoff,TOair=Takeoff==SPAWN.Takeoff.Air})
 local spawnonship=false
 local spawnonfarp=false
 local spawnonrunway=false
@@ -20039,43 +20062,35 @@ local scanstatics=true
 local scanscenery=false
 local verysafe=false
 if spawnonship or spawnonfarp or spawnonrunway then
-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)
 else
 if ishelo then
 if termtype==nil then
-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
-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
-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
 else
 if termtype==nil then
 if isbomber or istransport or istanker or isawacs then
-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
-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: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
-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
@@ -20138,7 +20153,6 @@ end
 if not SpawnTemplate.parked then
 SpawnTemplate.parked=true
 for UnitID=1,nunits do
-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
 local SY=UnitTemplate.y
@@ -20148,18 +20162,15 @@ local TX=PointVec3.x+(SX-BX)
 local TY=PointVec3.z+(SY-BY)
 if spawnonground then
 if spawnonship or spawnonfarp or spawnonrunway then
-self:T2(string.format("Group %s spawning at farp, ship or runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=PointVec3.x
 SpawnTemplate.units[UnitID].y=PointVec3.z
 SpawnTemplate.units[UnitID].alt=PointVec3.y
 else
-self:T2(string.format("Group %s spawning at airbase %s on parking spot id %d",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),parkingindex[UnitID]))
 SpawnTemplate.units[UnitID].x=parkingspots[UnitID].x
 SpawnTemplate.units[UnitID].y=parkingspots[UnitID].z
 SpawnTemplate.units[UnitID].alt=parkingspots[UnitID].y
 end
 else
-self:T2(string.format("Group %s spawning in air at %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=TX
 SpawnTemplate.units[UnitID].y=TY
 SpawnTemplate.units[UnitID].alt=PointVec3.y
@@ -20169,9 +20180,6 @@ UnitTemplate.parking_id=nil
 if parkingindex[UnitID]then
 UnitTemplate.parking=parkingindex[UnitID]
 end
-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
 SpawnPoint.x=PointVec3.x
@@ -20211,9 +20219,7 @@ end
 local Parkingdata={}
 for _,TerminalID in pairs(Spots)do
 local spot=Airbase:GetParkingSpotData(TerminalID)
-self:T2({spot=spot})
 if spot and spot.Free then
-self:T2(string.format("Adding parking spot ID=%d TermType=%d",spot.TerminalID,spot.TerminalType))
 table.insert(Parkingdata,spot)
 end
 end
@@ -20229,12 +20235,10 @@ return nil
 end
 function SPAWN:ParkAircraft(SpawnAirbase,TerminalType,Parkingdata,SpawnIndex)
 local PointVec3=SpawnAirbase:GetCoordinate()
-self:T2(PointVec3)
 local Takeoff=SPAWN.Takeoff.Cold
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 if SpawnTemplate then
 local GroupAlive=self:GetGroupFromIndex(SpawnIndex)
-self:T2({"Current point of ",self.SpawnTemplatePrefix,SpawnAirbase})
 local TemplateGroup=GROUP:FindByName(self.SpawnTemplatePrefix)
 local TemplateUnit=TemplateGroup:GetUnit(1)
 local ishelo=TemplateUnit:HasAttribute("Helicopters")
@@ -20261,7 +20265,6 @@ SpawnPoint.alt=0
 SpawnPoint.type=GROUPTEMPLATE.Takeoff[Takeoff][1]
 SpawnPoint.action=GROUPTEMPLATE.Takeoff[Takeoff][2]
 local spawnonground=not(Takeoff==SPAWN.Takeoff.Air)
-self:T2({spawnonground=spawnonground,TOtype=Takeoff,TOair=Takeoff==SPAWN.Takeoff.Air})
 local spawnonship=false
 local spawnonfarp=false
 local spawnonrunway=false
@@ -20288,43 +20291,35 @@ local scanstatics=true
 local scanscenery=false
 local verysafe=false
 if spawnonship or spawnonfarp or spawnonrunway then
-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)
 else
 if ishelo then
 if termtype==nil then
-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
-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
-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
 else
 if termtype==nil then
 if isbomber or istransport then
-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
-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: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
-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
@@ -20372,18 +20367,15 @@ local TX=PointVec3.x+(SX-BX)
 local TY=PointVec3.z+(SY-BY)
 if spawnonground then
 if spawnonship or spawnonfarp or spawnonrunway then
-self:T2(string.format("Group %s spawning at farp, ship or runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=PointVec3.x
 SpawnTemplate.units[UnitID].y=PointVec3.z
 SpawnTemplate.units[UnitID].alt=PointVec3.y
 else
-self:T2(string.format("Group %s spawning at airbase %s on parking spot id %d",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),parkingindex[UnitID]))
 SpawnTemplate.units[UnitID].x=parkingspots[UnitID].x
 SpawnTemplate.units[UnitID].y=parkingspots[UnitID].z
 SpawnTemplate.units[UnitID].alt=parkingspots[UnitID].y
 end
 else
-self:T2(string.format("Group %s spawning in air at %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=TX
 SpawnTemplate.units[UnitID].y=TY
 SpawnTemplate.units[UnitID].alt=PointVec3.y
@@ -20393,9 +20385,6 @@ UnitTemplate.parking_id=nil
 if parkingindex[UnitID]then
 UnitTemplate.parking=parkingindex[UnitID]
 end
-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
 SpawnPoint.x=PointVec3.x
@@ -20425,7 +20414,6 @@ return nil
 end
 function SPAWN:SpawnFromVec3(Vec3,SpawnIndex)
 local PointVec3=POINT_VEC3:NewFromVec3(Vec3)
-self:T2(PointVec3)
 if SpawnIndex then
 else
 SpawnIndex=self.SpawnIndex+1
@@ -20433,7 +20421,6 @@ end
 if self:_GetSpawnIndex(SpawnIndex)then
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
 if SpawnTemplate then
-self:T2({"Current point of ",self.SpawnTemplatePrefix,Vec3})
 local TemplateHeight=SpawnTemplate.route and SpawnTemplate.route.points[1].alt or nil
 SpawnTemplate.route=SpawnTemplate.route or{}
 SpawnTemplate.route.points=SpawnTemplate.route.points or{}
@@ -20453,7 +20440,6 @@ SpawnTemplate.units[UnitID].y=TY
 if SpawnTemplate.CategoryID~=Group.Category.SHIP then
 SpawnTemplate.units[UnitID].alt=Vec3.y or TemplateHeight
 end
-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
@@ -20528,10 +20514,8 @@ SpawnPrefix=self.SpawnAliasPrefix
 end
 if SpawnIndex then
 local SpawnName=string.format('%s#%03d',SpawnPrefix,SpawnIndex)
-self:T2(SpawnName)
 return SpawnName
 else
-self:T2(SpawnPrefix)
 return SpawnPrefix
 end
 end
@@ -20707,7 +20691,6 @@ local UnitPrefix,Rest
 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:T2({UnitPrefix,Rest})
 end
 SpawnTemplate.units[UnitID].unitId=nil
 end
@@ -20879,7 +20862,6 @@ end
 else
 SpawnTemplate.route.points[t].alt=nil
 end
-self:T2('SpawnTemplate.route.points['..t..'].x = '..SpawnTemplate.route.points[t].x..', SpawnTemplate.route.points['..t..'].y = '..SpawnTemplate.route.points[t].y)
 end
 end
 self:_RandomizeZones(SpawnIndex)
@@ -20906,21 +20888,16 @@ self:_RandomizeRoute(SpawnIndex)
 return self
 end
 function SPAWN:_SetInitialPosition(SpawnIndex)
-self:T2({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnRandomizeZones})
 if self.SpawnFromNewPosition then
-self:T2("Preparing Spawn at Vec2 ",self.SpawnInitPosition)
 local SpawnVec2=self.SpawnInitPosition
-self:T2({SpawnVec2=SpawnVec2})
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 SpawnTemplate.route=SpawnTemplate.route or{}
 SpawnTemplate.route.points=SpawnTemplate.route.points or{}
 SpawnTemplate.route.points[1]=SpawnTemplate.route.points[1]or{}
 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:T2({Route=SpawnTemplate.route})
 for UnitID=1,#SpawnTemplate.units do
 local UnitTemplate=SpawnTemplate.units[UnitID]
-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
@@ -20929,7 +20906,6 @@ local TX=SpawnVec2.x+(SX-BX)
 local TY=SpawnVec2.y+(SY-BY)
 UnitTemplate.x=TX
 UnitTemplate.y=TY
-self:T2('After Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
 end
 SpawnTemplate.route.points[1].x=SpawnVec2.x
 SpawnTemplate.route.points[1].y=SpawnVec2.y
@@ -20942,20 +20918,14 @@ function SPAWN:_RandomizeZones(SpawnIndex)
 if self.SpawnRandomizeZones then
 local SpawnZone=nil
 while not SpawnZone do
-self:T2({SpawnZoneTableCount=#self.SpawnZoneTable,self.SpawnZoneTable})
 local ZoneID=math.random(#self.SpawnZoneTable)
-self:T2(ZoneID)
 SpawnZone=self.SpawnZoneTable[ZoneID]:GetZoneMaybe()
 end
-self:T2("Preparing Spawn in Zone",SpawnZone:GetName())
 local SpawnVec2=SpawnZone:GetRandomVec2()
-self:T2({SpawnVec2=SpawnVec2})
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 self.SpawnGroups[SpawnIndex].SpawnZone=SpawnZone
-self:T2({Route=SpawnTemplate.route})
 for UnitID=1,#SpawnTemplate.units do
 local UnitTemplate=SpawnTemplate.units[UnitID]
-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
@@ -20964,7 +20934,6 @@ local TX=SpawnVec2.x+(SX-BX)
 local TY=SpawnVec2.y+(SY-BY)
 UnitTemplate.x=TX
 UnitTemplate.y=TY
-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
@@ -20993,10 +20962,8 @@ end
 return self
 end
 function SPAWN:_GetSpawnIndex(SpawnIndex)
-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:T2({SpawnCount=self.SpawnCount,SpawnIndex=SpawnIndex})
 if SpawnIndex and SpawnIndex>=self.SpawnCount+1 then
 self.SpawnCount=self.SpawnCount+1
 SpawnIndex=self.SpawnCount
@@ -21018,27 +20985,45 @@ local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-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:T2("Alive Units: "..self.AliveUnits)
 end
 end
 end
 end
+function SPAWN:_CountAliveUnits()
+local count=0
+if self.SpawnAliasPrefix then
+if not self.SpawnAliasPrefixEscaped then self.SpawnAliasPrefixEscaped=string.gsub(self.SpawnAliasPrefix,"[%p%s]",".")end
+local SpawnAliasPrefix=self.SpawnAliasPrefixEscaped
+local agroups=GROUP:FindAllByMatching(SpawnAliasPrefix)
+for _,_grp in pairs(agroups)do
+local game=self:_GetPrefixFromGroupName(_grp.GroupName)
+if game and game==self.SpawnAliasPrefix then
+count=count+_grp:CountAliveUnits()
+end
+end
+else
+if not self.SpawnTemplatePrefixEscaped then self.SpawnTemplatePrefixEscaped=string.gsub(self.SpawnTemplatePrefix,"[%p%s]",".")end
+local SpawnTemplatePrefix=self.SpawnTemplatePrefixEscaped
+local groups=GROUP:FindAllByMatching(SpawnTemplatePrefix)
+for _,_grp in pairs(groups)do
+local game=self:_GetPrefixFromGroupName(_grp.GroupName)
+if game and game==self.SpawnTemplatePrefix then
+count=count+_grp:CountAliveUnits()
+end
+end
+end
+return count
+end
 function SPAWN:_OnDeadOrCrash(EventData)
-self:T2("Dead or crash event ID "..tostring(EventData.id or 0))
-self:T2("Dead or crash event for "..tostring(EventData.IniUnitName or"none"))
 local unit=UNIT:FindByName(EventData.IniUnitName)
 if unit then
 local EventPrefix=self:_GetPrefixFromGroupName(unit.GroupName)
 if EventPrefix then
-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
+self.AliveUnits=self:_CountAliveUnits()
 end
-self:T2("New Alive Units: "..self.AliveUnits)
 end
 end
 end
@@ -21047,9 +21032,7 @@ local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T2({"TakeOff event: "..EventPrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
-self:T2("self.Landed = false")
 SpawnGroup:SetState(SpawnGroup,"Spawn_Landed",false)
 end
 end
@@ -21060,12 +21043,10 @@ local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T2({"Land event: "..EventPrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
 SpawnGroup:SetState(SpawnGroup,"Spawn_Landed",true)
 if self.RepeatOnLanding then
 local SpawnGroupIndex=self:GetSpawnIndexFromGroup(SpawnGroup)
-self:T2({"Landed:","ReSpawn:",SpawnGroup:GetName(),SpawnGroupIndex})
 SCHEDULER:New(nil,self.ReSpawn,{self,SpawnGroupIndex},3)
 end
 end
@@ -21077,12 +21058,10 @@ local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T2({"EngineShutdown event: "..EventPrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
 local Landed=SpawnGroup:GetState(SpawnGroup,"Spawn_Landed")
 if Landed and self.RepeatOnEngineShutDown then
 local SpawnGroupIndex=self:GetSpawnIndexFromGroup(SpawnGroup)
-self:T2({"EngineShutDown: ","ReSpawn:",SpawnGroup:GetName(),SpawnGroupIndex})
 SCHEDULER:New(nil,self.ReSpawn,{self,SpawnGroupIndex},3)
 end
 end
@@ -21096,7 +21075,6 @@ return true
 end
 function SPAWN:_SpawnCleanUpScheduler()
 local SpawnGroup,SpawnCursor=self:GetFirstAliveGroup()
-self:T2({"CleanUp Scheduler:",SpawnGroup,SpawnCursor})
 local IsHelo=false
 while SpawnGroup do
 IsHelo=SpawnGroup:IsHelicopter()
@@ -21106,13 +21084,11 @@ local SpawnUnit=UnitData
 local SpawnUnitName=SpawnUnit:GetName()
 self.SpawnCleanUpTimeStamps[SpawnUnitName]=self.SpawnCleanUpTimeStamps[SpawnUnitName]or{}
 local Stamp=self.SpawnCleanUpTimeStamps[SpawnUnitName]
-self:T2({SpawnUnitName,Stamp})
 if Stamp.Vec2 then
 if(SpawnUnit:InAir()==false and SpawnUnit:GetVelocityKMH()<1)or IsHelo then
 local NewVec2=SpawnUnit:GetVec2()or{x=0,y=0}
 if(Stamp.Vec2.x==NewVec2.x and Stamp.Vec2.y==NewVec2.y)or(SpawnUnit:GetLife()<=1)then
 if Stamp.Time+self.SpawnCleanUpInterval<timer.getTime()then
-self:T2({"CleanUp Scheduler:","ReSpawning:",SpawnGroup:GetName()})
 SCHEDULER:New(nil,self.ReSpawn,{self,SpawnCursor},3)
 Stamp.Vec2=nil
 Stamp.Time=nil
@@ -21138,7 +21114,6 @@ end
 end
 end
 SpawnGroup,SpawnCursor=self:GetNextAliveGroup(SpawnCursor)
-self:T2({"CleanUp Scheduler:",SpawnGroup,SpawnCursor})
 end
 return true
 end
@@ -26311,6 +26286,85 @@ PatrolGroup:Route(Route,Delay)
 end
 return self
 end
+function CONTROLLABLE:NewIRMarker(EnableImmediately,Runtime)
+if self.ClassName=="GROUP"then
+self.IRMarkerGroup=true
+self.IRMarkerUnit=false
+elseif self.ClassName=="UNIT"then
+self.IRMarkerGroup=false
+self.IRMarkerUnit=true
+end
+self.spot=nil
+self.timer=nil
+self.stoptimer=nil
+if EnableImmediately and EnableImmediately==true then
+self:EnableIRMarker(Runtime)
+end
+return self
+end
+function CONTROLLABLE:EnableIRMarker(Runtime)
+if self.IRMarkerGroup==nil then
+self:NewIRMarker(true,Runtime)
+return
+end
+if(self.IRMarkerGroup==true)then
+self:EnableIRMarkerForGroup()
+return
+end
+self.timer=TIMER:New(CONTROLLABLE._MarkerBlink,self)
+self.timer:Start(nil,1-math.random(1,5)/10/2,Runtime)
+return self
+end
+function CONTROLLABLE:DisableIRMarker()
+if(self.IRMarkerGroup==true)then
+self:DisableIRMarkerForGroup()
+return
+end
+if self.spot then
+self.spot:destroy()
+self.spot=nil
+if self.timer and self.timer:IsRunning()then
+self.timer:Stop()
+self.timer=nil
+end
+end
+return self
+end
+function CONTROLLABLE:EnableIRMarkerForGroup()
+if self.ClassName=="GROUP"then
+local units=self:GetUnits()or{}
+for _,_unit in pairs(units)do
+_unit:EnableIRMarker()
+end
+end
+return self
+end
+function CONTROLLABLE:DisableIRMarkerForGroup()
+if self.ClassName=="GROUP"then
+local units=self:GetUnits()or{}
+for _,_unit in pairs(units)do
+_unit:DisableIRMarker()
+end
+end
+return self
+end
+function CONTROLLABLE:_MarkerBlink()
+if self:IsAlive()~=true then
+self:DisableIRMarker()
+return
+end
+self.timer.dT=1-(math.random(1,2)/10/2)
+local _,_,unitBBHeight,_=self:GetObjectSize()
+local unitPos=self:GetPositionVec3()
+self.spot=Spot.createInfraRed(
+self.DCSUnit,
+{x=0,y=(unitBBHeight+1),z=0},
+{x=unitPos.x,y=(unitPos.y+unitBBHeight),z=unitPos.z}
+)
+local offTimer=TIMER:New(function()if self.spot then self.spot:destroy()end end)
+offTimer:Start(0.5)
+return self
+end
 GROUP={
 ClassName="GROUP",
 }
@@ -26401,35 +26455,39 @@ end
 return GroupsFound
 end
 function GROUP:GetDCSObject()
+if(not self.LastCallDCSObject)or(self.LastCallDCSObject and timer.getTime()-self.LastCallDCSObject>1)then
 local DCSGroup=Group.getByName(self.GroupName)
 if DCSGroup then
+self.LastCallDCSObject=timer.getTime()
+self.DCSObject=DCSGroup
 return DCSGroup
+else
+self.DCSObject=nil
+self.LastCallDCSObject=nil
+end
+else
+return self.DCSObject
 end
-self:T2(string.format("ERROR: Could not get DCS group object of group %s because DCS object could not be found!",tostring(self.GroupName)))
 return nil
 end
 function GROUP:GetPositionVec3()
-self:F2(self.PositionableName)
 local DCSPositionable=self:GetDCSObject()
 if DCSPositionable then
 local unit=DCSPositionable:getUnits()[1]
 if unit then
 local PositionablePosition=unit:getPosition().p
-self:T3(PositionablePosition)
 return PositionablePosition
 end
 end
 return nil
 end
 function GROUP:IsAlive()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 if DCSGroup:isExist()then
 local DCSUnit=DCSGroup:getUnit(1)
 if DCSUnit then
 local GroupIsAlive=DCSUnit:isActive()
-self:T3(GroupIsAlive)
 return GroupIsAlive
 end
 end
@@ -26437,7 +26495,6 @@ end
 return nil
 end
 function GROUP:IsActive()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup and DCSGroup:isExist()then
 local unit=DCSGroup:getUnit(1)
@@ -26449,7 +26506,6 @@ end
 return nil
 end
 function GROUP:Destroy(GenerateEvent,delay)
-self:F2(self.GroupName)
 if delay and delay>0 then
 self:ScheduleOnce(delay,GROUP.Destroy,self,GenerateEvent)
 else
@@ -26475,17 +26531,14 @@ end
 return nil
 end
 function GROUP:GetCategory()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCategory=DCSGroup:getCategory()
-self:T3(GroupCategory)
 return GroupCategory
 end
 return nil
 end
 function GROUP:GetCategoryName()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local CategoryNames={
@@ -26496,7 +26549,6 @@ local CategoryNames={
 [Group.Category.TRAIN]="Train",
 }
 local GroupCategory=DCSGroup:getCategory()
-self:T3(GroupCategory)
 return CategoryNames[GroupCategory]
 end
 return nil
@@ -26515,11 +26567,9 @@ end
 return nil
 end
 function GROUP:GetCountry()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCountry=DCSGroup:getUnit(1):getCountry()
-self:T3(GroupCountry)
 return GroupCountry
 end
 return nil
@@ -26549,7 +26599,6 @@ end
 return nil
 end
 function GROUP:GetSpeedMax()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local Units=self:GetUnits()
@@ -26566,7 +26615,6 @@ end
 return nil
 end
 function GROUP:GetRange()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local Units=self:GetUnits()
@@ -26587,7 +26635,6 @@ end
 return nil
 end
 function GROUP:GetUnits()
-self:F2({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local DCSUnits=DCSGroup:getUnits()or{}
@@ -26602,13 +26649,11 @@ unit=_DATABASE:AddUnit(UnitName)
 Units[#Units+1]=unit
 end
 end
-self:T3(Units)
 return Units
 end
 return nil
 end
 function GROUP:GetPlayerUnits()
-self:F2({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local DCSUnits=DCSGroup:getUnits()
@@ -26619,7 +26664,6 @@ if PlayerUnit:GetPlayerName()then
 Units[#Units+1]=PlayerUnit
 end
 end
-self:T3(Units)
 return Units
 end
 return nil
@@ -26677,7 +26721,6 @@ end
 return nil
 end
 function GROUP:CountAliveUnits()
-self:F3({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local units=self:GetUnits()
@@ -26693,7 +26736,6 @@ end
 return 0
 end
 function GROUP:GetFirstUnitAlive()
-self:F3({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local units=self:GetUnits()
@@ -26707,7 +26749,6 @@ end
 return nil
 end
 function GROUP:GetFirstUnit()
-self:F3({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local units=self:GetUnits()
@@ -26716,7 +26757,6 @@ end
 return nil
 end
 function GROUP:GetVelocityVec3()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup and DCSGroup:isExist()then
 local GroupUnits=DCSGroup:getUnits()
@@ -26737,11 +26777,9 @@ BASE:E({"Cannot GetVelocityVec3",Group=self,Alive=self:IsAlive()})
 return nil
 end
 function GROUP:GetAltitude(FromGround)
-self:F2(self.GroupName)
 return self:GetHeight(FromGround)
 end
 function GROUP:GetHeight(FromGround)
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupUnits=DCSGroup:getUnits()
@@ -26761,27 +26799,22 @@ end
 return nil
 end
 function GROUP:GetInitialSize()
-self:F3({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupInitialSize=DCSGroup:getInitialSize()
-self:T3(GroupInitialSize)
 return GroupInitialSize
 end
 return nil
 end
 function GROUP:GetDCSUnits()
-self:F2({self.GroupName})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local DCSUnits=DCSGroup:getUnits()
-self:T3(DCSUnits)
 return DCSUnits
 end
 return nil
 end
 function GROUP:Activate(delay)
-self:F2({self.GroupName})
 if delay and delay>0 then
 self:ScheduleOnce(delay,GROUP.Activate,self)
 else
@@ -26789,42 +26822,42 @@ trigger.action.activateGroup(self:GetDCSObject())
 end
 return self
 end
+function GROUP:Deactivate(delay)
+if delay and delay>0 then
+self:ScheduleOnce(delay,GROUP.Deactivate,self)
+else
+trigger.action.deactivateGroup(self:GetDCSObject())
+end
+return self
+end
 function GROUP:GetTypeName()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupTypeName=DCSGroup:getUnit(1):getTypeName()
-self:T3(GroupTypeName)
 return(GroupTypeName)
 end
 return nil
 end
 function GROUP:GetNatoReportingName()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupTypeName=DCSGroup:getUnit(1):getTypeName()
-self:T3(GroupTypeName)
 return UTILS.GetReportingName(GroupTypeName)
 end
 return"Bogey"
 end
 function GROUP:GetPlayerName()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local PlayerName=DCSGroup:getUnit(1):getPlayerName()
-self:T3(PlayerName)
 return(PlayerName)
 end
 return nil
 end
 function GROUP:GetCallsign()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCallSign=DCSGroup:getUnit(1):getCallsign()
-self:T3(GroupCallSign)
 return GroupCallSign
 end
 BASE:E({"Cannot GetCallsign",Positionable=self,Alive=self:IsAlive()})
@@ -26869,11 +26902,9 @@ return self:GetVec3()
 end
 end
 function GROUP:GetPointVec2()
-self:F2(self.GroupName)
 local FirstUnit=self:GetUnit(1)
 if FirstUnit then
 local FirstUnitPointVec2=FirstUnit:GetPointVec2()
-self:T3(FirstUnitPointVec2)
 return FirstUnitPointVec2
 end
 BASE:E({"Cannot GetPointVec2",Group=self,Alive=self:IsAlive()})
@@ -26926,19 +26957,15 @@ end
 BASE:E({"Cannot GetCoordinate",Group=self,Alive=self:IsAlive()})
 end
 function GROUP:GetRandomVec3(Radius)
-self:F2(self.GroupName)
 local FirstUnit=self:GetUnit(1)
 if FirstUnit then
 local FirstUnitRandomPointVec3=FirstUnit:GetRandomVec3(Radius)
-self:T3(FirstUnitRandomPointVec3)
 return FirstUnitRandomPointVec3
 end
 BASE:E({"Cannot GetRandomVec3",Group=self,Alive=self:IsAlive()})
 return nil
 end
 function GROUP:GetHeading()
-self:F2(self.GroupName)
-self:F2(self.GroupName)
 local GroupSize=self:GetSize()
 local HeadingAccumulator=0
 local n=0
@@ -26956,7 +26983,6 @@ BASE:E({"Cannot GetHeading",Group=self,Alive=self:IsAlive()})
 return nil
 end
 function GROUP:GetFuelMin()
-self:F3(self.ControllableName)
 if not self:GetDCSObject()then
 BASE:E({"Cannot GetFuel",Group=self,Alive=self:IsAlive()})
 return 0
@@ -26976,7 +27002,6 @@ end
 return min,unit
 end
 function GROUP:GetFuelAvg()
-self:F(self.ControllableName)
 local DCSControllable=self:GetDCSObject()
 if DCSControllable then
 local GroupSize=self:GetSize()
@@ -26984,7 +27009,6 @@ local TotalFuel=0
 for UnitID,UnitData in pairs(self:GetUnits())do
 local Unit=UnitData
 local UnitFuel=Unit:GetFuel()or 0
-self:F({Fuel=UnitFuel})
 TotalFuel=TotalFuel+UnitFuel
 end
 local GroupFuel=TotalFuel/GroupSize
@@ -26997,7 +27021,6 @@ function GROUP:GetFuel()
 return self:GetFuelAvg()
 end
 function GROUP:GetAmmunition()
-self:F(self.ControllableName)
 local DCSControllable=self:GetDCSObject()
 local Ntot=0
 local Nshells=0
@@ -27037,7 +27060,6 @@ end
 return nil
 end
 function GROUP:IsCompletelyInZone(Zone)
-self:F2({self.GroupName,Zone})
 if not self:IsAlive()then return false end
 for UnitID,UnitData in pairs(self:GetUnits())do
 local Unit=UnitData
@@ -27049,7 +27071,6 @@ end
 return true
 end
 function GROUP:IsPartlyInZone(Zone)
-self:F2({self.GroupName,Zone})
 local IsOneUnitInZone=false
 local IsOneUnitOutsideZone=false
 if not self:IsAlive()then return false end
@@ -27071,7 +27092,6 @@ function GROUP:IsPartlyOrCompletelyInZone(Zone)
 return self:IsPartlyInZone(Zone)or self:IsCompletelyInZone(Zone)
 end
 function GROUP:IsNotInZone(Zone)
-self:F2({self.GroupName,Zone})
 if not self:IsAlive()then return true end
 for UnitID,UnitData in pairs(self:GetUnits())do
 local Unit=UnitData
@@ -27092,7 +27112,6 @@ end
 return false
 end
 function GROUP:CountInZone(Zone)
-self:F2({self.GroupName,Zone})
 local Count=0
 if not self:IsAlive()then return Count end
 for UnitID,UnitData in pairs(self:GetUnits())do
@@ -27104,57 +27123,46 @@ end
 return Count
 end
 function GROUP:IsAir()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local IsAirResult=DCSGroup:getCategory()==Group.Category.AIRPLANE or DCSGroup:getCategory()==Group.Category.HELICOPTER
-self:T3(IsAirResult)
 return IsAirResult
 end
 return nil
 end
 function GROUP:IsHelicopter()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCategory=DCSGroup:getCategory()
-self:T2(GroupCategory)
 return GroupCategory==Group.Category.HELICOPTER
 end
 return nil
 end
 function GROUP:IsAirPlane()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCategory=DCSGroup:getCategory()
-self:T2(GroupCategory)
 return GroupCategory==Group.Category.AIRPLANE
 end
 return nil
 end
 function GROUP:IsGround()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCategory=DCSGroup:getCategory()
-self:T2(GroupCategory)
 return GroupCategory==Group.Category.GROUND
 end
 return nil
 end
 function GROUP:IsShip()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCategory=DCSGroup:getCategory()
-self:T2(GroupCategory)
 return GroupCategory==Group.Category.SHIP
 end
 return nil
 end
 function GROUP:AllOnGround()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local AllOnGroundResult=true
@@ -27163,7 +27171,6 @@ if UnitData:inAir()then
 AllOnGroundResult=false
 end
 end
-self:T3(AllOnGroundResult)
 return AllOnGroundResult
 end
 return nil
@@ -27189,7 +27196,6 @@ return self:SetAIOnOff(false)
 end
 end
 function GROUP:GetMaxVelocity()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupVelocityMax=0
@@ -27205,7 +27211,6 @@ end
 return nil
 end
 function GROUP:GetMinHeight()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupHeightMin=999999999
@@ -27221,7 +27226,6 @@ end
 return nil
 end
 function GROUP:GetMaxHeight()
-self:F2()
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupHeightMax=-999999999
@@ -27285,12 +27289,10 @@ self.InitRespawnRandomizePositionInner=InnerRadius
 return self
 end
 function GROUP:InitCoordinate(coordinate)
-self:F({coordinate=coordinate})
 self.InitCoord=coordinate
 return self
 end
 function GROUP:InitRadioCommsOnOff(switch)
-self:F({switch=switch})
 if switch==true or switch==nil then
 self.InitRespawnRadio=true
 else
@@ -27299,12 +27301,10 @@ end
 return self
 end
 function GROUP:InitRadioFrequency(frequency)
-self:F({frequency=frequency})
 self.InitRespawnFreq=frequency
 return self
 end
 function GROUP:InitRadioModulation(modulation)
-self:F({modulation=modulation})
 if modulation and modulation:lower()=="fm"then
 self.InitRespawnModu=radio.modulation.FM
 else
@@ -27313,7 +27313,6 @@ end
 return self
 end
 function GROUP:InitModex(modex)
-self:F({modex=modex})
 if modex then
 self.InitRespawnModex=tonumber(modex)
 end
@@ -27336,13 +27335,10 @@ local Vec3=Zone and Zone:GetVec3()or self:GetVec3()
 local From={x=Template.x,y=Template.y}
 Template.x=Vec3.x
 Template.y=Vec3.z
-self:F(#Template.units)
 if Reset==true then
 for UnitID,UnitData in pairs(self:GetUnits())do
 local GroupUnit=UnitData
-self:F(GroupUnit:GetName())
 if GroupUnit:IsAlive()then
-self:I("FF Alive")
 local GroupUnitVec3=GroupUnit:GetVec3()
 if Zone then
 if self.InitRespawnRandomizePositionZone then
@@ -27368,12 +27364,10 @@ Template.units[UnitID].y=GroupUnitVec3.z
 end
 Template.units[UnitID].heading=_Heading(self.InitRespawnHeading and self.InitRespawnHeading or GroupUnit:GetHeading())
 Template.units[UnitID].psi=-Template.units[UnitID].heading
-self:F({UnitID,Template.units[UnitID],Template.units[UnitID]})
 end
 end
 elseif Reset==false then
 for UnitID,TemplateUnitData in pairs(Template.units)do
-self:F("Reset")
 local GroupUnitVec3={x=TemplateUnitData.x,y=TemplateUnitData.alt,z=TemplateUnitData.y}
 if Zone then
 if self.InitRespawnRandomizePositionZone then
@@ -27393,7 +27387,6 @@ Template.units[UnitID].alt=self.InitRespawnHeight and self.InitRespawnHeight or
 Template.units[UnitID].x=(Template.units[UnitID].x-From.x)+GroupUnitVec3.x
 Template.units[UnitID].y=(Template.units[UnitID].y-From.y)+GroupUnitVec3.z
 Template.units[UnitID].heading=self.InitRespawnHeading and self.InitRespawnHeading or TemplateUnitData.heading
-self:F({UnitID,Template.units[UnitID],Template.units[UnitID]})
 end
 else
 local units=self:GetUnits()
@@ -27428,17 +27421,14 @@ if self.InitRespawnModu then
 Template.modulation=self.InitRespawnModu
 end
 self:Destroy(false)
-self:T({Template=Template})
 _DATABASE:Spawn(Template)
 self:ResetEvents()
 return self
 end
 function GROUP:RespawnAtCurrentAirbase(SpawnTemplate,Takeoff,Uncontrolled)
-self:F2({SpawnTemplate,Takeoff,Uncontrolled})
 if self and self:IsAlive()then
 local airbase=self:GetCoordinate():GetClosestAirbase()
 if airbase then
-self:F2("Closest airbase = "..airbase:GetName())
 else
 self:E("ERROR: could not find closest airbase!")
 return nil
@@ -27467,7 +27457,6 @@ local y
 for UnitID=1,#units do
 local unit=units[UnitID]
 local Parkingspot,TermialID,Distance=unit:GetCoordinate():GetClosestParkingSpot(airbase)
-self:T2(string.format("Closest parking spot distance = %s, terminal ID=%s",tostring(Distance),tostring(TermialID)))
 local uc=unit:GetCoordinate()
 SpawnTemplate.units[UnitID].x=uc.x
 SpawnTemplate.units[UnitID].y=uc.z
@@ -27501,15 +27490,12 @@ end
 return nil
 end
 function GROUP:GetTaskMission()
-self:F2(self.GroupName)
 return UTILS.DeepCopy(_DATABASE.Templates.Groups[self.GroupName].Template)
 end
 function GROUP:GetTaskRoute()
-self:F2(self.GroupName)
 return UTILS.DeepCopy(_DATABASE.Templates.Groups[self.GroupName].Template.route.points)
 end
 function GROUP:CopyRoute(Begin,End,Randomize,Radius)
-self:F2({Begin,End})
 local Points={}
 local GroupName=string.match(self:GetName(),".*#")
 if GroupName then
@@ -27517,7 +27503,6 @@ GroupName=GroupName:sub(1,-2)
 else
 GroupName=self:GetName()
 end
-self:T3({GroupName})
 local Template=_DATABASE.Templates.Groups[GroupName].Template
 if Template then
 if not Begin then
@@ -27553,7 +27538,6 @@ if ThreatLevelA2G>MaxThreatLevelA2G then
 MaxThreatLevelA2G=ThreatLevelA2G
 end
 end
-self:T3(MaxThreatLevelA2G)
 return MaxThreatLevelA2G
 end
 function GROUP:GetThreatLevel()
@@ -27568,20 +27552,17 @@ end
 return threatlevelMax
 end
 function GROUP:InAir()
-self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local DCSUnit=DCSGroup:getUnit(1)
 if DCSUnit then
 local GroupInAir=DCSGroup:getUnit(1):inAir()
-self:T3(GroupInAir)
 return GroupInAir
 end
 end
 return nil
 end
 function GROUP:IsAirborne(AllUnits)
-self:F2(self.GroupName)
 local units=self:GetUnits()
 if units then
 if AllUnits then
@@ -27704,7 +27685,6 @@ return attribute
 end
 do
 function GROUP:RouteRTB(RTBAirbase,Speed)
-self:F({RTBAirbase:GetName(),Speed})
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 if RTBAirbase then
@@ -27713,7 +27693,6 @@ local coord=self:GetCoordinate()
 local PointFrom=coord:WaypointAirTurningPoint(nil,Speed)
 local PointLanding=RTBAirbase:GetCoordinate():WaypointAirLanding(Speed,RTBAirbase)
 local Points={PointFrom,PointLanding}
-self:T3(Points)
 local Template=self:GetTemplate()
 Template.route.points=Points
 self:Respawn(Template,true)
@@ -27760,7 +27739,6 @@ HasPlayers=true
 end
 end
 if HasPlayers==true then
-self:F2(PlayerNames)
 return PlayerNames
 end
 return nil
@@ -27779,7 +27757,6 @@ return PlayerCount
 end
 end
 function GROUP:EnableEmission(switch)
-self:F2(self.GroupName)
 local switch=switch or false
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
@@ -27791,7 +27768,6 @@ function GROUP:SetCommandInvisible(switch)
 return self:CommandSetInvisible(switch)
 end
 function GROUP:CommandSetInvisible(switch)
-self:F2(self.GroupName)
 if switch==nil then
 switch=false
 end
@@ -27803,7 +27779,6 @@ function GROUP:SetCommandImmortal(switch)
 return self:CommandSetImmortal(switch)
 end
 function GROUP:CommandSetImmortal(switch)
-self:F2(self.GroupName)
 if switch==nil then
 switch=false
 end
@@ -27812,7 +27787,6 @@ self:SetCommand(SetImmortal)
 return self
 end
 function GROUP:GetSkill()
-self:F2(self.GroupName)
 local unit=self:GetUnit(1)
 local name=unit:GetName()
 local skill=_DATABASE.Templates.Units[name].Template.skill or"Random"
@@ -28000,14 +27974,23 @@ function UNIT:Name()
 return self.UnitName
 end
 function UNIT:GetDCSObject()
+if(not self.LastCallDCSObject)or(self.LastCallDCSObject and timer.getTime()-self.LastCallDCSObject>1)then
 local DCSUnit=Unit.getByName(self.UnitName)
 if DCSUnit then
+self.LastCallDCSObject=timer.getTime()
+self.DCSObject=DCSUnit
 return DCSUnit
+else
+self.DCSObject=nil
+self.LastCallDCSObject=nil
+end
+else
+return self.DCSObject
 end
 return nil
 end
 function UNIT:GetAltitude(FromGround)
-local DCSUnit=Unit.getByName(self.UnitName)
+local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local altitude=0
 local point=DCSUnit:getPoint()
@@ -28021,19 +28004,14 @@ end
 return nil
 end
 function UNIT:ReSpawnAt(Coordinate,Heading)
-self:T(self:Name())
 local SpawnGroupTemplate=UTILS.DeepCopy(_DATABASE:GetGroupTemplateFromUnitName(self:Name()))
-self:T(SpawnGroupTemplate)
 local SpawnGroup=self:GetGroup()
-self:T({SpawnGroup=SpawnGroup})
 if SpawnGroup then
 local Vec3=SpawnGroup:GetVec3()
 SpawnGroupTemplate.x=Coordinate.x
 SpawnGroupTemplate.y=Coordinate.z
-self:F(#SpawnGroupTemplate.units)
 for UnitID,UnitData in pairs(SpawnGroup:GetUnits()or{})do
 local GroupUnit=UnitData
-self:F(GroupUnit:GetName())
 if GroupUnit:IsAlive()then
 local GroupUnitVec3=GroupUnit:GetVec3()
 local GroupUnitHeading=GroupUnit:GetHeading()
@@ -28041,22 +28019,17 @@ SpawnGroupTemplate.units[UnitID].alt=GroupUnitVec3.y
 SpawnGroupTemplate.units[UnitID].x=GroupUnitVec3.x
 SpawnGroupTemplate.units[UnitID].y=GroupUnitVec3.z
 SpawnGroupTemplate.units[UnitID].heading=GroupUnitHeading
-self:F({UnitID,SpawnGroupTemplate.units[UnitID],SpawnGroupTemplate.units[UnitID]})
 end
 end
 end
 for UnitTemplateID,UnitTemplateData in pairs(SpawnGroupTemplate.units)do
-self:T({UnitTemplateData.name,self:Name()})
 SpawnGroupTemplate.units[UnitTemplateID].unitId=nil
 if UnitTemplateData.name==self:Name()then
-self:T("Adjusting")
 SpawnGroupTemplate.units[UnitTemplateID].alt=Coordinate.y
 SpawnGroupTemplate.units[UnitTemplateID].x=Coordinate.x
 SpawnGroupTemplate.units[UnitTemplateID].y=Coordinate.z
 SpawnGroupTemplate.units[UnitTemplateID].heading=Heading
-self:F({UnitTemplateID,SpawnGroupTemplate.units[UnitTemplateID],SpawnGroupTemplate.units[UnitTemplateID]})
 else
-self:F(SpawnGroupTemplate.units[UnitTemplateID].name)
 local GroupUnit=UNIT:FindByName(SpawnGroupTemplate.units[UnitTemplateID].name)
 if GroupUnit and GroupUnit:IsAlive()then
 local GroupUnitVec3=GroupUnit:GetVec3()
@@ -28067,7 +28040,6 @@ UnitTemplateData.y=GroupUnitVec3.z
 UnitTemplateData.heading=GroupUnitHeading
 else
 if SpawnGroupTemplate.units[UnitTemplateID].name~=self:Name()then
-self:T("nilling")
 SpawnGroupTemplate.units[UnitTemplateID].delete=true
 end
 end
@@ -28076,7 +28048,6 @@ end
 local i=1
 while i<=#SpawnGroupTemplate.units do
 local UnitTemplateData=SpawnGroupTemplate.units[i]
-self:T(UnitTemplateData.name)
 if UnitTemplateData.delete then
 table.remove(SpawnGroupTemplate.units,i)
 else
@@ -28084,11 +28055,9 @@ i=i+1
 end
 end
 SpawnGroupTemplate.groupId=nil
-self:T(SpawnGroupTemplate)
 _DATABASE:Spawn(SpawnGroupTemplate)
 end
 function UNIT:IsActive()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitIsActive=DCSUnit:isActive()
@@ -28105,7 +28074,6 @@ end
 return nil
 end
 function UNIT:IsAlive()
-self:F3(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit and DCSUnit:isExist()then
 local UnitIsAlive=DCSUnit:isActive()
@@ -28117,7 +28085,6 @@ function UNIT:IsDead()
 return not self:IsAlive()
 end
 function UNIT:GetCallsign()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitCallSign=DCSUnit:getCallsign()
@@ -28126,7 +28093,6 @@ UnitCallSign=DCSUnit:getName()
 end
 return UnitCallSign
 end
-self:F(self.ClassName.." "..self.UnitName.." not found!")
 return nil
 end
 function UNIT:IsPlayer()
@@ -28150,7 +28116,6 @@ end
 return false
 end
 function UNIT:GetPlayerName()
-self:F(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local PlayerName=DCSUnit:getPlayerName()
@@ -28176,7 +28141,6 @@ local typename=self:GetTypeName()
 return UTILS.GetReportingName(typename)
 end
 function UNIT:GetNumber()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitNumber=DCSUnit:getNumber()
@@ -28185,7 +28149,6 @@ end
 return nil
 end
 function UNIT:GetSpeedMax()
-self:F2(self.UnitName)
 local Desc=self:GetDesc()
 if Desc then
 local SpeedMax=Desc.speedMax
@@ -28194,7 +28157,6 @@ end
 return 0
 end
 function UNIT:GetRange()
-self:F2(self.UnitName)
 local Desc=self:GetDesc()
 if Desc then
 local Range=Desc.range
@@ -28208,7 +28170,6 @@ end
 return nil
 end
 function UNIT:IsRefuelable()
-self:F2(self.UnitName)
 local refuelable=self:HasAttribute("Refuelable")
 local system=nil
 local Desc=self:GetDesc()
@@ -28218,7 +28179,6 @@ end
 return refuelable,system
 end
 function UNIT:IsTanker()
-self:F2(self.UnitName)
 local tanker=self:HasAttribute("Tankers")
 local system=nil
 if tanker then
@@ -28270,7 +28230,6 @@ end
 return false
 end
 function UNIT:GetGroup()
-self:F2(self.UnitName)
 local UnitGroup=GROUP:FindByName(self.GroupName)
 if UnitGroup then
 return UnitGroup
@@ -28287,17 +28246,14 @@ end
 return nil
 end
 function UNIT:GetPrefix()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitPrefix=string.match(self.UnitName,".*#"):sub(1,-2)
-self:T3(UnitPrefix)
 return UnitPrefix
 end
 return nil
 end
 function UNIT:GetAmmo()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitAmmo=DCSUnit:getAmmo()
@@ -28393,7 +28349,6 @@ local _,_,_,_,_,shells=self:GetAmmunition()
 return shells or 0
 end
 function UNIT:GetSensors()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitSensors=DCSUnit:getSensors()
@@ -28402,7 +28357,6 @@ end
 return nil
 end
 function UNIT:HasSensors(...)
-self:F2(arg)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local HasSensors=DCSUnit:hasSensors(unpack(arg))
@@ -28411,7 +28365,6 @@ end
 return nil
 end
 function UNIT:HasSEAD()
-self:F2()
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitSEADAttributes=DCSUnit:getDesc().attributes
@@ -28427,7 +28380,6 @@ end
 return nil
 end
 function UNIT:GetRadar()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitRadarOn,UnitRadarObject=DCSUnit:getRadar()
@@ -28436,7 +28388,6 @@ end
 return nil,nil
 end
 function UNIT:GetFuel()
-self:F3(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitFuel=DCSUnit:getFuel()
@@ -28445,18 +28396,16 @@ end
 return nil
 end
 function UNIT:GetUnits()
-self:F3({self.UnitName})
 local DCSUnit=self:GetDCSObject()
 local Units={}
 if DCSUnit then
 Units[1]=UNIT:Find(DCSUnit)
-self:T3(Units)
+-self:T3(Units)
 return Units
 end
 return nil
 end
 function UNIT:GetLife()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit and DCSUnit:isExist()then
 local UnitLife=DCSUnit:getLife()
@@ -28465,7 +28414,6 @@ end
 return-1
 end
 function UNIT:GetLife0()
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitLife0=DCSUnit:getLife0()
@@ -28474,7 +28422,6 @@ end
 return 0
 end
 function UNIT:GetLifeRelative()
-self:F2(self.UnitName)
 if self and self:IsAlive()then
 local life0=self:GetLife0()
 local lifeN=self:GetLife()
@@ -28483,7 +28430,6 @@ end
 return-1
 end
 function UNIT:GetDamageRelative()
-self:F2(self.UnitName)
 if self and self:IsAlive()then
 return 1-self:GetLifeRelative()
 end
@@ -28498,7 +28444,6 @@ end
 return 0
 end
 function UNIT:GetUnitCategory()
-self:F3(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 return DCSUnit:getDesc().category
@@ -28506,7 +28451,6 @@ end
 return nil
 end
 function UNIT:GetCategoryName()
-self:F3(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local CategoryNames={
@@ -28517,7 +28461,6 @@ local CategoryNames={
 [Unit.Category.STRUCTURE]="Structure",
 }
 local UnitCategory=DCSUnit:getDesc().category
-self:T3(UnitCategory)
 return CategoryNames[UnitCategory]
 end
 return nil
@@ -28628,47 +28571,37 @@ end
 return nil
 end
 function UNIT:OtherUnitInRadius(AwaitUnit,Radius)
-self:F2({self.UnitName,AwaitUnit.UnitName,Radius})
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitVec3=self:GetVec3()
 local AwaitUnitVec3=AwaitUnit:GetVec3()
 if(((UnitVec3.x-AwaitUnitVec3.x)^2+(UnitVec3.z-AwaitUnitVec3.z)^2)^0.5<=Radius)then
-self:T3("true")
 return true
 else
-self:T3("false")
 return false
 end
 end
 return nil
 end
 function UNIT:IsFriendly(FriendlyCoalition)
-self:F2()
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitCoalition=DCSUnit:getCoalition()
-self:T3({UnitCoalition,FriendlyCoalition})
 local IsFriendlyResult=(UnitCoalition==FriendlyCoalition)
-self:F(IsFriendlyResult)
 return IsFriendlyResult
 end
 return nil
 end
 function UNIT:IsShip()
-self:F2()
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitDescriptor=DCSUnit:getDesc()
-self:T3({UnitDescriptor.category,Unit.Category.SHIP})
 local IsShipResult=(UnitDescriptor.category==Unit.Category.SHIP)
-self:T3(IsShipResult)
 return IsShipResult
 end
 return nil
 end
 function UNIT:InAir(NoHeloCheck)
-self:F2(self.UnitName)
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
 local UnitInAir=DCSUnit:inAir()
@@ -28683,7 +28616,6 @@ if Velocity<1 and Height<=60 then
 UnitInAir=false
 end
 end
-self:T3(UnitInAir)
 return UnitInAir
 end
 return nil
@@ -28768,7 +28700,6 @@ end
 return nil
 end
 function UNIT:EnableEmission(switch)
-self:F2(self.UnitName)
 local switch=switch or false
 local DCSUnit=self:GetDCSObject()
 if DCSUnit then
@@ -28777,7 +28708,6 @@ end
 return self
 end
 function UNIT:GetSkill()
-self:F2(self.UnitName)
 local name=self.UnitName
 local skill="Random"
 if _DATABASE.Templates.Units[name]and _DATABASE.Templates.Units[name].Template and _DATABASE.Templates.Units[name].Template.skill then
@@ -28786,7 +28716,6 @@ end
 return skill
 end
 function UNIT:GetSTN()
-self:F2(self.UnitName)
 local STN=nil
 local VCL=nil
 local VCN=nil
@@ -36923,7 +36852,7 @@ local HasDetectedObjects=false
 if Detection and Detection:IsAlive()then
 self:T({"DetectionGroup is Alive",Detection:GetName()})
 local DetectionGroupName=Detection:GetName()
-local DetectionUnit=Detection:GetUnit(1)
+local DetectionUnit=Detection:GetFirstUnitAlive()
 local DetectedUnits={}
 local DetectedTargets=DetectionUnit:GetDetectedTargets(
 self.DetectVisual,
@@ -36933,7 +36862,7 @@ self.DetectIRST,
 self.DetectRWR,
 self.DetectDLINK
 )
-for DetectionObjectID,Detection in pairs(DetectedTargets)do
+for DetectionObjectID,Detection in pairs(DetectedTargets or{})do
 local DetectedObject=Detection.object
 if DetectedObject and DetectedObject:isExist()and DetectedObject.id_<50000000 then
 local DetectedObjectName=DetectedObject:getName()
@@ -36944,7 +36873,7 @@ self.DetectedObjects[DetectedObjectName].Object=DetectedObject
 end
 end
 end
-for DetectionObjectName,DetectedObjectData in pairs(self.DetectedObjects)do
+for DetectionObjectName,DetectedObjectData in pairs(self.DetectedObjects or{})do
 local DetectedObject=DetectedObjectData.Object
 if DetectedObject:isExist()then
 local TargetIsDetected,TargetIsVisible,TargetLastTime,TargetKnowType,TargetKnowDistance,TargetLastPos,TargetLastVelocity=DetectionUnit:IsTargetDetected(
@@ -50860,7 +50789,6 @@ end
 end
 end
 function WAREHOUSE:_UnitDead(deadunit,deadgroup,request)
-self:F(self.lid.."FF unit dead "..deadunit:GetName())
 local opsgroup=_DATABASE:FindOpsGroup(deadgroup)
 if opsgroup then
 return nil
@@ -61625,7 +61553,7 @@ if u and pn then
 return u,pn
 end
 local DCSunit=Unit.getByName(_unitName)
-if DCSunit then
+if DCSunit and DCSunit.getPlayerName then
 local playername=DCSunit:getPlayerName()
 local unit=UNIT:Find(DCSunit)
 self:T2({DCSunit=DCSunit,unit=unit,playername=playername})
@@ -67013,6 +66941,7 @@ DynamicCargo={},
 ChinookTroopCircleRadius=5,
 TroopUnloadDistGround=5,
 TroopUnloadDistHover=1.5,
+UserSetGroup=nil,
 }
 CTLD.RadioModulation={
 AM=0,
@@ -67047,7 +66976,7 @@ CTLD.UnitTypeCapabilities={
 ["OH-58D"]={type="OH58D",crates=false,troops=false,cratelimit=0,trooplimit=0,length=14,cargoweightlimit=400},
 ["CH-47Fbl1"]={type="CH-47Fbl1",crates=true,troops=true,cratelimit=4,trooplimit=31,length=20,cargoweightlimit=10800},
 }
-CTLD.version="1.1.17"
+CTLD.version="1.1.16"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -67171,6 +67100,8 @@ self.nobuildinloadzones=true
 self.movecratesbeforebuild=true
 self.surfacetypes={land.SurfaceType.LAND,land.SurfaceType.ROAD,land.SurfaceType.RUNWAY,land.SurfaceType.SHALLOW_WATER}
 self.enableChinookGCLoading=true
+self.ChinookTroopCircleRadius=5
+self.UserSetGroup=nil
 local AliaS=string.gsub(self.alias," ","_")
 self.filename=string.format("CTLD_%s_Persist.csv",AliaS)
 self.allowcratepickupagain=true
@@ -69595,6 +69526,10 @@ capabilities.cargoweightlimit=Maxcargoweight or maxcargo
 self.UnitTypeCapabilities[unittype]=capabilities
 return self
 end
+function CTLD:SetOwnSetPilotGroups(Set)
+self.UserSetGroup=Set
+return self
+end
 function CTLD:UnitCapabilities(Unittype,Cancrates,Cantroops,Cratelimit,Trooplimit,Length,Maxcargoweight)
 self:I(self.lid.."This function been replaced with `SetUnitCapabilities()` - pls use the new one going forward!")
 self:SetUnitCapabilities(Unittype,Cancrates,Cantroops,Cratelimit,Trooplimit,Length,Maxcargoweight)
@@ -70099,7 +70034,9 @@ end
 function CTLD:onafterStart(From,Event,To)
 self:T({From,Event,To})
 self:I(self.lid.."Started ("..self.version..")")
-if self.useprefix or self.enableHercules then
+if self.UserSetGroup then
+self.PilotGroups=self.UserSetGroup
+elseif self.useprefix or self.enableHercules then
 local prefix=self.prefixes
 if self.enableHercules then
 self.PilotGroups=SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(prefix):FilterStart()
@@ -70971,6 +70908,9 @@ topmenuname="CSAR",
 ADFRadioPwr=1000,
 PilotWeight=80,
 CreateRadioBeacons=true,
+UserSetGroup=nil,
+AllowIRStrobe=false,
+IRStrobeRuntime=300,
 }
 CSAR.AircraftType={}
 CSAR.AircraftType["SA342Mistral"]=2
@@ -70990,7 +70930,7 @@ CSAR.AircraftType["MH-60R"]=10
 CSAR.AircraftType["OH-6A"]=2
 CSAR.AircraftType["OH-58D"]=2
 CSAR.AircraftType["CH-47Fbl1"]=31
-CSAR.version="1.0.27"
+CSAR.version="1.0.29"
 function CSAR:New(Coalition,Template,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Template,Alias})
@@ -71096,6 +71036,7 @@ self.usewetfeet=false
 self.allowbronco=false
 self.ADFRadioPwr=1000
 self.PilotWeight=80
+self.UserSetGroup=nil
 self.useSRS=false
 self.SRSPath="E:\\Program Files\\DCS-SimpleRadio-Standalone"
 self.SRSchannel=300
@@ -71116,13 +71057,13 @@ self.filepath=nil
 self.saveinterval=600
 return self
 end
-function CSAR:_CreateDownedPilotTrack(Group,Groupname,Side,OriginalUnit,Description,Typename,Frequency,Playername,Wetfeet)
+function CSAR:_CreateDownedPilotTrack(Group,Groupname,Side,OriginalUnit,Description,Typename,Frequency,Playername,Wetfeet,BeaconName)
 self:T({"_CreateDownedPilotTrack",Groupname,Side,OriginalUnit,Description,Typename,Frequency,Playername})
 local DownedPilot={}
 DownedPilot.desc=Description or""
 DownedPilot.frequency=Frequency or 0
 DownedPilot.index=self.downedpilotcounter
-DownedPilot.name=Groupname or""
+DownedPilot.name=Groupname or Playername or""
 DownedPilot.originalUnit=OriginalUnit or""
 DownedPilot.player=Playername or""
 DownedPilot.side=Side or 0
@@ -71131,6 +71072,7 @@ DownedPilot.group=Group
 DownedPilot.timestamp=0
 DownedPilot.alive=true
 DownedPilot.wetfeet=Wetfeet or false
+DownedPilot.BeaconName=BeaconName
 local PilotTable=self.downedPilots
 local counter=self.downedpilotcounter
 PilotTable[counter]={}
@@ -71243,8 +71185,16 @@ else
 self:_DisplayToAllSAR("Troops In Contact. ".._typeName.." requests CASEVAC. ",self.coalition,self.messageTime)
 end
 end
+local BeaconName
+if _playerName then
+BeaconName=_unitName..math.random(1,10000)
+elseif _unitName then
+BeaconName=_playerName..math.random(1,10000)
+else
+BeaconName="Ghost-1-1"..math.random(1,10000)
+end
 if(_freq and _freq~=0)then
-self:_AddBeaconToGroup(_spawnedGroup,_freq)
+self:_AddBeaconToGroup(_spawnedGroup,_freq,BeaconName)
 end
 self:_AddSpecialOptions(_spawnedGroup)
 local _text=_description
@@ -71265,7 +71215,7 @@ end
 end
 self:T({_spawnedGroup,_alias})
 local _GroupName=_spawnedGroup:GetName()or _alias
-self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet)
+self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet,BeaconName)
 self:_InitSARForPilot(_spawnedGroup,_unitName,_freq,noMessage,_playerName)
 return self
 end
@@ -72017,7 +71967,7 @@ _distance=string.format("%.1fnm",UTILS.MetersToNM(_closest.distance))
 else
 _distance=string.format("%.1fkm",_closest.distance/1000)
 end
-local _msg=string.format("%s - Popping signal flare at your %s o\'clock. Distance %s",self:_GetCustomCallSign(_unitName),_clockDir,_distance)
+local _msg=string.format("%s - Firing signal flare at your %s o\'clock. Distance %s",self:_GetCustomCallSign(_unitName),_clockDir,_distance)
 self:_DisplayMessageToSAR(_heli,_msg,self.messageTime,false,true,true)
 local _coord=_closest.pilot:GetCoordinate()
 _coord:FlareRed(_clockDir)
@@ -72042,7 +71992,6 @@ local voice=self.CSARVoice or MSRS.Voices.Google.Standard.en_GB_Standard_F
 if self.msrs:GetProvider()==MSRS.Provider.WINDOWS then
 voice=self.CSARVoiceMS or MSRS.Voices.Microsoft.Hedda
 end
-self:F("Voice = "..voice)
 self.SRSQueue:NewTransmission(_message,duration,self.msrs,tstart,2,subgroups,subtitle,subduration,self.SRSchannel,self.SRSModulation,gender,culture,voice,volume,label,self.coordinate)
 end
 if ToScreen==true or ToScreen==nil then
@@ -72055,6 +72004,37 @@ end
 end
 return self
 end
+function CSAR:_ReqIRStrobe(_unitName)
+self:T(self.lid.." _ReqIRStrobe")
+local _heli=self:_GetSARHeli(_unitName)
+if _heli==nil then
+return
+end
+local smokedist=8000
+if smokedist<self.approachdist_far then smokedist=self.approachdist_far end
+local _closest=self:_GetClosestDownedPilot(_heli)
+if _closest~=nil and _closest.pilot~=nil and _closest.distance>0 and _closest.distance<smokedist then
+local _clockDir=self:_GetClockDirection(_heli,_closest.pilot)
+local _distance=string.format("%.1fkm",_closest.distance/1000)
+if _SETTINGS:IsImperial()then
+_distance=string.format("%.1fnm",UTILS.MetersToNM(_closest.distance))
+else
+_distance=string.format("%.1fkm",_closest.distance/1000)
+end
+local _msg=string.format("%s - IR Strobe active at your %s o\'clock. Distance %s",self:_GetCustomCallSign(_unitName),_clockDir,_distance)
+self:_DisplayMessageToSAR(_heli,_msg,self.messageTime,false,true,true)
+_closest.pilot:NewIRMarker(true,self.IRStrobeRuntime or 300)
+else
+local _distance=string.format("%.1fkm",smokedist/1000)
+if _SETTINGS:IsImperial()then
+_distance=string.format("%.1fnm",UTILS.MetersToNM(smokedist))
+else
+_distance=string.format("%.1fkm",smokedist/1000)
+end
+self:_DisplayMessageToSAR(_heli,string.format("No Pilots within %s",_distance),self.messageTime,false,false,true)
+end
+return self
+end
 function CSAR:_Reqsmoke(_unitName)
 self:T(self.lid.." _Reqsmoke")
 local _heli=self:_GetSARHeli(_unitName)
@@ -72177,7 +72157,12 @@ local _rootPath=MENU_GROUP:New(_group,menuname)
 local _rootMenu1=MENU_GROUP_COMMAND:New(_group,"List Active CSAR",_rootPath,self._DisplayActiveSAR,self,_unitName)
 local _rootMenu2=MENU_GROUP_COMMAND:New(_group,"Check Onboard",_rootPath,self._CheckOnboard,self,_unitName)
 local _rootMenu3=MENU_GROUP_COMMAND:New(_group,"Request Signal Flare",_rootPath,self._SignalFlare,self,_unitName)
-local _rootMenu4=MENU_GROUP_COMMAND:New(_group,"Request Smoke",_rootPath,self._Reqsmoke,self,_unitName):Refresh()
+local _rootMenu4=MENU_GROUP_COMMAND:New(_group,"Request Smoke",_rootPath,self._Reqsmoke,self,_unitName)
+if self.AllowIRStrobe then
+local _rootMenu5=MENU_GROUP_COMMAND:New(_group,"Request IR Strobe",_rootPath,self._ReqIRStrobe,self,_unitName):Refresh()
+else
+_rootMenu4:Refresh()
+end
 end
 end
 end
@@ -72240,7 +72225,7 @@ if clock>12 then clock=clock-12 end
 end
 return clock
 end
-function CSAR:_AddBeaconToGroup(_group,_freq)
+function CSAR:_AddBeaconToGroup(_group,_freq,_name)
 self:T(self.lid.." _AddBeaconToGroup")
 if self.CreateRadioBeacons==false then return end
 local _group=_group
@@ -72261,7 +72246,7 @@ local Frequency=_freq
 local name=_radioUnit:GetName()
 local Sound="l10n/DEFAULT/"..self.radioSound
 local vec3=_radioUnit:GetVec3()or _radioUnit:GetPositionVec3()or{x=0,y=0,z=0}
-trigger.action.radioTransmission(Sound,vec3,0,false,Frequency,self.ADFRadioPwr or 1000,name..math.random(1,10000))
+trigger.action.radioTransmission(Sound,vec3,0,false,Frequency,self.ADFRadioPwr or 1000,_name)
 end
 end
 return self
@@ -72276,8 +72261,10 @@ self:T({_pilot.name})
 local pilot=_pilot
 local group=pilot.group
 local frequency=pilot.frequency or 0
+local bname=pilot.BeaconName or pilot.name..math.random(1,100000)
+trigger.action.stopRadioTransmission(bname)
 if group and group:IsAlive()and frequency>0 then
-self:_AddBeaconToGroup(group,frequency)
+self:_AddBeaconToGroup(group,frequency,bname)
 end
 end
 end
@@ -72305,6 +72292,10 @@ else
 return false
 end
 end
+function CSAR:SetOwnSetPilotGroups(Set)
+self.UserSetGroup=Set
+return self
+end
 function CSAR:onafterStart(From,Event,To)
 self:T({From,Event,To})
 self:I(self.lid.."Started ("..self.version..")")
@@ -72315,7 +72306,9 @@ self:HandleEvent(EVENTS.LandingAfterEjection,self._EventHandler)
 self:HandleEvent(EVENTS.PlayerEnterAircraft,self._EventHandler)
 self:HandleEvent(EVENTS.PlayerEnterUnit,self._EventHandler)
 self:HandleEvent(EVENTS.PilotDead,self._EventHandler)
-if self.allowbronco then
+if self.UserSetGroup then
+self.allheligroupset=self.UserSetGroup
+elseif self.allowbronco then
 local prefixes=self.csarPrefix or{}
 self.allheligroupset=SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(prefixes):FilterStart()
 elseif self.useprefix then
@@ -76123,10 +76116,14 @@ local Dispatcher=AI_A2G_Fsm:GetDispatcher()
 local Squadron=Dispatcher:GetSquadronFromDefender(DefenderGroup)
 if Squadron then
 local FirstUnit=AttackSetUnit:GetRandomSurely()
+if FirstUnit then
 local Coordinate=FirstUnit:GetCoordinate()
 if self.SetSendPlayerMessages then
 Dispatcher:MessageToPlayers(Squadron,DefenderName..", on route to ground target at "..Coordinate:ToStringA2G(DefenderGroup),DefenderGroup)
 end
+else
+return
+end
 end
 self:GetParent(self).onafterEngageRoute(self,DefenderGroup,From,Event,To,AttackSetUnit)
 end