@jtff/miztemplate-lib 3.3.0 → 3.3.2

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2024-08-12T11:39:03+02:00-a54944b0214abee2fc0206e8a246bbe9f36c41d3 ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-08-29T10:25:13+02:00-f531fdaa7055bd56bd3afb8a03857833d7c3122b ***')
 if not MOOSE_DEVELOPMENT_FOLDER then
 MOOSE_DEVELOPMENT_FOLDER='Scripts'
 end
@@ -464,6 +464,11 @@ containers={},
 droptanks={},
 adapters={},
 torpedoes={},
+Gazelle={},
+CH47={},
+OH58={},
+UH1H={},
+AH64D={},
 }
 }
 ENUMS.Storage.weapons.nurs.SNEB_TYPE253_F1B="weapons.nurs.SNEB_TYPE253_F1B"
@@ -1023,6 +1028,57 @@ ENUMS.Storage.weapons.bombs.AGM_62="weapons.bombs.AGM_62"
 ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_WHITE="weapons.containers.{US_M10_SMOKE_TANK_WHITE}"
 ENUMS.Storage.weapons.missiles.MICA_T="weapons.missiles.MICA_T"
 ENUMS.Storage.weapons.containers.HVAR_rocket="weapons.containers.HVAR_rocket"
+ENUMS.Storage.weapons.Gazelle.HMP400_100RDS={4,15,46,1771}
+ENUMS.Storage.weapons.Gazelle.HMP400_200RDS={4,15,46,1770}
+ENUMS.Storage.weapons.Gazelle.HMP400_400RDS={4,15,46,1769}
+ENUMS.Storage.weapons.Gazelle.GIAT_M261_AP={4,15,46,1768}
+ENUMS.Storage.weapons.Gazelle.GIAT_M261_SAPHEI={4,15,46,1767}
+ENUMS.Storage.weapons.Gazelle.GIAT_M261_HE={4,15,46,1766}
+ENUMS.Storage.weapons.Gazelle.GIAT_M261_HEAP={4,15,46,1765}
+ENUMS.Storage.weapons.Gazelle.GIAT_M261_APHE={4,15,46,1764}
+ENUMS.Storage.weapons.Gazelle.GAZELLE_IR_DEFLECTOR={4,15,47,680}
+ENUMS.Storage.weapons.Gazelle.GAZELLE_FAS_SANDFILTER={4,15,47,679}
+ENUMS.Storage.weapons.CH47.CH47_PORT_M60D={4,15,46,2476}
+ENUMS.Storage.weapons.CH47.CH47_STBD_M60D={4,15,46,2477}
+ENUMS.Storage.weapons.CH47.CH47_AFT_M60D={4,15,46,2478}
+ENUMS.Storage.weapons.CH47.CH47_PORT_M134D={4,15,46,2482}
+ENUMS.Storage.weapons.CH47.CH47_STBD_M134D={4,15,46,2483}
+ENUMS.Storage.weapons.CH47.CH47_AFT_M3M={4,15,46,2484}
+ENUMS.Storage.weapons.CH47.CH47_PORT_M240H={4,15,46,2479}
+ENUMS.Storage.weapons.CH47.CH47_STBD_M240H={4,15,46,2480}
+ENUMS.Storage.weapons.CH47.CH47_AFT_M240H={4,15,46,2481}
+ENUMS.Storage.weapons.UH1H.M134_MiniGun_Right={4,15,46,161}
+ENUMS.Storage.weapons.UH1H.M134_MiniGun_Left={4,15,46,160}
+ENUMS.Storage.weapons.UH1H.M134_MiniGun_Right_Door={4,15,46,175}
+ENUMS.Storage.weapons.UH1H.M60_MG_Right_Door={4,15,46,177}
+ENUMS.Storage.weapons.UH1H.M134_MiniGun_Left_Door={4,15,46,174}
+ENUMS.Storage.weapons.UH1H.M60_MG_Left_Door={4,15,46,176}
+ENUMS.Storage.weapons.OH58.FIM92={4,4,7,446}
+ENUMS.Storage.weapons.OH58.MG_M3P100={4,15,46,2578}
+ENUMS.Storage.weapons.OH58.MG_M3P200={4,15,46,2577}
+ENUMS.Storage.weapons.OH58.MG_M3P300={4,15,46,2576}
+ENUMS.Storage.weapons.OH58.MG_M3P400={4,15,46,2575}
+ENUMS.Storage.weapons.OH58.MG_M3P500={4,15,46,2574}
+ENUMS.Storage.weapons.OH58.Smk_Grenade_Blue={4,5,9,484}
+ENUMS.Storage.weapons.OH58.Smk_Grenade_Green={4,5,9,485}
+ENUMS.Storage.weapons.OH58.Smk_Grenade_Red={4,5,9,483}
+ENUMS.Storage.weapons.OH58.Smk_Grenade_Violet={4,5,9,486}
+ENUMS.Storage.weapons.OH58.Smk_Grenade_White={4,5,9,488}
+ENUMS.Storage.weapons.OH58.Smk_Grenade_Yellow={4,5,9,487}
+ENUMS.Storage.weapons.AH64D.AN_APG78={4,15,44,2138}
+ENUMS.Storage.weapons.AH64D.Internal_Aux_FuelTank={1,3,43,1700}
+ENUMS.FARPType={
+FARP="FARP",
+INVISIBLE="INVISIBLE",
+HELIPADSINGLE="HELIPADSINGLE",
+PADSINGLE="PADSINGLE",
+}
+ENUMS.FARPObjectTypeNamesAndShape={
+[ENUMS.FARPType.FARP]={TypeName="FARP",ShapeName="FARPS"},
+[ENUMS.FARPType.INVISIBLE]={TypeName="Invisible FARP",ShapeName="invisiblefarp"},
+[ENUMS.FARPType.HELIPADSINGLE]={TypeName="SINGLE_HELIPAD",ShapeName="FARP"},
+[ENUMS.FARPType.PADSINGLE]={TypeName="FARP_SINGLE_01",ShapeName="FARP_SINGLE_01"},
+}
 SMOKECOLOR=trigger.smokeColor
 FLARECOLOR=trigger.flareColor
 BIGSMOKEPRESET={
@@ -1826,7 +1882,7 @@ function UTILS.SecondsToClock(seconds,short)
 if seconds==nil then
 return nil
 end
-local seconds=tonumber(seconds)
+local seconds=tonumber(seconds)or 0
 local _seconds=seconds%(60*60*24)
 if seconds<0 then
 return nil
@@ -2352,9 +2408,9 @@ local sinDec=0.39782*sin(L)
 local cosDec=cos(asin(sinDec))
 local cosH=(cos(zenith)-(sinDec*sin(latitude)))/(cosDec*cos(latitude))
 if rising and cosH>1 then
-return"N/R"
-elseif cosH<-1 then
 return"N/S"
+elseif cosH<-1 then
+return"N/R"
 end
 local H
 if rising then
@@ -2502,14 +2558,16 @@ return FreeFMFrequencies
 end
 function UTILS.GenerateVHFrequencies()
 local _skipFrequencies={
-214,274,291.5,295,297.5,
-300.5,304,305,307,309.5,311,312,312.5,316,
-320,324,328,329,330,332,336,337,
-342,343,348,351,352,353,358,
-363,365,368,372.5,374,
-380,381,384,385,389,395,396,
-414,420,430,432,435,440,450,455,462,470,485,
-507,515,520,525,528,540,550,560,570,577,580,
+214,243,264,273,274,288,291.5,295,297.5,
+300.5,304,305,307,309.5,310,311,312,312.5,316,317,
+320,323,324,325,326,328,329,330,332,335,336,337,
+340,342,343,346,348,351,352,353,358,
+360,363,364,365,368,372.5,373,374,
+380,381,384,385,387,389,391,395,396,399,
+403,404,410,412,414,418,420,423,
+430,432,435,440,445,
+450,455,462,470,485,490,
+507,515,520,525,528,540,550,560,563,570,577,580,595,
 602,625,641,662,670,680,682,690,
 705,720,722,730,735,740,745,750,770,795,
 822,830,862,866,
@@ -3661,6 +3719,80 @@ end
 UTILS.lcg.seed=(UTILS.lcg.a*UTILS.lcg.seed+UTILS.lcg.c)%UTILS.lcg.m
 return UTILS.lcg.seed/UTILS.lcg.m
 end
+function UTILS.SpawnFARPAndFunctionalStatics(Name,Coordinate,FARPType,Coalition,Country,CallSign,Frequency,Modulation,ADF,SpawnRadius,VehicleTemplate,Liquids,Equipment)
+local farplocation=Coordinate
+local farptype=FARPType or ENUMS.FARPType.FARP
+local Coalition=Coalition or coalition.side.BLUE
+local callsign=CallSign or CALLSIGN.FARP.Berlin
+local freq=Frequency or 127.5
+local mod=Modulation or radio.modulation.AM
+local radius=SpawnRadius or 100
+if radius<0 or radius>150 then radius=100 end
+local liquids=Liquids or 10
+liquids=liquids*1000
+local equip=Equipment or 10
+local statictypes=ENUMS.FARPObjectTypeNamesAndShape[farptype]or{TypeName="FARP",ShapeName="FARPS"}
+local STypeName=statictypes.TypeName
+local SShapeName=statictypes.ShapeName
+local Country=Country or(Coalition==coalition.side.BLUE and country.id.USA or country.id.RUSSIA)
+local ReturnObjects={}
+local newfarp=SPAWNSTATIC:NewFromType(STypeName,"Heliports",Country)
+newfarp:InitShape(SShapeName)
+newfarp:InitFARP(callsign,freq,mod)
+local spawnedfarp=newfarp:SpawnFromCoordinate(farplocation,0,Name)
+table.insert(ReturnObjects,spawnedfarp)
+local FARPStaticObjectsNato={
+["FUEL"]={TypeName="FARP Fuel Depot",ShapeName="GSM Rus",Category="Fortifications"},
+["AMMO"]={TypeName="FARP Ammo Dump Coating",ShapeName="SetkaKP",Category="Fortifications"},
+["TENT"]={TypeName="FARP Tent",ShapeName="PalatkaB",Category="Fortifications"},
+["WINDSOCK"]={TypeName="Windsock",ShapeName="H-Windsock_RW",Category="Fortifications"},
+}
+local farpobcount=0
+for _name,_object in pairs(FARPStaticObjectsNato)do
+local objloc=farplocation:Translate(radius,farpobcount*30)
+local heading=objloc:HeadingTo(farplocation)
+local newobject=SPAWNSTATIC:NewFromType(_object.TypeName,_object.Category,Country)
+newobject:InitShape(_object.ShapeName)
+newobject:InitHeading(heading)
+newobject:SpawnFromCoordinate(objloc,farpobcount*30,_name.." - "..Name)
+table.insert(ReturnObjects,newobject)
+farpobcount=farpobcount+1
+end
+if VehicleTemplate and type(VehicleTemplate)=="string"then
+local vcoordinate=farplocation:Translate(radius,farpobcount*30)
+local heading=vcoordinate:HeadingTo(farplocation)
+local vehicles=SPAWN:NewWithAlias(VehicleTemplate,"FARP Vehicles - "..Name)
+vehicles:InitGroupHeading(heading)
+vehicles:InitCountry(Country)
+vehicles:InitCoalition(Coalition)
+vehicles:InitDelayOff()
+local spawnedvehicle=vehicles:SpawnFromCoordinate(vcoordinate)
+table.insert(ReturnObjects,spawnedvehicle)
+end
+local newWH=STORAGE:New(Name)
+if liquids and liquids>0 then
+newWH:SetLiquid(STORAGE.Liquid.DIESEL,liquids)
+newWH:SetLiquid(STORAGE.Liquid.GASOLINE,liquids)
+newWH:SetLiquid(STORAGE.Liquid.JETFUEL,liquids)
+newWH:SetLiquid(STORAGE.Liquid.MW50,liquids)
+end
+if equip and equip>0 then
+for cat,nitem in pairs(ENUMS.Storage.weapons)do
+for name,item in pairs(nitem)do
+newWH:SetItem(item,equip)
+end
+end
+end
+local ADFName
+if ADF and type(ADF)=="number"then
+local ADFFreq=ADF*1000
+local Sound="l10n/DEFAULT/beacon.ogg"
+local vec3=farplocation:GetVec3()
+ADFName=Name.." ADF "..tostring(ADF).."KHz"
+trigger.action.radioTransmission(Sound,vec3,0,true,ADFFreq,250,ADFName)
+end
+return ReturnObjects,ADFName
+end
 PROFILER={
 ClassName="PROFILER",
 Counters={},
@@ -5146,6 +5278,46 @@ initiator=PlayerUnit:GetDCSObject()
 }
 world.onEvent(Event)
 end
+function BASE:CreateEventNewDynamicCargo(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.NewDynamicCargo,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
+function BASE:CreateEventDynamicCargoLoaded(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.DynamicCargoLoaded,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
+function BASE:CreateEventDynamicCargoUnloaded(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.DynamicCargoUnloaded,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
+function BASE:CreateEventDynamicCargoRemoved(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.DynamicCargoRemoved,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
 function BASE:onEvent(event)
 if self then
 for EventID,EventObject in pairs(self.Events)do
@@ -6515,6 +6687,10 @@ world.event.S_EVENT_NEW_ZONE_GOAL=world.event.S_EVENT_MAX+1004
 world.event.S_EVENT_DELETE_ZONE_GOAL=world.event.S_EVENT_MAX+1005
 world.event.S_EVENT_REMOVE_UNIT=world.event.S_EVENT_MAX+1006
 world.event.S_EVENT_PLAYER_ENTER_AIRCRAFT=world.event.S_EVENT_MAX+1007
+world.event.S_EVENT_NEW_DYNAMIC_CARGO=world.event.S_EVENT_MAX+1008
+world.event.S_EVENT_DYNAMIC_CARGO_LOADED=world.event.S_EVENT_MAX+1009
+world.event.S_EVENT_DYNAMIC_CARGO_UNLOADED=world.event.S_EVENT_MAX+1010
+world.event.S_EVENT_DYNAMIC_CARGO_REMOVED=world.event.S_EVENT_MAX+1011
 EVENTS={
 Shot=world.event.S_EVENT_SHOT,
 Hit=world.event.S_EVENT_HIT,
@@ -6584,6 +6760,10 @@ SimulationFreeze=world.event.S_EVENT_SIMULATION_FREEZE or-1,
 SimulationUnfreeze=world.event.S_EVENT_SIMULATION_UNFREEZE or-1,
 HumanAircraftRepairStart=world.event.S_EVENT_HUMAN_AIRCRAFT_REPAIR_START or-1,
 HumanAircraftRepairFinish=world.event.S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH or-1,
+NewDynamicCargo=world.event.S_EVENT_NEW_DYNAMIC_CARGO or-1,
+DynamicCargoLoaded=world.event.S_EVENT_DYNAMIC_CARGO_LOADED or-1,
+DynamicCargoUnloaded=world.event.S_EVENT_DYNAMIC_CARGO_UNLOADED or-1,
+DynamicCargoRemoved=world.event.S_EVENT_DYNAMIC_CARGO_REMOVED or-1,
 }
 local _EVENTMETA={
 [world.event.S_EVENT_SHOT]={
@@ -6963,6 +7143,30 @@ Side="I",
 Event="OnEventHumanAircraftRepairFinish",
 Text="S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH"
 },
+[EVENTS.NewDynamicCargo]={
+Order=1,
+Side="I",
+Event="OnEventNewDynamicCargo",
+Text="S_EVENT_NEW_DYNAMIC_CARGO"
+},
+[EVENTS.DynamicCargoLoaded]={
+Order=1,
+Side="I",
+Event="OnEventDynamicCargoLoaded",
+Text="S_EVENT_DYNAMIC_CARGO_LOADED"
+},
+[EVENTS.DynamicCargoUnloaded]={
+Order=1,
+Side="I",
+Event="OnEventDynamicCargoUnloaded",
+Text="S_EVENT_DYNAMIC_CARGO_UNLOADED"
+},
+[EVENTS.DynamicCargoRemoved]={
+Order=1,
+Side="I",
+Event="OnEventDynamicCargoRemoved",
+Text="S_EVENT_DYNAMIC_CARGO_REMOVED"
+},
 }
 function EVENT:New()
 local self=BASE:Inherit(self,BASE:New())
@@ -7157,6 +7361,46 @@ initiator=PlayerUnit:GetDCSObject()
 }
 world.onEvent(Event)
 end
+function EVENT:CreateEventNewDynamicCargo(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.NewDynamicCargo,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
+function EVENT:CreateEventDynamicCargoLoaded(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.DynamicCargoLoaded,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
+function EVENT:CreateEventDynamicCargoUnloaded(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.DynamicCargoUnloaded,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
+function EVENT:CreateEventDynamicCargoRemoved(DynamicCargo)
+self:F({DynamicCargo})
+local Event={
+id=EVENTS.DynamicCargoRemoved,
+time=timer.getTime(),
+dynamiccargo=DynamicCargo,
+initiator=DynamicCargo:GetDCSObject(),
+}
+world.onEvent(Event)
+end
 end
 function EVENT:onEvent(Event)
 local ErrorHandler=function(errmsg)
@@ -7233,7 +7477,13 @@ elseif Event.IniObjectCategory==Object.Category.CARGO then
 Event.IniDCSUnit=Event.initiator
 Event.IniDCSUnitName=Event.IniDCSUnit:getName()
 Event.IniUnitName=Event.IniDCSUnitName
+if string.match(Event.IniUnitName,".+|%d%d:%d%d|PKG%d+")then
+Event.IniDynamicCargo=DYNAMICCARGO:FindByName(Event.IniUnitName)
+Event.IniDynamicCargoName=Event.IniUnitName
+Event.IniPlayerName=string.match(Event.IniUnitName,"^(.+)|%d%d:%d%d|PKG%d+")
+else
 Event.IniUnit=CARGO:FindByName(Event.IniDCSUnitName)
+end
 Event.IniCoalition=Event.IniDCSUnit:getCoalition()
 Event.IniCategory=Event.IniDCSUnit:getDesc().category
 Event.IniTypeName=Event.IniDCSUnit:getTypeName()
@@ -7320,7 +7570,7 @@ Event.TgtCategory=Event.TgtDCSUnit:getDesc().category
 Event.TgtTypeName=Event.TgtDCSUnit:getTypeName()
 end
 end
-if Event.weapon and type(Event.weapon)=="table"then
+if Event.weapon and type(Event.weapon)=="table"and Event.weapon.isExist and Event.weapon:isExist()then
 Event.Weapon=Event.weapon
 Event.WeaponName=Event.weapon:isExist()and Event.weapon:getTypeName()or"Unknown Weapon"
 Event.WeaponUNIT=CLIENT:Find(Event.Weapon,'',true)
@@ -7351,6 +7601,13 @@ if Event.cargo then
 Event.Cargo=Event.cargo
 Event.CargoName=Event.cargo.Name
 end
+if Event.dynamiccargo then
+Event.IniDynamicCargo=Event.dynamiccargo
+Event.IniDynamicCargoName=Event.IniDynamicCargo.StaticName
+if Event.IniDynamicCargo.Owner or Event.IniUnitName then
+Event.IniPlayerName=Event.IniDynamicCargo.Owner or string.match(Event.IniUnitName or"None|00:00|PKG00","^(.+)|%d%d:%d%d|PKG%d+")
+end
+end
 if Event.zone then
 Event.Zone=Event.zone
 Event.ZoneName=Event.zone.ZoneName
@@ -10790,6 +11047,7 @@ PATHLINES={},
 STORAGES={},
 STNS={},
 SADL={},
+DYNAMICCARGO={},
 }
 local _DATABASECoalition=
 {
@@ -10820,6 +11078,7 @@ self:HandleEvent(EVENTS.DeleteCargo)
 self:HandleEvent(EVENTS.NewZone)
 self:HandleEvent(EVENTS.DeleteZone)
 self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventOnPlayerLeaveUnit)
+self:HandleEvent(EVENTS.DynamicCargoRemoved,self._EventOnDynamicCargoRemoved)
 self:_RegisterTemplates()
 self:_RegisterGroupsAndUnits()
 self:_RegisterClients()
@@ -10832,11 +11091,13 @@ local UnitFound=self.UNITS[UnitName]
 return UnitFound
 end
 function DATABASE:AddUnit(DCSUnitName,force)
-if not self.UNITS[DCSUnitName]or force==true then
-self:T({"Add UNIT:",DCSUnitName})
-self.UNITS[DCSUnitName]=UNIT:Register(DCSUnitName)
+local DCSunitName=DCSUnitName
+if type(DCSunitName)=="number"then DCSunitName=string.format("%d",DCSUnitName)end
+if not self.UNITS[DCSunitName]or force==true then
+self:T({"Add UNIT:",DCSunitName})
+self.UNITS[DCSunitName]=UNIT:Register(DCSunitName)
 end
-return self.UNITS[DCSUnitName]
+return self.UNITS[DCSunitName]
 end
 function DATABASE:DeleteUnit(DCSUnitName)
 self:T("DeleteUnit "..tostring(DCSUnitName))
@@ -10856,6 +11117,21 @@ function DATABASE:FindStatic(StaticName)
 local StaticFound=self.STATICS[StaticName]
 return StaticFound
 end
+function DATABASE:AddDynamicCargo(Name)
+if not self.DYNAMICCARGO[Name]then
+self.DYNAMICCARGO[Name]=DYNAMICCARGO:Register(Name)
+return self.DYNAMICCARGO[Name]
+end
+return nil
+end
+function DATABASE:FindDynamicCargo(DynamicCargoName)
+local StaticFound=self.DYNAMICCARGO[DynamicCargoName]
+return StaticFound
+end
+function DATABASE:DeleteDynamicCargo(DynamicCargoName)
+self.DYNAMICCARGO[DynamicCargoName]=nil
+return self
+end
 function DATABASE:AddAirbase(AirbaseName)
 if not self.AIRBASES[AirbaseName]then
 self.AIRBASES[AirbaseName]=AIRBASE:Register(AirbaseName)
@@ -11124,10 +11400,12 @@ local ClientFound=self.CLIENTS[ClientName]
 return ClientFound
 end
 function DATABASE:AddClient(ClientName,Force)
-if not self.CLIENTS[ClientName]or Force==true then
-self.CLIENTS[ClientName]=CLIENT:Register(ClientName)
+local DCSUnitName=ClientName
+if type(DCSUnitName)=="number"then DCSUnitName=string.format("%d",ClientName)end
+if not self.CLIENTS[DCSUnitName]or Force==true then
+self.CLIENTS[DCSUnitName]=CLIENT:Register(DCSUnitName)
 end
-return self.CLIENTS[ClientName]
+return self.CLIENTS[DCSUnitName]
 end
 function DATABASE:FindGroup(GroupName)
 local GroupFound=self.GROUPS[GroupName]
@@ -11145,13 +11423,24 @@ end
 return self.GROUPS[GroupName]
 end
 function DATABASE:AddPlayer(UnitName,PlayerName)
+if type(UnitName)=="number"then UnitName=string.format("%d",UnitName)end
 if PlayerName then
-self:T({"Add player for unit:",UnitName,PlayerName})
+self:I({"Add player for unit:",UnitName,PlayerName})
 self.PLAYERS[PlayerName]=UnitName
 self.PLAYERUNITS[PlayerName]=self:FindUnit(UnitName)
 self.PLAYERSJOINED[PlayerName]=PlayerName
 end
 end
+function DATABASE:_FindPlayerNameByUnitName(UnitName)
+if UnitName then
+for playername,unitname in pairs(self.PLAYERS)do
+if unitname==UnitName and self.PLAYERUNITS[playername]and self.PLAYERUNITS[playername]:IsAlive()then
+return playername,self.PLAYERUNITS[playername]
+end
+end
+end
+return nil
+end
 function DATABASE:DeletePlayer(UnitName,PlayerName)
 if PlayerName then
 self:T({"Clean player:",PlayerName})
@@ -11388,7 +11677,6 @@ resourcePayload={
 StaticTemplate.CategoryID="static"
 StaticTemplate.CoalitionID=Coalition or coalition.side.BLUE
 StaticTemplate.CountryID=Country or country.id.GERMANY
-UTILS.PrintTableToLog(StaticTemplate)
 return StaticTemplate
 end
 function DATABASE:GetStaticGroupTemplate(StaticName)
@@ -11437,21 +11725,21 @@ function DATABASE:GetCoalitionFromClientTemplate(ClientName)
 if self.Templates.ClientsByName[ClientName]then
 return self.Templates.ClientsByName[ClientName].CoalitionID
 end
-self:E("ERROR: Template does not exist for client "..tostring(ClientName))
+self:E("WARNING: Template does not exist for client "..tostring(ClientName))
 return nil
 end
 function DATABASE:GetCategoryFromClientTemplate(ClientName)
 if self.Templates.ClientsByName[ClientName]then
 return self.Templates.ClientsByName[ClientName].CategoryID
 end
-self:E("ERROR: Template does not exist for client "..tostring(ClientName))
+self:E("WARNING: Template does not exist for client "..tostring(ClientName))
 return nil
 end
 function DATABASE:GetCountryFromClientTemplate(ClientName)
 if self.Templates.ClientsByName[ClientName]then
 return self.Templates.ClientsByName[ClientName].CountryID
 end
-self:E("ERROR: Template does not exist for client "..tostring(ClientName))
+self:E("WARNING: Template does not exist for client "..tostring(ClientName))
 return nil
 end
 function DATABASE:GetCoalitionFromAirbase(AirbaseName)
@@ -11486,7 +11774,7 @@ self:AddGroup(DCSGroupName,true)
 for DCSUnitId,DCSUnit in pairs(DCSGroup:getUnits())do
 local DCSUnitName=DCSUnit:getName()
 self:I(string.format("Register Unit: %s",tostring(DCSUnitName)))
-self:AddUnit(DCSUnitName,true)
+self:AddUnit(tostring(DCSUnitName),true)
 end
 else
 self:E({"Group does not exist: ",DCSGroup})
@@ -11565,10 +11853,14 @@ end
 return self
 end
 function DATABASE:_EventOnBirth(Event)
-self:F({Event})
+self:T({Event})
 if Event.IniDCSUnit then
 if Event.IniObjectCategory==Object.Category.STATIC then
 self:AddStatic(Event.IniDCSUnitName)
+elseif Event.IniObjectCategory==Object.Category.CARGO and string.match(Event.IniUnitName,".+|%d%d:%d%d|PKG%d+")then
+local cargo=self:AddDynamicCargo(Event.IniDCSUnitName)
+self:I(string.format("Adding dynamic cargo %s",tostring(Event.IniDCSUnitName)))
+self:CreateEventNewDynamicCargo(cargo)
 else
 if Event.IniObjectCategory==Object.Category.UNIT then
 self:AddUnit(Event.IniDCSUnitName)
@@ -11660,6 +11952,12 @@ end
 end
 end
 end
+function DATABASE:_EventOnDynamicCargoRemoved(Event)
+self:T({Event})
+if Event.IniDynamicCargoName then
+self:DeleteDynamicCargo(Event.IniDynamicCargoName)
+end
+end
 function DATABASE:_EventOnPlayerLeaveUnit(Event)
 self:F2({Event})
 local function FindPlayerName(UnitName)
@@ -11950,8 +12248,6 @@ List={},
 Index={},
 Database=nil,
 CallScheduler=nil,
-TimeInterval=nil,
-YieldInterval=nil,
 }
 function SET_BASE:New(Database)
 local self=BASE:Inherit(self,FSM:New())
@@ -11998,11 +12294,9 @@ local ObjectFound=self.Set[ObjectName]
 return ObjectFound
 end
 function SET_BASE:GetSet()
-self:F2()
 return self.Set or{}
 end
 function SET_BASE:GetSetNames()
-self:F2()
 local Names={}
 for Name,Object in pairs(self.Set)do
 table.insert(Names,Name)
@@ -12010,7 +12304,6 @@ end
 return Names
 end
 function SET_BASE:GetSetObjects()
-self:F2()
 local Objects={}
 for Name,Object in pairs(self.Set)do
 table.insert(Objects,Object)
@@ -12018,7 +12311,6 @@ end
 return Objects
 end
 function SET_BASE:Remove(ObjectName,NoTriggerEvent)
-self:F2({ObjectName=ObjectName})
 local TriggerEvent=true
 if NoTriggerEvent then
 TriggerEvent=false
@@ -12040,7 +12332,6 @@ end
 end
 end
 function SET_BASE:Add(ObjectName,Object)
-self:T2({ObjectName=ObjectName,Object=Object})
 if self.Set[ObjectName]then
 self:Remove(ObjectName,true)
 end
@@ -12050,9 +12341,6 @@ self:Added(ObjectName,Object)
 return self
 end
 function SET_BASE:AddObject(Object)
-self:F2(Object.ObjectName)
-self:T(Object.UnitName)
-self:T(Object.ObjectName)
 self:Add(Object.ObjectName,Object)
 end
 function SET_BASE:SortByName()
@@ -12105,22 +12393,18 @@ end
 return SetA
 end
 function SET_BASE:Get(ObjectName)
-self:F(ObjectName)
 local Object=self.Set[ObjectName]
-self:T3({ObjectName,Object})
 return Object
 end
 function SET_BASE:GetFirst()
 local ObjectName=self.Index[1]
 local FirstObject=self.Set[ObjectName]
-self:T3({FirstObject})
 return FirstObject
 end
 function SET_BASE:GetLast()
 local tablemax=table.maxn(self.Index)
 local ObjectName=self.Index[tablemax]
 local LastObject=self.Set[ObjectName]
-self:T3({LastObject})
 return LastObject
 end
 function SET_BASE:GetRandom()
@@ -12129,7 +12413,6 @@ for _,_ind in pairs(self.Index)do
 tablemax=tablemax+1
 end
 local RandomItem=self.Set[self.Index[math.random(1,tablemax)]]
-self:T3({RandomItem})
 return RandomItem
 end
 function SET_BASE:GetRandomSurely()
@@ -12140,7 +12423,6 @@ tablemax=tablemax+1
 sorted[tablemax]=_obj
 end
 local RandomItem=sorted[math.random(1,tablemax)]
-self:T3({RandomItem})
 return RandomItem
 end
 function SET_BASE:Count()
@@ -12152,11 +12434,6 @@ self.Filter=OtherFilter
 self.Database=BaseSet:GetSet()
 return self
 end
-function SET_BASE:SetIteratorIntervals(YieldInterval,TimeInterval)
-self.YieldInterval=YieldInterval
-self.TimeInterval=TimeInterval
-return self
-end
 function SET_BASE:SetSomeIteratorLimit(Limit)
 self.SomeIteratorLimit=Limit or 1
 return self
@@ -12203,7 +12480,6 @@ self:UnHandleEvent(EVENTS.Crash)
 return self
 end
 function SET_BASE:FindNearestObjectFromPointVec2(PointVec2)
-self:F2(PointVec2)
 local NearestObject=nil
 local ClosestDistance=nil
 for ObjectID,ObjectData in pairs(self.Set)do
@@ -12221,17 +12497,14 @@ end
 return NearestObject
 end
 function SET_BASE:_EventOnBirth(Event)
-self:F3({Event})
 if Event.IniDCSUnit then
 local ObjectName,Object=self:AddInDatabase(Event)
-self:T3(ObjectName,Object)
 if Object and self:IsIncludeObject(Object)then
 self:Add(ObjectName,Object)
 end
 end
 end
 function SET_BASE:_EventOnDeadOrCrash(Event)
-self:F({Event})
 if Event.IniDCSUnit then
 local ObjectName,Object=self:FindInDatabase(Event)
 if ObjectName then
@@ -12240,14 +12513,12 @@ end
 end
 end
 function SET_BASE:ForEach(IteratorFunction,arg,Set,Function,FunctionArguments)
-self:F3(arg)
 Set=Set or self:GetSet()
 arg=arg or{}
 local function CoRoutine()
 local Count=0
 for ObjectID,ObjectData in pairs(Set)do
 local Object=ObjectData
-self:T3(Object)
 if Function then
 if Function(unpack(FunctionArguments or{}),Object)==true then
 IteratorFunction(Object,unpack(arg))
@@ -12262,7 +12533,6 @@ end
 local co=CoRoutine
 local function Schedule()
 local status,res=co()
-self:T3({status,res})
 if status==false then
 error(res)
 end
@@ -12275,7 +12545,6 @@ Schedule()
 return self
 end
 function SET_BASE:ForSome(IteratorFunction,arg,Set,Function,FunctionArguments)
-self:F3(arg)
 Set=Set or self:GetSet()
 arg=arg or{}
 local Limit=self:GetSomeIteratorLimit()
@@ -12283,7 +12552,6 @@ local function CoRoutine()
 local Count=0
 for ObjectID,ObjectData in pairs(Set)do
 local Object=ObjectData
-self:T3(Object)
 if Function then
 if Function(unpack(FunctionArguments),Object)==true then
 IteratorFunction(Object,unpack(arg))
@@ -12301,7 +12569,6 @@ end
 local co=CoRoutine
 local function Schedule()
 local status,res=co()
-self:T3({status,res})
 if status==false then
 error(res)
 end
@@ -12314,11 +12581,9 @@ Schedule()
 return self
 end
 function SET_BASE:IsIncludeObject(Object)
-self:F3(Object)
 return true
 end
 function SET_BASE:IsInSet(Object)
-self:F3(Object)
 local outcome=false
 local name=Object:GetName()
 self:ForEach(
@@ -12331,11 +12596,9 @@ end
 return outcome
 end
 function SET_BASE:IsNotInSet(Object)
-self:F3(Object)
 return not self:IsInSet(Object)
 end
 function SET_BASE:GetObjectNames()
-self:F3()
 local ObjectNames=""
 for ObjectName,Object in pairs(self.Set)do
 ObjectNames=ObjectNames..ObjectName..", "
@@ -12343,12 +12606,10 @@ end
 return ObjectNames
 end
 function SET_BASE:Flush(MasterObject)
-self:F3()
 local ObjectNames=""
 for ObjectName,Object in pairs(self.Set)do
 ObjectNames=ObjectNames..ObjectName..", "
 end
-self:F({MasterObject=MasterObject and MasterObject:GetClassNameAndID(),"Objects in Set:",ObjectNames})
 return ObjectNames
 end
 end
@@ -12385,7 +12646,6 @@ self:FilterActive(false)
 return self
 end
 function SET_GROUP:GetAliveSet()
-self:F2()
 local AliveSet=SET_GROUP:New()
 for GroupName,GroupObject in pairs(self.Set)do
 local GroupObject=GroupObject
@@ -12398,7 +12658,6 @@ end
 return AliveSet.Set or{}
 end
 function SET_GROUP:GetUnitTypeNames()
-self:F2()
 local MT={}
 local UnitTypes={}
 local ReportUnitTypes=REPORT:New()
@@ -12450,7 +12709,6 @@ local GroupFound=self.Set[GroupName]
 return GroupFound
 end
 function SET_GROUP:FindNearestGroupFromPointVec2(PointVec2)
-self:F2(PointVec2)
 local NearestGroup=nil
 local ClosestDistance=nil
 local Set=self:GetAliveSet()
@@ -12608,7 +12866,6 @@ end
 return self
 end
 function SET_GROUP:_EventOnDeadOrCrash(Event)
-self:F({Event})
 if Event.IniDCSUnit then
 local ObjectName,Object=self:FindInDatabase(Event)
 if ObjectName then
@@ -12623,36 +12880,29 @@ end
 end
 end
 function SET_GROUP:AddInDatabase(Event)
-self:F3({Event})
 if Event.IniObjectCategory==Object.Category.UNIT then
 if not self.Database[Event.IniDCSGroupName]then
 self.Database[Event.IniDCSGroupName]=GROUP:Register(Event.IniDCSGroupName)
-self:T3(self.Database[Event.IniDCSGroupName])
 end
 end
 return Event.IniDCSGroupName,self.Database[Event.IniDCSGroupName]
 end
 function SET_GROUP:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSGroupName,self.Database[Event.IniDCSGroupName]
 end
 function SET_GROUP:ForEachGroup(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_GROUP:ForSomeGroup(IteratorFunction,...)
-self:F2(arg)
 self:ForSome(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_GROUP:ForEachGroupAlive(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetAliveSet())
 return self
 end
 function SET_GROUP:ForSomeGroupAlive(IteratorFunction,...)
-self:F2(arg)
 self:ForSome(IteratorFunction,arg,self:GetAliveSet())
 return self
 end
@@ -12667,7 +12917,6 @@ end
 return self
 end
 function SET_GROUP:ForEachGroupCompletelyInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,GroupObject)
 if GroupObject:IsCompletelyInZone(ZoneObject)then
@@ -12679,7 +12928,6 @@ end,{ZoneObject})
 return self
 end
 function SET_GROUP:ForEachGroupPartlyInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,GroupObject)
 if GroupObject:IsPartlyInZone(ZoneObject)then
@@ -12691,7 +12939,6 @@ end,{ZoneObject})
 return self
 end
 function SET_GROUP:ForEachGroupNotInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,GroupObject)
 if GroupObject:IsNotInZone(ZoneObject)then
@@ -12703,7 +12950,6 @@ end,{ZoneObject})
 return self
 end
 function SET_GROUP:AllCompletelyInZone(Zone)
-self:F2(Zone)
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
 if not GroupData:IsCompletelyInZone(Zone)then
@@ -12713,7 +12959,6 @@ end
 return true
 end
 function SET_GROUP:ForEachGroupAnyInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,GroupObject)
 if GroupObject:IsAnyInZone(ZoneObject)then
@@ -12725,7 +12970,6 @@ end,{ZoneObject})
 return self
 end
 function SET_GROUP:AnyCompletelyInZone(Zone)
-self:F2(Zone)
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
 if GroupData:IsCompletelyInZone(Zone)then
@@ -12735,7 +12979,6 @@ end
 return false
 end
 function SET_GROUP:AnyInZone(Zone)
-self:F2(Zone)
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
 if GroupData:IsPartlyInZone(Zone)or GroupData:IsCompletelyInZone(Zone)then
@@ -12745,7 +12988,6 @@ end
 return false
 end
 function SET_GROUP:AnyPartlyInZone(Zone)
-self:F2(Zone)
 local IsPartlyInZone=false
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
@@ -12762,7 +13004,6 @@ return false
 end
 end
 function SET_GROUP:NoneInZone(Zone)
-self:F2(Zone)
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
 if not GroupData:IsNotInZone(Zone)then
@@ -12772,7 +13013,6 @@ end
 return true
 end
 function SET_GROUP:CountInZone(Zone)
-self:F2(Zone)
 local Count=0
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
@@ -12783,7 +13023,6 @@ end
 return Count
 end
 function SET_GROUP:CountUnitInZone(Zone)
-self:F2(Zone)
 local Count=0
 local Set=self:GetSet()
 for GroupID,GroupData in pairs(Set)do
@@ -12809,11 +13048,9 @@ end
 return CountG,CountU
 end
 function SET_GROUP:IsIncludeObject(MGroup)
-self:F2(MGroup)
 local MGroupInclude=true
 if self.Filter.Alive==true then
 local MGroupAlive=false
-self:F({Active=self.Filter.Active})
 if MGroup and MGroup:IsAlive()then
 MGroupAlive=true
 end
@@ -12821,7 +13058,6 @@ MGroupInclude=MGroupInclude and MGroupAlive
 end
 if self.Filter.Active~=nil then
 local MGroupActive=false
-self:F({Active=self.Filter.Active})
 if self.Filter.Active==false or(self.Filter.Active==true and MGroup:IsActive()==true)then
 MGroupActive=true
 end
@@ -12830,7 +13066,6 @@ end
 if self.Filter.Coalitions and MGroupInclude then
 local MGroupCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
-self:T3({"Coalition:",MGroup:GetCoalition(),self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==MGroup:GetCoalition()then
 MGroupCoalition=true
 end
@@ -12840,7 +13075,6 @@ end
 if self.Filter.Categories and MGroupInclude then
 local MGroupCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
-self:T3({"Category:",MGroup:GetCategory(),self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and self.FilterMeta.Categories[CategoryName]==MGroup:GetCategory()then
 MGroupCategory=true
 end
@@ -12850,7 +13084,6 @@ end
 if self.Filter.Countries and MGroupInclude then
 local MGroupCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
-self:T3({"Country:",MGroup:GetCountry(),CountryName})
 if country.id[CountryName]==MGroup:GetCountry()then
 MGroupCountry=true
 end
@@ -12860,8 +13093,7 @@ end
 if self.Filter.GroupPrefixes and MGroupInclude then
 local MGroupPrefix=false
 for GroupPrefixId,GroupPrefix in pairs(self.Filter.GroupPrefixes)do
-self:T3({"Prefix:",string.find(MGroup:GetName(),GroupPrefix,1),GroupPrefix})
-if string.find(MGroup:GetName(),GroupPrefix:gsub("-","%%-"),1)then
+if string.find(MGroup:GetName(),string.gsub(GroupPrefix,"-","%%-"),1)then
 MGroupPrefix=true
 end
 end
@@ -12881,7 +13113,6 @@ local MGroupFunc=false
 MGroupFunc=self:_EvalFilterFunctions(MGroup)
 MGroupInclude=MGroupInclude and MGroupFunc
 end
-self:T2(MGroupInclude)
 return MGroupInclude
 end
 function SET_GROUP:GetClosestGroup(Coordinate,Coalitions)
@@ -12947,7 +13178,6 @@ self:FilterActive(false)
 return self
 end
 function SET_UNIT:AddUnit(Unit)
-self:F2(Unit:GetName())
 self:Add(Unit:GetName(),Unit)
 if Unit:IsInstanceOf("UNIT")then
 Unit:SetCargoBayWeightLimit()
@@ -12956,7 +13186,6 @@ return self
 end
 function SET_UNIT:AddUnitsByName(AddUnitNames)
 local AddUnitNamesArray=(type(AddUnitNames)=="table")and AddUnitNames or{AddUnitNames}
-self:T(AddUnitNamesArray)
 for AddUnitID,AddUnitName in pairs(AddUnitNamesArray)do
 self:Add(AddUnitName,UNIT:FindByName(AddUnitName))
 end
@@ -13145,17 +13374,14 @@ end
 return self
 end
 function SET_UNIT:AddInDatabase(Event)
-self:F3({Event})
 if Event.IniObjectCategory==Object.Category.UNIT then
 if not self.Database[Event.IniDCSUnitName]then
 self.Database[Event.IniDCSUnitName]=UNIT:Register(Event.IniDCSUnitName)
-self:T3(self.Database[Event.IniDCSUnitName])
 end
 end
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_UNIT:FindInDatabase(Event)
-self:F2({Event.IniDCSUnitName,self.Set[Event.IniDCSUnitName],Event})
 return Event.IniDCSUnitName,self.Set[Event.IniDCSUnitName]
 end
 do
@@ -13163,10 +13389,8 @@ function SET_UNIT:IsPartiallyInZone(ZoneTest)
 local IsPartiallyInZone=false
 local function EvaluateZone(ZoneUnit)
 local ZoneUnitName=ZoneUnit:GetName()
-self:F({ZoneUnitName=ZoneUnitName})
 if self:FindUnit(ZoneUnitName)then
 IsPartiallyInZone=true
-self:F({Found=true})
 return false
 end
 return true
@@ -13189,12 +13413,10 @@ return IsNotInZone
 end
 end
 function SET_UNIT:ForEachUnit(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_UNIT:GetSetPerThreatLevel(FromThreatLevel,ToThreatLevel)
-self:F2(arg)
 local ThreatLevelSet={}
 if self:Count()~=0 then
 for UnitName,UnitObject in pairs(self.Set)do
@@ -13203,12 +13425,10 @@ local ThreatLevel=Unit:GetThreatLevel()
 ThreatLevelSet[ThreatLevel]=ThreatLevelSet[ThreatLevel]or{}
 ThreatLevelSet[ThreatLevel].Set=ThreatLevelSet[ThreatLevel].Set or{}
 ThreatLevelSet[ThreatLevel].Set[UnitName]=UnitObject
-self:F({ThreatLevel=ThreatLevel,ThreatLevelSet=ThreatLevelSet[ThreatLevel].Set})
 end
 local OrderedPerThreatLevelSet={}
 local ThreatLevelIncrement=FromThreatLevel<=ToThreatLevel and 1 or-1
 for ThreatLevel=FromThreatLevel,ToThreatLevel,ThreatLevelIncrement do
-self:F({ThreatLevel=ThreatLevel})
 local ThreatLevelItem=ThreatLevelSet[ThreatLevel]
 if ThreatLevelItem then
 for UnitName,UnitObject in pairs(ThreatLevelItem.Set)do
@@ -13220,7 +13440,6 @@ return OrderedPerThreatLevelSet
 end
 end
 function SET_UNIT:ForEachUnitPerThreatLevel(FromThreatLevel,ToThreatLevel,IteratorFunction,...)
-self:F2(arg)
 local ThreatLevelSet={}
 if self:Count()~=0 then
 for UnitName,UnitObject in pairs(self.Set)do
@@ -13229,11 +13448,9 @@ local ThreatLevel=Unit:GetThreatLevel()
 ThreatLevelSet[ThreatLevel]=ThreatLevelSet[ThreatLevel]or{}
 ThreatLevelSet[ThreatLevel].Set=ThreatLevelSet[ThreatLevel].Set or{}
 ThreatLevelSet[ThreatLevel].Set[UnitName]=UnitObject
-self:F({ThreatLevel=ThreatLevel,ThreatLevelSet=ThreatLevelSet[ThreatLevel].Set})
 end
 local ThreatLevelIncrement=FromThreatLevel<=ToThreatLevel and 1 or-1
 for ThreatLevel=FromThreatLevel,ToThreatLevel,ThreatLevelIncrement do
-self:F({ThreatLevel=ThreatLevel})
 local ThreatLevelItem=ThreatLevelSet[ThreatLevel]
 if ThreatLevelItem then
 self:ForEach(IteratorFunction,arg,ThreatLevelItem.Set)
@@ -13243,7 +13460,6 @@ end
 return self
 end
 function SET_UNIT:ForEachUnitCompletelyInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,UnitObject)
 if UnitObject:IsInZone(ZoneObject)then
@@ -13255,7 +13471,6 @@ end,{ZoneObject})
 return self
 end
 function SET_UNIT:ForEachUnitNotInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,UnitObject)
 if UnitObject:IsNotInZone(ZoneObject)then
@@ -13267,7 +13482,6 @@ end,{ZoneObject})
 return self
 end
 function SET_UNIT:GetUnitTypes()
-self:F2()
 local MT={}
 local UnitTypes={}
 for UnitID,UnitData in pairs(self:GetSet())do
@@ -13287,7 +13501,6 @@ end
 return UnitTypes
 end
 function SET_UNIT:GetUnitTypesText()
-self:F2()
 local MT={}
 local UnitTypes=self:GetUnitTypes()
 for UnitTypeID,UnitType in pairs(UnitTypes)do
@@ -13296,7 +13509,6 @@ end
 return table.concat(MT,", ")
 end
 function SET_UNIT:GetUnitThreatLevels()
-self:F2()
 local UnitThreatLevels={}
 for UnitID,UnitData in pairs(self:GetSet())do
 local ThreatUnit=UnitData
@@ -13322,7 +13534,6 @@ MaxThreatLevelA2G=ThreatLevelA2G
 MaxThreatText=ThreatText
 end
 end
-self:F({MaxThreatLevelA2G=MaxThreatLevelA2G,MaxThreatText=MaxThreatText})
 return MaxThreatLevelA2G,MaxThreatText
 end
 function SET_UNIT:GetCoordinate()
@@ -13359,7 +13570,6 @@ local heading=self:GetHeading()or 0
 local velocity=self:GetVelocity()or 0
 Coordinate:SetHeading(heading)
 Coordinate:SetVelocity(velocity)
-self:T(UTILS.PrintTableToLog(Coordinate))
 end
 return Coordinate
 end
@@ -13374,7 +13584,6 @@ if Velocity~=0 then
 MaxVelocity=(MaxVelocity<Velocity)and Velocity or MaxVelocity
 end
 end
-self:F({MaxVelocity=MaxVelocity})
 return MaxVelocity
 end
 function SET_UNIT:GetHeading()
@@ -13401,7 +13610,6 @@ end
 return HeadingSet
 end
 function SET_UNIT:HasRadar(RadarType)
-self:F2(RadarType)
 local RadarCount=0
 for UnitID,UnitData in pairs(self:GetSet())do
 local UnitSensorTest=UnitData
@@ -13411,7 +13619,6 @@ HasSensors=UnitSensorTest:HasSensors(Unit.SensorType.RADAR,RadarType)
 else
 HasSensors=UnitSensorTest:HasSensors(Unit.SensorType.RADAR)
 end
-self:T3(HasSensors)
 if HasSensors then
 RadarCount=RadarCount+1
 end
@@ -13419,14 +13626,12 @@ end
 return RadarCount
 end
 function SET_UNIT:HasSEAD()
-self:F2()
 local SEADCount=0
 for UnitID,UnitData in pairs(self:GetSet())do
 local UnitSEAD=UnitData
 if UnitSEAD:IsAlive()then
 local UnitSEADAttributes=UnitSEAD:GetDesc().attributes
 local HasSEAD=UnitSEAD:HasSEAD()
-self:T3(HasSEAD)
 if HasSEAD then
 SEADCount=SEADCount+1
 end
@@ -13435,7 +13640,6 @@ end
 return SEADCount
 end
 function SET_UNIT:HasGroundUnits()
-self:F2()
 local GroundUnitCount=0
 for UnitID,UnitData in pairs(self:GetSet())do
 local UnitTest=UnitData
@@ -13446,7 +13650,6 @@ end
 return GroundUnitCount
 end
 function SET_UNIT:HasAirUnits()
-self:F2()
 local AirUnitCount=0
 for UnitID,UnitData in pairs(self:GetSet())do
 local UnitTest=UnitData
@@ -13457,7 +13660,6 @@ end
 return AirUnitCount
 end
 function SET_UNIT:HasFriendlyUnits(FriendlyCoalition)
-self:F2()
 local FriendlyUnitCount=0
 for UnitID,UnitData in pairs(self:GetSet())do
 local UnitTest=UnitData
@@ -13468,7 +13670,6 @@ end
 return FriendlyUnitCount
 end
 function SET_UNIT:IsIncludeObject(MUnit)
-self:F2({MUnit})
 local MUnitInclude=false
 if MUnit:IsAlive()~=nil then
 MUnitInclude=true
@@ -13482,7 +13683,6 @@ end
 if self.Filter.Coalitions and MUnitInclude then
 local MUnitCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
-self:F({"Coalition:",MUnit:GetCoalition(),self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==MUnit:GetCoalition()then
 MUnitCoalition=true
 end
@@ -13492,7 +13692,6 @@ end
 if self.Filter.Categories and MUnitInclude then
 local MUnitCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
-self:T3({"Category:",MUnit:GetDesc().category,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and self.FilterMeta.Categories[CategoryName]==MUnit:GetDesc().category then
 MUnitCategory=true
 end
@@ -13502,7 +13701,6 @@ end
 if self.Filter.Types and MUnitInclude then
 local MUnitType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
-self:T3({"Type:",MUnit:GetTypeName(),TypeName})
 if TypeName==MUnit:GetTypeName()then
 MUnitType=true
 end
@@ -13512,7 +13710,6 @@ end
 if self.Filter.Countries and MUnitInclude then
 local MUnitCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
-self:T3({"Country:",MUnit:GetCountry(),CountryName})
 if country.id[CountryName]==MUnit:GetCountry()then
 MUnitCountry=true
 end
@@ -13522,7 +13719,6 @@ end
 if self.Filter.UnitPrefixes and MUnitInclude then
 local MUnitPrefix=false
 for UnitPrefixId,UnitPrefix in pairs(self.Filter.UnitPrefixes)do
-self:T3({"Prefix:",string.find(MUnit:GetName(),UnitPrefix,1),UnitPrefix})
 if string.find(MUnit:GetName(),UnitPrefix,1)then
 MUnitPrefix=true
 end
@@ -13532,10 +13728,8 @@ end
 if self.Filter.RadarTypes and MUnitInclude then
 local MUnitRadar=false
 for RadarTypeID,RadarType in pairs(self.Filter.RadarTypes)do
-self:T3({"Radar:",RadarType})
 if MUnit:HasSensors(Unit.SensorType.RADAR,RadarType)==true then
 if MUnit:GetRadar()==true then
-self:T3("RADAR Found")
 end
 MUnitRadar=true
 end
@@ -13545,7 +13739,6 @@ end
 if self.Filter.SEAD and MUnitInclude then
 local MUnitSEAD=false
 if MUnit:HasSEAD()==true then
-self:T3("SEAD Found")
 MUnitSEAD=true
 end
 MUnitInclude=MUnitInclude and MUnitSEAD
@@ -13554,7 +13747,6 @@ end
 if self.Filter.Zones and MUnitInclude then
 local MGroupZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
-self:T3("Zone:",ZoneName)
 if MUnit:IsInZone(Zone)then
 MGroupZone=true
 end
@@ -13565,7 +13757,6 @@ if self.Filter.Functions and MUnitInclude then
 local MUnitFunc=self:_EvalFilterFunctions(MUnit)
 MUnitInclude=MUnitInclude and MUnitFunc
 end
-self:T2(MUnitInclude)
 return MUnitInclude
 end
 function SET_UNIT:GetTypeNames(Delimiter)
@@ -13621,13 +13812,11 @@ local self=BASE:Inherit(self,SET_BASE:New(_DATABASE.STATICS))
 return self
 end
 function SET_STATIC:AddStatic(AddStatic)
-self:F2(AddStatic:GetName())
 self:Add(AddStatic:GetName(),AddStatic)
 return self
 end
 function SET_STATIC:AddStaticsByName(AddStaticNames)
 local AddStaticNamesArray=(type(AddStaticNames)=="table")and AddStaticNames or{AddStaticNames}
-self:T(AddStaticNamesArray)
 for AddStaticID,AddStaticName in pairs(AddStaticNamesArray)do
 self:Add(AddStaticName,STATIC:FindByName(AddStaticName))
 end
@@ -13728,7 +13917,7 @@ if _DATABASE then
 self:_FilterStart()
 self:HandleEvent(EVENTS.Birth,self._EventOnBirth)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
-self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._EventOnDeadOrCrash)
 end
 return self
 end
@@ -13743,17 +13932,14 @@ end
 return CountU
 end
 function SET_STATIC:AddInDatabase(Event)
-self:F3({Event})
 if Event.IniObjectCategory==Object.Category.STATIC then
 if not self.Database[Event.IniDCSUnitName]then
 self.Database[Event.IniDCSUnitName]=STATIC:Register(Event.IniDCSUnitName)
-self:T3(self.Database[Event.IniDCSUnitName])
 end
 end
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_STATIC:FindInDatabase(Event)
-self:F2({Event.IniDCSUnitName,self.Set[Event.IniDCSUnitName],Event})
 return Event.IniDCSUnitName,self.Set[Event.IniDCSUnitName]
 end
 do
@@ -13783,18 +13969,15 @@ Zone:Search(EvaluateZone)
 return IsNotInZone
 end
 function SET_STATIC:ForEachStaticInZone(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 end
 function SET_STATIC:ForEachStatic(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_STATIC:ForEachStaticCompletelyInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,StaticObject)
 if StaticObject:IsInZone(ZoneObject)then
@@ -13806,7 +13989,6 @@ end,{ZoneObject})
 return self
 end
 function SET_STATIC:ForEachStaticNotInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,StaticObject)
 if StaticObject:IsNotInZone(ZoneObject)then
@@ -13818,7 +14000,6 @@ end,{ZoneObject})
 return self
 end
 function SET_STATIC:GetStaticTypes()
-self:F2()
 local MT={}
 local StaticTypes={}
 for StaticID,StaticData in pairs(self:GetSet())do
@@ -13838,7 +14019,6 @@ end
 return StaticTypes
 end
 function SET_STATIC:GetStaticTypesText()
-self:F2()
 local MT={}
 local StaticTypes=self:GetStaticTypes()
 for StaticTypeID,StaticType in pairs(StaticTypes)do
@@ -13880,7 +14060,6 @@ Coordinate.y=(y2-y1)/2+y1
 Coordinate.z=(z2-z1)/2+z1
 Coordinate:SetHeading(AvgHeading)
 Coordinate:SetVelocity(MaxVelocity)
-self:F({Coordinate=Coordinate})
 return Coordinate
 end
 function SET_STATIC:GetVelocity()
@@ -13920,16 +14099,13 @@ MaxThreatLevelA2G=ThreatLevelA2G
 MaxThreatText=ThreatText
 end
 end
-self:F({MaxThreatLevelA2G=MaxThreatLevelA2G,MaxThreatText=MaxThreatText})
 return MaxThreatLevelA2G,MaxThreatText
 end
 function SET_STATIC:IsIncludeObject(MStatic)
-self:F2(MStatic)
 local MStaticInclude=true
 if self.Filter.Coalitions then
 local MStaticCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
-self:T3({"Coalition:",MStatic:GetCoalition(),self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==MStatic:GetCoalition()then
 MStaticCoalition=true
 end
@@ -13939,7 +14115,6 @@ end
 if self.Filter.Categories then
 local MStaticCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
-self:T3({"Category:",MStatic:GetDesc().category,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and self.FilterMeta.Categories[CategoryName]==MStatic:GetDesc().category then
 MStaticCategory=true
 end
@@ -13949,7 +14124,6 @@ end
 if self.Filter.Types then
 local MStaticType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
-self:T3({"Type:",MStatic:GetTypeName(),TypeName})
 if TypeName==MStatic:GetTypeName()then
 MStaticType=true
 end
@@ -13959,7 +14133,6 @@ end
 if self.Filter.Countries then
 local MStaticCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
-self:T3({"Country:",MStatic:GetCountry(),CountryName})
 if country.id[CountryName]==MStatic:GetCountry()then
 MStaticCountry=true
 end
@@ -13969,7 +14142,6 @@ end
 if self.Filter.StaticPrefixes then
 local MStaticPrefix=false
 for StaticPrefixId,StaticPrefix in pairs(self.Filter.StaticPrefixes)do
-self:T3({"Prefix:",string.find(MStatic:GetName(),StaticPrefix,1),StaticPrefix})
 if string.find(MStatic:GetName(),StaticPrefix,1)then
 MStaticPrefix=true
 end
@@ -13979,14 +14151,12 @@ end
 if self.Filter.Zones then
 local MStaticZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
-self:T3("Zone:",ZoneName)
 if MStatic and MStatic:IsInZone(Zone)then
 MStaticZone=true
 end
 end
 MStaticInclude=MStaticInclude and MStaticZone
 end
-self:T2(MStaticInclude)
 return MStaticInclude
 end
 function SET_STATIC:GetTypeNames(Delimiter)
@@ -14234,11 +14404,9 @@ end
 return self
 end
 function SET_CLIENT:_EventPlayerEnterUnit(Event)
-self:I("_EventPlayerEnterUnit")
 if Event.IniDCSUnit then
 if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround()then
 local ObjectName,Object=self:AddInDatabase(Event)
-self:T(ObjectName,UTILS.PrintTableToLog(Object))
 if Object and self:IsIncludeObject(Object)then
 self:Add(ObjectName,Object)
 end
@@ -14247,7 +14415,6 @@ end
 return self
 end
 function SET_CLIENT:_EventPlayerLeaveUnit(Event)
-self:I("_EventPlayerLeaveUnit")
 if Event.IniDCSUnit then
 if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround()then
 local ObjectName,Object=self:FindInDatabase(Event)
@@ -14259,20 +14426,16 @@ end
 return self
 end
 function SET_CLIENT:AddInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_CLIENT:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_CLIENT:ForEachClient(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_CLIENT:ForEachClientInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,ClientObject)
 if ClientObject:IsInZone(ZoneObject)then
@@ -14284,7 +14447,6 @@ end,{ZoneObject})
 return self
 end
 function SET_CLIENT:ForEachClientNotInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,ClientObject)
 if ClientObject:IsNotInZone(ZoneObject)then
@@ -14316,7 +14478,6 @@ end
 return AliveSet.Set or{}
 end
 function SET_CLIENT:IsIncludeObject(MClient)
-self:F2(MClient)
 local MClientInclude=true
 if MClient then
 local MClientName=MClient.UnitName
@@ -14334,12 +14495,10 @@ local ClientCoalitionID=_DATABASE:GetCoalitionFromClientTemplate(MClientName)
 if ClientCoalitionID==nil and MClient:IsAlive()~=nil then
 ClientCoalitionID=MClient:GetCoalition()
 end
-self:T3({"Coalition:",ClientCoalitionID,self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and ClientCoalitionID and self.FilterMeta.Coalitions[CoalitionName]==ClientCoalitionID then
 MClientCoalition=true
 end
 end
-self:T({"Evaluated Coalition",MClientCoalition})
 MClientInclude=MClientInclude and MClientCoalition
 end
 if self.Filter.Categories and MClientInclude then
@@ -14349,29 +14508,24 @@ local ClientCategoryID=_DATABASE:GetCategoryFromClientTemplate(MClientName)
 local UnitCategory=0
 if ClientCategoryID==nil and MClient:IsExist()then
 ClientCategoryID,UnitCategory=MClient:GetCategory()
-self:T3({"Category:",UnitCategory,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and UnitCategory and self.FilterMeta.Categories[CategoryName]==UnitCategory then
 MClientCategory=true
 end
 else
-self:T3({"Category:",ClientCategoryID,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and ClientCategoryID and self.FilterMeta.Categories[CategoryName]==ClientCategoryID then
 MClientCategory=true
 end
 end
 end
-self:T({"Evaluated Category",MClientCategory})
 MClientInclude=MClientInclude and MClientCategory
 end
 if self.Filter.Types and MClientInclude then
 local MClientType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
-self:T3({"Type:",MClient:GetTypeName(),TypeName})
 if TypeName==MClient:GetTypeName()then
 MClientType=true
 end
 end
-self:T({"Evaluated Type",MClientType})
 MClientInclude=MClientInclude and MClientType
 end
 if self.Filter.Countries and MClientInclude then
@@ -14381,29 +14535,24 @@ local ClientCountryID=_DATABASE:GetCountryFromClientTemplate(MClientName)
 if ClientCountryID==nil and MClient:IsAlive()~=nil then
 ClientCountryID=MClient:GetCountry()
 end
-self:T3({"Country:",ClientCountryID,country.id[CountryName],CountryName})
 if country.id[CountryName]and ClientCountryID and country.id[CountryName]==ClientCountryID then
 MClientCountry=true
 end
 end
-self:T({"Evaluated Country",MClientCountry})
 MClientInclude=MClientInclude and MClientCountry
 end
 if self.Filter.ClientPrefixes and MClientInclude then
 local MClientPrefix=false
 for ClientPrefixId,ClientPrefix in pairs(self.Filter.ClientPrefixes)do
-self:T3({"Prefix:",string.find(MClient.UnitName,ClientPrefix,1),ClientPrefix})
 if string.find(MClient.UnitName,ClientPrefix,1)then
 MClientPrefix=true
 end
 end
-self:T({"Evaluated Prefix",MClientPrefix})
 MClientInclude=MClientInclude and MClientPrefix
 end
 if self.Filter.Zones and MClientInclude then
 local MClientZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
-self:T3("Zone:",ZoneName)
 local unit=MClient:GetClientGroupUnit()
 if unit and unit:IsInZone(Zone)then
 MClientZone=true
@@ -14419,7 +14568,6 @@ if playername and string.find(playername,_Playername)then
 MClientPlayername=true
 end
 end
-self:T({"Evaluated Playername",MClientPlayername})
 MClientInclude=MClientInclude and MClientPlayername
 end
 if self.Filter.Callsigns and MClientInclude then
@@ -14430,7 +14578,6 @@ if callsign and string.find(callsign,_Callsign,1,true)then
 MClientCallsigns=true
 end
 end
-self:T({"Evaluated Callsign",MClientCallsigns})
 MClientInclude=MClientInclude and MClientCallsigns
 end
 if self.Filter.Functions and MClientInclude then
@@ -14438,7 +14585,6 @@ local MClientFunc=self:_EvalFilterFunctions(MClient)
 MClientInclude=MClientInclude and MClientFunc
 end
 end
-self:T2(MClientInclude)
 return MClientInclude
 end
 end
@@ -14580,20 +14726,16 @@ end
 return self
 end
 function SET_PLAYER:AddInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_PLAYER:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_PLAYER:ForEachPlayer(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_PLAYER:ForEachPlayerInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,ClientObject)
 if ClientObject:IsInZone(ZoneObject)then
@@ -14605,7 +14747,6 @@ end,{ZoneObject})
 return self
 end
 function SET_PLAYER:ForEachPlayerNotInZone(ZoneObject,IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet(),
 function(ZoneObject,ClientObject)
 if ClientObject:IsNotInZone(ZoneObject)then
@@ -14617,7 +14758,6 @@ end,{ZoneObject})
 return self
 end
 function SET_PLAYER:IsIncludeObject(MClient)
-self:F2(MClient)
 local MClientInclude=true
 if MClient then
 local MClientName=MClient.UnitName
@@ -14628,12 +14768,10 @@ local ClientCoalitionID=_DATABASE:GetCoalitionFromClientTemplate(MClientName)
 if ClientCoalitionID==nil and MClient:IsAlive()~=nil then
 ClientCoalitionID=MClient:GetCoalition()
 end
-self:T3({"Coalition:",ClientCoalitionID,self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and ClientCoalitionID and self.FilterMeta.Coalitions[CoalitionName]==ClientCoalitionID then
 MClientCoalition=true
 end
 end
-self:T({"Evaluated Coalition",MClientCoalition})
 MClientInclude=MClientInclude and MClientCoalition
 end
 if self.Filter.Categories and MClientInclude then
@@ -14643,59 +14781,49 @@ local ClientCategoryID=_DATABASE:GetCategoryFromClientTemplate(MClientName)
 local UnitCategory=0
 if ClientCategoryID==nil and MClient:IsExist()then
 ClientCategoryID,UnitCategory=MClient:GetCategory()
-self:T3({"Category:",UnitCategory,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and UnitCategory and self.FilterMeta.Categories[CategoryName]==UnitCategory then
 MClientCategory=true
 end
 else
-self:T3({"Category:",ClientCategoryID,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and ClientCategoryID and self.FilterMeta.Categories[CategoryName]==ClientCategoryID then
 MClientCategory=true
 end
 end
 end
-self:T({"Evaluated Category",MClientCategory})
 MClientInclude=MClientInclude and MClientCategory
 end
 if self.Filter.Types then
 local MClientType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
-self:T3({"Type:",MClient:GetTypeName(),TypeName})
 if TypeName==MClient:GetTypeName()then
 MClientType=true
 end
 end
-self:T({"Evaluated Type",MClientType})
 MClientInclude=MClientInclude and MClientType
 end
 if self.Filter.Countries then
 local MClientCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
 local ClientCountryID=_DATABASE:GetCountryFromClientTemplate(MClientName)
-self:T3({"Country:",ClientCountryID,country.id[CountryName],CountryName})
 if country.id[CountryName]and country.id[CountryName]==ClientCountryID then
 MClientCountry=true
 end
 end
-self:T({"Evaluated Country",MClientCountry})
 MClientInclude=MClientInclude and MClientCountry
 end
 if self.Filter.ClientPrefixes then
 local MClientPrefix=false
 for ClientPrefixId,ClientPrefix in pairs(self.Filter.ClientPrefixes)do
-self:T3({"Prefix:",string.find(MClient.UnitName,ClientPrefix,1),ClientPrefix})
 if string.find(MClient.UnitName,ClientPrefix,1)then
 MClientPrefix=true
 end
 end
-self:T({"Evaluated Prefix",MClientPrefix})
 MClientInclude=MClientInclude and MClientPrefix
 end
 end
 if self.Filter.Zones then
 local MClientZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
-self:T3("Zone:",ZoneName)
 local unit=MClient:GetClientGroupUnit()
 if unit and unit:IsInZone(Zone)then
 MClientZone=true
@@ -14703,7 +14831,6 @@ end
 end
 MClientInclude=MClientInclude and MClientZone
 end
-self:T2(MClientInclude)
 return MClientInclude
 end
 end
@@ -14758,7 +14885,6 @@ local AirbaseFound=nil
 for AirbaseName,AirbaseObject in pairs(self.Set)do
 local AirbaseCoordinate=AirbaseObject:GetCoordinate()
 local Distance=Coordinate:Get2DDistance(AirbaseCoordinate)
-self:F({Distance=Distance})
 if Distance<=Range then
 AirbaseFound=AirbaseObject
 break
@@ -14827,21 +14953,17 @@ function SET_AIRBASE:AddInDatabase(Event)
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_AIRBASE:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_AIRBASE:ForEachAirbase(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_AIRBASE:FindNearestAirbaseFromPointVec2(PointVec2)
-self:F2(PointVec2)
 local NearestAirbase=self:FindNearestObjectFromPointVec2(PointVec2)
 return NearestAirbase
 end
 function SET_AIRBASE:IsIncludeObject(MAirbase)
-self:F2(MAirbase)
 local MAirbaseInclude=true
 if MAirbase then
 local MAirbaseName=MAirbase:GetName()
@@ -14849,28 +14971,23 @@ if self.Filter.Coalitions then
 local MAirbaseCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 local AirbaseCoalitionID=_DATABASE:GetCoalitionFromAirbase(MAirbaseName)
-self:T3({"Coalition:",AirbaseCoalitionID,self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==AirbaseCoalitionID then
 MAirbaseCoalition=true
 end
 end
-self:T({"Evaluated Coalition",MAirbaseCoalition})
 MAirbaseInclude=MAirbaseInclude and MAirbaseCoalition
 end
 if self.Filter.Categories and MAirbaseInclude then
 local MAirbaseCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 local AirbaseCategoryID=_DATABASE:GetCategoryFromAirbase(MAirbaseName)
-self:T3({"Category:",AirbaseCategoryID,self.FilterMeta.Categories[CategoryName],CategoryName})
 if self.FilterMeta.Categories[CategoryName]and self.FilterMeta.Categories[CategoryName]==AirbaseCategoryID then
 MAirbaseCategory=true
 end
 end
-self:T({"Evaluated Category",MAirbaseCategory})
 MAirbaseInclude=MAirbaseInclude and MAirbaseCategory
 end
 end
-self:T2(MAirbaseInclude)
 return MAirbaseInclude
 end
 end
@@ -14980,20 +15097,16 @@ self:UnHandleEvent(EVENTS.DeleteCargo)
 return self
 end
 function SET_CARGO:AddInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_CARGO:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_CARGO:ForEachCargo(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_CARGO:FindNearestCargoFromPointVec2(PointVec2)
-self:F2(PointVec2)
 local NearestCargo=self:FindNearestObjectFromPointVec2(PointVec2)
 return NearestCargo
 end
@@ -15034,7 +15147,6 @@ local FirstCargo=self:FirstCargoWithState("Deployed")
 return FirstCargo
 end
 function SET_CARGO:IsIncludeObject(MCargo)
-self:F2(MCargo)
 local MCargoInclude=true
 if MCargo then
 local MCargoName=MCargo:GetName()
@@ -15042,42 +15154,34 @@ if self.Filter.Coalitions then
 local MCargoCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 local CargoCoalitionID=MCargo:GetCoalition()
-self:T3({"Coalition:",CargoCoalitionID,self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
 if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==CargoCoalitionID then
 MCargoCoalition=true
 end
 end
-self:F({"Evaluated Coalition",MCargoCoalition})
 MCargoInclude=MCargoInclude and MCargoCoalition
 end
 if self.Filter.Types then
 local MCargoType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
-self:T3({"Type:",MCargo:GetType(),TypeName})
 if TypeName==MCargo:GetType()then
 MCargoType=true
 end
 end
-self:F({"Evaluated Type",MCargoType})
 MCargoInclude=MCargoInclude and MCargoType
 end
 if self.Filter.CargoPrefixes then
 local MCargoPrefix=false
 for CargoPrefixId,CargoPrefix in pairs(self.Filter.CargoPrefixes)do
-self:T3({"Prefix:",string.find(MCargo.Name,CargoPrefix,1),CargoPrefix})
 if string.find(MCargo.Name,CargoPrefix,1)then
 MCargoPrefix=true
 end
 end
-self:F({"Evaluated Prefix",MCargoPrefix})
 MCargoInclude=MCargoInclude and MCargoPrefix
 end
 end
-self:T2(MCargoInclude)
 return MCargoInclude
 end
 function SET_CARGO:OnEventNewCargo(EventData)
-self:F({"New Cargo",EventData})
 if EventData.Cargo then
 if EventData.Cargo and self:IsIncludeObject(EventData.Cargo)then
 self:Add(EventData.Cargo.Name,EventData.Cargo)
@@ -15085,11 +15189,9 @@ end
 end
 end
 function SET_CARGO:OnEventDeleteCargo(EventData)
-self:F3({EventData})
 if EventData.Cargo then
 local Cargo=_DATABASE:FindCargo(EventData.Cargo.Name)
 if Cargo and Cargo.Name then
-self:F({CargoNoDestroy=Cargo.NoDestroy})
 if Cargo.NoDestroy then
 else
 self:Remove(Cargo.Name)
@@ -15186,15 +15288,12 @@ self:UnHandleEvent(EVENTS.DeleteZone)
 return self
 end
 function SET_ZONE:AddInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_ZONE:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_ZONE:ForEachZone(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
@@ -15225,27 +15324,22 @@ local coord=COORDINATE:New(x,y,z)
 return coord
 end
 function SET_ZONE:IsIncludeObject(MZone)
-self:F2(MZone)
 local MZoneInclude=true
 if MZone then
 local MZoneName=MZone:GetName()
 if self.Filter.Prefixes then
 local MZonePrefix=false
 for ZonePrefixId,ZonePrefix in pairs(self.Filter.Prefixes)do
-self:T2({"Prefix:",string.find(MZoneName,ZonePrefix,1),ZonePrefix})
 if string.find(MZoneName,ZonePrefix,1)then
 MZonePrefix=true
 end
 end
-self:T({"Evaluated Prefix",MZonePrefix})
 MZoneInclude=MZoneInclude and MZonePrefix
 end
 end
-self:T2(MZoneInclude)
 return MZoneInclude
 end
 function SET_ZONE:OnEventNewZone(EventData)
-self:F({"New Zone",EventData})
 if EventData.Zone then
 if EventData.Zone and self:IsIncludeObject(EventData.Zone)then
 self:Add(EventData.Zone.ZoneName,EventData.Zone)
@@ -15253,11 +15347,9 @@ end
 end
 end
 function SET_ZONE:OnEventDeleteZone(EventData)
-self:F3({EventData})
 if EventData.Zone then
 local Zone=_DATABASE:FindZone(EventData.Zone.ZoneName)
 if Zone and Zone.ZoneName then
-self:F({ZoneNoDestroy=Zone.NoDestroy})
 if Zone.NoDestroy then
 else
 self:Remove(Zone.ZoneName)
@@ -15434,54 +15526,42 @@ self:UnHandleEvent(EVENTS.DeleteZoneGoal)
 return self
 end
 function SET_ZONE_GOAL:AddInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_ZONE_GOAL:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_ZONE_GOAL:ForEachZone(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_ZONE_GOAL:IsIncludeObject(MZone)
-self:F2(MZone)
 local MZoneInclude=true
 if MZone then
 local MZoneName=MZone:GetName()
 if self.Filter.Prefixes then
 local MZonePrefix=false
 for ZonePrefixId,ZonePrefix in pairs(self.Filter.Prefixes)do
-self:T3({"Prefix:",string.find(MZoneName,ZonePrefix,1),ZonePrefix})
 if string.find(MZoneName,ZonePrefix,1)then
 MZonePrefix=true
 end
 end
-self:T({"Evaluated Prefix",MZonePrefix})
 MZoneInclude=MZoneInclude and MZonePrefix
 end
 end
-self:T2(MZoneInclude)
 return MZoneInclude
 end
 function SET_ZONE_GOAL:OnEventNewZoneGoal(EventData)
-self:T({"New Zone Capture Coalition",EventData})
-self:T({"Zone Capture Coalition",EventData.ZoneGoal})
 if EventData.ZoneGoal then
 if EventData.ZoneGoal and self:IsIncludeObject(EventData.ZoneGoal)then
-self:T({"Adding Zone Capture Coalition",EventData.ZoneGoal.ZoneName,EventData.ZoneGoal})
 self:Add(EventData.ZoneGoal.ZoneName,EventData.ZoneGoal)
 end
 end
 end
 function SET_ZONE_GOAL:OnEventDeleteZoneGoal(EventData)
-self:F3({EventData})
 if EventData.ZoneGoal then
 local Zone=_DATABASE:FindZone(EventData.ZoneGoal.ZoneName)
 if Zone and Zone.ZoneName then
-self:F({ZoneNoDestroy=Zone.NoDestroy})
 if Zone.NoDestroy then
 else
 self:Remove(Zone.ZoneName)
@@ -15605,33 +15685,27 @@ self:UnHandleEvent(EVENTS.DeleteZoneGoal)
 return self
 end
 function SET_OPSZONE:AddInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_OPSZONE:FindInDatabase(Event)
-self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
 end
 function SET_OPSZONE:ForEachZone(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_OPSZONE:IsIncludeObject(MZone)
-self:F2(MZone)
 local MZoneInclude=true
 if MZone then
 local MZoneName=MZone:GetName()
 if self.Filter.Prefixes then
 local MZonePrefix=false
 for ZonePrefixId,ZonePrefix in pairs(self.Filter.Prefixes)do
-self:T3({"Prefix:",string.find(MZoneName,ZonePrefix,1),ZonePrefix})
 if string.find(MZoneName,ZonePrefix,1)then
 MZonePrefix=true
 break
 end
 end
-self:T({"Evaluated Prefix",MZonePrefix})
 MZoneInclude=MZoneInclude and MZonePrefix
 end
 if self.Filter.Coalitions then
@@ -15646,25 +15720,19 @@ end
 MZoneInclude=MZoneInclude and MGroupCoalition
 end
 end
-self:T2(MZoneInclude)
 return MZoneInclude
 end
 function SET_OPSZONE:OnEventNewZoneGoal(EventData)
-self:T({"New Zone Capture Coalition",EventData})
-self:T({"Zone Capture Coalition",EventData.ZoneGoal})
 if EventData.ZoneGoal then
 if EventData.ZoneGoal and self:IsIncludeObject(EventData.ZoneGoal)then
-self:T({"Adding Zone Capture Coalition",EventData.ZoneGoal.ZoneName,EventData.ZoneGoal})
 self:Add(EventData.ZoneGoal.ZoneName,EventData.ZoneGoal)
 end
 end
 end
 function SET_OPSZONE:OnEventDeleteZoneGoal(EventData)
-self:F3({EventData})
 if EventData.ZoneGoal then
 local Zone=_DATABASE:FindZone(EventData.ZoneGoal.ZoneName)
 if Zone and Zone.ZoneName then
-self:F({ZoneNoDestroy=Zone.NoDestroy})
 if Zone.NoDestroy then
 else
 self:Remove(Zone.ZoneName)
@@ -15747,7 +15815,6 @@ end
 return AliveSet.Set or{}
 end
 function SET_OPSGROUP:Add(ObjectName,Object)
-self:T({ObjectName=ObjectName,Object=Object})
 if self.Set[ObjectName]then
 self:Remove(ObjectName,true)
 end
@@ -15907,7 +15974,6 @@ end
 return self
 end
 function SET_OPSGROUP:_EventOnBirth(Event)
-self:F3({Event})
 if Event.IniDCSUnit and Event.IniDCSGroup then
 local DCSgroup=Event.IniDCSGroup
 if DCSgroup:getInitialSize()==DCSgroup:getSize()then
@@ -15921,7 +15987,6 @@ end
 end
 end
 function SET_OPSGROUP:_EventOnDeadOrCrash(Event)
-self:F({Event})
 if Event.IniDCSUnit then
 local ObjectName,Object=self:FindInDatabase(Event)
 if ObjectName then
@@ -16010,7 +16075,6 @@ local self=BASE:Inherit(self,SET_BASE:New(zoneset))
 local zonenames={}
 if ZoneSet then
 for _,_zone in pairs(ZoneSet.Set)do
-self:T("Zone type handed: "..tostring(_zone.ClassName))
 table.insert(zonenames,_zone:GetName())
 end
 self:AddSceneryByName(zonenames)
@@ -16026,13 +16090,11 @@ zone:Scan({Object.Category.SCENERY})
 return zone:GetScannedSetScenery()
 end
 function SET_SCENERY:AddScenery(AddScenery)
-self:F2(AddScenery:GetName())
 self:Add(AddScenery:GetName(),AddScenery)
 return self
 end
 function SET_SCENERY:AddSceneryByName(AddSceneryNames)
 local AddSceneryNamesArray=(type(AddSceneryNames)=="table")and AddSceneryNames or{AddSceneryNames}
-self:T(AddSceneryNamesArray)
 for AddSceneryID,AddSceneryName in pairs(AddSceneryNamesArray)do
 self:Add(AddSceneryName,SCENERY:FindByZoneName(AddSceneryName))
 end
@@ -16064,7 +16126,6 @@ zones=Zones
 end
 for _,Zone in pairs(zones)do
 local zonename=Zone:GetName()
-self:T(zonename)
 self.Filter.Zones[zonename]=Zone
 end
 return self
@@ -16104,7 +16165,6 @@ end
 return CountU
 end
 function SET_SCENERY:GetAliveSet()
-self:F2()
 local AliveSet=SET_SCENERY:New()
 for GroupName,GroupObject in pairs(self.Set)do
 local GroupObject=GroupObject
@@ -16117,7 +16177,6 @@ end
 return AliveSet.Set or{},AliveSet
 end
 function SET_SCENERY:ForEachScenery(IteratorFunction,...)
-self:F2(arg)
 self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
@@ -16146,23 +16205,19 @@ end
 Coordinate.x=(x2-x1)/2+x1
 Coordinate.y=(y2-y1)/2+y1
 Coordinate.z=(z2-z1)/2+z1
-self:F({Coordinate=Coordinate})
 return Coordinate
 end
 function SET_SCENERY:IsIncludeObject(MScenery)
-self:T(MScenery.SceneryName)
 local MSceneryInclude=true
 if MScenery then
 local MSceneryName=MScenery:GetName()
 if self.Filter.Prefixes then
 local MSceneryPrefix=false
 for ZonePrefixId,ZonePrefix in pairs(self.Filter.Prefixes)do
-self:T({"Prefix:",string.find(MSceneryName,ZonePrefix,1),ZonePrefix})
 if string.find(MSceneryName,ZonePrefix,1)then
 MSceneryPrefix=true
 end
 end
-self:T({"Evaluated Prefix",MSceneryPrefix})
 MSceneryInclude=MSceneryInclude and MSceneryPrefix
 end
 if self.Filter.Zones then
@@ -16172,7 +16227,6 @@ local coord=MScenery:GetCoordinate()
 if coord and Zone:IsCoordinateInZone(coord)then
 MSceneryZone=true
 end
-self:T({"Evaluated Zone",MSceneryZone})
 end
 MSceneryInclude=MSceneryInclude and MSceneryZone
 end
@@ -16180,21 +16234,17 @@ if self.Filter.SceneryRoles then
 local MSceneryRole=false
 local Role=MScenery:GetProperty("ROLE")or"none"
 for ZoneRoleId,ZoneRole in pairs(self.Filter.SceneryRoles)do
-self:T({"Role:",ZoneRole,Role})
 if ZoneRole==Role then
 MSceneryRole=true
 end
 end
-self:T({"Evaluated Role ",MSceneryRole})
 MSceneryInclude=MSceneryInclude and MSceneryRole
 end
 end
-self:T2(MSceneryInclude)
 return MSceneryInclude
 end
 function SET_SCENERY:FilterOnce()
 for ObjectName,Object in pairs(self:GetSet())do
-self:T(ObjectName)
 if self:IsIncludeObject(Object)then
 self:Add(ObjectName,Object)
 else
@@ -16226,12 +16276,313 @@ end
 function SET_SCENERY:GetRelativeLife()
 local life=self:GetLife()
 local life0=self:GetLife0()
-self:T2(string.format("Set Lifepoints: %d life0 | %d life",life0,life))
 local rlife=math.floor((life/life0)*100)
 return rlife
 end
 end
 do
+SET_DYNAMICCARGO={
+ClassName="SET_DYNAMICCARGO",
+Filter={},
+Set={},
+List={},
+Index={},
+Database=nil,
+CallScheduler=nil,
+Filter={
+Coalitions=nil,
+Types=nil,
+Countries=nil,
+StaticPrefixes=nil,
+Zones=nil,
+},
+FilterMeta={
+Coalitions={
+red=coalition.side.RED,
+blue=coalition.side.BLUE,
+neutral=coalition.side.NEUTRAL,
+}
+},
+ZoneTimerInterval=20,
+ZoneTimer=nil,
+}
+function SET_DYNAMICCARGO:New()
+local self=BASE:Inherit(self,SET_BASE:New(_DATABASE.DYNAMICCARGO))
+return self
+end
+function SET_DYNAMICCARGO:IsIncludeObject(DCargo)
+local DCargoInclude=true
+if self.Filter.Coalitions then
+local DCargoCoalition=false
+for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
+if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==DCargo:GetCoalition()then
+DCargoCoalition=true
+end
+end
+DCargoInclude=DCargoInclude and DCargoCoalition
+end
+if self.Filter.Types then
+local DCargoType=false
+for TypeID,TypeName in pairs(self.Filter.Types)do
+if TypeName==DCargo:GetTypeName()then
+DCargoType=true
+end
+end
+DCargoInclude=DCargoInclude and DCargoType
+end
+if self.Filter.Countries then
+local DCargoCountry=false
+for CountryID,CountryName in pairs(self.Filter.Countries)do
+if country.id[CountryName]==DCargo:GetCountry()then
+DCargoCountry=true
+end
+end
+DCargoInclude=DCargoInclude and DCargoCountry
+end
+if self.Filter.StaticPrefixes then
+local DCargoPrefix=false
+for StaticPrefixId,StaticPrefix in pairs(self.Filter.StaticPrefixes)do
+if string.find(DCargo:GetName(),StaticPrefix,1)then
+DCargoPrefix=true
+end
+end
+DCargoInclude=DCargoInclude and DCargoPrefix
+end
+if self.Filter.Zones then
+local DCargoZone=false
+for ZoneName,Zone in pairs(self.Filter.Zones)do
+if DCargo and DCargo:IsInZone(Zone)then
+DCargoZone=true
+end
+end
+DCargoInclude=DCargoInclude and DCargoZone
+end
+return DCargoInclude
+end
+function SET_DYNAMICCARGO:FilterCoalitions(Coalitions)
+if not self.Filter.Coalitions then
+self.Filter.Coalitions={}
+end
+if type(Coalitions)~="table"then
+Coalitions={Coalitions}
+end
+for CoalitionID,Coalition in pairs(Coalitions)do
+self.Filter.Coalitions[Coalition]=Coalition
+end
+return self
+end
+function SET_DYNAMICCARGO:FilterTypes(Types)
+if not self.Filter.Types then
+self.Filter.Types={}
+end
+if type(Types)~="table"then
+Types={Types}
+end
+for TypeID,Type in pairs(Types)do
+self.Filter.Types[Type]=Type
+end
+return self
+end
+function SET_DYNAMICCARGO:FilterCountries(Countries)
+if not self.Filter.Countries then
+self.Filter.Countries={}
+end
+if type(Countries)~="table"then
+Countries={Countries}
+end
+for CountryID,Country in pairs(Countries)do
+self.Filter.Countries[Country]=Country
+end
+return self
+end
+function SET_DYNAMICCARGO:FilterPrefixes(Prefixes)
+if not self.Filter.StaticPrefixes then
+self.Filter.StaticPrefixes={}
+end
+if type(Prefixes)~="table"then
+Prefixes={Prefixes}
+end
+for PrefixID,Prefix in pairs(Prefixes)do
+self.Filter.StaticPrefixes[Prefix]=Prefix
+end
+return self
+end
+function SET_DYNAMICCARGO:FilterNamePattern(Patterns)
+return self:FilterPrefixes(Patterns)
+end
+function SET_DYNAMICCARGO:FilterIsLoaded()
+self:FilterFunction(
+function(cargo)
+if cargo and cargo.CargoState and cargo.CargoState==DYNAMICCARGO.State.LOADED then
+return true
+else
+return false
+end
+end
+)
+return self
+end
+function SET_DYNAMICCARGO:FilterIsUnloaded()
+self:FilterFunction(
+function(cargo)
+if cargo and cargo.CargoState and cargo.CargoState==DYNAMICCARGO.State.UNLOADED then
+return true
+else
+return false
+end
+end
+)
+return self
+end
+function SET_DYNAMICCARGO:FilterIsNew()
+self:FilterFunction(
+function(cargo)
+if cargo and cargo.CargoState and cargo.CargoState==DYNAMICCARGO.State.NEW then
+return true
+else
+return false
+end
+end
+)
+return self
+end
+function SET_DYNAMICCARGO:FilterCurrentOwner(PlayerName)
+self:FilterFunction(
+function(cargo)
+if cargo and cargo.Owner and string.find(cargo.Owner,PlayerName,1,true)then
+return true
+else
+return false
+end
+end
+)
+return self
+end
+function SET_DYNAMICCARGO:FilterZones(Zones)
+if not self.Filter.Zones then
+self.Filter.Zones={}
+end
+local zones={}
+if Zones.ClassName and Zones.ClassName=="SET_ZONE"then
+zones=Zones.Set
+elseif type(Zones)~="table"or(type(Zones)=="table"and Zones.ClassName)then
+self:E("***** FilterZones needs either a table of ZONE Objects or a SET_ZONE as parameter!")
+return self
+else
+zones=Zones
+end
+for _,Zone in pairs(zones)do
+local zonename=Zone:GetName()
+self.Filter.Zones[zonename]=Zone
+end
+return self
+end
+function SET_DYNAMICCARGO:FilterStart()
+if _DATABASE then
+self:HandleEvent(EVENTS.NewDynamicCargo,self._EventHandlerDCAdd)
+self:HandleEvent(EVENTS.DynamicCargoRemoved,self._EventHandlerDCRemove)
+if self.Filter.Zones then
+self.ZoneTimer=TIMER:New(self._ContinousZoneFilter,self)
+local timing=self.ZoneTimerInterval or 30
+self.ZoneTimer:Start(timing,timing)
+end
+self:_FilterStart()
+end
+return self
+end
+function SET_DYNAMICCARGO:FilterStop()
+if _DATABASE then
+self:UnHandleEvent(EVENTS.NewDynamicCargo)
+self:UnHandleEvent(EVENTS.DynamicCargoRemoved)
+if self.ZoneTimer and self.ZoneTimer:IsRunning()then
+self.ZoneTimer:Stop()
+end
+end
+return self
+end
+function SET_DYNAMICCARGO:_ContinousZoneFilter()
+local Database=_DATABASE.DYNAMICCARGO
+for ObjectName,Object in pairs(Database)do
+if self:IsIncludeObject(Object)and self:IsNotInSet(Object)then
+self:Add(ObjectName,Object)
+elseif(not self:IsIncludeObject(Object))and self:IsInSet(Object)then
+self:Remove(ObjectName)
+end
+end
+return self
+end
+function SET_DYNAMICCARGO:_EventHandlerDCAdd(Event)
+if Event.IniDynamicCargo and Event.IniDynamicCargoName then
+if not _DATABASE.DYNAMICCARGO[Event.IniDynamicCargoName]then
+_DATABASE:AddDynamicCargo(Event.IniDynamicCargoName)
+end
+local ObjectName,Object=self:FindInDatabase(Event)
+if Object and self:IsIncludeObject(Object)then
+self:Add(ObjectName,Object)
+end
+end
+return self
+end
+function SET_DYNAMICCARGO:_EventHandlerDCRemove(Event)
+if Event.IniDCSUnitName then
+local ObjectName,Object=self:FindInDatabase(Event)
+if ObjectName then
+self:Remove(ObjectName)
+end
+end
+return self
+end
+function SET_DYNAMICCARGO:FindInDatabase(Event)
+return Event.IniDCSUnitName,self.Set[Event.IniDCSUnitName]
+end
+function SET_DYNAMICCARGO:FilterZoneTimer(Seconds)
+self.ZoneTimerInterval=Seconds or 30
+return self
+end
+function SET_DYNAMICCARGO:FilterDeads()
+return self
+end
+function SET_DYNAMICCARGO:FilterCrashes()
+return self
+end
+function SET_DYNAMICCARGO:GetOwnerNames()
+local owners={}
+self:ForEach(
+function(cargo)
+if cargo and cargo.Owner then
+table.insert(owners,cargo.Owner,cargo.Owner)
+end
+end
+)
+return owners
+end
+function SET_DYNAMICCARGO:GetStorageObjects()
+local owners={}
+self:ForEach(
+function(cargo)
+if cargo and cargo.warehouse then
+table.insert(owners,cargo.StaticName,cargo.warehouse)
+end
+end
+)
+return owners
+end
+function SET_DYNAMICCARGO:GetOwnerClientObjects()
+local owners={}
+self:ForEach(
+function(cargo)
+if cargo and cargo.Owner then
+local client=CLIENT:FindByPlayerName(cargo.Owner)
+if client then
+table.insert(owners,cargo.Owner,client)
+end
+end
+end
+)
+return owners
+end
+end
+do
 COORDINATE={
 ClassName="COORDINATE",
 }
@@ -17448,7 +17799,7 @@ local Latitude,Longitude=self:GetLLDDM()
 local Tdiff=UTILS.GMTToLocalTimeDifference()
 local sunrise=UTILS.GetSunRiseAndSet(DayOfYear,Latitude,Longitude,true,Tdiff)
 local date=UTILS.GetDCSMissionDate()
-if InSeconds then
+if InSeconds or type(sunrise)=="string"then
 return sunrise
 else
 return UTILS.SecondsToClock(sunrise,true)
@@ -17518,7 +17869,7 @@ local Latitude,Longitude=self:GetLLDDM()
 local Tdiff=UTILS.GMTToLocalTimeDifference()
 local sunrise=UTILS.GetSunRiseAndSet(DayOfYear,Latitude,Longitude,false,Tdiff)
 local date=UTILS.GetDCSMissionDate()
-if InSeconds then
+if InSeconds or type(sunrise)=="string"then
 return sunrise
 else
 return UTILS.SecondsToClock(sunrise,true)
@@ -18180,6 +18531,7 @@ self.MessageCategory=""
 end
 if self.MessageDuration~=0 then
 self:T(self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$","").." / "..self.MessageDuration)
+local ID=Unit:GetID()
 trigger.action.outTextForUnit(Unit:GetID(),self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$",""),self.MessageDuration,self.ClearScreen)
 end
 end
@@ -18240,8 +18592,11 @@ self:ToCoalition(CoalitionSide)
 end
 return self
 end
-function MESSAGE:ToAll(Settings)
+function MESSAGE:ToAll(Settings,Delay)
 self:F()
+if Delay and Delay>0 then
+self:ScheduleOnce(Delay,MESSAGE.ToAll,self,Settings,0)
+else
 if self.MessageType then
 local Settings=Settings or _SETTINGS
 self.MessageDuration=Settings:GetMessageTime(self.MessageType)
@@ -18251,6 +18606,7 @@ if self.MessageDuration~=0 then
 self:T(self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$","").." / "..self.MessageDuration)
 trigger.action.outText(self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$",""),self.MessageDuration,self.ClearScreen)
 end
+end
 return self
 end
 function MESSAGE:ToAllIf(Condition)
@@ -22084,7 +22440,7 @@ local CX=X/2
 local CZ=Z/2
 return math.max(math.max(CX,CZ),boxmin)
 end
-BASE:E({"Cannot GetBoundingRadius",Positionable=self,Alive=self:IsAlive()})
+BASE:T({"Cannot GetBoundingRadius",Positionable=self,Alive=self:IsAlive()})
 return nil
 end
 function POSITIONABLE:GetAltitude()
@@ -22706,6 +23062,7 @@ POSITIONABLE.CargoBayCapacityValues={
 ["HL_KORD"]=6*POSITIONABLE.DefaultInfantryWeight,
 ["HL_DSHK"]=6*POSITIONABLE.DefaultInfantryWeight,
 ["CCKW_353"]=16*POSITIONABLE.DefaultInfantryWeight,
+["MaxxPro_MRAP"]=7*POSITIONABLE.DefaultInfantryWeight,
 }
 }
 function POSITIONABLE:SetCargoBayWeightLimit(WeightLimit)
@@ -23338,10 +23695,10 @@ local DCSTask={
 id='Strafing',
 params={
 point=Vec2,
-weaponType=WeaponType or 1073741822,
+weaponType=WeaponType or 805337088,
 expend=WeaponExpend or"Auto",
 attackQty=AttackQty or 1,
-attackQtyLimit=AttackQty>1 and true or false,
+attackQtyLimit=AttackQty~=nil and true or false,
 direction=Direction and math.rad(Direction)or 0,
 directionEnabled=Direction and true or false,
 groupAttack=GroupAttack or false,
@@ -26145,13 +26502,16 @@ end
 return nil
 end
 function GROUP:GetCoalition()
-self:F2(self.GroupName)
+if self.GroupCoalition~=nil then
+return self.GroupCoalition
+else
 local DCSGroup=self:GetDCSObject()
 if DCSGroup then
 local GroupCoalition=DCSGroup:getCoalition()
-self:T3(GroupCoalition)
+self.GroupCoalition=GroupCoalition
 return GroupCoalition
 end
+end
 return nil
 end
 function GROUP:GetCountry()
@@ -28419,7 +28779,10 @@ end
 function UNIT:GetSkill()
 self:F2(self.UnitName)
 local name=self.UnitName
-local skill=_DATABASE.Templates.Units[name].Template.skill or"Random"
+local skill="Random"
+if _DATABASE.Templates.Units[name]and _DATABASE.Templates.Units[name].Template and _DATABASE.Templates.Units[name].Template.skill then
+skill=_DATABASE.Templates.Units[name].Template.skill or"Random"
+end
 return skill
 end
 function UNIT:GetSTN()
@@ -31195,18 +31558,6 @@ net.send_chat_to(Message,tonumber(PlayerId))
 end
 return self
 end
-function NET:LoadMission(Path)
-local outcome=false
-if Path then
-outcome=net.load_mission(Path)
-end
-return outcome
-end
-function NET:LoadNextMission()
-local outcome=false
-outcome=net.load_next_mission()
-return outcome
-end
 function NET:GetPlayerList()
 local plist=nil
 plist=net.get_player_list()
@@ -31389,6 +31740,15 @@ end
 self.lid=string.format("STORAGE %s",StaticCargoName)
 return self
 end
+function STORAGE:NewFromDynamicCargo(DynamicCargoName)
+local self=BASE:Inherit(self,BASE:New())
+self.airbase=Unit.getByName(DynamicCargoName)
+if Airbase.getWarehouse then
+self.warehouse=Warehouse.getCargoAsWarehouse(self.airbase)
+end
+self.lid=string.format("STORAGE %s",DynamicCargoName)
+return self
+end
 function STORAGE:FindByName(AirbaseName)
 local storage=_DATABASE:FindStorage(AirbaseName)
 return storage
@@ -31529,6 +31889,258 @@ function STORAGE:GetInventory(Item)
 local inventory=self.warehouse:getInventory(Item)
 return inventory.aircraft,inventory.liquids,inventory.weapon
 end
+DYNAMICCARGO={
+ClassName="DYNAMICCARGO",
+verbose=0,
+testing=false,
+Interval=10,
+}
+DYNAMICCARGO.Liquid={
+JETFUEL=0,
+GASOLINE=1,
+MW50=2,
+DIESEL=3,
+}
+DYNAMICCARGO.LiquidName={
+GASOLINE="gasoline",
+DIESEL="diesel",
+MW50="methanol_mixture",
+JETFUEL="jet_fuel",
+}
+DYNAMICCARGO.Type={
+WEAPONS="weapons",
+LIQUIDS="liquids",
+AIRCRAFT="aircrafts",
+}
+DYNAMICCARGO.State={
+NEW="NEW",
+LOADED="LOADED",
+UNLOADED="UNLOADED",
+REMOVED="REMOVED",
+}
+DYNAMICCARGO.AircraftTypes={
+["CH-47Fbl1"]="CH-47Fbl1",
+}
+DYNAMICCARGO.AircraftDimensions={
+["CH-47Fbl1"]={
+["width"]=4,
+["height"]=6,
+["length"]=11,
+["ropelength"]=30,
+},
+}
+DYNAMICCARGO.version="0.0.5"
+function DYNAMICCARGO:Register(CargoName)
+local self=BASE:Inherit(self,POSITIONABLE:New(CargoName))
+self.StaticName=CargoName
+self.LastPosition=self:GetCoordinate()
+self.CargoState=DYNAMICCARGO.State.NEW
+self.Interval=DYNAMICCARGO.Interval or 10
+local DCSObject=self:GetDCSObject()
+if DCSObject then
+local warehouse=STORAGE:NewFromDynamicCargo(CargoName)
+self.warehouse=warehouse
+end
+self.lid=string.format("DYNAMICCARGO %s",CargoName)
+self.Owner=string.match(CargoName,"^(.+)|%d%d:%d%d|PKG%d+")or"None"
+self.timer=TIMER:New(DYNAMICCARGO._UpdatePosition,self)
+self.timer:Start(self.Interval,self.Interval)
+if not _DYNAMICCARGO_HELOS then
+_DYNAMICCARGO_HELOS=SET_CLIENT:New():FilterAlive():FilterFunction(DYNAMICCARGO._FilterHeloTypes):FilterStart()
+end
+if self.testing then
+BASE:TraceOn()
+BASE:TraceClass("DYNAMICCARGO")
+end
+return self
+end
+function DYNAMICCARGO:GetDCSObject()
+local DCSStatic=Unit.getByName(self.StaticName)
+if DCSStatic then
+return DCSStatic
+end
+return nil
+end
+function DYNAMICCARGO:GetLastOwner()
+return self.Owner
+end
+function DYNAMICCARGO:IsNew()
+if self.CargoState and self.CargoState==DYNAMICCARGO.State.NEW then
+return true
+else
+return false
+end
+end
+function DYNAMICCARGO:IsLoaded()
+if self.CargoState and self.CargoState==DYNAMICCARGO.State.LOADED then
+return true
+else
+return false
+end
+end
+function DYNAMICCARGO:IsUnloaded()
+if self.CargoState and self.CargoState==DYNAMICCARGO.State.REMOVED then
+return true
+else
+return false
+end
+end
+function DYNAMICCARGO:IsRemoved()
+if self.CargoState and self.CargoState==DYNAMICCARGO.State.UNLOADED then
+return true
+else
+return false
+end
+end
+function DYNAMICCARGO:GetCratesNeeded()
+return 1
+end
+function DYNAMICCARGO:WasDropped()
+return self.CargoState==DYNAMICCARGO.State.UNLOADED and true or false
+end
+function DYNAMICCARGO:GetType()
+return CTLD_CARGO.Enum.GCLOADABLE
+end
+function DYNAMICCARGO:GetLastPosition()
+return self.LastPosition
+end
+function DYNAMICCARGO:GetState()
+return self.CargoState
+end
+function DYNAMICCARGO:FindByName(Name)
+local storage=_DATABASE:FindDynamicCargo(Name)
+return storage
+end
+function DYNAMICCARGO:FindByMatching(Pattern)
+local GroupFound=nil
+for name,static in pairs(_DATABASE.DYNAMICCARGO)do
+if string.match(name,Pattern)then
+GroupFound=static
+break
+end
+end
+return GroupFound
+end
+function DYNAMICCARGO:FindAllByMatching(Pattern)
+local GroupsFound={}
+for name,static in pairs(_DATABASE.DYNAMICCARGO)do
+if string.match(name,Pattern)then
+GroupsFound[#GroupsFound+1]=static
+end
+end
+return GroupsFound
+end
+function DYNAMICCARGO:GetStorageObject()
+return self.warehouse
+end
+function DYNAMICCARGO:GetCargoWeight()
+local DCSObject=self:GetDCSObject()
+if DCSObject then
+local weight=DCSObject:getCargoWeight()
+return weight
+else
+return 0
+end
+end
+function DYNAMICCARGO:GetCargoDisplayName()
+local DCSObject=self:GetDCSObject()
+if DCSObject then
+local weight=DCSObject:getCargoDisplayName()
+return weight
+else
+return self.StaticName
+end
+end
+function DYNAMICCARGO:_GetPossibleHeloNearby(pos,loading)
+local set=_DYNAMICCARGO_HELOS:GetAliveSet()
+local success=false
+local Helo=nil
+local Playername=nil
+for _,_helo in pairs(set or{})do
+local helo=_helo
+local name=helo:GetPlayerName()or _DATABASE:_FindPlayerNameByUnitName(helo:GetName())or"None"
+self:T(self.lid.." Checking: "..name)
+local hpos=helo:GetCoordinate()
+local inair=helo:InAir()
+self:T(self.lid.." InAir: AGL/InAir: "..hpos.y-hpos:GetLandHeight().."/"..tostring(inair))
+local typename=helo:GetTypeName()
+if hpos and typename and inair==false then
+local dimensions=DYNAMICCARGO.AircraftDimensions[typename]
+if dimensions then
+local delta2D=hpos:Get2DDistance(pos)
+local delta3D=hpos:Get3DDistance(pos)
+if self.testing then
+self:T(string.format("Cargo relative position: 2D %dm | 3D %dm",delta2D,delta3D))
+self:T(string.format("Helo dimension: length %dm | width %dm | rope %dm",dimensions.length,dimensions.width,dimensions.ropelength))
+end
+if loading~=true and delta2D>dimensions.length or delta2D>dimensions.width or delta3D>dimensions.ropelength then
+success=true
+Helo=helo
+Playername=name
+end
+if loading==true and delta2D<dimensions.length or delta2D<dimensions.width or delta3D<dimensions.ropelength then
+success=true
+Helo=helo
+Playername=name
+end
+end
+end
+end
+return success,Helo,Playername
+end
+function DYNAMICCARGO:_UpdatePosition()
+self:T(self.lid.." _UpdatePositionAndState")
+if self:IsAlive()then
+local pos=self:GetCoordinate()
+if self.testing then
+self:T(string.format("Cargo position: x=%d, y=%d, z=%d",pos.x,pos.y,pos.z))
+self:T(string.format("Last position: x=%d, y=%d, z=%d",self.LastPosition.x,self.LastPosition.y,self.LastPosition.z))
+end
+if UTILS.Round(UTILS.VecDist3D(pos,self.LastPosition),2)>0.5 then
+if self.CargoState==DYNAMICCARGO.State.NEW then
+local isloaded,client,playername=self:_GetPossibleHeloNearby(pos,true)
+self:T(self.lid.." moved! NEW -> LOADED by "..tostring(playername))
+self.CargoState=DYNAMICCARGO.State.LOADED
+self.Owner=playername
+_DATABASE:CreateEventDynamicCargoLoaded(self)
+elseif self.CargoState==DYNAMICCARGO.State.LOADED then
+local count=_DYNAMICCARGO_HELOS:CountAlive()
+local landheight=pos:GetLandHeight()
+local agl=pos.y-landheight
+agl=UTILS.Round(agl,2)
+self:T(self.lid.." AGL: "..agl or-1)
+local isunloaded=true
+local client
+local playername
+if count>0 and(agl>0 or self.testing)then
+self:T(self.lid.." Possible alive helos: "..count or-1)
+if agl~=0 or self.testing then
+isunloaded,client,playername=self:_GetPossibleHeloNearby(pos,false)
+end
+if isunloaded then
+self:T(self.lid.." moved! LOADED -> UNLOADED by "..tostring(playername))
+self.CargoState=DYNAMICCARGO.State.UNLOADED
+self.Owner=playername
+_DATABASE:CreateEventDynamicCargoUnloaded(self)
+end
+end
+end
+self.LastPosition=pos
+end
+else
+if self.timer and self.timer:IsRunning()then self.timer:Stop()end
+self:T(self.lid.." dead! "..self.CargoState.."-> REMOVED")
+self.CargoState=DYNAMICCARGO.State.REMOVED
+_DATABASE:CreateEventDynamicCargoRemoved(self)
+end
+return self
+end
+function DYNAMICCARGO._FilterHeloTypes(client)
+if not client then return false end
+local typename=client:GetTypeName()
+local isinclude=DYNAMICCARGO.AircraftTypes[typename]~=nil and true or false
+return isinclude
+end
 CARGOS={}
 do
 CARGO={
@@ -42269,7 +42881,7 @@ return self
 end
 function RANGE:SetSoundfilesPath(path)
 self.soundpath=tostring(path or"Range Soundfiles/")
-self:I(self.lid..string.format("Setting sound files path to %s",self.soundpath))
+self:T2(self.lid..string.format("Setting sound files path to %s",self.soundpath))
 return self
 end
 function RANGE:SetSoundfilesInfo(csvfile)
@@ -42420,9 +43032,9 @@ if randommove==nil or _isstatic==true then
 randommove=false
 end
 if _isstatic==true then
-self:I(self.lid..string.format("Adding STATIC bombing target %s with good hit range %d. Random move = %s.",name,goodhitrange,tostring(randommove)))
+self:T(self.lid..string.format("Adding STATIC bombing target %s with good hit range %d. Random move = %s.",name,goodhitrange,tostring(randommove)))
 elseif _isstatic==false then
-self:I(self.lid..string.format("Adding UNIT bombing target %s with good hit range %d. Random move = %s.",name,goodhitrange,tostring(randommove)))
+self:T(self.lid..string.format("Adding UNIT bombing target %s with good hit range %d. Random move = %s.",name,goodhitrange,tostring(randommove)))
 else
 self:E(self.lid..string.format("ERROR! No bombing target with name %s could be found. Carefully check all UNIT and STATIC names defined in the mission editor!",name))
 end
@@ -42461,7 +43073,7 @@ function RANGE:AddBombingTargetScenery(scenery,goodhitrange)
 local name=scenery:GetName()
 goodhitrange=goodhitrange or RANGE.Defaults.goodhitrange
 if name then
-self:I(self.lid..string.format("Adding SCENERY bombing target %s with good hit range %d",name,goodhitrange))
+self:T(self.lid..string.format("Adding SCENERY bombing target %s with good hit range %d",name,goodhitrange))
 else
 self:E(self.lid..string.format("ERROR! No bombing target with name %s could be found!",name))
 end
@@ -42524,7 +43136,7 @@ function RANGE:OnEventBirth(EventData)
 self:F({eventbirth=EventData})
 if not EventData.IniPlayerName then return end
 local _unitName=EventData.IniUnitName
-local _unit,_playername=self:_GetPlayerUnitAndName(_unitName)
+local _unit,_playername=self:_GetPlayerUnitAndName(_unitName,EventData.IniPlayerName)
 self:T3(self.lid.."BIRTH: unit   = "..tostring(EventData.IniUnitName))
 self:T3(self.lid.."BIRTH: group  = "..tostring(EventData.IniGroupName))
 self:T3(self.lid.."BIRTH: player = "..tostring(_playername))
@@ -42616,6 +43228,7 @@ end
 end
 end
 function RANGE._OnImpact(weapon,self,playerData,attackHdg,attackAlt,attackVel)
+if not playerData then return end
 local _closetTarget=nil
 local _distance=nil
 local _closeCoord=nil
@@ -42625,8 +43238,8 @@ local _playername=playerData.playername
 local _unit=playerData.unit
 local impactcoord=weapon:GetImpactCoordinate()
 local insidezone=self.rangezone:IsCoordinateInZone(impactcoord)
-if playerData.smokebombimpact and insidezone then
-if playerData.delaysmoke then
+if playerData and playerData.smokebombimpact and insidezone then
+if playerData and playerData.delaysmoke then
 timer.scheduleFunction(self._DelayedSmoke,{coord=impactcoord,color=playerData.smokecolor},timer.getTime()+self.TdelaySmoke)
 else
 impactcoord:Smoke(playerData.smokecolor)
@@ -42709,14 +43322,15 @@ end
 local weapon=WEAPON:New(EventData.weapon)
 local _track=(weapon:IsBomb()and self.trackbombs)or(weapon:IsRocket()and self.trackrockets)or(weapon:IsMissile()and self.trackmissiles)
 local _unitName=EventData.IniUnitName
-local _unit,_playername=self:_GetPlayerUnitAndName(_unitName)
+local _unit,_playername=self:_GetPlayerUnitAndName(_unitName,EventData.IniPlayerName)
 local dPR=self.BombtrackThreshold*2
 if _unit and _playername then
 dPR=_unit:GetCoordinate():Get2DDistance(self.location)
 self:T(self.lid..string.format("Range %s, player %s, player-range distance = %d km.",self.rangename,_playername,dPR/1000))
 end
-if _track and dPR<=self.BombtrackThreshold and _unit and _playername then
+if _track and dPR<=self.BombtrackThreshold and _unit and _playername and self.PlayerSettings[_playername]then
 local playerData=self.PlayerSettings[_playername]
+if not playerData then return end
 local attackHdg=_unit:GetHeading()
 local attackAlt=_unit:GetHeight()
 attackAlt=UTILS.MetersToFeet(attackAlt)
@@ -42751,7 +43365,7 @@ end
 end
 text=text..string.format(", Control %.3f MHz (Relay=%s alive=%s)",self.rangecontrolfreq,tostring(self.rangecontrolrelayname),alive)
 end
-self:I(self.lid..text)
+self:T(self.lid..text)
 end
 self:_CheckPlayers()
 self:__Status(-10)
@@ -42862,7 +43476,7 @@ local f=io.open(filename,"wb")
 if f then
 f:write(data)
 f:close()
-self:I(self.lid..string.format("Saving player results to file %s",tostring(filename)))
+self:T(self.lid..string.format("Saving player results to file %s",tostring(filename)))
 else
 self:E(self.lid..string.format("ERROR: Could not save results to file %s",tostring(filename)))
 end
@@ -42909,7 +43523,7 @@ end
 local path=self.targetpath or lfs.writedir()..[[Logs\]]
 local filename=path..string.format("RANGE-%s_BombingResults.csv",self.rangename)
 local text=string.format("Loading player bomb results from file %s",filename)
-self:I(self.lid..text)
+self:T(self.lid..text)
 local data=_loadfile(filename)
 if data then
 local results=UTILS.Split(data,"\n")
@@ -43106,7 +43720,6 @@ function RANGE:_DisplayRangeInfo(_unitname)
 self:F(_unitname)
 local unit,playername,_multiplayer=self:_GetPlayerUnitAndName(_unitname)
 if unit and playername then
-self:I(playername)
 local text=""
 local coord=unit:GetCoordinate()
 if self.location then
@@ -43868,13 +44481,12 @@ self:T({speed=speed})
 end
 return speed
 end
-function RANGE:_GetPlayerUnitAndName(_unitName)
-self:F2(_unitName)
+function RANGE:_GetPlayerUnitAndName(_unitName,PlayerName)
 if _unitName~=nil then
 local multiplayer=false
 local DCSunit=Unit.getByName(_unitName)
-if DCSunit then
-local playername=DCSunit:getPlayerName()
+if DCSunit and DCSunit.getPlayerName then
+local playername=DCSunit:getPlayerName()or PlayerName or"None"
 local unit=UNIT:Find(DCSunit)
 self:T2({DCSunit=DCSunit,unit=unit,playername=playername})
 if DCSunit and unit and playername then
@@ -54011,6 +54623,7 @@ end
 CLIENTWATCH={}
 CLIENTWATCH.ClassName="CLIENTWATCH"
 CLIENTWATCH.Debug=false
+CLIENTWATCH.DebugEventData=false
 CLIENTWATCH.lid=nil
 CLIENTWATCHTools={}
 CLIENTWATCH.version="1.0.1"
@@ -54018,21 +54631,45 @@ function CLIENTWATCH:New(client)
 local self=BASE:Inherit(self,FSM:New())
 self:SetStartState("Idle")
 self:AddTransition("*","Spawn","*")
-if type(client)=="table"or type(client)=="string"then
+self.FilterCoalition=nil
+self.FilterCategory=nil
+if not client then
+if self.Debug then self:I({"New client instance created. ClientType = All clients"})end
+self:HandleEvent(EVENTS.Birth)
+function self:OnEventBirth(eventdata)
+if(eventdata.IniCategory==0 or eventdata.IniCategory==1)and eventdata.IniPlayerName
+and(not self.FilterCoalition or self.FilterCoalition==eventdata.IniCoalition)
+and(not self.FilterCategory or self.FilterCategory==eventdata.IniCategory)then
+if self.Debug then
+self:I({"Client spawned in.",IniCategory=eventdata.IniCategory})
+end
+local clientWatchDebug=self.Debug
+local clientObject=CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+self:Spawn(clientObject,eventdata)
+end
+end
+elseif type(client)=="table"or type(client)=="string"then
 if type(client)=="table"then
 if client.ClassName=="CLIENT"then
+if self.Debug then self:I({"New client instance created. ClientType = Wrapper.CLIENT",client})end
 self.ClientName=client:GetName()
 self:HandleEvent(EVENTS.Birth)
 function self:OnEventBirth(eventdata)
-if self.Debug then UTILS.PrintTableToLog(eventdata)end
-if eventdata.IniCategory and eventdata.IniCategory<=1 then
+if(eventdata.IniCategory==0 or eventdata.IniCategory==1)and eventdata.IniPlayerName
+and(not self.FilterCoalition or self.FilterCoalition==eventdata.IniCoalition)
+and(not self.FilterCategory or self.FilterCategory==eventdata.IniCategory)then
 if self.ClientName==eventdata.IniUnitName then
-local clientObject=CLIENTWATCHTools:_newClient(eventdata)
-self:Spawn(clientObject)
+if self.Debug then
+self:I({"Client spawned in.",IniCategory=eventdata.IniCategory})
+end
+local clientWatchDebug=self.Debug
+local clientObject=CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+self:Spawn(clientObject,eventdata)
 end
 end
 end
 else
+if self.Debug then self:I({"New client instance created. ClientType = Multiple Prefixes",client})end
 local tableValid=true
 for _,entry in pairs(client)do
 if type(entry)~="string"then
@@ -54044,12 +54681,17 @@ end
 if tableValid then
 self:HandleEvent(EVENTS.Birth)
 function self:OnEventBirth(eventdata)
-if self.Debug then UTILS.PrintTableToLog(eventdata)end
 for _,entry in pairs(client)do
-if eventdata.IniCategory and eventdata.IniCategory<=1 then
+if(eventdata.IniCategory==0 or eventdata.IniCategory==1)and eventdata.IniPlayerName
+and(not self.FilterCoalition or self.FilterCoalition==eventdata.IniCoalition)
+and(not self.FilterCategory or self.FilterCategory==eventdata.IniCategory)then
 if string.match(eventdata.IniUnitName,entry)or string.match(eventdata.IniGroupName,entry)then
-local clientObject=CLIENTWATCHTools:_newClient(eventdata)
-self:Spawn(clientObject)
+if self.Debug then
+self:I({"Client spawned in.",IniCategory=eventdata.IniCategory})
+end
+local clientWatchDebug=self.Debug
+local clientObject=CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+self:Spawn(clientObject,eventdata)
 break
 end
 end
@@ -54058,13 +54700,19 @@ end
 end
 end
 else
+if self.Debug then self:I({"New client instance created. ClientType = Single Prefix",client})end
 self:HandleEvent(EVENTS.Birth)
 function self:OnEventBirth(eventdata)
-if self.Debug then UTILS.PrintTableToLog(eventdata)end
-if eventdata.IniCategory and eventdata.IniCategory<=1 then
+if(eventdata.IniCategory==0 or eventdata.IniCategory==1)and eventdata.IniPlayerName
+and(not self.FilterCoalition or self.FilterCoalition==eventdata.IniCoalition)
+and(not self.FilterCategory or self.FilterCategory==eventdata.IniCategory)then
 if string.match(eventdata.IniUnitName,client)or string.match(eventdata.IniGroupName,client)then
-local clientObject=CLIENTWATCHTools:_newClient(eventdata)
-self:Spawn(clientObject)
+if self.Debug then
+self:I({"Client spawned in.",IniCategory=eventdata.IniCategory})
+end
+local clientWatchDebug=self.Debug
+local clientObject=CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+self:Spawn(clientObject,eventdata)
 end
 end
 end
@@ -54075,7 +54723,23 @@ return nil
 end
 return self
 end
-function CLIENTWATCHTools:_newClient(eventdata)
+function CLIENTWATCH:FilterByCoalition(value)
+if value==1 or value=="red"then
+self.FilterCoalition=1
+else
+self.FilterCoalition=2
+end
+return self
+end
+function CLIENTWATCH:FilterByCategory(value)
+if value==1 or value=="helicopter"then
+self.FilterCategory=1
+else
+self.FilterCategory=0
+end
+return self
+end
+function CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
 local self=BASE:Inherit(self,FSM:New())
 self:SetStartState("Alive")
 self:AddTransition("Alive","Despawn","Dead")
@@ -54139,102 +54803,159 @@ self:HandleEvent(EVENTS.WeaponDrop)
 self:HandleEvent(EVENTS.WeaponRearm)
 function self:OnEventHit(EventData)
 if EventData.TgtUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered hit event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Hit(EventData)
 end
 end
 function self:OnEventKill(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered kill event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Kill(EventData)
 end
 end
 function self:OnEventScore(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered score event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Score(EventData)
 end
 end
 function self:OnEventShot(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered shot event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Shot(EventData)
 end
 end
 function self:OnEventShootingStart(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered shooting start event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:ShootingStart(EventData)
 end
 end
 function self:OnEventShootingEnd(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered shooting end event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:ShootingEnd(EventData)
 end
 end
 function self:OnEventLand(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered land event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Land(EventData)
 end
 end
 function self:OnEventTakeoff(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered takeoff event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Takeoff(EventData)
 end
 end
 function self:OnEventRunwayTakeoff(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered runway takeoff event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:RunwayTakeoff(EventData)
 end
 end
 function self:OnEventRunwayTouch(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered runway touch event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:RunwayTouch(EventData)
 end
 end
 function self:OnEventRefueling(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered refueling event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Refueling(EventData)
 end
 end
 function self:OnEventRefuelingStop(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered refueling event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:RefuelingStop(EventData)
 end
 end
 function self:OnEventPlayerLeaveUnit(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered leave unit event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:PlayerLeaveUnit(EventData)
 self._deadRoutine()
 end
 end
 function self:OnEventCrash(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered crash event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Crash(EventData)
 self._deadRoutine()
 end
 end
 function self:OnEventDead(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered dead event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Dead(EventData)
 self._deadRoutine()
 end
 end
 function self:OnEventPilotDead(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered pilot dead event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:PilotDead(EventData)
 self._deadRoutine()
 end
 end
 function self:OnEventUnitLost(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered unit lost event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:UnitLost(EventData)
 self._deadRoutine()
 end
 end
 function self:OnEventEjection(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered ejection event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:Ejection(EventData)
 self._deadRoutine()
 end
 end
 function self:OnEventHumanFailure(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered human failure event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:HumanFailure(EventData)
 if not self.Unit:IsAlive()then
 self._deadRoutine()
@@ -54243,46 +54964,71 @@ end
 end
 function self:OnEventHumanAircraftRepairFinish(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered repair finished event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:HumanAircraftRepairFinish(EventData)
 end
 end
 function self:OnEventHumanAircraftRepairStart(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered repair start event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:HumanAircraftRepairStart(EventData)
 end
 end
 function self:OnEventEngineShutdown(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered engine shutdown event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:EngineShutdown(EventData)
 end
 end
 function self:OnEventEngineStartup(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered engine startup event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:EngineStartup(EventData)
 end
 end
 function self:OnEventWeaponAdd(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered weapon add event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:WeaponAdd(EventData)
 end
 end
 function self:OnEventWeaponDrop(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered weapon drop event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:WeaponDrop(EventData)
 end
 end
 function self:OnEventWeaponRearm(EventData)
 if EventData.IniUnitName==self.UnitName then
+if clientWatchDebug then
+self:I({"Client triggered weapon rearm event.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self:WeaponRearm(EventData)
 end
 end
 self.FallbackTimer=TIMER:New(function()
 if not self.Unit:IsAlive()then
+if clientWatchDebug then
+self:I({"Client is registered as dead without an event trigger. Running fallback dead routine.",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})
+end
 self._deadRoutine()
 end
 end)
 self.FallbackTimer:Start(5,5)
 function self._deadRoutine()
+if clientWatchDebug then self:I({"Client dead routine triggered. Shutting down tracking...",Player=self.PlayerName,Group=self.GroupName,Unit=self.UnitName})end
 self:UnHandleEvent(EVENTS.Hit)
 self:UnHandleEvent(EVENTS.Kill)
 self:UnHandleEvent(EVENTS.Score)
@@ -54312,7 +55058,7 @@ self:UnHandleEvent(EVENTS.WeaponRearm)
 self.FallbackTimer:Stop()
 self:Despawn()
 end
-self:I({"CLIENT SPAWN EVENT",PlayerName=self.PlayerName,UnitName=self.UnitName,GroupName=self.GroupName})
+self:I({"Detected client spawn and applied internal functions and events.",PlayerName=self.PlayerName,UnitName=self.UnitName,GroupName=self.GroupName})
 return self
 end
 AIRBOSS={
@@ -61374,7 +62120,7 @@ else
 self:E(self.lid..string.format("ERROR: Unknown radio sender %s!",tostring(sender)))
 return
 end
-local numbers=_split(number)
+local numbers=_split(tostring(number))
 local wait=0
 for i=1,#numbers do
 local n=numbers[i]
@@ -61410,7 +62156,7 @@ if Sender==""then
 self:E(self.lid..string.format("ERROR: Sender unknown!"))
 return
 end
-local numbers=_split(number)
+local numbers=_split(tostring(number))
 local wait=0
 for i=1,#numbers do
 local n=numbers[i]
@@ -62635,7 +63381,7 @@ if math.abs(self.holdingoffset)>0 then
 self:_GetZoneArcIn(case):FlareZone(FLARECOLOR.White,45)
 text=text.."\n* arc turn in with WHITE flares"
 self:_GetZoneArcOut(case):FlareZone(FLARECOLOR.White,45)
-text=text.."\n* arc trun out with WHITE flares"
+text=text.."\n* arc turn out with WHITE flares"
 end
 end
 if case==3 then
@@ -62668,7 +63414,7 @@ if math.abs(self.holdingoffset)>0 then
 self:_GetZoneArcIn(case):SmokeZone(SMOKECOLOR.Blue,45)
 text=text.."\n* arc turn in with BLUE smoke"
 self:_GetZoneArcOut(case):SmokeZone(SMOKECOLOR.Blue,45)
-text=text.."\n* arc trun out with BLUE smoke"
+text=text.."\n* arc turn out with BLUE smoke"
 end
 end
 if case==3 then
@@ -64365,6 +65111,65 @@ TACAN="Tacan",
 FARP="Farp",
 DELIMITER="Punto",
 },
+FR={
+HOURS="Heures",
+TIME="Temps",
+NOCLOUDINFO="Informations sur la couverture nuageuse non disponibles",
+OVERCAST="Ciel couvert",
+BROKEN="Nuages fragmentés",
+SCATTERED="Nuages épars",
+FEWCLOUDS="Nuages rares",
+NOCLOUDS="Clair",
+AIRPORT="Aéroport",
+INFORMATION="Information",
+SUNRISEAT="Levé du soleil à %s heure locale",
+SUNSETAT="Couché du soleil à %s heure locale",
+WINDFROMMS="Vent du %s pour %s mètres par seconde",
+WINDFROMKNOTS="Vent du %s pour %s noeuds",
+GUSTING="Rafale de vent",
+VISIKM="Visibilité %s kilomètres",
+VISISM="Visibilité %s Miles",
+RAIN="Pluie",
+TSTORM="Orage",
+SNOW="Neige",
+SSTROM="Tempête de neige",
+FOG="Brouillard",
+DUST="Poussière",
+PHENOMENA="Phénomène météorologique",
+CLOUDBASEM="Couverture nuageuse de %s à %s mètres",
+CLOUDBASEFT="Couverture nuageuse de %s à %s pieds",
+TEMPERATURE="Température",
+DEWPOINT="Point de rosée",
+ALTIMETER="Altimètre",
+ACTIVERUN="Décollages piste",
+ACTIVELANDING="Atterrissages piste",
+LEFT="Gauche",
+RIGHT="Droite",
+RWYLENGTH="Longueur de piste",
+METERS="Mètre",
+FEET="Pieds",
+ELEVATION="Hauteur",
+TOWERFREQ="Fréquences de la tour",
+ILSFREQ="Fréquences ILS",
+OUTERNDB="Fréquences Outer NDB",
+INNERNDB="Fréquences Inner NDB",
+VORFREQ="Fréquences VOR",
+VORFREQTTS="Fréquences V O R",
+TACANCH="Canal TACAN %d",
+RSBNCH="Canal RSBN",
+PRMGCH="Canal PRMG",
+ADVISE="Informez le contrôle que vous avez copié l'information",
+STATUTE="Statute Miles",
+DEGREES="Degré celcius",
+FAHRENHEIT="Degré Fahrenheit",
+INCHHG="Pouces de mercure",
+MMHG="Millimètres de mercure",
+HECTO="Hectopascals",
+METERSPER="Mètres par seconde",
+TACAN="TAKAN",
+FARP="FARPE",
+DELIMITER="Décimal",
+}
 }
 ATIS.locale="en"
 _ATIS={}
@@ -64404,7 +65209,7 @@ return self
 end
 function ATIS:_InitLocalization()
 self:T(self.lid.."_InitLocalization")
-self.gettext=TEXTANDSOUND:New("AWACS","en")
+self.gettext=TEXTANDSOUND:New("ATIS","en")
 self.locale="en"
 for locale,table in pairs(self.Messages)do
 local Locale=string.lower(tostring(locale))
@@ -64898,17 +65703,23 @@ self:T3(string.format("ZULU =%s",tostring(ZULU)))
 self:T3(string.format("NATO =%s",tostring(NATO)))
 local hours=self.gettext:GetEntry("HOURS",self.locale)
 local sunrise=coord:GetSunrise()
+local SUNRISE="no time"
+if tostring(sunrise)~="N/S"and tostring(sunrise)~="N/R"then
 sunrise=UTILS.Split(sunrise,":")
-local SUNRISE=string.format("%s%s",sunrise[1],sunrise[2])
+SUNRISE=string.format("%s%s",sunrise[1],sunrise[2])
 if self.useSRS then
 SUNRISE=string.format("%s %s %s",sunrise[1],sunrise[2],hours)
 end
+end
 local sunset=coord:GetSunset()
+local SUNSET="no time"
+if tostring(sunset)~="N/S"and tostring(sunset)~="N/R"then
 sunset=UTILS.Split(sunset,":")
-local SUNSET=string.format("%s%s",sunset[1],sunset[2])
+SUNSET=string.format("%s%s",sunset[1],sunset[2])
 if self.useSRS then
 SUNSET=string.format("%s %s %s",sunset[1],sunset[2],hours)
 end
+end
 local temperature=coord:GetTemperature(height+5)
 local dewpoint=temperature-(100-self.relHumidity)/5
 if self.TDegF then
@@ -64975,6 +65786,34 @@ precepitation=1
 else
 precepitation=3
 end
+elseif cloudspreset:find("RainyPreset4")then
+clouddens=5
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("RainyPreset5")then
+clouddens=5
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("RainyPreset6")then
+clouddens=5
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("NEWRAINPRESET4")then
+clouddens=5
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
 elseif cloudspreset:find("RainyPreset")then
 clouddens=9
 if temperature>5 then
@@ -65821,6 +66660,7 @@ CRATE="Crate",
 REPAIR="Repair",
 ENGINEERS="Engineers",
 STATIC="Static",
+GCLOADABLE="GC_Loadable",
 }
 function CTLD_CARGO:New(ID,Name,Templates,Sorte,HasBeenMoved,LoadDirectly,CratesNeeded,Positionable,Dropped,PerCrateMass,Stock,Subcategory,DontShowInMenu,Location)
 local self=BASE:Inherit(self,BASE:New())
@@ -65840,12 +66680,42 @@ self.Mark=nil
 self.Subcategory=Subcategory or"Other"
 self.DontShowInMenu=DontShowInMenu or false
 self.ResourceMap=nil
+self.StaticType="container_cargo"
+self.StaticShape=nil
+self.TypeNames=nil
+self.StaticCategory="Cargos"
 if type(Location)=="string"then
 Location=ZONE:New(Location)
 end
 self.Location=Location
 return self
 end
+function CTLD_CARGO:SetStaticTypeAndShape(Category,TypeName,ShapeName)
+self.StaticCategory=Category or"Cargos"
+self.StaticType=TypeName or"container_cargo"
+self.StaticShape=ShapeName
+return self
+end
+function CTLD_CARGO:GetStaticTypeAndShape()
+return self.StaticCategory,self.StaticType,self.StaticShape
+end
+function CTLD_CARGO:AddUnitTypeName(UnitTypes)
+if not self.TypeNames then self.TypeNames={}end
+if type(UnitTypes)~="table"then UnitTypes={UnitTypes}end
+for _,_singletype in pairs(UnitTypes or{})do
+self.TypeNames[_singletype]=_singletype
+end
+return self
+end
+function CTLD_CARGO:UnitCanCarry(Unit)
+if self.TypeNames==nil then return true end
+local typename=Unit:GetTypeName()or"none"
+if self.TypeNames[typename]then
+return true
+else
+return false
+end
+end
 function CTLD_CARGO:SetStaticResourceMap(ResourceMap)
 self.ResourceMap=ResourceMap
 return self
@@ -66139,6 +67009,10 @@ debug=false,
 wpZones={},
 dropOffZones={},
 pickupZones={},
+DynamicCargo={},
+ChinookTroopCircleRadius=5,
+TroopUnloadDistGround=5,
+TroopUnloadDistHover=1.5,
 }
 CTLD.RadioModulation={
 AM=0,
@@ -66171,9 +67045,9 @@ CTLD.UnitTypeCapabilities={
 ["Bronco-OV-10A"]={type="Bronco-OV-10A",crates=false,troops=true,cratelimit=0,trooplimit=5,length=13,cargoweightlimit=1450},
 ["OH-6A"]={type="OH-6A",crates=false,troops=true,cratelimit=0,trooplimit=4,length=7,cargoweightlimit=550},
 ["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=8000},
+["CH-47Fbl1"]={type="CH-47Fbl1",crates=true,troops=true,cratelimit=4,trooplimit=31,length=20,cargoweightlimit=10800},
 }
-CTLD.version="1.0.58"
+CTLD.version="1.1.17"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -66364,7 +67238,7 @@ self.PlayerTaskQueue:Push(PlayerTask,PlayerTask.PlayerTaskNr)
 return self
 end
 function CTLD:_EventHandler(EventData)
-self:I(string.format("%s Event = %d",self.lid,EventData.id))
+self:T(string.format("%s Event = %d",self.lid,EventData.id))
 local event=EventData
 if event.id==EVENTS.PlayerEnterAircraft or event.id==EVENTS.PlayerEnterUnit then
 local _coalition=event.IniCoalition
@@ -66391,24 +67265,71 @@ local unitname=event.IniUnitName or"none"
 self.CtldUnits[unitname]=nil
 self.Loaded_Cargo[unitname]=nil
 self.MenusDone[unitname]=nil
-elseif event.id==EVENTS.Birth and event.IniObjectCategory==6 and string.match(event.IniUnitName,".+|%d%d:%d%d|PKG%d+")then
-local function RegisterDynamicCargo()
-local static=_DATABASE:AddStatic(event.IniUnitName)
-if static then
-static.DCSCargoObject=event.IniDCSUnit
-local Mass=event.IniDCSUnit:getCargoWeight()
-local country=event.IniDCSUnit:getCountry()
-local template=_DATABASE:_GetGenericStaticCargoGroupTemplate(event.IniUnitName,event.IniTypeName,Mass,event.IniCoalition,country)
-_DATABASE:_RegisterStaticTemplate(template,event.IniCoalition,"static",country)
-self:I("**** Ground crew created static cargo added: "..event.IniUnitName.." | Weight in kgs: "..Mass)
-local cargotype=self:AddStaticsCargo(event.IniUnitName,Mass,1,nil,true)
-self.CrateCounter=self.CrateCounter+1
-self.Spawned_Crates[self.CrateCounter]=static
-cargotype.Positionable=static
-table.insert(self.Spawned_Cargo,cargotype)
+elseif event.id==EVENTS.NewDynamicCargo then
+self:T(self.lid.."GC New Event "..event.IniDynamicCargoName)
+self.DynamicCargo[event.IniDynamicCargoName]=event.IniDynamicCargo
+elseif event.id==EVENTS.DynamicCargoLoaded then
+self:T(self.lid.."GC Loaded Event "..event.IniDynamicCargoName)
+local dcargo=event.IniDynamicCargo
+local client=CLIENT:FindByPlayerName(dcargo.Owner)
+if client and client:IsAlive()then
+local unitname=client:GetName()or"none"
+local loaded={}
+if self.Loaded_Cargo[unitname]then
+loaded=self.Loaded_Cargo[unitname]
+else
+loaded={}
+loaded.Troopsloaded=0
+loaded.Cratesloaded=0
+loaded.Cargo={}
 end
+loaded.Cratesloaded=loaded.Cratesloaded+1
+table.insert(loaded.Cargo,dcargo)
+self.Loaded_Cargo[unitname]=nil
+self.Loaded_Cargo[unitname]=loaded
+local Group=client:GetGroup()
+self:_SendMessage(string.format("Crate %s loaded by ground crew!",event.IniDynamicCargoName),10,false,Group)
+self:__CratesPickedUp(1,Group,client,dcargo)
+end
+elseif event.id==EVENTS.DynamicCargoUnloaded then
+self:T(self.lid.."GC Unload Event "..event.IniDynamicCargoName)
+local dcargo=event.IniDynamicCargo
+local client=CLIENT:FindByPlayerName(dcargo.Owner)
+if client and client:IsAlive()then
+local unitname=client:GetName()or"none"
+local loaded={}
+if self.Loaded_Cargo[unitname]then
+loaded=self.Loaded_Cargo[unitname]
+loaded.Cratesloaded=loaded.Cratesloaded-1
+if loaded.Cratesloaded<0 then loaded.Cratesloaded=0 end
+local Loaded={}
+for _,_item in pairs(loaded.Cargo or{})do
+self:T(self.lid.."UNLOAD checking: ".._item:GetName())
+self:T(self.lid.."UNLOAD state: "..tostring(_item:WasDropped()))
+if _item and _item:GetType()==CTLD_CARGO.Enum.GCLOADABLE and event.IniDynamicCargoName and event.IniDynamicCargoName~=_item:GetName()and not _item:WasDropped()then
+table.insert(Loaded,_item)
+else
+table.insert(Loaded,_item)
+end
+end
+loaded.Cargo=nil
+loaded.Cargo=Loaded
+self.Loaded_Cargo[unitname]=nil
+self.Loaded_Cargo[unitname]=loaded
+else
+loaded={}
+loaded.Troopsloaded=0
+loaded.Cratesloaded=0
+loaded.Cargo={}
+self.Loaded_Cargo[unitname]=loaded
 end
-self:ScheduleOnce(0.5,RegisterDynamicCargo)
+local Group=client:GetGroup()
+self:_SendMessage(string.format("Crate %s unloaded by ground crew!",event.IniDynamicCargoName),10,false,Group)
+self:__CratesDropped(1,Group,client,{dcargo})
+end
+elseif event.id==EVENTS.DynamicCargoRemoved then
+self:T(self.lid.."GC Remove Event "..event.IniDynamicCargoName)
+self.DynamicCargo[event.IniDynamicCargoName]=nil
 end
 return self
 end
@@ -66833,7 +67754,7 @@ end
 local capabilities=self:_GetUnitCapabilities(Unit)
 local canloadcratesno=capabilities.cratelimit
 local loaddist=self.CrateDistance or 35
-local nearcrates,numbernearby=self:_FindCratesNearby(Group,Unit,loaddist,true)
+local nearcrates,numbernearby=self:_FindCratesNearby(Group,Unit,loaddist,true,true)
 if numbernearby>=canloadcratesno and not drop then
 self:_SendMessage("There are enough crates nearby already! Take care of those first!",10,false,Group)
 return self
@@ -66863,35 +67784,37 @@ local addon=0
 if IsHerc or IsHook then
 addon=180
 end
+heading=(heading+addon)%360
+local row=1
+local column=1
+local initialdist=IsHerc and 16 or(capabilities.length+2)
+local startpos=position:Translate(initialdist,heading)
+if self.placeCratesAhead==true then
+cratedistance=initialdist
+end
+local cratecoord=nil
 for i=1,number do
 local cratealias=string.format("%s-%s-%d",cratename,cratetemplate,math.random(1,100000))
-if not self.placeCratesAhead then
+if not self.placeCratesAhead or drop==true then
 cratedistance=(i-1)*2.5+capabilities.length
 if cratedistance>self.CrateDistance then cratedistance=self.CrateDistance end
 rheading=UTILS.RandomGaussian(0,30,-90,90,100)
-rheading=math.fmod((heading+rheading+addon),360)
-else
-local initialSpacing=IsHerc and 16 or(capabilities.length+2)
-local crateSpacing=4
-local lateralSpacing=4
-local nrSideBySideCrates=3
-if cratesneeded==1 then
-cratedistance=initialSpacing
-rheading=heading
-else
-if(i-1)%nrSideBySideCrates==0 then
-cratedistance=i==1 and initialSpacing or cratedistance+crateSpacing
-angleOffNose=math.ceil(math.deg(math.atan(lateralSpacing/cratedistance)))
-rheading=heading-angleOffNose
+rheading=math.fmod((heading+rheading),360)
+cratecoord=position:Translate(cratedistance,rheading)
 else
-rheading=rheading+angleOffNose
+cratedistance=(row-1)*6
+rheading=90
+row=row+1
+cratecoord=startpos:Translate(cratedistance,rheading)
+if row>4 then
+row=1
+startpos:Translate(6,heading,nil,true)
 end
 end
-end
-local cratecoord=position:Translate(cratedistance,rheading)
-local cratevec2=cratecoord:GetVec2()
 self.CrateCounter=self.CrateCounter+1
-local basetype=self.basetype or"container_cargo"
+local CCat,CType,CShape=Cargo:GetStaticTypeAndShape()
+local basetype=CType or self.basetype or"container_cargo"
+CCat=CCat or"Cargos"
 if isstatic then
 basetype=cratetemplate
 end
@@ -66904,20 +67827,26 @@ local dist=shipcoord:Get2DDistance(unitcoord)
 dist=dist-(20+math.random(1,10))
 local width=width/2
 local Offy=math.random(-width,width)
-local spawnstatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local spawnstatic=SPAWNSTATIC:NewFromType(basetype,CCat,self.cratecountry)
 :InitCargoMass(cgomass)
 :InitCargo(self.enableslingload)
 :InitLinkToUnit(Ship,dist,Offy,0)
+if CShape then
+spawnstatic:InitShape(CShape)
+end
 if isstatic then
 local map=cargotype:GetStaticResourceMap()
 spawnstatic.TemplateStaticUnit.resourcePayload=map
 end
 self.Spawned_Crates[self.CrateCounter]=spawnstatic:Spawn(270,cratealias)
 else
-local spawnstatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local spawnstatic=SPAWNSTATIC:NewFromType(basetype,CCat,self.cratecountry)
 :InitCoordinate(cratecoord)
 :InitCargoMass(cgomass)
 :InitCargo(self.enableslingload)
+if CShape then
+spawnstatic:InitShape(CShape)
+end
 if isstatic then
 local map=cargotype:GetStaticResourceMap()
 spawnstatic.TemplateStaticUnit.resourcePayload=map
@@ -66933,12 +67862,22 @@ if drop then
 realcargo=CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,true,false,cratesneeded,self.Spawned_Crates[self.CrateCounter],true,cargotype.PerCrateMass,nil,subcat)
 local map=cargotype:GetStaticResourceMap()
 realcargo:SetStaticResourceMap(map)
+local CCat,CType,CShape=cargotype:GetStaticTypeAndShape()
+realcargo:SetStaticTypeAndShape(CCat,CType,CShape)
+if cargotype.TypeNames then
+realcargo.TypeNames=UTILS.DeepCopy(cargotype.TypeNames)
+end
 table.insert(droppedcargo,realcargo)
 else
 realcargo=CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,false,false,cratesneeded,self.Spawned_Crates[self.CrateCounter],false,cargotype.PerCrateMass,nil,subcat)
 local map=cargotype:GetStaticResourceMap()
 realcargo:SetStaticResourceMap(map)
+if cargotype.TypeNames then
+realcargo.TypeNames=UTILS.DeepCopy(cargotype.TypeNames)
 end
+end
+local CCat,CType,CShape=cargotype:GetStaticTypeAndShape()
+realcargo:SetStaticTypeAndShape(CCat,CType,CShape)
 table.insert(self.Spawned_Cargo,realcargo)
 end
 if not(drop or pack)then
@@ -66952,7 +67891,7 @@ end
 self:_SendMessage(text,10,false,Group)
 return self
 end
-function CTLD:InjectStatics(Zone,Cargo,RandomCoord)
+function CTLD:InjectStatics(Zone,Cargo,RandomCoord,FromLoad)
 self:T(self.lid.." InjectStatics")
 local cratecoord=Zone:GetCoordinate()
 if RandomCoord then
@@ -66968,21 +67907,29 @@ local cratetemplate="Container"
 local cratename=cargotype:GetName()
 local cgotype=cargotype:GetType()
 local cgomass=cargotype:GetMass()
+local cratenumber=cargotype:GetCratesNeeded()or 1
+if FromLoad==true then cratenumber=1 end
+for i=1,cratenumber do
 local cratealias=string.format("%s-%s-%d",cratename,cratetemplate,math.random(1,100000))
 local isstatic=false
 if cgotype==CTLD_CARGO.Enum.STATIC then
 cratetemplate=cargotype:GetTemplates()
 isstatic=true
 end
-local basetype=self.basetype or"container_cargo"
+local CCat,CType,CShape=cargotype:GetStaticTypeAndShape()
+local basetype=CType or self.basetype or"container_cargo"
+CCat=CCat or"Cargos"
 if isstatic then
 basetype=cratetemplate
 end
 self.CrateCounter=self.CrateCounter+1
-local spawnstatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local spawnstatic=SPAWNSTATIC:NewFromType(basetype,CCat,self.cratecountry)
 :InitCargoMass(cgomass)
 :InitCargo(self.enableslingload)
 :InitCoordinate(cratecoord)
+if CShape then
+spawnstatic:InitShape(CShape)
+end
 if isstatic then
 local map=cargotype:GetStaticResourceMap()
 spawnstatic.TemplateStaticUnit.resourcePayload=map
@@ -66992,18 +67939,19 @@ local templ=cargotype:GetTemplates()
 local sorte=cargotype:GetType()
 cargotype.Positionable=self.Spawned_Crates[self.CrateCounter]
 table.insert(self.Spawned_Cargo,cargotype)
+end
 return self
 end
 function CTLD:InjectStaticFromTemplate(Zone,Template,Mass)
 self:T(self.lid.." InjectStaticFromTemplate")
 local cargotype=self:GetStaticsCargoFromTemplate(Template,Mass)
-self:InjectStatics(Zone,cargotype,true)
+self:InjectStatics(Zone,cargotype,true,true)
 return self
 end
 function CTLD:_ListCratesNearby(_group,_unit)
 self:T(self.lid.." _ListCratesNearby")
 local finddist=self.CrateDistance or 35
-local crates,number,loadedbygc,indexgc=self:_FindCratesNearby(_group,_unit,finddist,true)
+local crates,number,loadedbygc,indexgc=self:_FindCratesNearby(_group,_unit,finddist,true,true)
 if number>0 or indexgc>0 then
 local text=REPORT:New("Crates Found Nearby:")
 text:Add("------------------------------------------------------------")
@@ -67022,7 +67970,7 @@ text:Add("        N O N E")
 end
 text:Add("------------------------------------------------------------")
 if indexgc>0 then
-text:Add("Probably ground crew loaded (F8)")
+text:Add("Probably ground crew loadable (F8)")
 for _,_entry in pairs(loadedbygc)do
 local entry=_entry
 local name=entry:GetName()
@@ -67043,7 +67991,7 @@ end
 function CTLD:_RemoveCratesNearby(_group,_unit)
 self:T(self.lid.." _RemoveCratesNearby")
 local finddist=self.CrateDistance or 35
-local crates,number=self:_FindCratesNearby(_group,_unit,finddist,true)
+local crates,number=self:_FindCratesNearby(_group,_unit,finddist,true,true)
 if number>0 then
 local text=REPORT:New("Removing Crates Found Nearby:")
 text:Add("------------------------------------------------------------")
@@ -67088,7 +68036,7 @@ self:E({_point1,_point2})
 return-1
 end
 end
-function CTLD:_FindCratesNearby(_group,_unit,_dist,_ignoreweight)
+function CTLD:_FindCratesNearby(_group,_unit,_dist,_ignoreweight,ignoretype)
 self:T(self.lid.." _FindCratesNearby")
 local finddist=_dist
 local location=_group:GetCoordinate()
@@ -67100,53 +68048,31 @@ local LoadedbyGC={}
 local loadedmass=0
 local unittype="none"
 local capabilities={}
-local maxmass=2000
 local maxloadable=2000
-local IsNoHook=not self:IsHook(_unit)
+local IsHook=self:IsHook(_unit)
 if not _ignoreweight then
 maxloadable=self:_GetMaxLoadableMass(_unit)
 end
-self:T(self.lid.." Max loadable mass: "..maxloadable)
+self:T2(self.lid.." Max loadable mass: "..maxloadable)
 for _,_cargoobject in pairs(existingcrates)do
 local cargo=_cargoobject
 local static=cargo:GetPositionable()
 local weight=cargo:GetMass()
 local staticid=cargo:GetID()
-self:T(self.lid.." Found cargo mass: "..weight)
-local cargoalive=false
-local dcsunit=nil
-local dcsunitpos=nil
-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:T({dcsvec3=dcsunit:getPoint(),dcspos=dcsunit:getPosition().p})
-if dcsvec3 then
-dcsunitpos=COORDINATE:New(dcsvec3.x,dcsvec3.z,dcsvec3.y)
-end
-end
-end
-if static and(static:IsAlive()or cargoalive)then
-local staticpos=static:GetCoordinate()or dcsunitpos
-local landheight=staticpos:GetLandHeight()
-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
+self:T2(self.lid.." Found cargo mass: "..weight)
+if static and static:IsAlive()then
+local restricthooktononstatics=self.enableChinookGCLoading and IsHook
+local cargoisstatic=cargo:GetType()==CTLD_CARGO.Enum.STATIC and true or false
+local restricted=cargoisstatic and restricthooktononstatics
+local staticpos=static:GetCoordinate()
+local cando=cargo:UnitCanCarry(_unit)
+if ignoretype==true then cando=true end
 local distance=self:_GetDistance(location,staticpos)
-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
+if distance<=finddist and(weight<=maxloadable or _ignoreweight)and restricted==false and cando==true then
 index=index+1
 table.insert(found,staticid,cargo)
 maxloadable=maxloadable-weight
 end
-if GCloaded==true and distance<10 and static then
-indexg=indexg+1
-table.insert(LoadedbyGC,staticid,cargo)
-end
 end
 end
 return found,index,LoadedbyGC,indexg
@@ -67187,15 +68113,15 @@ loaded.Cratesloaded=0
 loaded.Cargo={}
 end
 local finddist=self.CrateDistance or 35
-local nearcrates,number=self:_FindCratesNearby(Group,Unit,finddist,false)
+local nearcrates,number=self:_FindCratesNearby(Group,Unit,finddist,false,false)
 self:T(self.lid.." Crates found: "..number)
 if number==0 and self.hoverautoloading then
 return self
 elseif number==0 then
-self:_SendMessage("Sorry no loadable crates nearby or max cargo weight reached!",10,false,Group)
+self:_SendMessage("Sorry, no loadable crates nearby or max cargo weight reached!",10,false,Group)
 return self
 elseif numberonboard==cratelimit then
-self:_SendMessage("Sorry no fully loaded!",10,false,Group)
+self:_SendMessage("Sorry, we are fully loaded!",10,false,Group)
 return self
 else
 local capacity=cratelimit-numberonboard
@@ -67274,9 +68200,13 @@ local type=cargo:GetType()
 if(type==CTLD_CARGO.Enum.TROOPS or type==CTLD_CARGO.Enum.ENGINEERS)and not cargo:WasDropped()then
 loadedmass=loadedmass+(cargo.PerCrateMass*cargo:GetCratesNeeded())
 end
-if type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS and not cargo:WasDropped()then
+if type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS and type~=CTLD_CARGO.Enum.GCLOADABLE and not cargo:WasDropped()then
 loadedmass=loadedmass+cargo.PerCrateMass
 end
+if type==CTLD_CARGO.Enum.GCLOADABLE then
+local mass=cargo:GetCargoWeight()
+loadedmass=loadedmass+mass
+end
 end
 end
 return loadedmass
@@ -67308,8 +68238,7 @@ local loadedcargo=self.Loaded_Cargo[unitname]or{}
 local loadedmass=self:_GetUnitCargoMass(Unit)
 local maxloadable=self:_GetMaxLoadableMass(Unit)
 local finddist=self.CrateDistance or 35
-local _,_,loadedgc,loadedno=self:_FindCratesNearby(Group,Unit,finddist,true)
-if self.Loaded_Cargo[unitname]or loadedno>0 then
+if self.Loaded_Cargo[unitname]then
 local no_troops=loadedcargo.Troopsloaded or 0
 local no_crates=loadedcargo.Cratesloaded or 0
 local cargotable=loadedcargo.Cargo or{}
@@ -67334,26 +68263,18 @@ local cratecount=0
 for _,_cargo in pairs(cargotable or{})do
 local cargo=_cargo
 local type=cargo:GetType()
-if(type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS)and(not cargo:WasDropped()or self.allowcratepickupagain)then
+if(type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS and type~=CTLD_CARGO.Enum.GCLOADABLE)and(not cargo:WasDropped()or self.allowcratepickupagain)then
 report:Add(string.format("Crate: %s size 1",cargo:GetName()))
 cratecount=cratecount+1
 end
+if type==CTLD_CARGO.Enum.GCLOADABLE and not cargo:WasDropped()then
+report:Add(string.format("GC loaded Crate: %s size 1",cargo:GetName()))
+cratecount=cratecount+1
+end
 end
 if cratecount==0 then
 report:Add("        N O N E")
 end
-if loadedno>0 then
-report:Add("------------------------------------------------------------")
-report:Add("       -- CRATES loaded via F8 --")
-for _,_cargo in pairs(loadedgc or{})do
-local cargo=_cargo
-local type=cargo:GetType()
-if(type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS)then
-report:Add(string.format("Crate: %s size 1",cargo:GetName()))
-loadedmass=loadedmass+cargo:GetMass()
-end
-end
-end
 report:Add("------------------------------------------------------------")
 report:Add("Total Mass: "..loadedmass.." kg. Loadable: "..maxloadable.." kg.")
 local text=report:Text()
@@ -67454,7 +68375,7 @@ return false
 end
 end
 function CTLD:IsHook(Unit)
-if string.find(Unit:GetTypeName(),"CH.47")then
+if Unit and string.find(Unit:GetTypeName(),"CH.47")then
 return true
 else
 return false
@@ -67525,10 +68446,12 @@ local heading=Group:GetHeading()or 0
 if hoverunload or grounded then
 randomcoord=Group:GetCoordinate()
 local Angle=(heading+270)%360
-local offset=hoverunload and 1.5 or 5
+local offset=hoverunload and self.TroopUnloadDistHover or self.TroopUnloadDistGround
 randomcoord:Translate(offset,Angle,nil,true)
 end
 local tempcount=0
+local ishook=self:IsHook(Unit)
+if ishook then tempcount=self.ChinookTroopCircleRadius or 5 end
 for _,_template in pairs(temptable)do
 self.TroopCounter=self.TroopCounter+1
 tempcount=tempcount+1
@@ -67623,7 +68546,7 @@ local cargotable=loadedcargo.Cargo
 for _,_cargo in pairs(cargotable)do
 local cargo=_cargo
 local type=cargo:GetType()
-if type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS and(not cargo:WasDropped()or self.allowcratepickupagain)then
+if type~=CTLD_CARGO.Enum.TROOPS and type~=CTLD_CARGO.Enum.ENGINEERS and type~=CTLD_CARGO.Enum.GCLOADABLE and(not cargo:WasDropped()or self.allowcratepickupagain)then
 self:_GetCrates(Group,Unit,cargo,1,true)
 cargo:SetWasDropped(true)
 cargo:SetHasMoved(true)
@@ -67641,6 +68564,10 @@ if type==CTLD_CARGO.Enum.TROOPS or type==CTLD_CARGO.Enum.ENGINEERS then
 table.insert(loaded.Cargo,_cargo)
 loaded.Troopsloaded=loaded.Troopsloaded+size
 end
+if type==CTLD_CARGO.Enum.GCLOADABLE and not cargo:WasDropped()then
+table.insert(loaded.Cargo,_cargo)
+loaded.Cratesloaded=loaded.Cratesloaded+size
+end
 end
 self.Loaded_Cargo[unitname]=nil
 self.Loaded_Cargo[unitname]=loaded
@@ -67671,7 +68598,7 @@ return self
 end
 end
 local finddist=self.CrateDistance or 35
-local crates,number=self:_FindCratesNearby(Group,Unit,finddist,true)
+local crates,number=self:_FindCratesNearby(Group,Unit,finddist,true,true)
 local buildables={}
 local foundbuilds=false
 local canbuild=false
@@ -67776,7 +68703,7 @@ end
 function CTLD:_RepairCrates(Group,Unit,Engineering)
 self:T(self.lid.." _RepairCrates")
 local finddist=self.CrateDistance or 35
-local crates,number=self:_FindCratesNearby(Group,Unit,finddist,true)
+local crates,number=self:_FindCratesNearby(Group,Unit,finddist,true,true)
 local buildables={}
 local foundbuilds=false
 local canbuild=false
@@ -67987,7 +68914,7 @@ local capabilities=self:_GetUnitCapabilities(_unit)
 local cantroops=capabilities.troops
 local cancrates=capabilities.crates
 local isHook=self:IsHook(_unit)
-local nohookswitch=not(isHook and self.enableChinookGCLoading)
+local nohookswitch=true
 local topmenu=MENU_GROUP:New(_group,"CTLD",nil)
 local toptroops=nil
 local topcrates=nil
@@ -68161,7 +69088,7 @@ local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,true,NoTr
 table.insert(self.Cargo_Troops,cargo)
 return self
 end
-function CTLD:AddCratesCargo(Name,Templates,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
+function CTLD:AddCratesCargo(Name,Templates,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location,UnitTypes,Category,TypeName,ShapeName)
 self:T(self.lid.." AddCratesCargo")
 if not self:_CheckTemplates(Templates)then
 self:E(self.lid.."Crates Cargo for "..Name.." has missing template(s)!")
@@ -68169,6 +69096,13 @@ return self
 end
 self.CargoCounter=self.CargoCounter+1
 local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,false,NoCrates,nil,nil,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
+if UnitTypes then
+cargo:AddUnitTypeName(UnitTypes)
+end
+cargo:SetStaticTypeAndShape("Cargos",self.basetype)
+if TypeName then
+cargo:SetStaticTypeAndShape(Category,TypeName,ShapeName)
+end
 table.insert(self.Cargo_Crates,cargo)
 return self
 end
@@ -68201,7 +69135,7 @@ local cargo=CTLD_CARGO:New(self.CargoCounter,Name,template,type,false,false,1,ni
 cargo:SetStaticResourceMap(ResourceMap)
 return cargo
 end
-function CTLD:AddCratesRepair(Name,Template,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
+function CTLD:AddCratesRepair(Name,Template,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location,UnitTypes,Category,TypeName,ShapeName)
 self:T(self.lid.." AddCratesRepair")
 if not self:_CheckTemplates(Template)then
 self:E(self.lid.."Repair Cargo for "..Name.." has a missing template!")
@@ -68209,6 +69143,13 @@ return self
 end
 self.CargoCounter=self.CargoCounter+1
 local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Template,Type,false,false,NoCrates,nil,nil,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
+if UnitTypes then
+cargo:AddUnitTypeName(UnitTypes)
+end
+cargo:SetStaticTypeAndShape("cargos",self.basetype)
+if TypeName then
+cargo:SetStaticTypeAndShape(Category,TypeName,ShapeName)
+end
 table.insert(self.Cargo_Crates,cargo)
 return self
 end
@@ -68950,7 +69891,7 @@ local wrenches=engineers.Group
 self:T(_engineers.lid.._engineers:GetStatus())
 if wrenches and wrenches:IsAlive()then
 if engineers:IsStatus("Running")or engineers:IsStatus("Searching")then
-local crates,number=self:_FindCratesNearby(wrenches,nil,self.EngineerSearch,true)
+local crates,number=self:_FindCratesNearby(wrenches,nil,self.EngineerSearch,true,true)
 engineers:Search(crates,number)
 elseif engineers:IsStatus("Moving")then
 engineers:Move()
@@ -69172,7 +70113,10 @@ self:HandleEvent(EVENTS.PlayerEnterAircraft,self._EventHandler)
 self:HandleEvent(EVENTS.PlayerEnterUnit,self._EventHandler)
 self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventHandler)
 self:HandleEvent(EVENTS.UnitLost,self._EventHandler)
-self:HandleEvent(EVENTS.Birth,self._EventHandler)
+self:HandleEvent(EVENTS.NewDynamicCargo,self._EventHandler)
+self:HandleEvent(EVENTS.DynamicCargoLoaded,self._EventHandler)
+self:HandleEvent(EVENTS.DynamicCargoUnloaded,self._EventHandler)
+self:HandleEvent(EVENTS.DynamicCargoRemoved,self._EventHandler)
 self:__Status(-5)
 if self.enableLoadSave then
 local interval=self.saveinterval
@@ -69231,9 +70175,11 @@ return self
 end
 function CTLD:onafterStop(From,Event,To)
 self:T({From,Event,To})
-self:UnhandleEvent(EVENTS.PlayerEnterAircraft)
-self:UnhandleEvent(EVENTS.PlayerEnterUnit)
-self:UnhandleEvent(EVENTS.PlayerLeaveUnit)
+self:UnHandleEvent(EVENTS.PlayerEnterAircraft)
+self:UnHandleEvent(EVENTS.PlayerEnterUnit)
+self:UnHandleEvent(EVENTS.PlayerLeaveUnit)
+self:UnHandleEvent(EVENTS.UnitLost)
+self:UnHandleEvent(EVENTS.Shot)
 return self
 end
 function CTLD:onbeforeTroopsPickedUp(From,Event,To,Group,Unit,Cargo)
@@ -69566,7 +70512,7 @@ local map=cargotype:GetStaticResourceMap()
 injectstatic:SetStaticResourceMap(map)
 end
 if injectstatic then
-self:InjectStatics(dropzone,injectstatic)
+self:InjectStatics(dropzone,injectstatic,false,true)
 end
 end
 end
@@ -69749,7 +70695,7 @@ local position=Cargo_Drop_Position:GetVec2()
 local Zone=ZONE_RADIUS:New("Cargo Static "..math.random(1,10000),position,100)
 if not dead then
 local injectstatic=CTLD_CARGO:New(nil,"Cargo Static Group "..math.random(1,10000),"iso_container",CTLD_CARGO.Enum.STATIC,true,false,1,nil,true,4500,1)
-self.CTLD:InjectStatics(Zone,injectstatic,true)
+self.CTLD:InjectStatics(Zone,injectstatic,true,true)
 end
 return self
 end
@@ -69757,13 +70703,17 @@ function CTLD_HERCULES:Cargo_SpawnDroppedAsCargo(_name,_pos)
 local theCargo=self.CTLD:_FindCratesCargoObject(_name)
 if theCargo then
 self.CTLD.CrateCounter=self.CTLD.CrateCounter+1
-self.CTLD.CargoCounter=self.CTLD.CargoCounter+1
-local basetype=self.CTLD.basetype or"container_cargo"
-local theStatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local CCat,CType,CShape=theCargo:GetStaticTypeAndShape()
+local basetype=CType or self.CTLD.basetype or"container_cargo"
+CCat=CCat or"Cargos"
+local theStatic=SPAWNSTATIC:NewFromType(basetype,CCat,self.cratecountry)
 :InitCargoMass(theCargo.PerCrateMass)
 :InitCargo(self.CTLD.enableslingload)
 :InitCoordinate(_pos)
-:Spawn(270,_name.."-Container-"..math.random(1,100000))
+if CShape then
+theStatic:InitShape(CShape)
+end
+theStatic:Spawn(270,_name.."-Container-"..math.random(1,100000))
 self.CTLD.Spawned_Crates[self.CTLD.CrateCounter]=theStatic
 local newCargo=CTLD_CARGO:New(self.CTLD.CargoCounter,theCargo.Name,theCargo.Templates,theCargo.CargoType,true,false,theCargo.CratesNeeded,self.CTLD.Spawned_Crates[self.CTLD.CrateCounter],true,theCargo.PerCrateMass,nil,theCargo.Subcategory)
 local map=theCargo:GetStaticResourceMap()
@@ -70020,6 +70970,7 @@ allheligroupset=nil,
 topmenuname="CSAR",
 ADFRadioPwr=1000,
 PilotWeight=80,
+CreateRadioBeacons=true,
 }
 CSAR.AircraftType={}
 CSAR.AircraftType["SA342Mistral"]=2
@@ -70039,7 +70990,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.26"
+CSAR.version="1.0.27"
 function CSAR:New(Coalition,Template,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Template,Alias})
@@ -71004,7 +71955,7 @@ distancetext=string.format("%.1fnm",UTILS.MetersToNM(_distance))
 else
 distancetext=string.format("%.1fkm",_distance/1000.0)
 end
-if _value.frequency==0 then
+if _value.frequency==0 or self.CreateRadioBeacons==false then
 table.insert(_csarList,{dist=_distance,msg=string.format("%s at %s - %s ",_value.desc,_coordinatesText,distancetext)})
 else
 table.insert(_csarList,{dist=_distance,msg=string.format("%s at %s - %.2f KHz ADF - %s ",_value.desc,_coordinatesText,_value.frequency/1000,distancetext)})
@@ -71291,6 +72242,7 @@ return clock
 end
 function CSAR:_AddBeaconToGroup(_group,_freq)
 self:T(self.lid.." _AddBeaconToGroup")
+if self.CreateRadioBeacons==false then return end
 local _group=_group
 if _group==nil then
 for _i,_current in ipairs(self.UsedVHFFrequencies)do
@@ -71316,6 +72268,7 @@ return self
 end
 function CSAR:_RefreshRadioBeacons()
 self:T(self.lid.." _RefreshRadioBeacons")
+if self.CreateRadioBeacons==false then return end
 if self:_CountActiveDownedPilots()>0 then
 local PilotTable=self.downedPilots
 for _,_pilot in pairs(PilotTable)do
@@ -82087,11 +83040,11 @@ Microsoft={
 ["David"]="Microsoft David Desktop",
 ["Zira"]="Microsoft Zira Desktop",
 ["Hortense"]="Microsoft Hortense Desktop",
-["de-DE-Hedda"]="Microsoft Hedda Desktop",
-["en-GB-Hazel"]="Microsoft Hazel Desktop",
-["en-US-David"]="Microsoft David Desktop",
-["en-US-Zira"]="Microsoft Zira Desktop",
-["fr-FR-Hortense"]="Microsoft Hortense Desktop",
+["de_DE_Hedda"]="Microsoft Hedda Desktop",
+["en_GB_Hazel"]="Microsoft Hazel Desktop",
+["en_US_David"]="Microsoft David Desktop",
+["en_US_Zira"]="Microsoft Zira Desktop",
+["fr_FR_Hortense"]="Microsoft Hortense Desktop",
 },
 MicrosoftGRPC={
 ["Hazel"]="Hazel",
@@ -82597,7 +83550,7 @@ end
 function MSRS:PlayTextExt(Text,Delay,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate)
 self:T({Text,Delay,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate})
 if Delay and Delay>0 then
-self:ScheduleOnce(Delay,MSRS.PlayTextExt,self,Text,0,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate)
+self:ScheduleOnce(Delay,self.PlayTextExt,self,Text,0,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate)
 else
 Frequencies=Frequencies or self:GetFrequencies()
 Modulations=Modulations or self:GetModulations()
@@ -82732,8 +83685,8 @@ end
 return res
 end
 function MSRS:_DCSgRPCtts(Text,Frequencies,Gender,Culture,Voice,Volume,Label,Coordinate)
-self:F("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
-self:F({Text,Frequencies,Gender,Culture,Voice,Volume,Label,Coordinate})
+self:T("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
+self:T({Text,Frequencies,Gender,Culture,Voice,Volume,Label,Coordinate})
 local options={}
 local ssml=Text or''
 Frequencies=UTILS.EnsureTable(Frequencies,true)or self:GetFrequencies()
@@ -82745,7 +83698,6 @@ options.position.lat,options.position.lon,options.position.alt=self:_GetLatLongA
 end
 options.coalition=UTILS.GetCoalitionName(self.coalition):lower()
 local provider=self.provider or MSRS.Provider.WINDOWS
-self:F({provider=provider})
 options.provider={}
 options.provider[provider]=self:GetProviderOptions(provider)
 Voice=Voice or self:GetVoice(self.provider)or self.voice