@jtff/miztemplate-lib 3.2.3 → 3.3.0

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2024-05-04T14:54:20+02:00-044fb66ca064687a743791e5a4a5d02c109ca9c1 ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-08-12T11:39:03+02:00-a54944b0214abee2fc0206e8a246bbe9f36c41d3 ***')
 if not MOOSE_DEVELOPMENT_FOLDER then
 MOOSE_DEVELOPMENT_FOLDER='Scripts'
 end
@@ -1044,7 +1044,9 @@ TheChannel="TheChannel",
 Syria="Syria",
 MarianaIslands="MarianaIslands",
 Falklands="Falklands",
-Sinai="SinaiMap"
+Sinai="SinaiMap",
+Kola="Kola",
+Afghanistan="Afghanistan",
 }
 CALLSIGN={
 Aircraft={
@@ -1165,6 +1167,44 @@ Trash=10,
 Cargo=11,
 Ascot=12,
 },
+AH64={
+Army_Air=9,
+Apache=10,
+Crow=11,
+Sioux=12,
+Gatling=13,
+Gunslinger=14,
+Hammerhead=15,
+Bootleg=16,
+Palehorse=17,
+Carnivor=18,
+Saber=19,
+},
+Kiowa={
+Anvil=1,
+Azrael=2,
+BamBam=3,
+Blackjack=4,
+Bootleg=5,
+BurninStogie=6,
+Chaos=7,
+CrazyHorse=8,
+Crusader=9,
+Darkhorse=10,
+Eagle=11,
+Lighthorse=12,
+Mustang=13,
+Outcast=14,
+Palehorse=15,
+Pegasus=16,
+Pistol=17,
+Roughneck=18,
+Saber=19,
+Shamus=20,
+Spur=21,
+Stetson=22,
+Wrath=23,
+},
 }
 UTILS={
 _MarkID=1
@@ -1315,6 +1355,11 @@ return s
 end
 end
 end
+function UTILS.TableLength(T)
+local count=0
+for _ in pairs(T or{})do count=count+1 end
+return count
+end
 function UTILS.PrintTableToLog(table,indent,noprint)
 local text="\n"
 if not table or type(table)~="table"then
@@ -1324,7 +1369,7 @@ end
 if not indent then indent=0 end
 for k,v in pairs(table)do
 if string.find(k," ")then k='"'..k..'"'end
-if type(v)=="table"then
+if type(v)=="table"and UTILS.TableLength(v)>0 then
 if not noprint then
 env.info(string.rep("  ",indent)..tostring(k).." = {")
 end
@@ -2070,6 +2115,10 @@ elseif map==DCSMAP.Falklands then
 declination=12
 elseif map==DCSMAP.Sinai then
 declination=4.8
+elseif map==DCSMAP.Kola then
+declination=15
+elseif map==DCSMAP.Afghanistan then
+declination=3
 else
 declination=0
 end
@@ -2207,6 +2256,16 @@ if value==Callsign then
 return name
 end
 end
+for name,value in pairs(CALLSIGN.AH64)do
+if value==Callsign then
+return name
+end
+end
+for name,value in pairs(CALLSIGN.Kiowa)do
+if value==Callsign then
+return name
+end
+end
 return"Ghostrider"
 end
 function UTILS.GMTToLocalTimeDifference()
@@ -2229,6 +2288,10 @@ elseif theatre==DCSMAP.Falklands then
 return-3
 elseif theatre==DCSMAP.Sinai then
 return 2
+elseif theatre==DCSMAP.Kola then
+return 3
+elseif theatre==DCSMAP.Afghanistan then
+return 4.5
 else
 BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0",tostring(theatre)))
 return 0
@@ -2413,6 +2476,14 @@ if type_name=="MH-60R"and(unit:getDrawArgumentValue(403)>0 or unit:getDrawArgume
 BASE:T(unit_name.." cargo door is open")
 return true
 end
+if type_name=="OH-58D"and(unit:getDrawArgumentValue(35)>0 or unit:getDrawArgumentValue(421)==-1)then
+BASE:T(unit_name.." cargo door is open")
+return true
+end
+if type_name=="CH-47Fbl1"and(unit:getDrawArgumentValue(86)>0.5)then
+BASE:T(unit_name.." rear cargo door is open")
+return true
+end
 return false
 end
 return nil
@@ -2688,6 +2759,9 @@ local group=_group
 if group and group:IsAlive()then
 local name=group:GetName()
 local template=string.gsub(name,"-(.+)$","")
+if string.find(name,"AID")then
+template=string.gsub(name,"(.AID.%d+$","")
+end
 if string.find(template,"#")then
 template=string.gsub(name,"#(%d+)$","")
 end
@@ -3498,6 +3572,95 @@ end
 local clockPos=math.ceil((relativeAngle%360)/30)
 return clockPos.." o'clock"
 end
+function UTILS.MGRSStringToSRSFriendly(Text,Slow)
+local Text=string.gsub(Text,"MGRS ","")
+Text=string.gsub(Text,"%s+","")
+Text=string.gsub(Text,"([%a%d])","%1;")
+Text=string.gsub(Text,"A","Alpha")
+Text=string.gsub(Text,"B","Bravo")
+Text=string.gsub(Text,"C","Charlie")
+Text=string.gsub(Text,"D","Delta")
+Text=string.gsub(Text,"E","Echo")
+Text=string.gsub(Text,"F","Foxtrot")
+Text=string.gsub(Text,"G","Golf")
+Text=string.gsub(Text,"H","Hotel")
+Text=string.gsub(Text,"I","India")
+Text=string.gsub(Text,"J","Juliett")
+Text=string.gsub(Text,"K","Kilo")
+Text=string.gsub(Text,"L","Lima")
+Text=string.gsub(Text,"M","Mike")
+Text=string.gsub(Text,"N","November")
+Text=string.gsub(Text,"O","Oscar")
+Text=string.gsub(Text,"P","Papa")
+Text=string.gsub(Text,"Q","Quebec")
+Text=string.gsub(Text,"R","Romeo")
+Text=string.gsub(Text,"S","Sierra")
+Text=string.gsub(Text,"T","Tango")
+Text=string.gsub(Text,"U","Uniform")
+Text=string.gsub(Text,"V","Victor")
+Text=string.gsub(Text,"W","Whiskey")
+Text=string.gsub(Text,"X","Xray")
+Text=string.gsub(Text,"Y","Yankee")
+Text=string.gsub(Text,"Z","Zulu")
+Text=string.gsub(Text,"0","zero")
+Text=string.gsub(Text,"9","niner")
+if Slow then
+Text='<prosody rate="slow">'..Text..'</prosody>'
+end
+Text="MGRS;"..Text
+return Text
+end
+function UTILS.ReadCSV(filename)
+if not UTILS.FileExists(filename)then
+env.error("File does not exist")
+return nil
+end
+local function _loadfile(filename)
+local f=io.open(filename,"rb")
+if f then
+local data=f:read("*all")
+f:close()
+return data
+else
+BASE:E(string.format("WARNING: Could read data from file %s!",tostring(filename)))
+return nil
+end
+end
+local data=_loadfile(filename)
+local lines=UTILS.Split(data,"\n")
+for _,line in pairs(lines)do
+line=string.gsub(line,"[\n\r]","")
+end
+local sep=";"
+local columns=UTILS.Split(lines[1],sep)
+table.remove(lines,1)
+local csvdata={}
+for i,line in pairs(lines)do
+line=string.gsub(line,"[\n\r]","")
+local row={}
+for j,value in pairs(UTILS.Split(line,sep))do
+local key=string.gsub(columns[j],"[\n\r]","")
+row[key]=value
+end
+table.insert(csvdata,row)
+end
+return csvdata
+end
+function UTILS.LCGRandomSeed(seed)
+UTILS.lcg={
+seed=seed or math.random(1,2^32-1),
+a=1664525,
+c=1013904223,
+m=2^32
+}
+end
+function UTILS.LCGRandom()
+if UTILS.lcg==nil then
+UTILS.LCGRandomSeed()
+end
+UTILS.lcg.seed=(UTILS.lcg.a*UTILS.lcg.seed+UTILS.lcg.c)%UTILS.lcg.m
+return UTILS.lcg.seed/UTILS.lcg.m
+end
 PROFILER={
 ClassName="PROFILER",
 Counters={},
@@ -4789,7 +4952,7 @@ message.volume=Volume
 self:SendTable(message)
 return self
 end
-local _TraceOnOff=true
+local _TraceOnOff=false
 local _TraceLevel=1
 local _TraceAll=false
 local _TraceClass={}
@@ -5143,7 +5306,7 @@ end
 end
 end
 function BASE:F(Arguments)
-if BASE.Debug and _TraceOnOff then
+if BASE.Debug and _TraceOnOff==true then
 local DebugInfoCurrent=BASE.Debug.getinfo(2,"nl")
 local DebugInfoFrom=BASE.Debug.getinfo(3,"l")
 if _TraceLevel>=1 then
@@ -5152,7 +5315,7 @@ end
 end
 end
 function BASE:F2(Arguments)
-if BASE.Debug and _TraceOnOff then
+if BASE.Debug and _TraceOnOff==true and _TraceLevel>=2 then
 local DebugInfoCurrent=BASE.Debug.getinfo(2,"nl")
 local DebugInfoFrom=BASE.Debug.getinfo(3,"l")
 if _TraceLevel>=2 then
@@ -5161,7 +5324,7 @@ end
 end
 end
 function BASE:F3(Arguments)
-if BASE.Debug and _TraceOnOff then
+if BASE.Debug and _TraceOnOff==true and _TraceLevel>=3 then
 local DebugInfoCurrent=BASE.Debug.getinfo(2,"nl")
 local DebugInfoFrom=BASE.Debug.getinfo(3,"l")
 if _TraceLevel>=3 then
@@ -5191,7 +5354,7 @@ end
 end
 end
 function BASE:T(Arguments)
-if BASE.Debug and _TraceOnOff then
+if BASE.Debug and _TraceOnOff==true then
 local DebugInfoCurrent=BASE.Debug.getinfo(2,"nl")
 local DebugInfoFrom=BASE.Debug.getinfo(3,"l")
 if _TraceLevel>=1 then
@@ -5200,7 +5363,7 @@ end
 end
 end
 function BASE:T2(Arguments)
-if BASE.Debug and _TraceOnOff then
+if BASE.Debug and _TraceOnOff==true and _TraceLevel>=2 then
 local DebugInfoCurrent=BASE.Debug.getinfo(2,"nl")
 local DebugInfoFrom=BASE.Debug.getinfo(3,"l")
 if _TraceLevel>=2 then
@@ -5209,7 +5372,7 @@ end
 end
 end
 function BASE:T3(Arguments)
-if BASE.Debug and _TraceOnOff then
+if BASE.Debug and _TraceOnOff==true and _TraceLevel>=3 then
 local DebugInfoCurrent=BASE.Debug.getinfo(2,"nl")
 local DebugInfoFrom=BASE.Debug.getinfo(3,"l")
 if _TraceLevel>=3 then
@@ -6409,14 +6572,18 @@ UnitDeleteTask=world.event.S_EVENT_UNIT_DELETE_TASK or-1,
 SimulationStart=world.event.S_EVENT_SIMULATION_START or-1,
 WeaponRearm=world.event.S_EVENT_WEAPON_REARM or-1,
 WeaponDrop=world.event.S_EVENT_WEAPON_DROP or-1,
-UnitTaskTimeout=world.event.S_EVENT_UNIT_TASK_TIMEOUT or-1,
+UnitTaskComplete=world.event.S_EVENT_UNIT_TASK_COMPLETE or-1,
 UnitTaskStage=world.event.S_EVENT_UNIT_TASK_STAGE or-1,
-MacSubtaskScore=world.event.S_EVENT_MAC_SUBTASK_SCORE or-1,
 MacExtraScore=world.event.S_EVENT_MAC_EXTRA_SCORE or-1,
 MissionRestart=world.event.S_EVENT_MISSION_RESTART or-1,
 MissionWinner=world.event.S_EVENT_MISSION_WINNER or-1,
-PostponedTakeoff=world.event.S_EVENT_POSTPONED_TAKEOFF or-1,
-PostponedLand=world.event.S_EVENT_POSTPONED_LAND or-1,
+RunwayTakeoff=world.event.S_EVENT_RUNWAY_TAKEOFF or-1,
+RunwayTouch=world.event.S_EVENT_RUNWAY_TOUCH or-1,
+MacLMSRestart=world.event.S_EVENT_MAC_LMS_RESTART or-1,
+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,
 }
 local _EVENTMETA={
 [world.event.S_EVENT_SHOT]={
@@ -6730,24 +6897,12 @@ Side="I",
 Event="OnEventWeaponDrop",
 Text="S_EVENT_WEAPON_DROP"
 },
-[EVENTS.UnitTaskTimeout]={
-Order=1,
-Side="I",
-Event="OnEventUnitTaskTimeout",
-Text="S_EVENT_UNIT_TASK_TIMEOUT "
-},
 [EVENTS.UnitTaskStage]={
 Order=1,
 Side="I",
 Event="OnEventUnitTaskStage",
 Text="S_EVENT_UNIT_TASK_STAGE "
 },
-[EVENTS.MacSubtaskScore]={
-Order=1,
-Side="I",
-Event="OnEventMacSubtaskScore",
-Text="S_EVENT_MAC_SUBTASK_SCORE"
-},
 [EVENTS.MacExtraScore]={
 Order=1,
 Side="I",
@@ -6766,17 +6921,47 @@ Side="I",
 Event="OnEventMissionWinner",
 Text="S_EVENT_MISSION_WINNER"
 },
-[EVENTS.PostponedTakeoff]={
+[EVENTS.RunwayTakeoff]={
+Order=1,
+Side="I",
+Event="OnEventRunwayTakeoff",
+Text="S_EVENT_RUNWAY_TAKEOFF"
+},
+[EVENTS.RunwayTouch]={
+Order=1,
+Side="I",
+Event="OnEventRunwayTouch",
+Text="S_EVENT_RUNWAY_TOUCH"
+},
+[EVENTS.MacLMSRestart]={
+Order=1,
+Side="I",
+Event="OnEventMacLMSRestart",
+Text="S_EVENT_MAC_LMS_RESTART"
+},
+[EVENTS.SimulationFreeze]={
 Order=1,
 Side="I",
-Event="OnEventPostponedTakeoff",
-Text="S_EVENT_POSTPONED_TAKEOFF"
+Event="OnEventSimulationFreeze",
+Text="S_EVENT_SIMULATION_FREEZE"
 },
-[EVENTS.PostponedLand]={
+[EVENTS.SimulationUnfreeze]={
 Order=1,
 Side="I",
-Event="OnEventPostponedLand",
-Text="S_EVENT_POSTPONED_LAND"
+Event="OnEventSimulationUnfreeze",
+Text="S_EVENT_SIMULATION_UNFREEZE"
+},
+[EVENTS.HumanAircraftRepairStart]={
+Order=1,
+Side="I",
+Event="OnEventHumanAircraftRepairStart",
+Text="S_EVENT_HUMAN_AIRCRAFT_REPAIR_START"
+},
+[EVENTS.HumanAircraftRepairFinish]={
+Order=1,
+Side="I",
+Event="OnEventHumanAircraftRepairFinish",
+Text="S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH"
 },
 }
 function EVENT:New()
@@ -7099,7 +7284,7 @@ Event.TgtCategory=Event.TgtDCSUnit:getDesc().category
 Event.TgtTypeName=Event.TgtDCSUnit:getTypeName()
 elseif Event.TgtObjectCategory==Object.Category.STATIC then
 Event.TgtDCSUnit=Event.target
-if Event.target:isExist()and Event.id~=33 then
+if Event.target.isExist and Event.target:isExist()and Event.id~=33 then
 Event.TgtDCSUnitName=Event.TgtDCSUnit:getName()
 if Event.TgtDCSUnitName and Event.TgtDCSUnitName~=""then
 Event.TgtUnitName=Event.TgtDCSUnitName
@@ -7135,14 +7320,14 @@ Event.TgtCategory=Event.TgtDCSUnit:getDesc().category
 Event.TgtTypeName=Event.TgtDCSUnit:getTypeName()
 end
 end
-if Event.weapon then
+if Event.weapon and type(Event.weapon)=="table"then
 Event.Weapon=Event.weapon
-Event.WeaponName=Event.Weapon:getTypeName()
+Event.WeaponName=Event.weapon:isExist()and Event.weapon:getTypeName()or"Unknown Weapon"
 Event.WeaponUNIT=CLIENT:Find(Event.Weapon,'',true)
 Event.WeaponPlayerName=Event.WeaponUNIT and Event.Weapon.getPlayerName and Event.Weapon:getPlayerName()
-Event.WeaponCoalition=Event.WeaponUNIT and Event.Weapon:getCoalition()
-Event.WeaponCategory=Event.WeaponUNIT and Event.Weapon:getDesc().category
-Event.WeaponTypeName=Event.WeaponUNIT and Event.Weapon:getTypeName()
+Event.WeaponCoalition=Event.WeaponUNIT and Event.Weapon.getCoalition and Event.Weapon:getCoalition()
+Event.WeaponCategory=Event.WeaponUNIT and Event.Weapon.getDesc and Event.Weapon:getDesc().category
+Event.WeaponTypeName=Event.WeaponUNIT and Event.Weapon.getTypeName and Event.Weapon:getTypeName()
 end
 if Event.place then
 if Event.id==EVENTS.LandingAfterEjection then
@@ -7588,8 +7773,7 @@ end
 function SETTINGS:SetPlayerMenu(PlayerUnit)
 if _SETTINGS.ShowPlayerMenu==true then
 local PlayerGroup=PlayerUnit:GetGroup()
-local PlayerName=PlayerUnit:GetPlayerName()
-local PlayerNames=PlayerGroup:GetPlayerNames()
+local PlayerName=PlayerUnit:GetPlayerName()or"None"
 local PlayerMenu=MENU_GROUP:New(PlayerGroup,'Settings "'..PlayerName..'"')
 self.PlayerMenu=PlayerMenu
 self:T(string.format("Setting menu for player %s",tostring(PlayerName)))
@@ -8395,6 +8579,7 @@ return self
 end
 end
 function MENU_GROUP_DELAYED:Set()
+if not self.GroupID then return end
 do
 if not self.MenuSet then
 missionCommands.addSubMenuForGroup(self.GroupID,self.MenuText,self.MenuParentPath)
@@ -9013,7 +9198,7 @@ local FoundUnit=UNIT:FindByName(UnitObject:getName())
 if FoundUnit then
 SetUnit:AddUnit(FoundUnit)
 else
-local FoundStatic=STATIC:FindByName(UnitObject:getName())
+local FoundStatic=STATIC:FindByName(UnitObject:getName(),false)
 if FoundStatic then
 SetUnit:AddUnit(FoundStatic)
 end
@@ -9991,10 +10176,18 @@ for _,object in pairs(layer["objects"])do
 if object["name"]==DrawingName then
 if(object["primitiveType"]=="Line"and object["closed"]==true)or(object["polygonMode"]=="free")then
 for _,point in UTILS.spairs(object["points"])do
+local skip=false
 local p={x=object["mapX"]+point["x"],
 y=object["mapY"]+point["y"]}
+for _,pt in pairs(points)do
+if pt.x==p.x and pt.y==p.y then
+skip=true
+end
+end
+if not skip then
 table.add(points,p)
 end
+end
 elseif object["polygonMode"]=="rect"then
 local angle=object["angle"]
 local half_width=object["width"]/2
@@ -10620,6 +10813,7 @@ self:HandleEvent(EVENTS.PlayerEnterUnit,self._EventOnPlayerEnterUnit)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Hit,self.AccountHits)
 self:HandleEvent(EVENTS.NewCargo)
 self:HandleEvent(EVENTS.DeleteCargo)
@@ -10637,14 +10831,15 @@ function DATABASE:FindUnit(UnitName)
 local UnitFound=self.UNITS[UnitName]
 return UnitFound
 end
-function DATABASE:AddUnit(DCSUnitName)
-if not self.UNITS[DCSUnitName]then
+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)
 end
 return self.UNITS[DCSUnitName]
 end
 function DATABASE:DeleteUnit(DCSUnitName)
+self:T("DeleteUnit "..tostring(DCSUnitName))
 self.UNITS[DCSUnitName]=nil
 end
 function DATABASE:AddStatic(DCSStaticName)
@@ -10928,18 +11123,22 @@ function DATABASE:FindClient(ClientName)
 local ClientFound=self.CLIENTS[ClientName]
 return ClientFound
 end
-function DATABASE:AddClient(ClientName)
-if not self.CLIENTS[ClientName]then
+function DATABASE:AddClient(ClientName,Force)
+if not self.CLIENTS[ClientName]or Force==true then
 self.CLIENTS[ClientName]=CLIENT:Register(ClientName)
 end
 return self.CLIENTS[ClientName]
 end
 function DATABASE:FindGroup(GroupName)
 local GroupFound=self.GROUPS[GroupName]
+if GroupFound==nil and GroupName~=nil and self.Templates.Groups[GroupName]==nil then
+self:_RegisterDynamicGroup(GroupName)
+return self.GROUPS[GroupName]
+end
 return GroupFound
 end
-function DATABASE:AddGroup(GroupName)
-if not self.GROUPS[GroupName]then
+function DATABASE:AddGroup(GroupName,force)
+if not self.GROUPS[GroupName]or force==true then
 self:T({"Add GROUP:",GroupName})
 self.GROUPS[GroupName]=GROUP:Register(GroupName)
 end
@@ -11132,10 +11331,13 @@ end
 return nextoctal
 end
 function DATABASE:GetGroupTemplate(GroupName)
-local GroupTemplate=self.Templates.Groups[GroupName].Template
+local GroupTemplate=nil
+if self.Templates.Groups[GroupName]then
+GroupTemplate=self.Templates.Groups[GroupName].Template
 GroupTemplate.SpawnCoalitionID=self.Templates.Groups[GroupName].CoalitionID
 GroupTemplate.SpawnCategoryID=self.Templates.Groups[GroupName].CategoryID
 GroupTemplate.SpawnCountryID=self.Templates.Groups[GroupName].CountryID
+end
 return GroupTemplate
 end
 function DATABASE:_RegisterStaticTemplate(StaticTemplate,CoalitionID,CategoryID,CountryID)
@@ -11161,6 +11363,34 @@ Country=self.Templates.Statics[StaticTemplateName].CountryID
 self:AddStatic(StaticTemplateName)
 return self
 end
+function DATABASE:_GetGenericStaticCargoGroupTemplate(Name,Typename,Mass,Coalition,Country)
+local StaticTemplate={}
+StaticTemplate.name=Name or"None"
+StaticTemplate.units={[1]={
+name=Name,
+resourcePayload={
+["weapons"]={},
+["aircrafts"]={},
+["gasoline"]=0,
+["diesel"]=0,
+["methanol_mixture"]=0,
+["jet_fuel"]=0,
+},
+["mass"]=Mass or 0,
+["category"]="Cargos",
+["canCargo"]=true,
+["type"]=Typename or"container_cargo",
+["rate"]=100,
+["y"]=0,
+["x"]=0,
+["heading"]=0,
+}}
+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)
 if self.Templates.Statics[StaticName]then
 local StaticTemplate=self.Templates.Statics[StaticName].GroupTemplate
@@ -11204,14 +11434,26 @@ return nil
 end
 end
 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))
+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))
+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))
+return nil
+end
 function DATABASE:GetCoalitionFromAirbase(AirbaseName)
 return self.AIRBASES[AirbaseName]:GetCoalition()
 end
@@ -11235,6 +11477,22 @@ end
 end
 return self
 end
+function DATABASE:_RegisterDynamicGroup(Groupname)
+local DCSGroup=Group.getByName(Groupname)
+if DCSGroup and DCSGroup:isExist()then
+local DCSGroupName=DCSGroup:getName()
+self:I(string.format("Register Group: %s",tostring(DCSGroupName)))
+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)
+end
+else
+self:E({"Group does not exist: ",DCSGroup})
+end
+return self
+end
 function DATABASE:_RegisterGroupsAndUnits()
 local CoalitionsData={GroupsRed=coalition.getGroups(coalition.side.RED),GroupsBlue=coalition.getGroups(coalition.side.BLUE),GroupsNeutral=coalition.getGroups(coalition.side.NEUTRAL)}
 for CoalitionId,CoalitionData in pairs(CoalitionsData)do
@@ -11323,24 +11581,27 @@ end
 end
 end
 if Event.IniObjectCategory==Object.Category.UNIT then
-Event.IniUnit=self:FindUnit(Event.IniDCSUnitName)
 Event.IniGroup=self:FindGroup(Event.IniDCSGroupName)
+Event.IniUnit=self:FindUnit(Event.IniDCSUnitName)
 local client=self.CLIENTS[Event.IniDCSUnitName]
 if client then
 end
 local PlayerName=Event.IniUnit:GetPlayerName()
 if PlayerName then
 self:I(string.format("Player '%s' joined unit '%s' of group '%s'",tostring(PlayerName),tostring(Event.IniDCSUnitName),tostring(Event.IniDCSGroupName)))
-if not client then
-client=self:AddClient(Event.IniDCSUnitName)
+if client==nil or(client and client:CountPlayers()==0)then
+client=self:AddClient(Event.IniDCSUnitName,true)
 end
 client:AddPlayer(PlayerName)
 if not self.PLAYERS[PlayerName]then
 self:AddPlayer(Event.IniUnitName,PlayerName)
 end
+local function SetPlayerSettings(self,PlayerName,IniUnit)
 local Settings=SETTINGS:Set(PlayerName)
-Settings:SetPlayerMenu(Event.IniUnit)
-self:CreateEventPlayerEnterAircraft(Event.IniUnit)
+Settings:SetPlayerMenu(IniUnit)
+self:CreateEventPlayerEnterAircraft(IniUnit)
+end
+self:ScheduleOnce(1,SetPlayerSettings,self,PlayerName,Event.IniUnit)
 end
 end
 end
@@ -11363,7 +11624,7 @@ end
 else
 if Event.IniObjectCategory==1 then
 if self.UNITS[Event.IniDCSUnitName]then
-self:DeleteUnit(Event.IniDCSUnitName)
+self:ScheduleOnce(1,self.DeleteUnit,self,Event.IniDCSUnitName)
 end
 local client=self.CLIENTS[name]
 if client then
@@ -12319,6 +12580,8 @@ self:HandleEvent(EVENTS.Birth,self._EventOnBirth)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventOnDeadOrCrash)
 if self.Filter.Zones then
 self.ZoneTimer=TIMER:New(self._ContinousZoneFilter,self)
 local timing=self.ZoneTimerInterval or 30
@@ -12337,6 +12600,7 @@ self:UnHandleEvent(EVENTS.Birth)
 self:UnHandleEvent(EVENTS.Dead)
 self:UnHandleEvent(EVENTS.Crash)
 self:UnHandleEvent(EVENTS.RemoveUnit)
+self:UnHandleEvent(EVENTS.UnitLost)
 if self.Filter.Zones and self.ZoneTimer and self.ZoneTimer:IsRunning()then
 self.ZoneTimer:Stop()
 end
@@ -12627,14 +12891,17 @@ local gmin=nil
 for GroupID,GroupData in pairs(Set)do
 local group=GroupData
 if group and group:IsAlive()and(Coalitions==nil or UTILS.IsAnyInTable(Coalitions,group:GetCoalition()))then
-local coord=group:GetCoord()
-local d=UTILS.VecDist3D(Coordinate,coord)
+local coord=group:GetCoordinate()
+local d
+if coord~=nil then
+d=UTILS.VecDist3D(Coordinate,coord)
 if d<dmin then
 dmin=d
 gmin=group
 end
 end
 end
+end
 return gmin,dmin
 end
 function SET_GROUP:SetCargoBayWeightLimit()
@@ -12788,6 +13055,18 @@ Active=Active or not(Active==false)
 self.Filter.Active=Active
 return self
 end
+function SET_UNIT:FilterAlive()
+self:FilterFunction(
+function(unit)
+if unit and unit:IsExist()and unit:IsAlive()then
+return true
+else
+return false
+end
+end
+)
+return self
+end
 function SET_UNIT:FilterHasRadar(RadarTypes)
 self.Filter.RadarTypes=self.Filter.RadarTypes or{}
 if type(RadarTypes)~="table"then
@@ -12856,6 +13135,7 @@ self:HandleEvent(EVENTS.Birth,self._EventOnBirth)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._EventOnDeadOrCrash)
 if self.Filter.Zones then
 self.ZoneTimer=TIMER:New(self._ContinousZoneFilter,self)
 local timing=self.ZoneTimerInterval or 30
@@ -13882,6 +14162,18 @@ Active=Active or not(Active==false)
 self.Filter.Active=Active
 return self
 end
+function SET_CLIENT:FilterAlive()
+self:FilterFunction(
+function(unit)
+if unit and unit:IsExist()and unit:IsAlive()then
+return true
+else
+return false
+end
+end
+)
+return self
+end
 function SET_CLIENT:FilterZones(Zones)
 if not self.Filter.Zones then
 self.Filter.Zones={}
@@ -14039,8 +14331,11 @@ if self.Filter.Coalitions and MClientInclude then
 local MClientCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 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 self.FilterMeta.Coalitions[CoalitionName]==ClientCoalitionID then
+if self.FilterMeta.Coalitions[CoalitionName]and ClientCoalitionID and self.FilterMeta.Coalitions[CoalitionName]==ClientCoalitionID then
 MClientCoalition=true
 end
 end
@@ -14051,11 +14346,20 @@ if self.Filter.Categories and MClientInclude then
 local MClientCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 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 self.FilterMeta.Categories[CategoryName]==ClientCategoryID then
+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
@@ -14074,8 +14378,11 @@ if self.Filter.Countries and MClientInclude then
 local MClientCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
 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 country.id[CountryName]==ClientCountryID then
+if country.id[CountryName]and ClientCountryID and country.id[CountryName]==ClientCountryID then
 MClientCountry=true
 end
 end
@@ -14314,27 +14621,39 @@ self:F2(MClient)
 local MClientInclude=true
 if MClient then
 local MClientName=MClient.UnitName
-if self.Filter.Coalitions then
+if self.Filter.Coalitions and MClientInclude then
 local MClientCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 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 self.FilterMeta.Coalitions[CoalitionName]==ClientCoalitionID then
+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 then
+if self.Filter.Categories and MClientInclude then
 local MClientCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 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 self.FilterMeta.Categories[CategoryName]==ClientCategoryID then
+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
@@ -15573,6 +15892,7 @@ self:HandleEvent(EVENTS.Birth,self._EventOnBirth)
 self:HandleEvent(EVENTS.Dead,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._EventOnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._EventOnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._EventOnDeadOrCrash)
 end
 return self
 end
@@ -17159,6 +17479,8 @@ local Latitude,Longitude=self:GetLLDDM()
 local Tdiff=UTILS.GMTToLocalTimeDifference()
 local sunrise=UTILS.GetSunRiseAndSet(DayOfYear,Latitude,Longitude,true,Tdiff)
 local sunset=UTILS.GetSunRiseAndSet(DayOfYear,Latitude,Longitude,false,Tdiff)
+if sunrise=="N/R"then return false end
+if sunrise=="N/S"then return true end
 local time=UTILS.ClockToSeconds(clock)
 if time>sunrise and time<=sunset then
 return true
@@ -17830,19 +18152,7 @@ return self
 end
 function MESSAGE:ToClient(Client,Settings)
 self:F(Client)
-if Client and Client:GetClientGroupID()then
-if self.MessageType then
-local Settings=Settings or(Client and _DATABASE:GetPlayerSettings(Client:GetPlayerName()))or _SETTINGS
-self.MessageDuration=Settings:GetMessageTime(self.MessageType)
-self.MessageCategory=""
-end
-local Unit=Client:GetClient()
-if self.MessageDuration~=0 then
-local ClientGroupID=Client:GetClientGroupID()
-self:T(self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$","").." / "..self.MessageDuration)
-trigger.action.outTextForUnit(Unit:GetID(),self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$",""),self.MessageDuration,self.ClearScreen)
-end
-end
+self:ToUnit(Client,Settings)
 return self
 end
 function MESSAGE:ToGroup(Group,Settings)
@@ -17980,9 +18290,9 @@ _MESSAGESRS.MSRS:SetProviderOptionsGoogle(PathToCredentials)
 _MESSAGESRS.MSRS:SetProvider(MSRS.Provider.GOOGLE)
 end
 _MESSAGESRS.label=Label or MSRS.Label or"MESSAGE"
-_MESSAGESRS.MSRS:SetLabel(Label or"MESSAGE")
+_MESSAGESRS.MSRS:SetLabel(_MESSAGESRS.label)
 _MESSAGESRS.port=Port or MSRS.port or 5002
-_MESSAGESRS.MSRS:SetPort(Port or 5002)
+_MESSAGESRS.MSRS:SetPort(_MESSAGESRS.port)
 _MESSAGESRS.volume=Volume or MSRS.volume or 1
 _MESSAGESRS.MSRS:SetVolume(_MESSAGESRS.volume)
 if Voice then _MESSAGESRS.MSRS:SetVoice(Voice)end
@@ -18538,7 +18848,6 @@ Cold=4,
 }
 function SPAWN:New(SpawnTemplatePrefix)
 local self=BASE:Inherit(self,BASE:New())
-self:F({SpawnTemplatePrefix})
 local TemplateGroup=GROUP:FindByName(SpawnTemplatePrefix)
 if TemplateGroup then
 self.SpawnTemplatePrefix=SpawnTemplatePrefix
@@ -18580,7 +18889,6 @@ return self
 end
 function SPAWN:NewWithAlias(SpawnTemplatePrefix,SpawnAliasPrefix)
 local self=BASE:Inherit(self,BASE:New())
-self:F({SpawnTemplatePrefix,SpawnAliasPrefix})
 local TemplateGroup=GROUP:FindByName(SpawnTemplatePrefix)
 if TemplateGroup then
 self.SpawnTemplatePrefix=SpawnTemplatePrefix
@@ -18622,7 +18930,6 @@ return self
 end
 function SPAWN:NewFromTemplate(SpawnTemplate,SpawnTemplatePrefix,SpawnAliasPrefix,NoMooseNamingPostfix)
 local self=BASE:Inherit(self,BASE:New())
-self:F({SpawnTemplate,SpawnTemplatePrefix,SpawnAliasPrefix})
 if SpawnTemplatePrefix==nil or SpawnTemplatePrefix==""then
 BASE:I("ERROR: in function NewFromTemplate, required parameter SpawnTemplatePrefix is not set")
 return nil
@@ -18671,7 +18978,6 @@ self.SpawnHookScheduler=SCHEDULER:New(nil)
 return self
 end
 function SPAWN:InitLimit(SpawnMaxUnitsAlive,SpawnMaxGroups)
-self:F({self.SpawnTemplatePrefix,SpawnMaxUnitsAlive,SpawnMaxGroups})
 self.SpawnInitLimit=true
 self.SpawnMaxUnitsAlive=SpawnMaxUnitsAlive
 self.SpawnMaxGroups=SpawnMaxGroups
@@ -18681,24 +18987,21 @@ end
 return self
 end
 function SPAWN:InitKeepUnitNames(KeepUnitNames)
-self:F()
-self.SpawnInitKeepUnitNames=KeepUnitNames or true
+self.SpawnInitKeepUnitNames=false
+if KeepUnitNames==true then self.SpawnInitKeepUnitNames=true end
 return self
 end
 function SPAWN:InitLateActivated(LateActivated)
-self:F()
 self.LateActivated=LateActivated or true
 return self
 end
 function SPAWN:InitAirbase(AirbaseName,Takeoff,TerminalType)
-self:F()
 self.SpawnInitAirbase=AIRBASE:FindByName(AirbaseName)
 self.SpawnInitTakeoff=Takeoff or SPAWN.Takeoff.Hot
 self.SpawnInitTerminalType=TerminalType
 return self
 end
 function SPAWN:InitHeading(HeadingMin,HeadingMax)
-self:F()
 self.SpawnInitHeadingMin=HeadingMin
 self.SpawnInitHeadingMax=HeadingMax
 return self
@@ -18716,22 +19019,18 @@ self.SpawnInitCoalition=Coalition
 return self
 end
 function SPAWN:InitCountry(Country)
-self:F()
 self.SpawnInitCountry=Country
 return self
 end
 function SPAWN:InitCategory(Category)
-self:F()
 self.SpawnInitCategory=Category
 return self
 end
 function SPAWN:InitLivery(Livery)
-self:F({livery=Livery})
 self.SpawnInitLivery=Livery
 return self
 end
 function SPAWN:InitSkill(Skill)
-self:F({skill=Skill})
 if Skill:lower()=="average"then
 self.SpawnInitSkill="Average"
 elseif Skill:lower()=="good"then
@@ -18746,7 +19045,6 @@ end
 return self
 end
 function SPAWN:InitSTN(Octal)
-self:F({Octal=Octal})
 self.SpawnInitSTN=Octal or 77777
 local num=UTILS.OctalToDecimal(Octal)
 if num==nil or num<1 then
@@ -18759,7 +19057,6 @@ end
 return self
 end
 function SPAWN:InitSADL(Octal)
-self:F({Octal=Octal})
 self.SpawnInitSADL=Octal or 7777
 local num=UTILS.OctalToDecimal(Octal)
 if num==nil or num<1 then
@@ -18772,7 +19069,6 @@ end
 return self
 end
 function SPAWN:InitSpeedMps(MPS)
-self:F({MPS=MPS})
 if MPS==nil or tonumber(MPS)<0 then
 MPS=125
 end
@@ -18780,7 +19076,6 @@ self.InitSpeed=MPS
 return self
 end
 function SPAWN:InitSpeedKnots(Knots)
-self:F({Knots=Knots})
 if Knots==nil or tonumber(Knots)<0 then
 Knots=300
 end
@@ -18788,7 +19083,6 @@ self.InitSpeed=UTILS.KnotsToMps(Knots)
 return self
 end
 function SPAWN:InitSpeedKph(KPH)
-self:F({KPH=KPH})
 if KPH==nil or tonumber(KPH)<0 then
 KPH=UTILS.KnotsToKmph(300)
 end
@@ -18796,17 +19090,14 @@ self.InitSpeed=UTILS.KmphToMps(KPH)
 return self
 end
 function SPAWN:InitRadioCommsOnOff(switch)
-self:F({switch=switch})
 self.SpawnInitRadio=switch or true
 return self
 end
 function SPAWN:InitRadioFrequency(frequency)
-self:F({frequency=frequency})
 self.SpawnInitFreq=frequency
 return self
 end
 function SPAWN:InitRadioModulation(modulation)
-self:F({modulation=modulation})
 if modulation and modulation:lower()=="fm"then
 self.SpawnInitModu=radio.modulation.FM
 else
@@ -18823,7 +19114,6 @@ self.SpawnInitModexPostfix=postfix
 return self
 end
 function SPAWN:InitRandomizeRoute(SpawnStartPoint,SpawnEndPoint,SpawnRadius,SpawnHeight)
-self:F({self.SpawnTemplatePrefix,SpawnStartPoint,SpawnEndPoint,SpawnRadius,SpawnHeight})
 self.SpawnRandomizeRoute=true
 self.SpawnRandomizeRouteStartPoint=SpawnStartPoint
 self.SpawnRandomizeRouteEndPoint=SpawnEndPoint
@@ -18835,7 +19125,6 @@ end
 return self
 end
 function SPAWN:InitRandomizePosition(RandomizePosition,OuterRadius,InnerRadius)
-self:F({self.SpawnTemplatePrefix,RandomizePosition,OuterRadius,InnerRadius})
 self.SpawnRandomizePosition=RandomizePosition or false
 self.SpawnRandomizePositionOuterRadius=OuterRadius or 0
 self.SpawnRandomizePositionInnerRadius=InnerRadius or 0
@@ -18845,7 +19134,6 @@ end
 return self
 end
 function SPAWN:InitRandomizeUnits(RandomizeUnits,OuterRadius,InnerRadius)
-self:F({self.SpawnTemplatePrefix,RandomizeUnits,OuterRadius,InnerRadius})
 self.SpawnRandomizeUnits=RandomizeUnits or false
 self.SpawnOuterRadius=OuterRadius or 0
 self.SpawnInnerRadius=InnerRadius or 0
@@ -18855,19 +19143,16 @@ end
 return self
 end
 function SPAWN:InitSetUnitRelativePositions(Positions)
-self:F({self.SpawnTemplatePrefix,Positions})
 self.SpawnUnitsWithRelativePositions=true
 self.UnitsRelativePositions=Positions
 return self
 end
 function SPAWN:InitSetUnitAbsolutePositions(Positions)
-self:F({self.SpawnTemplatePrefix,Positions})
 self.SpawnUnitsWithAbsolutePositions=true
 self.UnitsAbsolutePositions=Positions
 return self
 end
 function SPAWN:InitRandomizeTemplate(SpawnTemplatePrefixTable)
-self:F({self.SpawnTemplatePrefix,SpawnTemplatePrefixTable})
 local temptable={}
 for _,_temp in pairs(SpawnTemplatePrefixTable)do
 temptable[#temptable+1]=_temp
@@ -18880,24 +19165,20 @@ end
 return self
 end
 function SPAWN:InitRandomizeTemplateSet(SpawnTemplateSet)
-self:F({self.SpawnTemplatePrefix})
 local setnames=SpawnTemplateSet:GetSetNames()
 self:InitRandomizeTemplate(setnames)
 return self
 end
 function SPAWN:InitRandomizeTemplatePrefixes(SpawnTemplatePrefixes)
-self:F({self.SpawnTemplatePrefix})
 local SpawnTemplateSet=SET_GROUP:New():FilterPrefixes(SpawnTemplatePrefixes):FilterOnce()
 self:InitRandomizeTemplateSet(SpawnTemplateSet)
 return self
 end
 function SPAWN:InitGrouping(Grouping)
-self:F({self.SpawnTemplatePrefix,Grouping})
 self.SpawnGrouping=Grouping
 return self
 end
 function SPAWN:InitRandomizeZones(SpawnZoneTable)
-self:F({self.SpawnTemplatePrefix,SpawnZoneTable})
 local temptable={}
 for _,_temp in pairs(SpawnZoneTable)do
 temptable[#temptable+1]=_temp
@@ -18923,59 +19204,54 @@ self.SpawnInitCallSignName=string.lower(Name):gsub("^%l",string.upper)
 return self
 end
 function SPAWN:InitPositionCoordinate(Coordinate)
-self:T({self.SpawnTemplatePrefix,Coordinate:GetVec2()})
+self:T2({self.SpawnTemplatePrefix,Coordinate:GetVec2()})
 self:InitPositionVec2(Coordinate:GetVec2())
 return self
 end
 function SPAWN:InitPositionVec2(Vec2)
-self:T({self.SpawnTemplatePrefix,Vec2})
+self:T2({self.SpawnTemplatePrefix,Vec2})
 self.SpawnInitPosition=Vec2
 self.SpawnFromNewPosition=true
-self:I("MaxGroups:"..self.SpawnMaxGroups)
+self:T2("MaxGroups:"..self.SpawnMaxGroups)
 for SpawnGroupID=1,self.SpawnMaxGroups do
 self:_SetInitialPosition(SpawnGroupID)
 end
 return self
 end
 function SPAWN:InitRepeat()
-self:F({self.SpawnTemplatePrefix,self.SpawnIndex})
 self.Repeat=true
 self.RepeatOnEngineShutDown=false
 self.RepeatOnLanding=true
 return self
 end
 function SPAWN:InitRepeatOnLanding()
-self:F({self.SpawnTemplatePrefix})
 self:InitRepeat()
 self.RepeatOnEngineShutDown=false
 self.RepeatOnLanding=true
 return self
 end
 function SPAWN:InitRepeatOnEngineShutDown()
-self:F({self.SpawnTemplatePrefix})
 self:InitRepeat()
 self.RepeatOnEngineShutDown=true
 self.RepeatOnLanding=false
 return self
 end
 function SPAWN:InitCleanUp(SpawnCleanUpInterval)
-self:F({self.SpawnTemplatePrefix,SpawnCleanUpInterval})
 self.SpawnCleanUpInterval=SpawnCleanUpInterval
 self.SpawnCleanUpTimeStamps={}
 local SpawnGroup,SpawnCursor=self:GetFirstAliveGroup()
-self:T({"CleanUp Scheduler:",SpawnGroup})
+self:T2({"CleanUp Scheduler:",SpawnGroup})
 self.CleanUpScheduler=SCHEDULER:New(self,self._SpawnCleanUpScheduler,{},1,SpawnCleanUpInterval,0.2)
 return self
 end
 function SPAWN:InitArray(SpawnAngle,SpawnWidth,SpawnDeltaX,SpawnDeltaY)
-self:F({self.SpawnTemplatePrefix,SpawnAngle,SpawnWidth,SpawnDeltaX,SpawnDeltaY})
 self.SpawnVisible=true
 local SpawnX=0
 local SpawnY=0
 local SpawnXIndex=0
 local SpawnYIndex=0
 for SpawnGroupID=1,self.SpawnMaxGroups do
-self:T({SpawnX,SpawnY,SpawnXIndex,SpawnYIndex})
+self:T2({SpawnX,SpawnY,SpawnXIndex,SpawnYIndex})
 self.SpawnGroups[SpawnGroupID].Visible=true
 self.SpawnGroups[SpawnGroupID].Spawned=false
 SpawnXIndex=SpawnXIndex+1
@@ -18992,9 +19268,9 @@ self.SpawnGroups[SpawnGroupID].SpawnTemplate.lateActivation=true
 self.SpawnGroups[SpawnGroupID].SpawnTemplate.visible=true
 self.SpawnGroups[SpawnGroupID].Visible=true
 self:HandleEvent(EVENTS.Birth,self._OnBirth)
-self:HandleEvent(EVENTS.Dead,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._OnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._OnDeadOrCrash)
 if self.Repeat then
 self:HandleEvent(EVENTS.Takeoff,self._OnTakeOff)
 self:HandleEvent(EVENTS.Land,self._OnLand)
@@ -19008,6 +19284,19 @@ SpawnY=SpawnYIndex*SpawnDeltaY
 end
 return self
 end
+function SPAWN:StopRepeat()
+if self.Repeat then
+self:UnHandleEvent(EVENTS.Takeoff)
+self:UnHandleEvent(EVENTS.Land)
+end
+if self.RepeatOnEngineShutDown then
+self:UnHandleEvent(EVENTS.EngineShutdown)
+end
+self.Repeat=false
+self.RepeatOnEngineShutDown=false
+self.RepeatOnLanding=false
+return self
+end
 do
 function SPAWN:InitAIOnOff(AIOnOff)
 self.AIOnOff=AIOnOff
@@ -19032,8 +19321,8 @@ function SPAWN:InitDelayOff()
 return self:InitDelayOnOff(false)
 end
 end
-function SPAWN:InitHiddenOnMap()
-self.SpawnHiddenOnMap=true
+function SPAWN:InitHiddenOnMap(OnOff)
+self.SpawnHiddenOnMap=OnOff==false and false or true
 return self
 end
 function SPAWN:InitHiddenOnMFD()
@@ -19045,7 +19334,6 @@ self.SpawnHiddenOnPlanner=true
 return self
 end
 function SPAWN:Spawn()
-self:F({self.SpawnTemplatePrefix,self.SpawnIndex,self.AliveUnits})
 if self.SpawnInitAirbase then
 return self:SpawnAtAirbase(self.SpawnInitAirbase,self.SpawnInitTakeoff,nil,self.SpawnInitTerminalType)
 else
@@ -19053,7 +19341,6 @@ return self:SpawnWithIndex(self.SpawnIndex+1)
 end
 end
 function SPAWN:ReSpawn(SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex})
 if not SpawnIndex then
 SpawnIndex=1
 end
@@ -19070,17 +19357,29 @@ if SpawnGroup and WayPoints then
 SpawnGroup:WayPointInitialize(WayPoints)
 SpawnGroup:WayPointExecute(1,5)
 end
-if SpawnGroup.ReSpawnFunction then
+if SpawnGroup and SpawnGroup.ReSpawnFunction then
 SpawnGroup:ReSpawnFunction()
 end
-SpawnGroup:ResetEvents()
+if SpawnGroup then SpawnGroup:ResetEvents()end
 return SpawnGroup
 end
 function SPAWN:SetSpawnIndex(SpawnIndex)
 self.SpawnIndex=SpawnIndex or 0
 end
 function SPAWN:SpawnWithIndex(SpawnIndex,NoBirth)
-self:F2({SpawnTemplatePrefix=self.SpawnTemplatePrefix,SpawnIndex=SpawnIndex,AliveUnits=self.AliveUnits,SpawnMaxGroups=self.SpawnMaxGroups})
+local set=SET_GROUP:New():FilterAlive():FilterPrefixes({self.SpawnTemplatePrefix,self.SpawnAliasPrefix}):FilterOnce()
+local aliveunits=0
+set:ForEachGroupAlive(
+function(grp)
+aliveunits=aliveunits+grp:CountAliveUnits()
+end
+)
+if aliveunits~=self.AliveUnits then
+self.AliveUnits=aliveunits
+self:T2("***** self.AliveUnits accounting failure! Corrected! *****")
+end
+set=nil
+self:T2({SpawnTemplatePrefix=self.SpawnTemplatePrefix,SpawnIndex=SpawnIndex,AliveUnits=self.AliveUnits,SpawnMaxGroups=self.SpawnMaxGroups})
 if self:_GetSpawnIndex(SpawnIndex)then
 if self.SpawnFromNewPosition then
 self:_SetInitialPosition(SpawnIndex)
@@ -19090,10 +19389,10 @@ self.SpawnGroups[self.SpawnIndex].Group:Activate()
 else
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
 local SpawnZone=self.SpawnGroups[self.SpawnIndex].SpawnZone
-self:T(SpawnTemplate.name)
+self:T2(SpawnTemplate.name)
 if SpawnTemplate then
 local PointVec3=POINT_VEC3:New(SpawnTemplate.route.points[1].x,SpawnTemplate.route.points[1].alt,SpawnTemplate.route.points[1].y)
-self:T({"Current point of ",self.SpawnTemplatePrefix,PointVec3})
+self:T2({"Current point of ",self.SpawnTemplatePrefix,PointVec3})
 if self.SpawnRandomizePosition then
 local RandomVec2=PointVec3:GetRandomVec2InRadius(self.SpawnRandomizePositionOuterRadius,self.SpawnRandomizePositionInnerRadius)
 local CurrentX=SpawnTemplate.units[1].x
@@ -19103,7 +19402,7 @@ SpawnTemplate.y=RandomVec2.y
 for UnitID=1,#SpawnTemplate.units do
 SpawnTemplate.units[UnitID].x=SpawnTemplate.units[UnitID].x+(RandomVec2.x-CurrentX)
 SpawnTemplate.units[UnitID].y=SpawnTemplate.units[UnitID].y+(RandomVec2.y-CurrentY)
-self:T('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
+self:T2('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 end
 end
 if self.SpawnRandomizeUnits then
@@ -19117,18 +19416,16 @@ if not inZone then
 RandomVec2=PointVec3:GetRandomVec2InRadius(self.SpawnOuterRadius,self.SpawnInnerRadius)
 numTries=numTries+1
 inZone=SpawnZone:IsVec2InZone(RandomVec2)
-self:I("Retrying "..numTries.."spawn "..SpawnTemplate.name.." in Zone "..SpawnZone:GetName().."!")
-self:I(SpawnZone)
 end
 end
 if(not inZone)then
-self:I("Could not place unit within zone and within radius!")
+self:T2("Could not place unit within zone and within radius!")
 RandomVec2=SpawnZone:GetRandomVec2()
 end
 end
 SpawnTemplate.units[UnitID].x=RandomVec2.x
 SpawnTemplate.units[UnitID].y=RandomVec2.y
-self:T('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
+self:T2('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 end
 end
 local function _Heading(courseDeg)
@@ -19243,7 +19540,7 @@ if self.SpawnHiddenOnMFD then
 SpawnTemplate.hiddenOnMFD=true
 end
 if self.SpawnHiddenOnMap then
-SpawnTemplate.hidden=true
+SpawnTemplate.hidden=self.SpawnHiddenOnMap
 end
 SpawnTemplate.CategoryID=self.SpawnInitCategory or SpawnTemplate.CategoryID
 SpawnTemplate.CountryID=self.SpawnInitCountry or SpawnTemplate.CountryID
@@ -19252,8 +19549,8 @@ end
 if not NoBirth then
 self:HandleEvent(EVENTS.Birth,self._OnBirth)
 end
-self:HandleEvent(EVENTS.Dead,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.Crash,self._OnDeadOrCrash)
+self:HandleEvent(EVENTS.UnitLost,self._OnDeadOrCrash)
 self:HandleEvent(EVENTS.RemoveUnit,self._OnDeadOrCrash)
 if self.Repeat then
 self:HandleEvent(EVENTS.Takeoff,self._OnTakeOff)
@@ -19280,7 +19577,6 @@ end
 return nil
 end
 function SPAWN:SpawnScheduled(SpawnTime,SpawnTimeVariation,WithDelay)
-self:F({SpawnTime,SpawnTimeVariation})
 local SpawnTime=SpawnTime or 60
 local SpawnTimeVariation=SpawnTimeVariation or 0.5
 if SpawnTime~=nil and SpawnTimeVariation~=nil then
@@ -19293,17 +19589,14 @@ end
 return self
 end
 function SPAWN:SpawnScheduleStart()
-self:F({self.SpawnTemplatePrefix})
 self.SpawnScheduler:Start()
 return self
 end
 function SPAWN:SpawnScheduleStop()
-self:F({self.SpawnTemplatePrefix})
 self.SpawnScheduler:Stop()
 return self
 end
 function SPAWN:OnSpawnGroup(SpawnCallBackFunction,...)
-self:F("OnSpawnGroup")
 self.SpawnFunctionHook=SpawnCallBackFunction
 self.SpawnFunctionArguments={}
 if arg then
@@ -19312,21 +19605,17 @@ end
 return self
 end
 function SPAWN:SpawnAtAirbase(SpawnAirbase,Takeoff,TakeoffAltitude,TerminalType,EmergencyAirSpawn,Parkingdata)
-self:F({self.SpawnTemplatePrefix,SpawnAirbase,Takeoff,TakeoffAltitude,TerminalType})
 local PointVec3=SpawnAirbase:GetCoordinate()
 self:T2(PointVec3)
 Takeoff=Takeoff or SPAWN.Takeoff.Hot
 if EmergencyAirSpawn==nil then
 EmergencyAirSpawn=true
 end
-self:F({SpawnIndex=self.SpawnIndex})
 if self:_GetSpawnIndex(self.SpawnIndex+1)then
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
-self:F({SpawnTemplate=SpawnTemplate})
 if SpawnTemplate then
 local GroupAlive=self:GetGroupFromIndex(self.SpawnIndex)
-self:F({GroupAlive=GroupAlive})
-self:T({"Current point of ",self.SpawnTemplatePrefix,SpawnAirbase})
+self:T2({"Current point of ",self.SpawnTemplatePrefix,SpawnAirbase})
 local TemplateGroup=GROUP:FindByName(self.SpawnTemplatePrefix)
 local TemplateUnit=TemplateGroup:GetUnit(1)
 local group=TemplateGroup
@@ -19343,7 +19632,6 @@ SpawnPoint.helipadId=nil
 SpawnPoint.airdromeId=nil
 local AirbaseID=SpawnAirbase:GetID()
 local AirbaseCategory=SpawnAirbase:GetAirbaseCategory()
-self:F({AirbaseCategory=AirbaseCategory})
 if AirbaseCategory==Airbase.Category.SHIP then
 SpawnPoint.linkUnit=AirbaseID
 SpawnPoint.helipadId=AirbaseID
@@ -19357,7 +19645,7 @@ SpawnPoint.alt=0
 SpawnPoint.type=GROUPTEMPLATE.Takeoff[Takeoff][1]
 SpawnPoint.action=GROUPTEMPLATE.Takeoff[Takeoff][2]
 local spawnonground=not(Takeoff==SPAWN.Takeoff.Air)
-self:T({spawnonground=spawnonground,TOtype=Takeoff,TOair=Takeoff==SPAWN.Takeoff.Air})
+self:T2({spawnonground=spawnonground,TOtype=Takeoff,TOair=Takeoff==SPAWN.Takeoff.Air})
 local spawnonship=false
 local spawnonfarp=false
 local spawnonrunway=false
@@ -19395,43 +19683,43 @@ local scanstatics=true
 local scanscenery=false
 local verysafe=false
 if spawnonship or spawnonfarp or spawnonrunway then
-self:T(string.format("Group %s is spawned on farp/ship/runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
+self:T2(string.format("Group %s is spawned on farp/ship/runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 nfree=SpawnAirbase:GetFreeParkingSpotsNumber(termtype,true)
 spots=SpawnAirbase:GetFreeParkingSpotsTable(termtype,true)
 else
 if ishelo then
 if termtype==nil then
-self:T(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterOnly))
+self:T2(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterOnly))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.HelicopterOnly,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 if nfree<nunits then
-self:T(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterUsable))
+self:T2(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterUsable))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.HelicopterUsable,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
-self:T(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),termtype))
+self:T2(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),termtype))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,termtype,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
 if termtype==nil then
 if isbomber or istransport or istanker or isawacs then
-self:T(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenBig))
+self:T2(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenBig))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.OpenBig,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 if nfree<nunits then
-self:T(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenMedOrBig))
+self:T2(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenMedOrBig))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.OpenMedOrBig,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
-self:T(string.format("Fighter group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.FighterAircraft))
+self:T2(string.format("Fighter group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.FighterAircraft))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.FighterAircraft,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
-self:T(string.format("Plane group %s is at %s using terminal type %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),tostring(termtype)))
+self:T2(string.format("Plane group %s is at %s using terminal type %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),tostring(termtype)))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,termtype,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
@@ -19504,18 +19792,18 @@ local TX=PointVec3.x+(SX-BX)
 local TY=PointVec3.z+(SY-BY)
 if spawnonground then
 if spawnonship or spawnonfarp or spawnonrunway then
-self:T(string.format("Group %s spawning at farp, ship or runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
+self:T2(string.format("Group %s spawning at farp, ship or runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=PointVec3.x
 SpawnTemplate.units[UnitID].y=PointVec3.z
 SpawnTemplate.units[UnitID].alt=PointVec3.y
 else
-self:T(string.format("Group %s spawning at airbase %s on parking spot id %d",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),parkingindex[UnitID]))
+self:T2(string.format("Group %s spawning at airbase %s on parking spot id %d",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),parkingindex[UnitID]))
 SpawnTemplate.units[UnitID].x=parkingspots[UnitID].x
 SpawnTemplate.units[UnitID].y=parkingspots[UnitID].z
 SpawnTemplate.units[UnitID].alt=parkingspots[UnitID].y
 end
 else
-self:T(string.format("Group %s spawning in air at %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
+self:T2(string.format("Group %s spawning in air at %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=TX
 SpawnTemplate.units[UnitID].y=TY
 SpawnTemplate.units[UnitID].alt=PointVec3.y
@@ -19525,8 +19813,8 @@ UnitTemplate.parking_id=nil
 if parkingindex[UnitID]then
 UnitTemplate.parking=parkingindex[UnitID]
 end
-self:T(string.format("Group %s unit number %d: Parking    = %s",self.SpawnTemplatePrefix,UnitID,tostring(UnitTemplate.parking)))
-self:T(string.format("Group %s unit number %d: Parking ID = %s",self.SpawnTemplatePrefix,UnitID,tostring(UnitTemplate.parking_id)))
+self:T2(string.format("Group %s unit number %d: Parking    = %s",self.SpawnTemplatePrefix,UnitID,tostring(UnitTemplate.parking)))
+self:T2(string.format("Group %s unit number %d: Parking ID = %s",self.SpawnTemplatePrefix,UnitID,tostring(UnitTemplate.parking_id)))
 self:T2('After Translation SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 end
 end
@@ -19551,7 +19839,6 @@ end
 return nil
 end
 function SPAWN:SpawnAtParkingSpot(Airbase,Spots,Takeoff)
-self:F({Airbase=Airbase,Spots=Spots,Takeoff=Takeoff})
 if type(Spots)~="table"then
 Spots={Spots}
 end
@@ -19570,7 +19857,7 @@ for _,TerminalID in pairs(Spots)do
 local spot=Airbase:GetParkingSpotData(TerminalID)
 self:T2({spot=spot})
 if spot and spot.Free then
-self:T(string.format("Adding parking spot ID=%d TermType=%d",spot.TerminalID,spot.TerminalType))
+self:T2(string.format("Adding parking spot ID=%d TermType=%d",spot.TerminalID,spot.TerminalType))
 table.insert(Parkingdata,spot)
 end
 end
@@ -19585,14 +19872,13 @@ end
 return nil
 end
 function SPAWN:ParkAircraft(SpawnAirbase,TerminalType,Parkingdata,SpawnIndex)
-self:F({SpawnIndex=SpawnIndex,SpawnMaxGroups=self.SpawnMaxGroups})
 local PointVec3=SpawnAirbase:GetCoordinate()
 self:T2(PointVec3)
 local Takeoff=SPAWN.Takeoff.Cold
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 if SpawnTemplate then
 local GroupAlive=self:GetGroupFromIndex(SpawnIndex)
-self:T({"Current point of ",self.SpawnTemplatePrefix,SpawnAirbase})
+self:T2({"Current point of ",self.SpawnTemplatePrefix,SpawnAirbase})
 local TemplateGroup=GROUP:FindByName(self.SpawnTemplatePrefix)
 local TemplateUnit=TemplateGroup:GetUnit(1)
 local ishelo=TemplateUnit:HasAttribute("Helicopters")
@@ -19606,7 +19892,6 @@ SpawnPoint.helipadId=nil
 SpawnPoint.airdromeId=nil
 local AirbaseID=SpawnAirbase:GetID()
 local AirbaseCategory=SpawnAirbase:GetAirbaseCategory()
-self:F({AirbaseCategory=AirbaseCategory})
 if AirbaseCategory==Airbase.Category.SHIP then
 SpawnPoint.linkUnit=AirbaseID
 SpawnPoint.helipadId=AirbaseID
@@ -19620,7 +19905,7 @@ SpawnPoint.alt=0
 SpawnPoint.type=GROUPTEMPLATE.Takeoff[Takeoff][1]
 SpawnPoint.action=GROUPTEMPLATE.Takeoff[Takeoff][2]
 local spawnonground=not(Takeoff==SPAWN.Takeoff.Air)
-self:T({spawnonground=spawnonground,TOtype=Takeoff,TOair=Takeoff==SPAWN.Takeoff.Air})
+self:T2({spawnonground=spawnonground,TOtype=Takeoff,TOair=Takeoff==SPAWN.Takeoff.Air})
 local spawnonship=false
 local spawnonfarp=false
 local spawnonrunway=false
@@ -19647,43 +19932,43 @@ local scanstatics=true
 local scanscenery=false
 local verysafe=false
 if spawnonship or spawnonfarp or spawnonrunway then
-self:T(string.format("Group %s is spawned on farp/ship/runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
+self:T2(string.format("Group %s is spawned on farp/ship/runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 nfree=SpawnAirbase:GetFreeParkingSpotsNumber(termtype,true)
 spots=SpawnAirbase:GetFreeParkingSpotsTable(termtype,true)
 else
 if ishelo then
 if termtype==nil then
-self:T(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterOnly))
+self:T2(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterOnly))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.HelicopterOnly,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 if nfree<nunits then
-self:T(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterUsable))
+self:T2(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.HelicopterUsable))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.HelicopterUsable,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
-self:T(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),termtype))
+self:T2(string.format("Helo group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),termtype))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,termtype,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
 if termtype==nil then
 if isbomber or istransport then
-self:T(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenBig))
+self:T2(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenBig))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.OpenBig,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 if nfree<nunits then
-self:T(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenMedOrBig))
+self:T2(string.format("Transport/bomber group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.OpenMedOrBig))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.OpenMedOrBig,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
-self:T(string.format("Fighter group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.FighterAircraft))
+self:T2(string.format("Fighter group %s is at %s using terminal type %d.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),AIRBASE.TerminalType.FighterAircraft))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,AIRBASE.TerminalType.FighterAircraft,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
 else
-self:T(string.format("Plane group %s is at %s using terminal type %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),tostring(termtype)))
+self:T2(string.format("Plane group %s is at %s using terminal type %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),tostring(termtype)))
 spots=SpawnAirbase:FindFreeParkingSpotForAircraft(TemplateGroup,termtype,scanradius,scanunits,scanstatics,scanscenery,verysafe,nunits,Parkingdata)
 nfree=#spots
 end
@@ -19722,7 +20007,6 @@ end
 if not SpawnTemplate.parked then
 SpawnTemplate.parked=true
 for UnitID=1,nunits do
-self:F('Before Translation SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 local UnitTemplate=SpawnTemplate.units[UnitID]
 local SX=UnitTemplate.x
 local SY=UnitTemplate.y
@@ -19732,18 +20016,18 @@ local TX=PointVec3.x+(SX-BX)
 local TY=PointVec3.z+(SY-BY)
 if spawnonground then
 if spawnonship or spawnonfarp or spawnonrunway then
-self:T(string.format("Group %s spawning at farp, ship or runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
+self:T2(string.format("Group %s spawning at farp, ship or runway %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=PointVec3.x
 SpawnTemplate.units[UnitID].y=PointVec3.z
 SpawnTemplate.units[UnitID].alt=PointVec3.y
 else
-self:T(string.format("Group %s spawning at airbase %s on parking spot id %d",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),parkingindex[UnitID]))
+self:T2(string.format("Group %s spawning at airbase %s on parking spot id %d",self.SpawnTemplatePrefix,SpawnAirbase:GetName(),parkingindex[UnitID]))
 SpawnTemplate.units[UnitID].x=parkingspots[UnitID].x
 SpawnTemplate.units[UnitID].y=parkingspots[UnitID].z
 SpawnTemplate.units[UnitID].alt=parkingspots[UnitID].y
 end
 else
-self:T(string.format("Group %s spawning in air at %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
+self:T2(string.format("Group %s spawning in air at %s.",self.SpawnTemplatePrefix,SpawnAirbase:GetName()))
 SpawnTemplate.units[UnitID].x=TX
 SpawnTemplate.units[UnitID].y=TY
 SpawnTemplate.units[UnitID].alt=PointVec3.y
@@ -19776,7 +20060,6 @@ end
 end
 end
 function SPAWN:ParkAtAirbase(SpawnAirbase,TerminalType,Parkingdata)
-self:F({self.SpawnTemplatePrefix,SpawnAirbase,TerminalType})
 self:ParkAircraft(SpawnAirbase,TerminalType,Parkingdata,1)
 for SpawnIndex=2,self.SpawnMaxGroups do
 self:ParkAircraft(SpawnAirbase,TerminalType,Parkingdata,SpawnIndex)
@@ -19785,7 +20068,6 @@ self:SetSpawnIndex(0)
 return nil
 end
 function SPAWN:SpawnFromVec3(Vec3,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,Vec3,SpawnIndex})
 local PointVec3=POINT_VEC3:NewFromVec3(Vec3)
 self:T2(PointVec3)
 if SpawnIndex then
@@ -19795,7 +20077,7 @@ end
 if self:_GetSpawnIndex(SpawnIndex)then
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
 if SpawnTemplate then
-self:T({"Current point of ",self.SpawnTemplatePrefix,Vec3})
+self:T2({"Current point of ",self.SpawnTemplatePrefix,Vec3})
 local TemplateHeight=SpawnTemplate.route and SpawnTemplate.route.points[1].alt or nil
 SpawnTemplate.route=SpawnTemplate.route or{}
 SpawnTemplate.route.points=SpawnTemplate.route.points or{}
@@ -19815,7 +20097,7 @@ SpawnTemplate.units[UnitID].y=TY
 if SpawnTemplate.CategoryID~=Group.Category.SHIP then
 SpawnTemplate.units[UnitID].alt=Vec3.y or TemplateHeight
 end
-self:T('After Translation SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
+self:T2('After Translation SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
 end
 SpawnTemplate.route.points[1].x=Vec3.x
 SpawnTemplate.route.points[1].y=Vec3.z
@@ -19831,15 +20113,12 @@ end
 return nil
 end
 function SPAWN:SpawnFromCoordinate(Coordinate,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex})
 return self:SpawnFromVec3(Coordinate:GetVec3(),SpawnIndex)
 end
 function SPAWN:SpawnFromPointVec3(PointVec3,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex})
 return self:SpawnFromVec3(PointVec3:GetVec3(),SpawnIndex)
 end
 function SPAWN:SpawnFromVec2(Vec2,MinHeight,MaxHeight,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,self.SpawnIndex,Vec2,MinHeight,MaxHeight,SpawnIndex})
 local Height=nil
 if MinHeight and MaxHeight then
 Height=math.random(MinHeight,MaxHeight)
@@ -19847,25 +20126,21 @@ end
 return self:SpawnFromVec3({x=Vec2.x,y=Height,z=Vec2.y},SpawnIndex)
 end
 function SPAWN:SpawnFromPointVec2(PointVec2,MinHeight,MaxHeight,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,self.SpawnIndex})
 return self:SpawnFromVec2(PointVec2:GetVec2(),MinHeight,MaxHeight,SpawnIndex)
 end
 function SPAWN:SpawnFromUnit(HostUnit,MinHeight,MaxHeight,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,HostUnit,MinHeight,MaxHeight,SpawnIndex})
 if HostUnit and HostUnit:IsAlive()~=nil then
 return self:SpawnFromVec2(HostUnit:GetVec2(),MinHeight,MaxHeight,SpawnIndex)
 end
 return nil
 end
 function SPAWN:SpawnFromStatic(HostStatic,MinHeight,MaxHeight,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,HostStatic,MinHeight,MaxHeight,SpawnIndex})
 if HostStatic and HostStatic:IsAlive()then
 return self:SpawnFromVec2(HostStatic:GetVec2(),MinHeight,MaxHeight,SpawnIndex)
 end
 return nil
 end
 function SPAWN:SpawnInZone(Zone,RandomizeGroup,MinHeight,MaxHeight,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,Zone,RandomizeGroup,MinHeight,MaxHeight,SpawnIndex})
 if Zone then
 if RandomizeGroup then
 return self:SpawnFromVec2(Zone:GetRandomVec2(),MinHeight,MaxHeight,SpawnIndex)
@@ -19891,22 +20166,20 @@ end
 return nil
 end
 function SPAWN:SpawnGroupName(SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex})
 local SpawnPrefix=self.SpawnTemplatePrefix
 if self.SpawnAliasPrefix then
 SpawnPrefix=self.SpawnAliasPrefix
 end
 if SpawnIndex then
 local SpawnName=string.format('%s#%03d',SpawnPrefix,SpawnIndex)
-self:T(SpawnName)
+self:T2(SpawnName)
 return SpawnName
 else
-self:T(SpawnPrefix)
+self:T2(SpawnPrefix)
 return SpawnPrefix
 end
 end
 function SPAWN:GetFirstAliveGroup()
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix})
 for SpawnIndex=1,self.SpawnCount do
 local SpawnGroup=self:GetGroupFromIndex(SpawnIndex)
 if SpawnGroup and SpawnGroup:IsAlive()then
@@ -19916,7 +20189,6 @@ end
 return nil,nil
 end
 function SPAWN:GetNextAliveGroup(SpawnIndexStart)
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix,SpawnIndexStart})
 SpawnIndexStart=SpawnIndexStart+1
 for SpawnIndex=SpawnIndexStart,self.SpawnCount do
 local SpawnGroup=self:GetGroupFromIndex(SpawnIndex)
@@ -19927,7 +20199,6 @@ end
 return nil,nil
 end
 function SPAWN:GetLastAliveGroup()
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix})
 for SpawnIndex=self.SpawnCount,1,-1 do
 local SpawnGroup=self:GetGroupFromIndex(SpawnIndex)
 if SpawnGroup and SpawnGroup:IsAlive()then
@@ -19939,7 +20210,6 @@ self.SpawnIndex=nil
 return nil
 end
 function SPAWN:GetGroupFromIndex(SpawnIndex)
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix,SpawnIndex})
 if not SpawnIndex then
 SpawnIndex=1
 end
@@ -19969,18 +20239,15 @@ end
 return nil
 end
 function SPAWN:GetSpawnIndexFromGroup(SpawnGroup)
-self:F2({self.SpawnTemplatePrefix,self.SpawnAliasPrefix,SpawnGroup})
 local IndexString=string.match(SpawnGroup:GetName(),"#(%d*)$"):sub(2)
 local Index=tonumber(IndexString)
 self:T3(IndexString,Index)
 return Index
 end
 function SPAWN:_GetLastIndex()
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix})
 return self.SpawnMaxGroups
 end
 function SPAWN:_InitializeSpawnGroups(SpawnIndex)
-self:F3({self.SpawnTemplatePrefix,self.SpawnAliasPrefix,SpawnIndex})
 if not self.SpawnGroups[SpawnIndex]then
 self.SpawnGroups[SpawnIndex]={}
 self.SpawnGroups[SpawnIndex].Visible=false
@@ -20011,7 +20278,6 @@ return nil
 end
 end
 function SPAWN:_GetGroupCountryID(SpawnPrefix)
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix,SpawnPrefix})
 local TemplateGroup=Group.getByName(SpawnPrefix)
 if TemplateGroup then
 local TemplateUnits=TemplateGroup:getUnits()
@@ -20021,13 +20287,11 @@ return nil
 end
 end
 function SPAWN:_GetTemplate(SpawnTemplatePrefix)
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix,SpawnTemplatePrefix})
 local SpawnTemplate=nil
 if _DATABASE.Templates.Groups[SpawnTemplatePrefix]==nil then
 error('No Template exists for SpawnTemplatePrefix = '..SpawnTemplatePrefix)
 end
 local Template=_DATABASE.Templates.Groups[SpawnTemplatePrefix].Template
-self:F({Template=Template})
 SpawnTemplate=UTILS.DeepCopy(_DATABASE.Templates.Groups[SpawnTemplatePrefix].Template)
 if SpawnTemplate==nil then
 error('No Template returned for SpawnTemplatePrefix = '..SpawnTemplatePrefix)
@@ -20036,7 +20300,6 @@ self:T3({SpawnTemplate})
 return SpawnTemplate
 end
 function SPAWN:_Prepare(SpawnTemplatePrefix,SpawnIndex)
-self:F({self.SpawnTemplatePrefix,self.SpawnAliasPrefix})
 local SpawnTemplate
 if self.TweakedTemplate~=nil and self.TweakedTemplate==true then
 BASE:I("WARNING: You are using a tweaked template.")
@@ -20058,7 +20321,6 @@ SpawnTemplate.visible=false
 end
 if self.SpawnGrouping then
 local UnitAmount=#SpawnTemplate.units
-self:F({UnitAmount=UnitAmount,SpawnGrouping=self.SpawnGrouping})
 if UnitAmount>self.SpawnGrouping then
 for UnitID=self.SpawnGrouping+1,UnitAmount do
 SpawnTemplate.units[UnitID]=nil
@@ -20074,7 +20336,9 @@ end
 end
 if self.SpawnInitKeepUnitNames==false then
 for UnitID=1,#SpawnTemplate.units do
+if not string.find(SpawnTemplate.units[UnitID].name,"#IFF_",1,true)then
 SpawnTemplate.units[UnitID].name=string.format(SpawnTemplate.name..'-%02d',UnitID)
+end
 SpawnTemplate.units[UnitID].unitId=nil
 end
 else
@@ -20086,11 +20350,9 @@ end
 local UnitPrefix,Rest
 if SpawnInitKeepUnitIFF==false then
 UnitPrefix,Rest=string.match(SpawnTemplate.units[UnitID].name,"^([^#]+)#?"):gsub("^%s*(.-)%s*$","%1")
-self:T({UnitPrefix,Rest})
-else
-UnitPrefix=SpawnTemplate.units[UnitID].name
-end
 SpawnTemplate.units[UnitID].name=string.format('%s#%03d-%02d',UnitPrefix,SpawnIndex,UnitID)
+self:T2({UnitPrefix,Rest})
+end
 SpawnTemplate.units[UnitID].unitId=nil
 end
 end
@@ -20248,7 +20510,6 @@ self:T3({"Template:",SpawnTemplate})
 return SpawnTemplate
 end
 function SPAWN:_RandomizeRoute(SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnRandomizeRoute,self.SpawnRandomizeRouteStartPoint,self.SpawnRandomizeRouteEndPoint,self.SpawnRandomizeRouteRadius})
 if self.SpawnRandomizeRoute then
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 local RouteCount=#SpawnTemplate.route.points
@@ -20262,14 +20523,13 @@ end
 else
 SpawnTemplate.route.points[t].alt=nil
 end
-self:T('SpawnTemplate.route.points['..t..'].x = '..SpawnTemplate.route.points[t].x..', SpawnTemplate.route.points['..t..'].y = '..SpawnTemplate.route.points[t].y)
+self:T2('SpawnTemplate.route.points['..t..'].x = '..SpawnTemplate.route.points[t].x..', SpawnTemplate.route.points['..t..'].y = '..SpawnTemplate.route.points[t].y)
 end
 end
 self:_RandomizeZones(SpawnIndex)
 return self
 end
 function SPAWN:_RandomizeTemplate(SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnRandomizeTemplate})
 if self.SpawnRandomizeTemplate then
 self.SpawnGroups[SpawnIndex].SpawnTemplatePrefix=self.SpawnTemplatePrefixTable[math.random(1,#self.SpawnTemplatePrefixTable)]
 self.SpawnGroups[SpawnIndex].SpawnTemplate=self:_Prepare(self.SpawnGroups[SpawnIndex].SpawnTemplatePrefix,SpawnIndex)
@@ -20290,21 +20550,21 @@ self:_RandomizeRoute(SpawnIndex)
 return self
 end
 function SPAWN:_SetInitialPosition(SpawnIndex)
-self:T({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnRandomizeZones})
+self:T2({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnRandomizeZones})
 if self.SpawnFromNewPosition then
-self:T("Preparing Spawn at Vec2 ",self.SpawnInitPosition)
+self:T2("Preparing Spawn at Vec2 ",self.SpawnInitPosition)
 local SpawnVec2=self.SpawnInitPosition
-self:T({SpawnVec2=SpawnVec2})
+self:T2({SpawnVec2=SpawnVec2})
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 SpawnTemplate.route=SpawnTemplate.route or{}
 SpawnTemplate.route.points=SpawnTemplate.route.points or{}
 SpawnTemplate.route.points[1]=SpawnTemplate.route.points[1]or{}
 SpawnTemplate.route.points[1].x=SpawnTemplate.route.points[1].x or 0
 SpawnTemplate.route.points[1].y=SpawnTemplate.route.points[1].y or 0
-self:T({Route=SpawnTemplate.route})
+self:T2({Route=SpawnTemplate.route})
 for UnitID=1,#SpawnTemplate.units do
 local UnitTemplate=SpawnTemplate.units[UnitID]
-self:T('Before Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
+self:T2('Before Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
 local SX=UnitTemplate.x
 local SY=UnitTemplate.y
 local BX=SpawnTemplate.route.points[1].x
@@ -20313,7 +20573,7 @@ local TX=SpawnVec2.x+(SX-BX)
 local TY=SpawnVec2.y+(SY-BY)
 UnitTemplate.x=TX
 UnitTemplate.y=TY
-self:T('After Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
+self:T2('After Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
 end
 SpawnTemplate.route.points[1].x=SpawnVec2.x
 SpawnTemplate.route.points[1].y=SpawnVec2.y
@@ -20323,24 +20583,23 @@ end
 return self
 end
 function SPAWN:_RandomizeZones(SpawnIndex)
-self:F({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnRandomizeZones})
 if self.SpawnRandomizeZones then
 local SpawnZone=nil
 while not SpawnZone do
-self:T({SpawnZoneTableCount=#self.SpawnZoneTable,self.SpawnZoneTable})
+self:T2({SpawnZoneTableCount=#self.SpawnZoneTable,self.SpawnZoneTable})
 local ZoneID=math.random(#self.SpawnZoneTable)
-self:T(ZoneID)
+self:T2(ZoneID)
 SpawnZone=self.SpawnZoneTable[ZoneID]:GetZoneMaybe()
 end
-self:T("Preparing Spawn in Zone",SpawnZone:GetName())
+self:T2("Preparing Spawn in Zone",SpawnZone:GetName())
 local SpawnVec2=SpawnZone:GetRandomVec2()
-self:T({SpawnVec2=SpawnVec2})
+self:T2({SpawnVec2=SpawnVec2})
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
 self.SpawnGroups[SpawnIndex].SpawnZone=SpawnZone
-self:T({Route=SpawnTemplate.route})
+self:T2({Route=SpawnTemplate.route})
 for UnitID=1,#SpawnTemplate.units do
 local UnitTemplate=SpawnTemplate.units[UnitID]
-self:T('Before Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
+self:T2('Before Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
 local SX=UnitTemplate.x
 local SY=UnitTemplate.y
 local BX=SpawnTemplate.route.points[1].x
@@ -20349,7 +20608,7 @@ local TX=SpawnVec2.x+(SX-BX)
 local TY=SpawnVec2.y+(SY-BY)
 UnitTemplate.x=TX
 UnitTemplate.y=TY
-self:T('After Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
+self:T2('After Translation SpawnTemplate.units['..UnitID..'].x = '..UnitTemplate.x..', SpawnTemplate.units['..UnitID..'].y = '..UnitTemplate.y)
 end
 SpawnTemplate.x=SpawnVec2.x
 SpawnTemplate.y=SpawnVec2.y
@@ -20359,7 +20618,6 @@ end
 return self
 end
 function SPAWN:_TranslateRotate(SpawnIndex,SpawnRootX,SpawnRootY,SpawnX,SpawnY,SpawnAngle)
-self:F({self.SpawnTemplatePrefix,SpawnIndex,SpawnRootX,SpawnRootY,SpawnX,SpawnY,SpawnAngle})
 local TranslatedX=SpawnX
 local TranslatedY=SpawnY
 local RotatedX=-TranslatedX*math.cos(math.rad(SpawnAngle))+TranslatedY*math.sin(math.rad(SpawnAngle))
@@ -20379,10 +20637,10 @@ end
 return self
 end
 function SPAWN:_GetSpawnIndex(SpawnIndex)
-self:F2({self.SpawnTemplatePrefix,SpawnIndex,self.SpawnMaxGroups,self.SpawnMaxUnitsAlive,self.AliveUnits,#self.SpawnTemplate.units})
+self:T2({template=self.SpawnTemplatePrefix,SpawnIndex=SpawnIndex,SpawnMaxGroups=self.SpawnMaxGroups,SpawnMaxUnitsAlive=self.SpawnMaxUnitsAlive,AliveUnits=self.AliveUnits,TemplateUnits=#self.SpawnTemplate.units})
 if(self.SpawnMaxGroups==0)or(SpawnIndex<=self.SpawnMaxGroups)then
 if(self.SpawnMaxUnitsAlive==0)or(self.AliveUnits+#self.SpawnTemplate.units<=self.SpawnMaxUnitsAlive)or self.UnControlled==true then
-self:F({SpawnCount=self.SpawnCount,SpawnIndex=SpawnIndex})
+self:T2({SpawnCount=self.SpawnCount,SpawnIndex=SpawnIndex})
 if SpawnIndex and SpawnIndex>=self.SpawnCount+1 then
 self.SpawnCount=self.SpawnCount+1
 SpawnIndex=self.SpawnCount
@@ -20400,59 +20658,58 @@ end
 return self.SpawnIndex
 end
 function SPAWN:_OnBirth(EventData)
-self:F(self.SpawnTemplatePrefix)
 local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T({"Birth Event:",EventPrefix,self.SpawnTemplatePrefix})
+self:T2({"Birth Event:",EventPrefix,self.SpawnTemplatePrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
 self.AliveUnits=self.AliveUnits+1
-self:T("Alive Units: "..self.AliveUnits)
+self:T2("Alive Units: "..self.AliveUnits)
 end
 end
 end
 end
 function SPAWN:_OnDeadOrCrash(EventData)
-self:F(self.SpawnTemplatePrefix)
+self:T2("Dead or crash event ID "..tostring(EventData.id or 0))
+self:T2("Dead or crash event for "..tostring(EventData.IniUnitName or"none"))
 local unit=UNIT:FindByName(EventData.IniUnitName)
 if unit then
 local EventPrefix=self:_GetPrefixFromGroupName(unit.GroupName)
 if EventPrefix then
-self:T({"Dead event: "..EventPrefix})
-if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
+self:T2({"Dead event: "..EventPrefix})
+self:T2(string.format("EventPrefix = %s | SpawnAliasPrefix = %s  | Old AliveUnits = %d",EventPrefix or"",self.SpawnAliasPrefix or"",self.AliveUnits or 0))
+if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)and self.AliveUnits>0 then
 self.AliveUnits=self.AliveUnits-1
-self:T("Alive Units: "..self.AliveUnits)
 end
+self:T2("New Alive Units: "..self.AliveUnits)
 end
 end
 end
 function SPAWN:_OnTakeOff(EventData)
-self:F(self.SpawnTemplatePrefix)
 local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T({"TakeOff event: "..EventPrefix})
+self:T2({"TakeOff event: "..EventPrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
-self:T("self.Landed = false")
+self:T2("self.Landed = false")
 SpawnGroup:SetState(SpawnGroup,"Spawn_Landed",false)
 end
 end
 end
 end
 function SPAWN:_OnLand(EventData)
-self:F(self.SpawnTemplatePrefix)
 local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T({"Land event: "..EventPrefix})
+self:T2({"Land event: "..EventPrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
 SpawnGroup:SetState(SpawnGroup,"Spawn_Landed",true)
 if self.RepeatOnLanding then
 local SpawnGroupIndex=self:GetSpawnIndexFromGroup(SpawnGroup)
-self:T({"Landed:","ReSpawn:",SpawnGroup:GetName(),SpawnGroupIndex})
+self:T2({"Landed:","ReSpawn:",SpawnGroup:GetName(),SpawnGroupIndex})
 SCHEDULER:New(nil,self.ReSpawn,{self,SpawnGroupIndex},3)
 end
 end
@@ -20460,17 +20717,16 @@ end
 end
 end
 function SPAWN:_OnEngineShutDown(EventData)
-self:F(self.SpawnTemplatePrefix)
 local SpawnGroup=EventData.IniGroup
 if SpawnGroup then
 local EventPrefix=self:_GetPrefixFromGroup(SpawnGroup)
 if EventPrefix then
-self:T({"EngineShutdown event: "..EventPrefix})
+self:T2({"EngineShutdown event: "..EventPrefix})
 if EventPrefix==self.SpawnTemplatePrefix or(self.SpawnAliasPrefix and EventPrefix==self.SpawnAliasPrefix)then
 local Landed=SpawnGroup:GetState(SpawnGroup,"Spawn_Landed")
 if Landed and self.RepeatOnEngineShutDown then
 local SpawnGroupIndex=self:GetSpawnIndexFromGroup(SpawnGroup)
-self:T({"EngineShutDown: ","ReSpawn:",SpawnGroup:GetName(),SpawnGroupIndex})
+self:T2({"EngineShutDown: ","ReSpawn:",SpawnGroup:GetName(),SpawnGroupIndex})
 SCHEDULER:New(nil,self.ReSpawn,{self,SpawnGroupIndex},3)
 end
 end
@@ -20483,9 +20739,8 @@ self:Spawn()
 return true
 end
 function SPAWN:_SpawnCleanUpScheduler()
-self:F({"CleanUp Scheduler:",self.SpawnTemplatePrefix})
 local SpawnGroup,SpawnCursor=self:GetFirstAliveGroup()
-self:T({"CleanUp Scheduler:",SpawnGroup,SpawnCursor})
+self:T2({"CleanUp Scheduler:",SpawnGroup,SpawnCursor})
 local IsHelo=false
 while SpawnGroup do
 IsHelo=SpawnGroup:IsHelicopter()
@@ -20495,14 +20750,14 @@ local SpawnUnit=UnitData
 local SpawnUnitName=SpawnUnit:GetName()
 self.SpawnCleanUpTimeStamps[SpawnUnitName]=self.SpawnCleanUpTimeStamps[SpawnUnitName]or{}
 local Stamp=self.SpawnCleanUpTimeStamps[SpawnUnitName]
-self:T({SpawnUnitName,Stamp})
+self:T2({SpawnUnitName,Stamp})
 if Stamp.Vec2 then
 if(SpawnUnit:InAir()==false and SpawnUnit:GetVelocityKMH()<1)or IsHelo then
 local NewVec2=SpawnUnit:GetVec2()or{x=0,y=0}
 if(Stamp.Vec2.x==NewVec2.x and Stamp.Vec2.y==NewVec2.y)or(SpawnUnit:GetLife()<=1)then
 if Stamp.Time+self.SpawnCleanUpInterval<timer.getTime()then
-self:T({"CleanUp Scheduler:","ReSpawning:",SpawnGroup:GetName()})
-self:ReSpawn(SpawnCursor)
+self:T2({"CleanUp Scheduler:","ReSpawning:",SpawnGroup:GetName()})
+SCHEDULER:New(nil,self.ReSpawn,{self,SpawnCursor},3)
 Stamp.Vec2=nil
 Stamp.Time=nil
 end
@@ -20527,7 +20782,7 @@ end
 end
 end
 SpawnGroup,SpawnCursor=self:GetNextAliveGroup(SpawnCursor)
-self:T({"CleanUp Scheduler:",SpawnGroup,SpawnCursor})
+self:T2({"CleanUp Scheduler:",SpawnGroup,SpawnCursor})
 end
 return true
 end
@@ -20564,10 +20819,47 @@ self.InitStaticType=StaticType
 self.InitStaticCategory=StaticCategory
 self.CountryID=CountryID or country.id.USA
 self.SpawnTemplatePrefix=self.InitStaticType
+self.TemplateStaticUnit={}
 self.InitStaticCoordinate=COORDINATE:New(0,0,0)
 self.InitStaticHeading=0
 return self
 end
+function SPAWNSTATIC:_InitResourceTable(CombinedWeight)
+if not self.TemplateStaticUnit.resourcePayload then
+self.TemplateStaticUnit.resourcePayload={
+["weapons"]={},
+["aircrafts"]={},
+["gasoline"]=0,
+["diesel"]=0,
+["methanol_mixture"]=0,
+["jet_fuel"]=0,
+}
+end
+self:InitCargo(true)
+self:InitCargoMass(CombinedWeight or 1)
+return self
+end
+function SPAWNSTATIC:AddCargoResource(Type,Name,Amount,CombinedWeight)
+if not self.TemplateStaticUnit.resourcePayload then
+self:_InitResourceTable(CombinedWeight)
+end
+if Type==STORAGE.Type.LIQUIDS and type(Name)=="string"then
+self.TemplateStaticUnit.resourcePayload[Name]=Amount
+else
+self.TemplateStaticUnit.resourcePayload[Type]={
+[Name]={
+["amount"]=Amount,
+}
+}
+end
+UTILS.PrintTableToLog(self.TemplateStaticUnit)
+return self
+end
+function SPAWNSTATIC:ResetCargoResources()
+self.TemplateStaticUnit.resourcePayload=nil
+self:_InitResourceTable()
+return self
+end
 function SPAWNSTATIC:InitCoordinate(Coordinate)
 self.InitStaticCoordinate=Coordinate
 return self
@@ -20622,6 +20914,15 @@ self.InitOffsetY=OffsetY or 0
 self.InitOffsetAngle=OffsetAngle or 0
 return self
 end
+function SPAWNSTATIC:OnSpawnStatic(SpawnCallBackFunction,...)
+self:F("OnSpawnStatic")
+self.SpawnFunctionHook=SpawnCallBackFunction
+self.SpawnFunctionArguments={}
+if arg then
+self.SpawnFunctionArguments=arg
+end
+return self
+end
 function SPAWNSTATIC:Spawn(Heading,NewName)
 if Heading then
 self.InitStaticHeading=Heading
@@ -20725,6 +21026,9 @@ self:T("Spawning Static")
 self:T2({Template=Template})
 Static=coalition.addStaticObject(CountryID,Template)
 end
+if self.SpawnFunctionHook then
+self:ScheduleOnce(0.3,self.SpawnFunctionHook,mystatic,unpack(self.SpawnFunctionArguments))
+end
 return mystatic
 end
 TIMER={
@@ -21388,11 +21692,11 @@ function IDENTIFIABLE:GetCategory()
 self:F2(self.ObjectName)
 local DCSObject=self:GetDCSObject()
 if DCSObject then
-local ObjectCategory=DCSObject:getCategory()
+local ObjectCategory,UnitCategory=DCSObject:getCategory()
 self:T3(ObjectCategory)
-return ObjectCategory
+return ObjectCategory,UnitCategory
 end
-return nil
+return nil,nil
 end
 function IDENTIFIABLE:GetCategoryName()
 local DCSIdentifiable=self:GetDCSObject()
@@ -23239,20 +23543,25 @@ lastWptIndex=LastWptNumber
 }
 return DCSTask
 end
-function CONTROLLABLE:TaskLandAtVec2(Vec2,Duration)
+function CONTROLLABLE:TaskLandAtVec2(Vec2,Duration,CombatLanding,DirectionAfterLand)
 local DCSTask={
 id='Land',
 params={
 point=Vec2,
 durationFlag=Duration and true or false,
 duration=Duration,
+combatLandingFlag=CombatLanding==true and true or false,
 },
 }
+if DirectionAfterLand~=nil and type(DirectionAfterLand)=="number"then
+DCSTask.params.directionEnabled=true
+DCSTask.params.direction=math.rad(DirectionAfterLand)
+end
 return DCSTask
 end
-function CONTROLLABLE:TaskLandAtZone(Zone,Duration,RandomPoint)
+function CONTROLLABLE:TaskLandAtZone(Zone,Duration,RandomPoint,CombatLanding,DirectionAfterLand)
 local Point=RandomPoint and Zone:GetRandomVec2()or Zone:GetVec2()
-local DCSTask=CONTROLLABLE.TaskLandAtVec2(self,Point,Duration)
+local DCSTask=CONTROLLABLE.TaskLandAtVec2(self,Point,Duration,CombatLanding,DirectionAfterLand)
 return DCSTask
 end
 function CONTROLLABLE:TaskFollow(FollowControllable,Vec3,LastWaypointIndex)
@@ -24459,6 +24768,30 @@ self:SetOption(AI.Option.Air.id.PROHIBIT_AB,Prohibit)
 end
 return self
 end
+function CONTROLLABLE:OptionEvasionOfARM(Seconds)
+self:F2({self.ControllableName})
+local DCSControllable=self:GetDCSObject()
+if DCSControllable then
+local Controller=self:_GetController()
+if self:IsGround()then
+if Seconds==nil then Seconds=false end
+Controller:setOption(AI.Option.Ground.id.EVASION_OF_ARM,Seconds)
+end
+end
+return self
+end
+function CONTROLLABLE:OptionFormationInterval(meters)
+self:F2({self.ControllableName})
+local DCSControllable=self:GetDCSObject()
+if DCSControllable then
+local Controller=self:_GetController()
+if self:IsGround()then
+if meters==nil or meters>100 or meters<0 then meters=50 end
+Controller:setOption(30,meters)
+end
+end
+return self
+end
 function CONTROLLABLE:OptionECM(ECMvalue)
 self:F2({self.ControllableName})
 local DCSControllable=self:GetDCSObject()
@@ -25715,6 +26048,7 @@ local DCSGroup=Group.getByName(self.GroupName)
 if DCSGroup then
 return DCSGroup
 end
+self:T2(string.format("ERROR: Could not get DCS group object of group %s because DCS object could not be found!",tostring(self.GroupName)))
 return nil
 end
 function GROUP:GetPositionVec3()
@@ -26216,6 +26550,7 @@ end
 end
 end
 local DCSGroup=Group.getByName(self.GroupName)
+if DCSGroup then
 local DCSUnits=DCSGroup:getUnits()or{}
 for _,_unit in pairs(DCSUnits)do
 if Object.isExist(_unit)then
@@ -26227,6 +26562,7 @@ return coord
 end
 end
 end
+end
 BASE:E({"Cannot GetCoordinate",Group=self,Alive=self:IsAlive()})
 end
 function GROUP:GetRandomVec3(Radius)
@@ -26542,7 +26878,11 @@ return nil
 end
 function GROUP:GetTemplate()
 local GroupName=self:GetName()
-return UTILS.DeepCopy(_DATABASE:GetGroupTemplate(GroupName))
+local template=_DATABASE:GetGroupTemplate(GroupName)
+if template then
+return UTILS.DeepCopy(template)
+end
+return nil
 end
 function GROUP:GetTemplateRoutePoints()
 local GroupName=self:GetName()
@@ -27050,7 +27390,7 @@ function GROUP:GetPlayerNames()
 local HasPlayers=false
 local PlayerNames={}
 local Units=self:GetUnits()
-for UnitID,UnitData in pairs(Units)do
+for UnitID,UnitData in pairs(Units or{})do
 local Unit=UnitData
 local PlayerName=Unit:GetPlayerName()
 if PlayerName and PlayerName~=""then
@@ -27432,7 +27772,16 @@ end
 function UNIT:IsPlayer()
 local group=self:GetGroup()
 if not group then return false end
-local units=group:GetTemplate().units
+local template=group:GetTemplate()
+if(template==nil)or(template.units==nil)then
+local DCSObject=self:GetDCSObject()
+if DCSObject then
+if DCSObject:getPlayerName()~=nil then return true else return false end
+else
+return false
+end
+end
+local units=template.units
 for _,unit in pairs(units)do
 if unit.name==self:GetName()and(unit.skill=="Client"or unit.skill=="Player")then
 return true
@@ -27610,6 +27959,8 @@ local nrockets=0
 local nmissiles=0
 local nbombs=0
 local narti=0
+local nAPshells=0
+local nHEshells=0
 local unit=self
 local ammotable=unit:GetAmmo()
 if ammotable then
@@ -27627,6 +27978,12 @@ nshells=nshells+Nammo
 if ammotable[w].desc.warhead and ammotable[w].desc.warhead.explosiveMass and ammotable[w].desc.warhead.explosiveMass>0 then
 narti=narti+Nammo
 end
+if ammotable[w].desc.typeName and string.find(ammotable[w].desc.typeName,"_AP",1,true)then
+nAPshells=nAPshells+Nammo
+end
+if ammotable[w].desc.typeName and string.find(ammotable[w].desc.typeName,"_HE",1,true)then
+nHEshells=nHEshells+Nammo
+end
 elseif Category==Weapon.Category.ROCKET then
 nrockets=nrockets+Nammo
 elseif Category==Weapon.Category.BOMB then
@@ -27649,7 +28006,31 @@ end
 end
 end
 nammo=nshells+nrockets+nmissiles+nbombs
-return nammo,nshells,nrockets,nbombs,nmissiles,narti
+return nammo,nshells,nrockets,nbombs,nmissiles,narti,nAPshells,nHEshells
+end
+function UNIT:HasAPShells()
+local _,_,_,_,_,_,shells=self:GetAmmunition()
+if shells>0 then return true else return false end
+end
+function UNIT:GetAPShells()
+local _,_,_,_,_,_,shells=self:GetAmmunition()
+return shells or 0
+end
+function UNIT:GetHEShells()
+local _,_,_,_,_,_,_,shells=self:GetAmmunition()
+return shells or 0
+end
+function UNIT:HasHEShells()
+local _,_,_,_,_,_,_,shells=self:GetAmmunition()
+if shells>0 then return true else return false end
+end
+function UNIT:HasArtiShells()
+local _,_,_,_,_,shells=self:GetAmmunition()
+if shells>0 then return true else return false end
+end
+function UNIT:GetArtiShells()
+local _,_,_,_,_,shells=self:GetAmmunition()
+return shells or 0
 end
 function UNIT:GetSensors()
 self:F2(self.UnitName)
@@ -27789,17 +28170,17 @@ if Descriptor then
 local Attributes=Descriptor.attributes
 if self:IsGround()then
 local ThreatLevels={
-"Unarmed",
-"Infantry",
-"Old Tanks & APCs",
-"Tanks & IFVs without ATGM",
-"Tanks & IFV with ATGM",
-"Modern Tanks",
-"AAA",
-"IR Guided SAMs",
-"SR SAMs",
-"MR SAMs",
-"LR SAMs"
+[1]="Unarmed",
+[2]="Infantry",
+[3]="Old Tanks & APCs",
+[4]="Tanks & IFVs without ATGM",
+[5]="Tanks & IFV with ATGM",
+[6]="Modern Tanks",
+[7]="AAA",
+[8]="IR Guided SAMs",
+[9]="SR SAMs",
+[10]="MR SAMs",
+[11]="LR SAMs"
 }
 if Attributes["LR SAM"]then ThreatLevel=10
 elseif Attributes["MR SAM"]then ThreatLevel=9
@@ -27820,17 +28201,17 @@ ThreatText=ThreatLevels[ThreatLevel+1]
 end
 if self:IsAir()then
 local ThreatLevels={
-"Unarmed",
-"Tanker",
-"AWACS",
-"Transport Helicopter",
-"UAV",
-"Bomber",
-"Strategic Bomber",
-"Attack Helicopter",
-"Battleplane",
-"Multirole Fighter",
-"Fighter"
+[1]="Unarmed",
+[2]="Tanker",
+[3]="AWACS",
+[4]="Transport Helicopter",
+[5]="UAV",
+[6]="Bomber",
+[7]="Strategic Bomber",
+[8]="Attack Helicopter",
+[9]="Battleplane",
+[10]="Multirole Fighter",
+[11]="Fighter"
 }
 if Attributes["Fighters"]then ThreatLevel=10
 elseif Attributes["Multirole fighters"]then ThreatLevel=9
@@ -27849,17 +28230,17 @@ ThreatText=ThreatLevels[ThreatLevel+1]
 end
 if self:IsShip()then
 local ThreatLevels={
-"Unarmed ship",
-"Light armed ships",
-"Corvettes",
-"",
-"Frigates",
-"",
-"Cruiser",
-"",
-"Destroyer",
-"",
-"Aircraft Carrier"
+[1]="Unarmed ship",
+[2]="Light armed ships",
+[3]="Corvettes",
+[4]="",
+[5]="Frigates",
+[6]="",
+[7]="Cruiser",
+[8]="",
+[9]="Destroyer",
+[10]="",
+[11]="Aircraft Carrier"
 }
 if Attributes["Aircraft Carriers"]then ThreatLevel=10
 elseif Attributes["Destroyers"]then ThreatLevel=8
@@ -28130,6 +28511,9 @@ function CLIENT:AddPlayer(PlayerName)
 table.insert(self.Players,PlayerName)
 return self
 end
+function CLIENT:CountPlayers()
+return#self.Players or 0
+end
 function CLIENT:GetPlayers()
 return self.Players
 end
@@ -28198,7 +28582,7 @@ self.AliveCheckScheduler:NoTrace()
 return self
 end
 function CLIENT:_AliveCheckScheduler(SchedulerName)
-self:F3({SchedulerName,self.ClientName,self.ClientAlive2,self.ClientBriefingShown,self.ClientCallBack})
+self:T2({SchedulerName,self.ClientName,self.ClientAlive2,self.ClientBriefingShown,self.ClientCallBack})
 if self:IsAlive()then
 if self.ClientAlive2==false then
 self:ShowBriefing()
@@ -28485,6 +28869,20 @@ end
 end
 return GroupsFound
 end
+function STATIC:GetStaticStorage()
+local name=self:GetName()
+local storage=STORAGE:NewFromStaticCargo(name)
+return storage
+end
+function STATIC:GetCargoWeight()
+local DCSObject=StaticObject.getByName(self.StaticName)
+local mass=-1
+if DCSObject then
+mass=DCSObject:getCargoWeight()or 0
+local masstxt=DCSObject:getCargoDisplayName()or"none"
+end
+return mass
+end
 AIRBASE={
 ClassName="AIRBASE",
 CategoryName={
@@ -28742,7 +29140,6 @@ AIRBASE.MarianaIslands={
 }
 AIRBASE.SouthAtlantic={
 ["Almirante_Schroeders"]="Almirante Schroeders",
-["Caleta_Tortel"]="Caleta Tortel",
 ["Comandante_Luis_Piedrabuena"]="Comandante Luis Piedrabuena",
 ["Cullen"]="Cullen",
 ["El_Calafate"]="El Calafate",
@@ -28773,49 +29170,84 @@ AIRBASE.SouthAtlantic={
 AIRBASE.Sinai={
 ["Abu_Rudeis"]="Abu Rudeis",
 ["Abu_Suwayr"]="Abu Suwayr",
+["Al_Bahr_al_Ahmar"]="Al Bahr al Ahmar",
 ["Al_Ismailiyah"]="Al Ismailiyah",
+["Al_Khatatbah"]="Al Khatatbah",
 ["Al_Mansurah"]="Al Mansurah",
+["Al_Rahmaniyah_Air_Base"]="Al Rahmaniyah Air Base",
 ["As_Salihiyah"]="As Salihiyah",
 ["AzZaqaziq"]="AzZaqaziq",
 ["Baluza"]="Baluza",
 ["Ben_Gurion"]="Ben-Gurion",
+["Beni_Suef"]="Beni Suef",
 ["Bilbeis_Air_Base"]="Bilbeis Air Base",
 ["Bir_Hasanah"]="Bir Hasanah",
+["Birma_Air_Base"]="Birma Air Base",
+["Borj_El_Arab_International_Airport"]="Borj El Arab International Airport",
 ["Cairo_International_Airport"]="Cairo International Airport",
 ["Cairo_West"]="Cairo West",
 ["Difarsuwar_Airfield"]="Difarsuwar Airfield",
 ["El_Arish"]="El Arish",
 ["El_Gora"]="El Gora",
+["El_Minya"]="El Minya",
 ["Fayed"]="Fayed",
+["Gebel_El_Basur_Air_Base"]="Gebel El Basur Air Base",
 ["Hatzerim"]="Hatzerim",
 ["Hatzor"]="Hatzor",
+["Hurghada_International_Airport"]="Hurghada International Airport",
 ["Inshas_Airbase"]="Inshas Airbase",
+["Jiyanklis_Air_Base"]="Jiyanklis Air Base",
 ["Kedem"]="Kedem",
 ["Kibrit_Air_Base"]="Kibrit Air Base",
+["Kom_Awshim"]="Kom Awshim",
 ["Melez"]="Melez",
 ["Nevatim"]="Nevatim",
 ["Ovda"]="Ovda",
-["Palmahim"]="Palmahim",
+["Palmachim"]="Palmachim",
+["Quwaysina"]="Quwaysina",
 ["Ramon_Airbase"]="Ramon Airbase",
+["Ramon_International_Airport"]="Ramon International Airport",
 ["Sde_Dov"]="Sde Dov",
+["Sharm_El_Sheikh_International_Airport"]="Sharm El Sheikh International Airport",
 ["St_Catherine"]="St Catherine",
 ["Tel_Nof"]="Tel Nof",
+["Wadi_Abu_Rish"]="Wadi Abu Rish",
 ["Wadi_al_Jandali"]="Wadi al Jandali",
 }
 AIRBASE.Kola={
-["Bas_100"]="Bas 100",
+["Banak"]="Banak",
 ["Bodo"]="Bodo",
 ["Jokkmokk"]="Jokkmokk",
 ["Kalixfors"]="Kalixfors",
 ["Kemi_Tornio"]="Kemi Tornio",
 ["Kiruna"]="Kiruna",
-["Lakselv"]="Lakselv",
 ["Monchegorsk"]="Monchegorsk",
 ["Murmansk_International"]="Murmansk International",
-["Olenegorsk"]="Olenegorsk",
+["Olenya"]="Olenya",
 ["Rovaniemi"]="Rovaniemi",
-["Severomorsk1"]="Severomorsk1",
-["Severomorsk3"]="Severomorsk3",
+["Severomorsk_1"]="Severomorsk-1",
+["Severomorsk_3"]="Severomorsk-3",
+["Vuojarvi"]="Vuojarvi",
+["Kirkenes"]="Kirkenes",
+["Kallax"]="Kallax",
+["Vidsel"]="Vidsel",
+}
+AIRBASE.Afghanistan={
+["Bost"]="Bost",
+["Camp_Bastion"]="Camp Bastion",
+["Camp_Bastion_Heliport"]="Camp Bastion Heliport",
+["Chaghcharan"]="Chaghcharan",
+["Dwyer"]="Dwyer",
+["Farah"]="Farah",
+["Herat"]="Herat",
+["Kandahar"]="Kandahar",
+["Kandahar_Heliport"]="Kandahar Heliport",
+["Maymana_Zahiraddin_Faryabi"]="Maymana Zahiraddin Faryabi",
+["Nimroz"]="Nimroz",
+["Qala_i_Naw"]="Qala i Naw",
+["Shindand"]="Shindand",
+["Shindand_Heliport"]="Shindand Heliport",
+["Tarinkot"]="Tarinkot",
 }
 AIRBASE.TerminalType={
 Runway=16,
@@ -29173,7 +29605,7 @@ function AIRBASE:GetFreeParkingSpotsTable(termtype,allowTOAC)
 local parkingfree=self:GetParkingData(true)
 local freespots={}
 for _,_spot in pairs(parkingfree)do
-if AIRBASE._CheckTerminalType(_spot.Term_Type,termtype)and _spot.Term_Index>0 then
+if AIRBASE._CheckTerminalType(_spot.Term_Type,termtype)then
 if(allowTOAC and allowTOAC==true)or _spot.TO_AC==false then
 local spot=self:_GetParkingSpotByID(_spot.Term_Index)
 spot.Free=true
@@ -30927,7 +31359,18 @@ GASOLINE=1,
 MW50=2,
 DIESEL=3,
 }
-STORAGE.version="0.0.1"
+STORAGE.LiquidName={
+GASOLINE="gasoline",
+DIESEL="diesel",
+MW50="methanol_mixture",
+JETFUEL="jet_fuel",
+}
+STORAGE.Type={
+WEAPONS="weapons",
+LIQUIDS="liquids",
+AIRCRAFT="aircrafts",
+}
+STORAGE.version="0.0.3"
 function STORAGE:New(AirbaseName)
 local self=BASE:Inherit(self,BASE:New())
 self.airbase=Airbase.getByName(AirbaseName)
@@ -30937,6 +31380,15 @@ end
 self.lid=string.format("STORAGE %s",AirbaseName)
 return self
 end
+function STORAGE:NewFromStaticCargo(StaticCargoName)
+local self=BASE:Inherit(self,BASE:New())
+self.airbase=StaticObject.getByName(StaticCargoName)
+if Airbase.getWarehouse then
+self.warehouse=Warehouse.getCargoAsWarehouse(self.airbase)
+end
+self.lid=string.format("STORAGE %s",StaticCargoName)
+return self
+end
 function STORAGE:FindByName(AirbaseName)
 local storage=_DATABASE:FindStorage(AirbaseName)
 return storage
@@ -31037,7 +31489,7 @@ local unlimited=false
 if N>0 then
 self:RemoveAmount(Type,1)
 local n=self:GetAmount(Type)
-unlimited=n==N
+unlimited=unlimited or n>2^29 or n==N
 if not unlimited then
 self:AddAmount(Type,1)
 end
@@ -35822,7 +36274,7 @@ function DETECTION_BASE:onafterStart(From,Event,To)
 self:__Detect(1)
 end
 function DETECTION_BASE:onafterDetect(From,Event,To)
-local DetectDelay=0.1
+local DetectDelay=0.15
 self.DetectionCount=0
 self.DetectionRun=0
 self:UnIdentifyAllDetectedObjects()
@@ -35853,13 +36305,15 @@ self.DetectionSet:ForEachGroupAlive(IteratorFunction,arg)
 return self
 end
 function DETECTION_BASE:onafterDetection(From,Event,To,Detection,DetectionTimeStamp)
+self:T({DetectedObjects=self.DetectedObjects})
 self.DetectionRun=self.DetectionRun+1
 local HasDetectedObjects=false
 if Detection and Detection:IsAlive()then
+self:T({"DetectionGroup is Alive",Detection:GetName()})
 local DetectionGroupName=Detection:GetName()
 local DetectionUnit=Detection:GetUnit(1)
 local DetectedUnits={}
-local DetectedTargets=Detection:GetDetectedTargets(
+local DetectedTargets=DetectionUnit:GetDetectedTargets(
 self.DetectVisual,
 self.DetectOptical,
 self.DetectRadar,
@@ -35867,7 +36321,6 @@ self.DetectIRST,
 self.DetectRWR,
 self.DetectDLINK
 )
-self:F({DetectedTargets=DetectedTargets})
 for DetectionObjectID,Detection in pairs(DetectedTargets)do
 local DetectedObject=Detection.object
 if DetectedObject and DetectedObject:isExist()and DetectedObject.id_<50000000 then
@@ -37796,7 +38249,6 @@ local DetectedItem=self.Detection:GetDetectedItemByIndex(Index)
 local TargetSetUnit=self.Detection:GetDetectedItemSet(DetectedItem)
 local MarkingCount=0
 local MarkedTypes={}
-TargetSetUnit:Flush(self)
 for TargetUnit,RecceData in pairs(self.Recces)do
 local Recce=RecceData
 self:F({TargetUnit=TargetUnit,Recce=Recce:GetName()})
@@ -37821,6 +38273,7 @@ break
 end
 end
 end
+if TargetSetUnit==nil then return end
 if self.AutoLase or(not self.AutoLase and(self.LaseStart+Duration>=timer.getTime()))then
 TargetSetUnit:ForEachUnitPerThreatLevel(10,0,
 function(TargetUnit)
@@ -37847,14 +38300,15 @@ self.LaserCodesUsed[LaserCode]=LaserCodeIndex
 local Spot=RecceUnit:LaseUnit(TargetUnit,LaserCode,Duration)
 local AttackSet=self.AttackSet
 local DesignateName=self.DesignateName
+local typename=TargetUnit:GetTypeName()
 function Spot:OnAfterDestroyed(From,Event,To)
-self.Recce:MessageToSetGroup("Target "..TargetUnit:GetTypeName().." destroyed. "..TargetSetUnit:Count().." targets left.",
+self.Recce:MessageToSetGroup("Target "..typename.." destroyed. "..TargetSetUnit:CountAlive().." targets left.",
 5,AttackSet,self.DesignateName)
 end
 self.Recces[TargetUnit]=RecceUnit
 MarkingCount=MarkingCount+1
 local TargetUnitType=TargetUnit:GetTypeName()
-RecceUnit:MessageToSetGroup("Marking "..TargetUnit:GetTypeName().." with laser "..RecceUnit:GetSpot().LaserCode.." for "..Duration.."s.",
+RecceUnit:MessageToSetGroup("Marking "..TargetUnitType.." with laser "..RecceUnit:GetSpot().LaserCode.." for "..Duration.."s.",
 10,self.AttackSet,DesignateName)
 if not MarkedTypes[TargetUnitType]then
 MarkedTypes[TargetUnitType]=true
@@ -37965,9 +38419,11 @@ end
 end
 end
 function DESIGNATE:onafterDoneSmoking(From,Event,To,Index)
+if self.Designating[Index]~=nil then
 self.Designating[Index]=string.gsub(self.Designating[Index],"S","")
 self:SetDesignateMenu()
 end
+end
 function DESIGNATE:onafterDoneIlluminating(From,Event,To,Index)
 self.Designating[Index]=string.gsub(self.Designating[Index],"I","")
 self:SetDesignateMenu()
@@ -38982,6 +39438,10 @@ elseif DCStype=="Mirage-F1CE"then
 self.aircraft.length=16
 self.aircraft.height=5
 self.aircraft.width=9
+elseif DCStype=="Saab340"then
+self.aircraft.length=19.73
+self.aircraft.height=6.97
+self.aircraft.width=21.44
 end
 self.aircraft.box=math.max(self.aircraft.length,self.aircraft.width)
 local text=string.format("\n******************************************************\n")
@@ -41489,7 +41949,7 @@ IRExitRange={filename="IR-ExitRange.ogg",duration=3.10},
 RANGE.Names={}
 RANGE.MenuF10={}
 RANGE.MenuF10Root=nil
-RANGE.version="2.7.3"
+RANGE.version="2.8.0"
 function RANGE:New(RangeName,Coalition)
 local self=BASE:Inherit(self,FSM:New())
 self.rangename=RangeName or"Practice Range"
@@ -41555,32 +42015,32 @@ end
 if self.rangecontrolfreq and not self.useSRS then
 self.rangecontrol=RADIOQUEUE:New(self.rangecontrolfreq,nil,self.rangename)
 self.rangecontrol.schedonce=true
-self.rangecontrol:SetDigit(0,RANGE.Sound.RC0.filename,RANGE.Sound.RC0.duration,self.soundpath)
-self.rangecontrol:SetDigit(1,RANGE.Sound.RC1.filename,RANGE.Sound.RC1.duration,self.soundpath)
-self.rangecontrol:SetDigit(2,RANGE.Sound.RC2.filename,RANGE.Sound.RC2.duration,self.soundpath)
-self.rangecontrol:SetDigit(3,RANGE.Sound.RC3.filename,RANGE.Sound.RC3.duration,self.soundpath)
-self.rangecontrol:SetDigit(4,RANGE.Sound.RC4.filename,RANGE.Sound.RC4.duration,self.soundpath)
-self.rangecontrol:SetDigit(5,RANGE.Sound.RC5.filename,RANGE.Sound.RC5.duration,self.soundpath)
-self.rangecontrol:SetDigit(6,RANGE.Sound.RC6.filename,RANGE.Sound.RC6.duration,self.soundpath)
-self.rangecontrol:SetDigit(7,RANGE.Sound.RC7.filename,RANGE.Sound.RC7.duration,self.soundpath)
-self.rangecontrol:SetDigit(8,RANGE.Sound.RC8.filename,RANGE.Sound.RC8.duration,self.soundpath)
-self.rangecontrol:SetDigit(9,RANGE.Sound.RC9.filename,RANGE.Sound.RC9.duration,self.soundpath)
+self.rangecontrol:SetDigit(0,self.Sound.RC0.filename,self.Sound.RC0.duration,self.soundpath)
+self.rangecontrol:SetDigit(1,self.Sound.RC1.filename,self.Sound.RC1.duration,self.soundpath)
+self.rangecontrol:SetDigit(2,self.Sound.RC2.filename,self.Sound.RC2.duration,self.soundpath)
+self.rangecontrol:SetDigit(3,self.Sound.RC3.filename,self.Sound.RC3.duration,self.soundpath)
+self.rangecontrol:SetDigit(4,self.Sound.RC4.filename,self.Sound.RC4.duration,self.soundpath)
+self.rangecontrol:SetDigit(5,self.Sound.RC5.filename,self.Sound.RC5.duration,self.soundpath)
+self.rangecontrol:SetDigit(6,self.Sound.RC6.filename,self.Sound.RC6.duration,self.soundpath)
+self.rangecontrol:SetDigit(7,self.Sound.RC7.filename,self.Sound.RC7.duration,self.soundpath)
+self.rangecontrol:SetDigit(8,self.Sound.RC8.filename,self.Sound.RC8.duration,self.soundpath)
+self.rangecontrol:SetDigit(9,self.Sound.RC9.filename,self.Sound.RC9.duration,self.soundpath)
 self.rangecontrol:SetSenderCoordinate(self.location)
 self.rangecontrol:SetSenderUnitName(self.rangecontrolrelayname)
 self.rangecontrol:Start(1,0.1)
 if self.instructorfreq and not self.useSRS then
 self.instructor=RADIOQUEUE:New(self.instructorfreq,nil,self.rangename)
 self.instructor.schedonce=true
-self.instructor:SetDigit(0,RANGE.Sound.IR0.filename,RANGE.Sound.IR0.duration,self.soundpath)
-self.instructor:SetDigit(1,RANGE.Sound.IR1.filename,RANGE.Sound.IR1.duration,self.soundpath)
-self.instructor:SetDigit(2,RANGE.Sound.IR2.filename,RANGE.Sound.IR2.duration,self.soundpath)
-self.instructor:SetDigit(3,RANGE.Sound.IR3.filename,RANGE.Sound.IR3.duration,self.soundpath)
-self.instructor:SetDigit(4,RANGE.Sound.IR4.filename,RANGE.Sound.IR4.duration,self.soundpath)
-self.instructor:SetDigit(5,RANGE.Sound.IR5.filename,RANGE.Sound.IR5.duration,self.soundpath)
-self.instructor:SetDigit(6,RANGE.Sound.IR6.filename,RANGE.Sound.IR6.duration,self.soundpath)
-self.instructor:SetDigit(7,RANGE.Sound.IR7.filename,RANGE.Sound.IR7.duration,self.soundpath)
-self.instructor:SetDigit(8,RANGE.Sound.IR8.filename,RANGE.Sound.IR8.duration,self.soundpath)
-self.instructor:SetDigit(9,RANGE.Sound.IR9.filename,RANGE.Sound.IR9.duration,self.soundpath)
+self.instructor:SetDigit(0,self.Sound.IR0.filename,self.Sound.IR0.duration,self.soundpath)
+self.instructor:SetDigit(1,self.Sound.IR1.filename,self.Sound.IR1.duration,self.soundpath)
+self.instructor:SetDigit(2,self.Sound.IR2.filename,self.Sound.IR2.duration,self.soundpath)
+self.instructor:SetDigit(3,self.Sound.IR3.filename,self.Sound.IR3.duration,self.soundpath)
+self.instructor:SetDigit(4,self.Sound.IR4.filename,self.Sound.IR4.duration,self.soundpath)
+self.instructor:SetDigit(5,self.Sound.IR5.filename,self.Sound.IR5.duration,self.soundpath)
+self.instructor:SetDigit(6,self.Sound.IR6.filename,self.Sound.IR6.duration,self.soundpath)
+self.instructor:SetDigit(7,self.Sound.IR7.filename,self.Sound.IR7.duration,self.soundpath)
+self.instructor:SetDigit(8,self.Sound.IR8.filename,self.Sound.IR8.duration,self.soundpath)
+self.instructor:SetDigit(9,self.Sound.IR9.filename,self.Sound.IR9.duration,self.soundpath)
 self.instructor:SetSenderCoordinate(self.location)
 self.instructor:SetSenderUnitName(self.instructorrelayname)
 self.instructor:Start(1,0.1)
@@ -41596,7 +42056,11 @@ self:_SmokeStrafeTargets()
 self:_SmokeStrafeTargetBoxes()
 self.rangezone:SmokeZone(SMOKECOLOR.White)
 end
-self:__Status(-60)
+self:__Status(-10)
+end
+function RANGE:SetMenuRoot(menu)
+self.menuF10root=menu
+return self
 end
 function RANGE:SetMaxStrafeAlt(maxalt)
 self.strafemaxalt=maxalt or RANGE.Defaults.strafemaxalt
@@ -41662,6 +42126,9 @@ self.location=coordinate
 return self
 end
 function RANGE:SetRangeZone(zone)
+if zone and type(zone)=="string"then
+zone=ZONE:FindByName(zone)
+end
 self.rangezone=zone
 return self
 end
@@ -41741,8 +42208,10 @@ self.instructmsrs:SetLabel("RANGEI")
 self.instructmsrs:SetVolume(Volume or 1.0)
 self.instructsrsQ=MSRSQUEUE:New("INSTRUCT")
 if PathToGoogleKey then
-self.controlmsrs:SetGoogle(PathToGoogleKey)
-self.instructmsrs:SetGoogle(PathToGoogleKey)
+self.controlmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
+self.controlmsrs:SetProvider(MSRS.Provider.GOOGLE)
+self.instructmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
+self.instructmsrs:SetProvider(MSRS.Provider.GOOGLE)
 end
 else
 self:E(self.lid..string.format("ERROR: No SRS path specified!"))
@@ -41803,6 +42272,31 @@ self.soundpath=tostring(path or"Range Soundfiles/")
 self:I(self.lid..string.format("Setting sound files path to %s",self.soundpath))
 return self
 end
+function RANGE:SetSoundfilesInfo(csvfile)
+local function getSound(filename)
+for key,_soundfile in pairs(self.Sound)do
+local soundfile=_soundfile
+if filename==soundfile.filename then
+return soundfile
+end
+end
+return nil
+end
+local data=UTILS.ReadCSV(csvfile)
+if data then
+for i,sound in pairs(data)do
+local soundfile=getSound(sound.filename..".ogg")
+if soundfile then
+soundfile.duration=tonumber(sound.duration)
+else
+self:E(string.format("ERROR: Could not get info for sound file %s",sound.filename))
+end
+end
+else
+self:E(string.format("ERROR: Could not read sound csv file!"))
+end
+return self
+end
 function RANGE:AddStrafePit(targetnames,boxlength,boxwidth,heading,inverseheading,goodpass,foulline)
 self:F({targetnames=targetnames,boxlength=boxlength,boxwidth=boxwidth,heading=heading,inverseheading=inverseheading,goodpass=goodpass,foulline=foulline})
 if type(targetnames)~="table"then
@@ -41984,6 +42478,9 @@ return self
 end
 function RANGE:AddBombingTargetGroup(group,goodhitrange,randommove)
 self:F({group=group,goodhitrange=goodhitrange,randommove=randommove})
+if group and type(group)=="string"then
+group=GROUP:FindByName(group)
+end
 if group then
 local _units=group:GetUnits()
 for _,_unit in pairs(_units)do
@@ -42197,7 +42694,7 @@ if self.rangecontrol then
 if self.useSRS then
 self.controlsrsQ:NewTransmission(_message,nil,self.controlmsrs,nil,1)
 else
-self.rangecontrol:NewTransmission(RANGE.Sound.RCWeaponImpactedTooFar.filename,RANGE.Sound.RCWeaponImpactedTooFar.duration,self.soundpath,nil,nil,_message,self.subduration)
+self.rangecontrol:NewTransmission(self.Sound.RCWeaponImpactedTooFar.filename,self.Sound.RCWeaponImpactedTooFar.duration,self.soundpath,nil,nil,_message,self.subduration)
 end
 end
 else
@@ -42268,13 +42765,13 @@ local group=player.client:GetGroup()
 self.instructsrsQ:NewTransmission(ttstext,nil,self.instructmsrs,nil,1,{group},text,10)
 else
 local RF=UTILS.Split(string.format("%.3f",self.rangecontrolfreq),".")
-self.instructor:NewTransmission(RANGE.Sound.IREnterRange.filename,RANGE.Sound.IREnterRange.duration,self.soundpath)
+self.instructor:NewTransmission(self.Sound.IREnterRange.filename,self.Sound.IREnterRange.duration,self.soundpath)
 self.instructor:Number2Transmission(RF[1])
 if tonumber(RF[2])>0 then
-self.instructor:NewTransmission(RANGE.Sound.IRDecimal.filename,RANGE.Sound.IRDecimal.duration,self.soundpath)
+self.instructor:NewTransmission(self.Sound.IRDecimal.filename,self.Sound.IRDecimal.duration,self.soundpath)
 self.instructor:Number2Transmission(RF[2])
 end
-self.instructor:NewTransmission(RANGE.Sound.IRMegaHertz.filename,RANGE.Sound.IRMegaHertz.duration,self.soundpath)
+self.instructor:NewTransmission(self.Sound.IRMegaHertz.filename,self.Sound.IRMegaHertz.duration,self.soundpath)
 end
 end
 end
@@ -42296,7 +42793,7 @@ text=text.."!"
 end
 self.instructsrsQ:NewTransmission(text,nil,self.instructmsrs,nil,1,{player.client:GetGroup()},text,10)
 else
-self.instructor:NewTransmission(RANGE.Sound.IRExitRange.filename,RANGE.Sound.IRExitRange.duration,self.soundpath)
+self.instructor:NewTransmission(self.Sound.IRExitRange.filename,self.Sound.IRExitRange.duration,self.soundpath)
 end
 end
 end
@@ -42317,20 +42814,20 @@ if self.useSRS then
 local group=player.client:GetGroup()
 self.controlsrsQ:NewTransmission(text,nil,self.controlmsrs,nil,1,{group},text,10)
 else
-self.rangecontrol:NewTransmission(RANGE.Sound.RCImpact.filename,RANGE.Sound.RCImpact.duration,self.soundpath,nil,nil,text,self.subduration)
+self.rangecontrol:NewTransmission(self.Sound.RCImpact.filename,self.Sound.RCImpact.duration,self.soundpath,nil,nil,text,self.subduration)
 self.rangecontrol:Number2Transmission(string.format("%03d",result.radial),nil,0.1)
-self.rangecontrol:NewTransmission(RANGE.Sound.RCDegrees.filename,RANGE.Sound.RCDegrees.duration,self.soundpath)
-self.rangecontrol:NewTransmission(RANGE.Sound.RCFor.filename,RANGE.Sound.RCFor.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCDegrees.filename,self.Sound.RCDegrees.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCFor.filename,self.Sound.RCFor.duration,self.soundpath)
 self.rangecontrol:Number2Transmission(string.format("%d",UTILS.MetersToFeet(result.distance)))
-self.rangecontrol:NewTransmission(RANGE.Sound.RCFeet.filename,RANGE.Sound.RCFeet.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCFeet.filename,self.Sound.RCFeet.duration,self.soundpath)
 if result.quality=="POOR"then
-self.rangecontrol:NewTransmission(RANGE.Sound.RCPoorHit.filename,RANGE.Sound.RCPoorHit.duration,self.soundpath,nil,0.5)
+self.rangecontrol:NewTransmission(self.Sound.RCPoorHit.filename,self.Sound.RCPoorHit.duration,self.soundpath,nil,0.5)
 elseif result.quality=="INEFFECTIVE"then
-self.rangecontrol:NewTransmission(RANGE.Sound.RCIneffectiveHit.filename,RANGE.Sound.RCIneffectiveHit.duration,self.soundpath,nil,0.5)
+self.rangecontrol:NewTransmission(self.Sound.RCIneffectiveHit.filename,self.Sound.RCIneffectiveHit.duration,self.soundpath,nil,0.5)
 elseif result.quality=="GOOD"then
-self.rangecontrol:NewTransmission(RANGE.Sound.RCGoodHit.filename,RANGE.Sound.RCGoodHit.duration,self.soundpath,nil,0.5)
+self.rangecontrol:NewTransmission(self.Sound.RCGoodHit.filename,self.Sound.RCGoodHit.duration,self.soundpath,nil,0.5)
 elseif result.quality=="EXCELLENT"then
-self.rangecontrol:NewTransmission(RANGE.Sound.RCExcellentHit.filename,RANGE.Sound.RCExcellentHit.duration,self.soundpath,nil,0.5)
+self.rangecontrol:NewTransmission(self.Sound.RCExcellentHit.filename,self.Sound.RCExcellentHit.duration,self.soundpath,nil,0.5)
 end
 end
 end
@@ -42370,7 +42867,7 @@ else
 self:E(self.lid..string.format("ERROR: Could not save results to file %s",tostring(filename)))
 end
 end
-local path=lfs.writedir()..[[Logs\]]
+local path=self.targetpath or lfs.writedir()..[[Logs\]]
 local filename=path..string.format("RANGE-%s_BombingResults.csv",self.rangename)
 local scores="Name,Pass,Target,Distance,Radial,Quality,Weapon,Airframe,Mission Time"
 for playername,results in pairs(self.bombPlayerResults)do
@@ -42409,7 +42906,7 @@ self:E(self.lid..string.format("WARNING: Could not load player results from file
 return nil
 end
 end
-local path=lfs.writedir()..[[Logs\]]
+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)
@@ -42833,7 +43330,7 @@ local group=_unit:GetGroup()
 local text="You left the strafing zone too quickly! No score!"
 self.controlsrsQ:NewTransmission(text,nil,self.controlmsrs,nil,1)
 else
-self.rangecontrol:NewTransmission(RANGE.Sound.RCLeftStrafePitTooQuickly.filename,RANGE.Sound.RCLeftStrafePitTooQuickly.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCLeftStrafePitTooQuickly.filename,self.Sound.RCLeftStrafePitTooQuickly.duration,self.soundpath)
 end
 end
 else
@@ -42851,23 +43348,23 @@ end
 local resulttext=""
 if _result.pastfoulline==true then
 resulttext="* INVALID - PASSED FOUL LINE *"
-_sound=RANGE.Sound.RCPoorPass
+_sound=self.Sound.RCPoorPass
 else
 if accur>=90 then
 resulttext="DEADEYE PASS"
-_sound=RANGE.Sound.RCExcellentPass
+_sound=self.Sound.RCExcellentPass
 elseif accur>=75 then
 resulttext="EXCELLENT PASS"
-_sound=RANGE.Sound.RCExcellentPass
+_sound=self.Sound.RCExcellentPass
 elseif accur>=50 then
 resulttext="GOOD PASS"
-_sound=RANGE.Sound.RCGoodPass
+_sound=self.Sound.RCGoodPass
 elseif accur>=25 then
 resulttext="INEFFECTIVE PASS"
-_sound=RANGE.Sound.RCIneffectivePass
+_sound=self.Sound.RCIneffectivePass
 else
 resulttext="POOR PASS"
-_sound=RANGE.Sound.RCPoorPass
+_sound=self.Sound.RCPoorPass
 end
 end
 local _text=string.format("%s, hits on target %s: %d",self:_myname(_unitName),_result.zone.name,_result.hits)
@@ -42902,14 +43399,14 @@ if self.rangecontrol then
 if self.useSRS then
 self.controlsrsQ:NewTransmission(ttstext,nil,self.controlmsrs,nil,1)
 else
-self.rangecontrol:NewTransmission(RANGE.Sound.RCHitsOnTarget.filename,RANGE.Sound.RCHitsOnTarget.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCHitsOnTarget.filename,self.Sound.RCHitsOnTarget.duration,self.soundpath)
 self.rangecontrol:Number2Transmission(string.format("%d",_result.hits))
 if shots and accur then
-self.rangecontrol:NewTransmission(RANGE.Sound.RCTotalRoundsFired.filename,RANGE.Sound.RCTotalRoundsFired.duration,self.soundpath,nil,0.2)
+self.rangecontrol:NewTransmission(self.Sound.RCTotalRoundsFired.filename,self.Sound.RCTotalRoundsFired.duration,self.soundpath,nil,0.2)
 self.rangecontrol:Number2Transmission(string.format("%d",shots),nil,0.2)
-self.rangecontrol:NewTransmission(RANGE.Sound.RCAccuracy.filename,RANGE.Sound.RCAccuracy.duration,self.soundpath,nil,0.2)
+self.rangecontrol:NewTransmission(self.Sound.RCAccuracy.filename,self.Sound.RCAccuracy.duration,self.soundpath,nil,0.2)
 self.rangecontrol:Number2Transmission(string.format("%d",UTILS.Round(accur,0)))
-self.rangecontrol:NewTransmission(RANGE.Sound.RCPercent.filename,RANGE.Sound.RCPercent.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCPercent.filename,self.Sound.RCPercent.duration,self.soundpath)
 end
 self.rangecontrol:NewTransmission(_sound.filename,_sound.duration,self.soundpath,nil,0.5)
 end
@@ -42933,7 +43430,7 @@ if self.rangecontrol then
 if self.useSRS then
 self.controlsrsQ:NewTransmission(_msg,nil,self.controlmsrs,nil,1)
 else
-self.rangecontrol:NewTransmission(RANGE.Sound.RCRollingInOnStrafeTarget.filename,RANGE.Sound.RCRollingInOnStrafeTarget.duration,self.soundpath)
+self.rangecontrol:NewTransmission(self.Sound.RCRollingInOnStrafeTarget.filename,self.Sound.RCRollingInOnStrafeTarget.duration,self.soundpath)
 end
 end
 self:_DisplayMessageToGroup(_unit,_msg,10,true)
@@ -42953,15 +43450,21 @@ local _gid=group:GetID()
 if group and _gid then
 if not self.MenuAddedTo[_gid]then
 self.MenuAddedTo[_gid]=true
-local _rangePath=nil
-if RANGE.MenuF10Root then
-_rangePath=MENU_GROUP:New(group,"On the Range")
+local _rootMenu=nil
+if self.menuF10root then
+_rootMenu=self.menuF10root
+self:T2(self.lid..string.format("Creating F10 menu for group %s",group:GetName()))
+elseif RANGE.MenuF10Root then
+_rootMenu=RANGE.MenuF10Root
 else
 if RANGE.MenuF10[_gid]==nil then
-RANGE.MenuF10[_gid]=MENU_GROUP:New(group,"On the Range")
+self:T2(self.lid..string.format("Creating F10 menu 'On the Range' for group %s",group:GetName()))
+else
+self:T2(self.lid..string.format("F10 menu 'On the Range' already EXISTS for group %s",group:GetName()))
 end
-_rangePath=MENU_GROUP:New(group,self.rangename,RANGE.MenuF10[_gid])
+_rootMenu=RANGE.MenuF10[_gid]or MENU_GROUP:New(group,"On the Range")
 end
+local _rangePath=MENU_GROUP:New(group,self.rangename,_rootMenu)
 local _statsPath=MENU_GROUP:New(group,"Statistics",_rangePath)
 local _markPath=MENU_GROUP:New(group,"Mark Targets",_rangePath)
 local _settingsPath=MENU_GROUP:New(group,"My Settings",_rangePath)
@@ -43216,12 +43719,12 @@ local text=""
 if self.targetsheet then
 playerData.targeton=not playerData.targeton
 if playerData and playerData.targeton==true then
-text=string.format("roger, your targetsheets are now SAVED.")
+text=string.format("Roger, your targetsheets are now SAVED.")
 else
-text=string.format("affirm, your targetsheets are NOT SAVED.")
+text=string.format("Affirm, your targetsheets are NOT SAVED.")
 end
 else
-text="negative, target sheet data recorder is broken on this range."
+text="Negative, target sheet data recorder is broken on this range."
 end
 self:_DisplayMessageToGroup(unit,text,5,false,false)
 end
@@ -43861,7 +44364,7 @@ maxrange=32000,
 reloadtime=540,
 },
 }
-ARTY.version="1.3.0"
+ARTY.version="1.3.1"
 function ARTY:New(group,alias)
 local self=BASE:Inherit(self,FSM_CONTROLLABLE:New())
 if type(group)=="string"then
@@ -44324,7 +44827,7 @@ self:_EventFromTo("onafterStart",Event,From,To)
 local text=string.format("Started ARTY version %s for group %s.",ARTY.version,Controllable:GetName())
 self:I(self.lid..text)
 MESSAGE:New(text,5):ToAllIf(self.Debug)
-self.Nammo0,self.Nshells0,self.Nrockets0,self.Nmissiles0=self:GetAmmo(self.Debug)
+self.Nammo0,self.Nshells0,self.Nrockets0,self.Nmissiles0,self.Narty0=self:GetAmmo(self.Debug)
 if self.nukerange==nil then
 self.nukerange=1500/75000*self.nukewarhead
 end
@@ -44485,7 +44988,7 @@ function ARTY:_StatusReport(display)
 if display==nil then
 display=false
 end
-local Nammo,Nshells,Nrockets,Nmissiles=self:GetAmmo()
+local Nammo,Nshells,Nrockets,Nmissiles,Narty=self:GetAmmo()
 local Nnukes=self.Nukes
 local Nillu=self.Nillu
 local Nsmoke=self.Nsmoke
@@ -44496,7 +44999,7 @@ text=text..string.format("ARTY group          = %s\n",self.groupname)
 text=text..string.format("Clock               = %s\n",Clock)
 text=text..string.format("FSM state           = %s\n",self:GetState())
 text=text..string.format("Total ammo count    = %d\n",Nammo)
-text=text..string.format("Number of shells    = %d\n",Nshells)
+text=text..string.format("Number of shells    = %d\n",Narty)
 text=text..string.format("Number of rockets   = %d\n",Nrockets)
 text=text..string.format("Number of missiles  = %d\n",Nmissiles)
 text=text..string.format("Number of nukes     = %d\n",Nnukes)
@@ -44589,7 +45092,7 @@ weapon:SetFuncTrack(ARTY._FuncTrack,self,target)
 weapon:SetFuncImpact(ARTY._FuncImpact,self,target)
 weapon:StartTrack(2)
 end
-local _nammo,_nshells,_nrockets,_nmissiles=self:GetAmmo()
+local _nammo,_nshells,_nrockets,_nmissiles,_narty=self:GetAmmo()
 if self.currentTarget.weapontype==ARTY.WeaponType.TacticalNukes then
 self.Nukes=self.Nukes-1
 end
@@ -44606,7 +45109,7 @@ _outofammo=true
 end
 local _partlyoutofammo=self:_CheckOutOfAmmo({self.currentTarget})
 local _weapontype=self:_WeaponTypeName(self.currentTarget.weapontype)
-self:T(self.lid..string.format("Group %s ammo: total=%d, shells=%d, rockets=%d, missiles=%d",self.groupname,_nammo,_nshells,_nrockets,_nmissiles))
+self:T(self.lid..string.format("Group %s ammo: total=%d, shells=%d, rockets=%d, missiles=%d",self.groupname,_nammo,_narty,_nrockets,_nmissiles))
 self:T(self.lid..string.format("Group %s uses weapontype %s for current target.",self.groupname,_weapontype))
 local _ceasefire=false
 local _relocate=false
@@ -44874,7 +45377,7 @@ end
 end
 function ARTY:onafterStatus(Controllable,From,Event,To)
 self:_EventFromTo("onafterStatus",Event,From,To)
-local nammo,nshells,nrockets,nmissiles=self:GetAmmo()
+local nammo,nshells,nrockets,nmissiles,narty=self:GetAmmo()
 if self.iscargo and self.cargogroup then
 if self.cargogroup:IsLoaded()and not self:is("InTransit")then
 self:T(self.lid..string.format("Group %s has been loaded into a carrier and is now transported.",self.alias))
@@ -44885,7 +45388,7 @@ self:UnLoaded()
 end
 end
 local fsmstate=self:GetState()
-self:T(self.lid..string.format("Status %s, Ammo total=%d: shells=%d [smoke=%d, illu=%d, nukes=%d*%.3f kT], rockets=%d, missiles=%d",fsmstate,nammo,nshells,self.Nsmoke,self.Nillu,self.Nukes,self.nukewarhead/1000000,nrockets,nmissiles))
+self:T(self.lid..string.format("Status %s, Ammo total=%d: shells=%d [smoke=%d, illu=%d, nukes=%d*%.3f kT], rockets=%d, missiles=%d",fsmstate,nammo,narty,self.Nsmoke,self.Nillu,self.Nukes,self.nukewarhead/1000000,nrockets,nmissiles))
 if self.Controllable and self.Controllable:IsAlive()then
 if self.Debug then
 self:_StatusReport()
@@ -44937,10 +45440,14 @@ elseif _timedTarget then
 if self.currentTarget then
 self:CeaseFire(self.currentTarget)
 end
+if self:is("CombatReady")then
 self:OpenFire(_timedTarget)
+end
 elseif _normalTarget then
+if self:is("CombatReady")then
 self:OpenFire(_normalTarget)
 end
+end
 local gotsome=false
 if#self.targets>0 then
 for i=1,#self.targets do
@@ -45010,14 +45517,14 @@ self.currentTarget=target
 self.currentTarget.Tassigned=timer.getTime()
 end
 local range=Controllable:GetCoordinate():Get2DDistance(target.coord)
-local Nammo,Nshells,Nrockets,Nmissiles=self:GetAmmo()
-local nfire=Nammo
+local Nammo,Nshells,Nrockets,Nmissiles,Narty=self:GetAmmo()
+local nfire=Narty
 local _type="shots"
 if target.weapontype==ARTY.WeaponType.Auto then
-nfire=Nammo
+nfire=Narty
 _type="shots"
 elseif target.weapontype==ARTY.WeaponType.Cannon then
-nfire=Nshells
+nfire=Narty
 _type="shells"
 elseif target.weapontype==ARTY.WeaponType.TacticalNukes then
 nfire=self.Nukes
@@ -45158,7 +45665,7 @@ end
 end
 function ARTY:_CheckRearmed()
 self:F2()
-local nammo,nshells,nrockets,nmissiles=self:GetAmmo()
+local nammo,nshells,nrockets,nmissiles,narty=self:GetAmmo()
 local units=self.Controllable:GetUnits()
 local nunits=0
 if units then
@@ -45268,10 +45775,13 @@ local group=self.Controllable
 if weapontype==ARTY.WeaponType.TacticalNukes or weapontype==ARTY.WeaponType.IlluminationShells or weapontype==ARTY.WeaponType.SmokeShells then
 weapontype=ARTY.WeaponType.Cannon
 end
+if group:HasTask()then
+group:ClearTasks()
+end
 group:OptionROEOpenFire()
 local vec2=coord:GetVec2()
 local fire=group:TaskFireAtPoint(vec2,radius,nshells,weapontype)
-group:SetTask(fire)
+group:SetTask(fire,1)
 end
 function ARTY:_AttackGroup(target)
 local group=self.Controllable
@@ -45279,10 +45789,13 @@ local weapontype=target.weapontype
 if weapontype==ARTY.WeaponType.TacticalNukes or weapontype==ARTY.WeaponType.IlluminationShells or weapontype==ARTY.WeaponType.SmokeShells then
 weapontype=ARTY.WeaponType.Cannon
 end
+if group:HasTask()then
+group:ClearTasks()
+end
 group:OptionROEOpenFire()
 local targetgroup=GROUP:FindByName(target.name)
 local fire=group:TaskAttackGroup(targetgroup,weapontype,AI.Task.WeaponExpend.ONE,1)
-group:SetTask(fire)
+group:SetTask(fire,1)
 end
 function ARTY:_NuclearBlast(_coord)
 local S0=self.nukewarhead
@@ -45401,6 +45914,7 @@ local nammo=0
 local nshells=0
 local nrockets=0
 local nmissiles=0
+local nartyshells=0
 local units=self.Controllable:GetUnits()
 if units==nil then
 return nammo,nshells,nrockets,nmissiles
@@ -45468,6 +45982,8 @@ end
 end
 if _gotshell then
 nshells=nshells+Nammo
+local _,_,_,_,_,shells=unit:GetAmmunition()
+nartyshells=nartyshells+shells
 text=text..string.format("- %d shells of type %s\n",Nammo,_weaponName)
 elseif _gotrocket then
 nrockets=nrockets+Nammo
@@ -45491,7 +46007,7 @@ MESSAGE:New(text,10):ToAllIf(display)
 end
 end
 nammo=nshells+nrockets+nmissiles
-return nammo,nshells,nrockets,nmissiles
+return nammo,nshells,nrockets,nmissiles,nartyshells
 end
 function ARTY:_MissileCategoryName(categorynumber)
 local cat="unknown"
@@ -45940,7 +46456,8 @@ local dt=Tnow-self.currentTarget.Tassigned
 if self.Nshots==0 then
 self:T(self.lid..string.format("%s, waiting for %d seconds for first shot on target %s.",self.groupname,dt,name))
 end
-if dt>self.WaitForShotTime and(self.Nshots==0 or self.currentTarget.nshells>=self.Nshots)then
+self:T(string.format("dt = %d WaitTime = %d | shots = %d TargetShells = %d",dt,self.WaitForShotTime,self.Nshots,self.currentTarget.nshells))
+if(dt>self.WaitForShotTime and self.Nshots==0)or(self.currentTarget.nshells<=self.Nshots)then
 self:T(self.lid..string.format("%s, no shot event after %d seconds. Removing current target %s from list.",self.groupname,self.WaitForShotTime,name))
 self:CeaseFire(self.currentTarget)
 self:RemoveTarget(name)
@@ -45974,13 +46491,13 @@ self:T2(self.lid..string.format("WARNING: Move with name %s could not be found.
 return nil
 end
 function ARTY:_CheckOutOfAmmo(targets)
-local _nammo,_nshells,_nrockets,_nmissiles=self:GetAmmo()
+local _nammo,_nshells,_nrockets,_nmissiles,_narty=self:GetAmmo()
 local _partlyoutofammo=false
 for _,Target in pairs(targets)do
 if Target.weapontype==ARTY.WeaponType.Auto and _nammo==0 then
 self:T(self.lid..string.format("Group %s, auto weapon requested for target %s but all ammo is empty.",self.groupname,Target.name))
 _partlyoutofammo=true
-elseif Target.weapontype==ARTY.WeaponType.Cannon and _nshells==0 then
+elseif Target.weapontype==ARTY.WeaponType.Cannon and _narty==0 then
 self:T(self.lid..string.format("Group %s, cannons requested for target %s but shells empty.",self.groupname,Target.name))
 _partlyoutofammo=true
 elseif Target.weapontype==ARTY.WeaponType.TacticalNukes and self.Nukes<=0 then
@@ -46003,12 +46520,12 @@ end
 return _partlyoutofammo
 end
 function ARTY:_CheckWeaponTypeAvailable(target)
-local Nammo,Nshells,Nrockets,Nmissiles=self:GetAmmo()
+local Nammo,Nshells,Nrockets,Nmissiles,Narty=self:GetAmmo()
 local nfire=Nammo
 if target.weapontype==ARTY.WeaponType.Auto then
 nfire=Nammo
 elseif target.weapontype==ARTY.WeaponType.Cannon then
-nfire=Nshells
+nfire=Narty
 elseif target.weapontype==ARTY.WeaponType.TacticalNukes then
 nfire=self.Nukes
 elseif target.weapontype==ARTY.WeaponType.IlluminationShells then
@@ -50384,6 +50901,7 @@ if not self.allowSpawnOnClientSpots then
 local clients=_DATABASE.CLIENTS
 for clientname,client in pairs(clients)do
 local template=_DATABASE:GetGroupTemplateFromUnitName(clientname)
+if template then
 local units=template.units
 for i,unit in pairs(units)do
 local coord=COORDINATE:New(unit.x,unit.alt,unit.y)
@@ -50391,6 +50909,7 @@ coords[unit.name]=coord
 end
 end
 end
+end
 return coords
 end
 local parkingdata=airbase.parking
@@ -51993,6 +52512,7 @@ SuppressedGroups={},
 automode=true,
 autoshorad=true,
 ShoradGroupSet=nil,
+checkforfriendlies=false,
 }
 MANTIS.AdvancedState={
 GREEN=0,
@@ -52081,6 +52601,7 @@ MANTIS.SamDataCH={
 do
 function MANTIS:New(name,samprefix,ewrprefix,hq,coalition,dynamic,awacs,EmOnOff,Padding,Zones)
 local self=BASE:Inherit(self,FSM:New())
+self.name=name or"mymantis"
 self.SAM_Templates_Prefix=samprefix or"Red SAM"
 self.EWR_Templates_Prefix=ewrprefix or"Red EWR"
 self.HQ_Template_CC=hq or nil
@@ -52181,7 +52702,7 @@ end
 if self.HQ_Template_CC then
 self.HQ_CC=GROUP:FindByName(self.HQ_Template_CC)
 end
-self.version="0.8.16"
+self.version="0.8.18"
 self:I(string.format("***** Starting MANTIS Version %s *****",self.version))
 self:SetStartState("Stopped")
 self:AddTransition("Stopped","Start","Running")
@@ -52518,6 +53039,10 @@ local set=dectset
 if dlink then
 set=self:_PreFilterHeight(height)
 end
+local friendlyset
+if self.checkforfriendlies==true then
+friendlyset=SET_GROUP:New():FilterCoalitions(self.Coalition):FilterCategories({"plane","helicopter"}):FilterFunction(function(grp)if grp and grp:InAir()then return true else return false end end):FilterOnce()
+end
 for _,_coord in pairs(set)do
 local coord=_coord
 local targetdistance=samcoordinate:DistanceFromPointVec2(coord)
@@ -52539,7 +53064,14 @@ local text=string.format("Checking SAM at %s | Targetdist %d | Rad %d | Inrange
 local m=MESSAGE:New(text,10,"Check"):ToAllIf(self.debug)
 self:T(self.lid..text)
 end
-if targetdistance<=rad and zonecheck then
+local nofriendlies=true
+if self.checkforfriendlies==true then
+local closestfriend,distance=friendlyset:GetClosestGroup(samcoordinate)
+if closestfriend and distance and distance<rad then
+nofriendlies=false
+end
+end
+if targetdistance<=rad and zonecheck==true and nofriendlies==true then
 return true,targetdistance
 end
 end
@@ -53476,6 +54008,313 @@ end
 return self
 end
 end
+CLIENTWATCH={}
+CLIENTWATCH.ClassName="CLIENTWATCH"
+CLIENTWATCH.Debug=false
+CLIENTWATCH.lid=nil
+CLIENTWATCHTools={}
+CLIENTWATCH.version="1.0.1"
+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
+if type(client)=="table"then
+if client.ClassName=="CLIENT"then
+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 self.ClientName==eventdata.IniUnitName then
+local clientObject=CLIENTWATCHTools:_newClient(eventdata)
+self:Spawn(clientObject)
+end
+end
+end
+else
+local tableValid=true
+for _,entry in pairs(client)do
+if type(entry)~="string"then
+tableValid=false
+self:E({"The base handler failed to start because at least one entry in param1's table is not a string!",InvalidEntry=entry})
+return nil
+end
+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 string.match(eventdata.IniUnitName,entry)or string.match(eventdata.IniGroupName,entry)then
+local clientObject=CLIENTWATCHTools:_newClient(eventdata)
+self:Spawn(clientObject)
+break
+end
+end
+end
+end
+end
+end
+else
+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 string.match(eventdata.IniUnitName,client)or string.match(eventdata.IniGroupName,client)then
+local clientObject=CLIENTWATCHTools:_newClient(eventdata)
+self:Spawn(clientObject)
+end
+end
+end
+end
+else
+self:E({"The base handler failed to start because param1 is not a CLIENT object or a prefix string!",param1=client})
+return nil
+end
+return self
+end
+function CLIENTWATCHTools:_newClient(eventdata)
+local self=BASE:Inherit(self,FSM:New())
+self:SetStartState("Alive")
+self:AddTransition("Alive","Despawn","Dead")
+self.Unit=eventdata.IniUnit
+self.Group=self.Unit:GetGroup()
+self.Client=self.Unit:GetClient()
+self.PlayerName=self.Unit:GetPlayerName()
+self.UnitName=self.Unit:GetName()
+self.GroupName=self.Group:GetName()
+self:AddTransition("*","Hit","*")
+self:AddTransition("*","Kill","*")
+self:AddTransition("*","Score","*")
+self:AddTransition("*","Shot","*")
+self:AddTransition("*","ShootingStart","*")
+self:AddTransition("*","ShootingEnd","*")
+self:AddTransition("*","Land","*")
+self:AddTransition("*","Takeoff","*")
+self:AddTransition("*","RunwayTakeoff","*")
+self:AddTransition("*","RunwayTouch","*")
+self:AddTransition("*","Refueling","*")
+self:AddTransition("*","RefuelingStop","*")
+self:AddTransition("*","PlayerLeaveUnit","*")
+self:AddTransition("*","Crash","*")
+self:AddTransition("*","Dead","*")
+self:AddTransition("*","PilotDead","*")
+self:AddTransition("*","UnitLost","*")
+self:AddTransition("*","Ejection","*")
+self:AddTransition("*","HumanFailure","*")
+self:AddTransition("*","HumanAircraftRepairFinish","*")
+self:AddTransition("*","HumanAircraftRepairStart","*")
+self:AddTransition("*","EngineShutdown","*")
+self:AddTransition("*","EngineStartup","*")
+self:AddTransition("*","WeaponAdd","*")
+self:AddTransition("*","WeaponDrop","*")
+self:AddTransition("*","WeaponRearm","*")
+self:HandleEvent(EVENTS.Hit)
+self:HandleEvent(EVENTS.Kill)
+self:HandleEvent(EVENTS.Score)
+self:HandleEvent(EVENTS.Shot)
+self:HandleEvent(EVENTS.ShootingStart)
+self:HandleEvent(EVENTS.ShootingEnd)
+self:HandleEvent(EVENTS.Land)
+self:HandleEvent(EVENTS.Takeoff)
+self:HandleEvent(EVENTS.RunwayTakeoff)
+self:HandleEvent(EVENTS.RunwayTouch)
+self:HandleEvent(EVENTS.Refueling)
+self:HandleEvent(EVENTS.RefuelingStop)
+self:HandleEvent(EVENTS.PlayerLeaveUnit)
+self:HandleEvent(EVENTS.Crash)
+self:HandleEvent(EVENTS.Dead)
+self:HandleEvent(EVENTS.PilotDead)
+self:HandleEvent(EVENTS.UnitLost)
+self:HandleEvent(EVENTS.Ejection)
+self:HandleEvent(EVENTS.HumanFailure)
+self:HandleEvent(EVENTS.HumanAircraftRepairFinish)
+self:HandleEvent(EVENTS.HumanAircraftRepairStart)
+self:HandleEvent(EVENTS.EngineShutdown)
+self:HandleEvent(EVENTS.EngineStartup)
+self:HandleEvent(EVENTS.WeaponAdd)
+self:HandleEvent(EVENTS.WeaponDrop)
+self:HandleEvent(EVENTS.WeaponRearm)
+function self:OnEventHit(EventData)
+if EventData.TgtUnitName==self.UnitName then
+self:Hit(EventData)
+end
+end
+function self:OnEventKill(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Kill(EventData)
+end
+end
+function self:OnEventScore(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Score(EventData)
+end
+end
+function self:OnEventShot(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Shot(EventData)
+end
+end
+function self:OnEventShootingStart(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:ShootingStart(EventData)
+end
+end
+function self:OnEventShootingEnd(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:ShootingEnd(EventData)
+end
+end
+function self:OnEventLand(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Land(EventData)
+end
+end
+function self:OnEventTakeoff(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Takeoff(EventData)
+end
+end
+function self:OnEventRunwayTakeoff(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:RunwayTakeoff(EventData)
+end
+end
+function self:OnEventRunwayTouch(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:RunwayTouch(EventData)
+end
+end
+function self:OnEventRefueling(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Refueling(EventData)
+end
+end
+function self:OnEventRefuelingStop(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:RefuelingStop(EventData)
+end
+end
+function self:OnEventPlayerLeaveUnit(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:PlayerLeaveUnit(EventData)
+self._deadRoutine()
+end
+end
+function self:OnEventCrash(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Crash(EventData)
+self._deadRoutine()
+end
+end
+function self:OnEventDead(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Dead(EventData)
+self._deadRoutine()
+end
+end
+function self:OnEventPilotDead(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:PilotDead(EventData)
+self._deadRoutine()
+end
+end
+function self:OnEventUnitLost(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:UnitLost(EventData)
+self._deadRoutine()
+end
+end
+function self:OnEventEjection(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:Ejection(EventData)
+self._deadRoutine()
+end
+end
+function self:OnEventHumanFailure(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:HumanFailure(EventData)
+if not self.Unit:IsAlive()then
+self._deadRoutine()
+end
+end
+end
+function self:OnEventHumanAircraftRepairFinish(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:HumanAircraftRepairFinish(EventData)
+end
+end
+function self:OnEventHumanAircraftRepairStart(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:HumanAircraftRepairStart(EventData)
+end
+end
+function self:OnEventEngineShutdown(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:EngineShutdown(EventData)
+end
+end
+function self:OnEventEngineStartup(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:EngineStartup(EventData)
+end
+end
+function self:OnEventWeaponAdd(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:WeaponAdd(EventData)
+end
+end
+function self:OnEventWeaponDrop(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:WeaponDrop(EventData)
+end
+end
+function self:OnEventWeaponRearm(EventData)
+if EventData.IniUnitName==self.UnitName then
+self:WeaponRearm(EventData)
+end
+end
+self.FallbackTimer=TIMER:New(function()
+if not self.Unit:IsAlive()then
+self._deadRoutine()
+end
+end)
+self.FallbackTimer:Start(5,5)
+function self._deadRoutine()
+self:UnHandleEvent(EVENTS.Hit)
+self:UnHandleEvent(EVENTS.Kill)
+self:UnHandleEvent(EVENTS.Score)
+self:UnHandleEvent(EVENTS.Shot)
+self:UnHandleEvent(EVENTS.ShootingStart)
+self:UnHandleEvent(EVENTS.ShootingEnd)
+self:UnHandleEvent(EVENTS.Land)
+self:UnHandleEvent(EVENTS.Takeoff)
+self:UnHandleEvent(EVENTS.RunwayTakeoff)
+self:UnHandleEvent(EVENTS.RunwayTouch)
+self:UnHandleEvent(EVENTS.Refueling)
+self:UnHandleEvent(EVENTS.RefuelingStop)
+self:UnHandleEvent(EVENTS.PlayerLeaveUnit)
+self:UnHandleEvent(EVENTS.Crash)
+self:UnHandleEvent(EVENTS.Dead)
+self:UnHandleEvent(EVENTS.PilotDead)
+self:UnHandleEvent(EVENTS.UnitLost)
+self:UnHandleEvent(EVENTS.Ejection)
+self:UnHandleEvent(EVENTS.HumanFailure)
+self:UnHandleEvent(EVENTS.HumanAircraftRepairFinish)
+self:UnHandleEvent(EVENTS.HumanAircraftRepairStart)
+self:UnHandleEvent(EVENTS.EngineShutdown)
+self:UnHandleEvent(EVENTS.EngineStartup)
+self:UnHandleEvent(EVENTS.WeaponAdd)
+self:UnHandleEvent(EVENTS.WeaponDrop)
+self:UnHandleEvent(EVENTS.WeaponRearm)
+self.FallbackTimer:Stop()
+self:Despawn()
+end
+self:I({"CLIENT SPAWN EVENT",PlayerName=self.PlayerName,UnitName=self.UnitName,GroupName=self.GroupName})
+return self
+end
 AIRBOSS={
 ClassName="AIRBOSS",
 Debug=false,
@@ -54018,6 +54857,13 @@ function AIRBOSS:SetLSOCallInterval(TimeInterval)
 self.LSOdT=TimeInterval or 4
 return self
 end
+function AIRBOSS:SetIntoWindLegacy(SwitchOn)
+if SwitchOn==nil then
+SwitchOn=true
+end
+self.intowindold=SwitchOn
+return self
+end
 function AIRBOSS:SetAirbossNiceGuy(Switch)
 if Switch==true or Switch==nil then
 self.airbossnice=true
@@ -54482,6 +55328,9 @@ local eta=UTILS.SecondsToClock(self:_GetETAatNextWP())
 local hdg=self:GetHeading()
 local pos=self:GetCoordinate()
 local speed=self.carrier:GetVelocityKNOTS()
+if require then
+self.magvar=pos:GetMagneticDeclination()
+end
 local collision=false
 local holdtime=0
 if self.holdtimestamp then
@@ -55399,6 +56248,7 @@ HAWKEYE={file="PILOT-Hawkeye",suffix="ogg",loud=false,subtitle="",duration=0.63,
 TOMCAT={file="PILOT-Tomcat",suffix="ogg",loud=false,subtitle="",duration=0.66,subduration=5},
 HORNET={file="PILOT-Hornet",suffix="ogg",loud=false,subtitle="",duration=0.56,subduration=5},
 VIKING={file="PILOT-Viking",suffix="ogg",loud=false,subtitle="",duration=0.61,subduration=5},
+GREYHOUND={file="PILOT-Greyhound",suffix="ogg",loud=false,subtitle="",duration=0.61,subduration=5},
 BALL={file="PILOT-Ball",suffix="ogg",loud=false,subtitle="",duration=0.50,subduration=5},
 BINGOFUEL={file="PILOT-BingoFuel",suffix="ogg",loud=false,subtitle="",duration=0.80},
 GASATDIVERT={file="PILOT-GasAtDivert",suffix="ogg",loud=false,subtitle="",duration=1.80},
@@ -56026,7 +56876,7 @@ or flight.actype==AIRBOSS.AircraftCarrier.RHINOE
 or flight.actype==AIRBOSS.AircraftCarrier.RHINOF
 or flight.actype==AIRBOSS.AircraftCarrier.GROWLER then
 Speed=UTILS.KnotsToKmph(200)
-elseif flight.actype==AIRBOSS.AircraftCarrier.E2D then
+elseif flight.actype==AIRBOSS.AircraftCarrier.E2D or flight.actype==AIRBOSS.AircraftCarrier.C2A then
 Speed=UTILS.KnotsToKmph(150)
 elseif flight.actype==AIRBOSS.AircraftCarrier.F14A_AI or flight.actype==AIRBOSS.AircraftCarrier.F14A or flight.actype==AIRBOSS.AircraftCarrier.F14B then
 Speed=UTILS.KnotsToKmph(175)
@@ -58483,7 +59333,14 @@ local vpp=UTILS.VecDot(vT,zc)
 local vabs=UTILS.VecNorm(vT)
 return-vpa,vpp,vabs
 end
-function AIRBOSS:GetHeadingIntoWind_old(magnetic,coord)
+function AIRBOSS:GetHeadingIntoWind(vdeck,magnetic,coord)
+if self.intowindold then
+return self:GetHeadingIntoWind_old(vdeck,magnetic,coord)
+else
+return self:GetHeadingIntoWind_new(vdeck,magnetic,coord)
+end
+end
+function AIRBOSS:GetHeadingIntoWind_old(vdeck,magnetic,coord)
 local function adjustDegreesForWindSpeed(windSpeed)
 local degreesAdjustment=0
 if windSpeed>0 and windSpeed<3 then
@@ -58510,9 +59367,10 @@ end
 if intowind<0 then
 intowind=intowind+360
 end
-return intowind
+local vtot=math.max(vdeck-UTILS.MpsToKnots(vwind),4)
+return intowind,vtot
 end
-function AIRBOSS:GetHeadingIntoWind(vdeck,magnetic,coord)
+function AIRBOSS:GetHeadingIntoWind_new(vdeck,magnetic,coord)
 local Offset=self.carrierparam.rwyangle or 0
 local windfrom,vwind=self:GetWind(18,nil,coord)
 local Vmin=4
@@ -59846,6 +60704,8 @@ elseif actype==AIRBOSS.AircraftCarrier.AV8B then
 nickname="Harrier"
 elseif actype==AIRBOSS.AircraftCarrier.E2D then
 nickname="Hawkeye"
+elseif actype==AIRBOSS.AircraftCarrier.C2A then
+nickname="Greyhound"
 elseif actype==AIRBOSS.AircraftCarrier.F14A_AI or actype==AIRBOSS.AircraftCarrier.F14A or actype==AIRBOSS.AircraftCarrier.F14B then
 nickname="Tomcat"
 elseif actype==AIRBOSS.AircraftCarrier.FA18C or actype==AIRBOSS.AircraftCarrier.HORNET then
@@ -59865,8 +60725,10 @@ end
 function AIRBOSS:_GetOnboardNumbers(group,playeronly)
 local groupname=group:GetName()
 local text=string.format("Onboard numbers of group %s:",groupname)
-local units=group:GetTemplate().units
+local template=group:GetTemplate()
 local numbers={}
+if template then
+local units=template.units
 for _,unit in pairs(units)do
 local n=tostring(unit.onboard_num)
 local name=unit.name
@@ -59878,6 +60740,17 @@ end
 numbers[name]=n
 end
 self:T2(self.lid..text)
+else
+if playeronly then
+return 101
+else
+local units=group:GetUnits()
+for i,_unit in pairs(units)do
+local name=_unit:GetName()
+numbers[name]=100+i
+end
+end
+end
 return numbers
 end
 function AIRBOSS:_GetTowerFrequency()
@@ -63234,6 +64107,8 @@ SinaiMap=true,
 }
 ATIS.Sound={
 ActiveRunway={filename="ActiveRunway.ogg",duration=0.99},
+ActiveRunwayDeparture={filename="ActiveRunwayDeparture.ogg",duration=0.99},
+ActiveRunwayArrival={filename="ActiveRunwayArrival.ogg",duration=0.99},
 AdviceOnInitial={filename="AdviceOnInitial.ogg",duration=3.00},
 Airport={filename="Airport.ogg",duration=0.66},
 Altimeter={filename="Altimeter.ogg",duration=0.68},
@@ -63545,11 +64420,46 @@ function ATIS:SetLocale(locale)
 self.locale=string.lower(locale)
 return self
 end
-function ATIS:SetSoundfilesPath(path)
-self.soundpath=tostring(path or"ATIS Soundfiles/")
+function ATIS:SetSoundfilesPath(pathMain,pathAirports,pathNato)
+self.soundpath=tostring(pathMain or"ATIS Soundfiles/")
+if pathAirports==nil then
+self.soundpathAirports=self.soundpath..env.mission.theatre.."/"
+else
+self.soundpathAirports=pathAirports
+end
+if pathNato==nil then
+self.soundpathNato=self.soundpath.."NATO Alphabet/"
+else
+self.soundpathNato=pathNato
+end
 self:T(self.lid..string.format("Setting sound files path to %s",self.soundpath))
 return self
 end
+function ATIS:SetSoundfilesInfo(csvfile)
+local function getSound(filename)
+for key,_soundfile in pairs(self.Sound)do
+local soundfile=_soundfile
+if filename==soundfile.filename then
+return soundfile
+end
+end
+return nil
+end
+local data=UTILS.ReadCSV(csvfile)
+if data then
+for i,sound in pairs(data)do
+local soundfile=getSound(sound.filename..".ogg")
+if soundfile then
+soundfile.duration=tonumber(sound.duration)
+else
+self:E(string.format("ERROR: Could not get info for sound file %s",sound.filename))
+end
+end
+else
+self:E(string.format("ERROR: Could not read sound csv file!"))
+end
+return self
+end
 function ATIS:SetRadioRelayUnitName(unitname)
 self.relayunitname=unitname
 self:T(self.lid..string.format("Setting radio relay unit to %s",self.relayunitname))
@@ -63833,16 +64743,16 @@ self.radioqueue=RADIOQUEUE:New(self.frequency,self.modulation,string.format("ATI
 self.radioqueue:SetSenderCoordinate(self.airbase:GetCoordinate())
 self.radioqueue:SetSenderUnitName(self.relayunitname)
 self.radioqueue:SetRadioPower(self.power)
-self.radioqueue:SetDigit(0,ATIS.Sound.N0.filename,ATIS.Sound.N0.duration,self.soundpath)
-self.radioqueue:SetDigit(1,ATIS.Sound.N1.filename,ATIS.Sound.N1.duration,self.soundpath)
-self.radioqueue:SetDigit(2,ATIS.Sound.N2.filename,ATIS.Sound.N2.duration,self.soundpath)
-self.radioqueue:SetDigit(3,ATIS.Sound.N3.filename,ATIS.Sound.N3.duration,self.soundpath)
-self.radioqueue:SetDigit(4,ATIS.Sound.N4.filename,ATIS.Sound.N4.duration,self.soundpath)
-self.radioqueue:SetDigit(5,ATIS.Sound.N5.filename,ATIS.Sound.N5.duration,self.soundpath)
-self.radioqueue:SetDigit(6,ATIS.Sound.N6.filename,ATIS.Sound.N6.duration,self.soundpath)
-self.radioqueue:SetDigit(7,ATIS.Sound.N7.filename,ATIS.Sound.N7.duration,self.soundpath)
-self.radioqueue:SetDigit(8,ATIS.Sound.N8.filename,ATIS.Sound.N8.duration,self.soundpath)
-self.radioqueue:SetDigit(9,ATIS.Sound.N9.filename,ATIS.Sound.N9.duration,self.soundpath)
+self.radioqueue:SetDigit(0,self.Sound.N0.filename,self.Sound.N0.duration,self.soundpath)
+self.radioqueue:SetDigit(1,self.Sound.N1.filename,self.Sound.N1.duration,self.soundpath)
+self.radioqueue:SetDigit(2,self.Sound.N2.filename,self.Sound.N2.duration,self.soundpath)
+self.radioqueue:SetDigit(3,self.Sound.N3.filename,self.Sound.N3.duration,self.soundpath)
+self.radioqueue:SetDigit(4,self.Sound.N4.filename,self.Sound.N4.duration,self.soundpath)
+self.radioqueue:SetDigit(5,self.Sound.N5.filename,self.Sound.N5.duration,self.soundpath)
+self.radioqueue:SetDigit(6,self.Sound.N6.filename,self.Sound.N6.duration,self.soundpath)
+self.radioqueue:SetDigit(7,self.Sound.N7.filename,self.Sound.N7.duration,self.soundpath)
+self.radioqueue:SetDigit(8,self.Sound.N8.filename,self.Sound.N8.duration,self.soundpath)
+self.radioqueue:SetDigit(9,self.Sound.N9.filename,self.Sound.N9.duration,self.soundpath)
 self.radioqueue:Start(1,0.1)
 end
 self:HandleEvent(EVENTS.BaseCaptured)
@@ -64044,7 +64954,35 @@ local cloudceil=clouds.base+clouds.thickness
 local clouddens=clouds.density
 local cloudspreset=clouds.preset or"Nothing"
 local precepitation=0
-if cloudspreset:find("Preset10")then
+if cloudspreset:find("RainyPreset1")then
+clouddens=9
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("RainyPreset2")then
+clouddens=9
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("RainyPreset3")then
+clouddens=9
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("RainyPreset")then
+clouddens=9
+if temperature>5 then
+precepitation=1
+else
+precepitation=3
+end
+elseif cloudspreset:find("Preset10")then
 clouddens=4
 elseif cloudspreset:find("Preset11")then
 clouddens=4
@@ -64098,34 +65036,8 @@ elseif cloudspreset:find("Preset8")then
 clouddens=4
 elseif cloudspreset:find("Preset9")then
 clouddens=4
-elseif cloudspreset:find("RainyPreset")then
-clouddens=9
-if temperature>5 then
-precepitation=1
 else
-precepitation=3
-end
-elseif cloudspreset:find("RainyPreset1")then
-clouddens=9
-if temperature>5 then
-precepitation=1
-else
-precepitation=3
-end
-elseif cloudspreset:find("RainyPreset2")then
-clouddens=9
-if temperature>5 then
-precepitation=1
-else
-precepitation=3
-end
-elseif cloudspreset:find("RainyPreset3")then
-clouddens=9
-if temperature>5 then
-precepitation=1
-else
-precepitation=3
-end
+self:E(string.format("WARNING! Unknown weather preset: %s",tostring(cloudspreset)))
 end
 local CLOUDBASE=string.format("%d",UTILS.MetersToFeet(cloudbase))
 local CLOUDCEIL=string.format("%d",UTILS.MetersToFeet(cloudceil))
@@ -64140,25 +65052,25 @@ CLOUDBASE1000,CLOUDBASE0100=self:_GetThousandsAndHundreds(cloudbase)
 CLOUDCEIL1000,CLOUDCEIL0100=self:_GetThousandsAndHundreds(cloudceil)
 end
 local CloudCover={}
-CloudCover=ATIS.Sound.CloudsNotAvailable
+CloudCover=self.Sound.CloudsNotAvailable
 local CLOUDSsub=self.gettext:GetEntry("NOCLOUDINFO",self.locale)
 if static then
 if clouddens>=9 then
-CloudCover=ATIS.Sound.CloudsOvercast
+CloudCover=self.Sound.CloudsOvercast
 CLOUDSsub=self.gettext:GetEntry("OVERCAST",self.locale)
 elseif clouddens>=7 then
-CloudCover=ATIS.Sound.CloudsBroken
+CloudCover=self.Sound.CloudsBroken
 CLOUDSsub=self.gettext:GetEntry("BROKEN",self.locale)
 elseif clouddens>=4 then
-CloudCover=ATIS.Sound.CloudsScattered
+CloudCover=self.Sound.CloudsScattered
 CLOUDSsub=self.gettext:GetEntry("SCATTERED",self.locale)
 elseif clouddens>=1 then
-CloudCover=ATIS.Sound.CloudsFew
+CloudCover=self.Sound.CloudsFew
 CLOUDSsub=self.gettext:GetEntry("FEWCLOUDS",self.locale)
 else
 CLOUDBASE=nil
 CLOUDCEIL=nil
-CloudCover=ATIS.Sound.CloudsNo
+CloudCover=self.Sound.CloudsNo
 CLOUDSsub=self.gettext:GetEntry("NOCLOUDS",self.locale)
 end
 end
@@ -64171,38 +65083,38 @@ then
 subtitle=subtitle.." "..self.gettext:GetEntry("AIRPORT",self.locale)
 end
 if not self.useSRS then
-self.radioqueue:NewTransmission(string.format("%s/%s.ogg",self.theatre,self.airbasename),3.0,self.soundpath,nil,nil,subtitle,self.subduration)
+self.radioqueue:NewTransmission(string.format("%s.ogg",self.airbasename),3.0,self.soundpathAirports,nil,nil,subtitle,self.subduration)
 end
 local alltext=subtitle
 local information=self.gettext:GetEntry("INFORMATION",self.locale)
 subtitle=string.format("%s %s",information,NATO)
 local _INFORMATION=subtitle
 if not self.useSRS then
-self:Transmission(ATIS.Sound.Information,0.5,subtitle)
-self.radioqueue:NewTransmission(string.format("NATO Alphabet/%s.ogg",NATO),0.75,self.soundpath)
+self:Transmission(self.Sound.Information,0.5,subtitle)
+self.radioqueue:NewTransmission(string.format("%s.ogg",NATO),0.75,self.soundpathNato)
 end
 alltext=alltext..";\n"..subtitle
 subtitle=string.format("%s Zulu",ZULU)
 if not self.useSRS then
 self.radioqueue:Number2Transmission(ZULU,nil,0.5)
-self:Transmission(ATIS.Sound.Zulu,0.2,subtitle)
+self:Transmission(self.Sound.Zulu,0.2,subtitle)
 end
 alltext=alltext..";\n"..subtitle
 if not self.zulutimeonly then
 local sunrise=self.gettext:GetEntry("SUNRISEAT",self.locale)
 subtitle=string.format(sunrise,SUNRISE)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.SunriseAt,0.5,subtitle)
+self:Transmission(self.Sound.SunriseAt,0.5,subtitle)
 self.radioqueue:Number2Transmission(SUNRISE,nil,0.2)
-self:Transmission(ATIS.Sound.TimeLocal,0.2)
+self:Transmission(self.Sound.TimeLocal,0.2)
 end
 alltext=alltext..";\n"..subtitle
 local sunset=self.gettext:GetEntry("SUNSETAT",self.locale)
 subtitle=string.format(sunset,SUNSET)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.SunsetAt,0.5,subtitle)
+self:Transmission(self.Sound.SunsetAt,0.5,subtitle)
 self.radioqueue:Number2Transmission(SUNSET,nil,0.5)
-self:Transmission(ATIS.Sound.TimeLocal,0.2)
+self:Transmission(self.Sound.TimeLocal,0.2)
 end
 alltext=alltext..";\n"..subtitle
 end
@@ -64221,17 +65133,17 @@ subtitle=subtitle..", "..self.gettext:GetEntry("GUSTING",self.locale)
 end
 local _WIND=subtitle
 if not self.useSRS then
-self:Transmission(ATIS.Sound.WindFrom,1.0,subtitle)
+self:Transmission(self.Sound.WindFrom,1.0,subtitle)
 self.radioqueue:Number2Transmission(WINDFROM)
-self:Transmission(ATIS.Sound.At,0.2)
+self:Transmission(self.Sound.At,0.2)
 self.radioqueue:Number2Transmission(WINDSPEED)
 if self.metric then
-self:Transmission(ATIS.Sound.MetersPerSecond,0.2)
+self:Transmission(self.Sound.MetersPerSecond,0.2)
 else
-self:Transmission(ATIS.Sound.Knots,0.2)
+self:Transmission(self.Sound.Knots,0.2)
 end
 if turbulence>0 then
-self:Transmission(ATIS.Sound.Gusting,0.2)
+self:Transmission(self.Sound.Gusting,0.2)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64243,12 +65155,12 @@ local visi=self.gettext:GetEntry("VISISM",self.locale)
 subtitle=string.format(visi,VISIBILITY)
 end
 if not self.useSRS then
-self:Transmission(ATIS.Sound.Visibilty,1.0,subtitle)
+self:Transmission(self.Sound.Visibilty,1.0,subtitle)
 self.radioqueue:Number2Transmission(VISIBILITY)
 if self.metric then
-self:Transmission(ATIS.Sound.Kilometers,0.2)
+self:Transmission(self.Sound.Kilometers,0.2)
 else
-self:Transmission(ATIS.Sound.StatuteMiles,0.2)
+self:Transmission(self.Sound.StatuteMiles,0.2)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64289,21 +65201,21 @@ if wp then
 local phenos=self.gettext:GetEntry("PHENOMENA",self.locale)
 subtitle=string.format("%s: %s",phenos,wpsub)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.WeatherPhenomena,1.0,subtitle)
+self:Transmission(self.Sound.WeatherPhenomena,1.0,subtitle)
 if precepitation==1 then
-self:Transmission(ATIS.Sound.Rain,0.5)
+self:Transmission(self.Sound.Rain,0.5)
 elseif precepitation==2 then
-self:Transmission(ATIS.Sound.ThunderStorm,0.5)
+self:Transmission(self.Sound.ThunderStorm,0.5)
 elseif precepitation==3 then
-self:Transmission(ATIS.Sound.Snow,0.5)
+self:Transmission(self.Sound.Snow,0.5)
 elseif precepitation==4 then
-self:Transmission(ATIS.Sound.SnowStorm,0.5)
+self:Transmission(self.Sound.SnowStorm,0.5)
 end
 if fog then
-self:Transmission(ATIS.Sound.Fog,0.5)
+self:Transmission(self.Sound.Fog,0.5)
 end
 if dust then
-self:Transmission(ATIS.Sound.Dust,0.5)
+self:Transmission(self.Sound.Dust,0.5)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64322,28 +65234,28 @@ local cloudbase=self.gettext:GetEntry("CLOUDBASEFT",self.locale)
 subtitle=string.format(cloudbase,cbase,cceil)
 end
 if not self.useSRS then
-self:Transmission(ATIS.Sound.CloudBase,1.0,subtitle)
+self:Transmission(self.Sound.CloudBase,1.0,subtitle)
 if tonumber(CLOUDBASE1000)>0 then
 self.radioqueue:Number2Transmission(CLOUDBASE1000)
-self:Transmission(ATIS.Sound.Thousand,0.1)
+self:Transmission(self.Sound.Thousand,0.1)
 end
 if tonumber(CLOUDBASE0100)>0 then
 self.radioqueue:Number2Transmission(CLOUDBASE0100)
-self:Transmission(ATIS.Sound.Hundred,0.1)
+self:Transmission(self.Sound.Hundred,0.1)
 end
-self:Transmission(ATIS.Sound.CloudCeiling,0.5)
+self:Transmission(self.Sound.CloudCeiling,0.5)
 if tonumber(CLOUDCEIL1000)>0 then
 self.radioqueue:Number2Transmission(CLOUDCEIL1000)
-self:Transmission(ATIS.Sound.Thousand,0.1)
+self:Transmission(self.Sound.Thousand,0.1)
 end
 if tonumber(CLOUDCEIL0100)>0 then
 self.radioqueue:Number2Transmission(CLOUDCEIL0100)
-self:Transmission(ATIS.Sound.Hundred,0.1)
+self:Transmission(self.Sound.Hundred,0.1)
 end
 if self.metric then
-self:Transmission(ATIS.Sound.Meters,0.1)
+self:Transmission(self.Sound.Meters,0.1)
 else
-self:Transmission(ATIS.Sound.Feet,0.1)
+self:Transmission(self.Sound.Feet,0.1)
 end
 end
 end
@@ -64365,15 +65277,15 @@ end
 end
 local _TEMPERATURE=subtitle
 if not self.useSRS then
-self:Transmission(ATIS.Sound.Temperature,1.0,subtitle)
+self:Transmission(self.Sound.Temperature,1.0,subtitle)
 if temperature<0 then
-self:Transmission(ATIS.Sound.Minus,0.2)
+self:Transmission(self.Sound.Minus,0.2)
 end
 self.radioqueue:Number2Transmission(TEMPERATURE)
 if self.TDegF then
-self:Transmission(ATIS.Sound.DegreesFahrenheit,0.2)
+self:Transmission(self.Sound.DegreesFahrenheit,0.2)
 else
-self:Transmission(ATIS.Sound.DegreesCelsius,0.2)
+self:Transmission(self.Sound.DegreesCelsius,0.2)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64393,15 +65305,15 @@ end
 end
 local _DEWPOINT=subtitle
 if not self.useSRS then
-self:Transmission(ATIS.Sound.DewPoint,1.0,subtitle)
+self:Transmission(self.Sound.DewPoint,1.0,subtitle)
 if dewpoint<0 then
-self:Transmission(ATIS.Sound.Minus,0.2)
+self:Transmission(self.Sound.Minus,0.2)
 end
 self.radioqueue:Number2Transmission(DEWPOINT)
 if self.TDegF then
-self:Transmission(ATIS.Sound.DegreesFahrenheit,0.2)
+self:Transmission(self.Sound.DegreesFahrenheit,0.2)
 else
-self:Transmission(ATIS.Sound.DegreesCelsius,0.2)
+self:Transmission(self.Sound.DegreesCelsius,0.2)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64436,30 +65348,30 @@ end
 end
 local _ALTIMETER=subtitle
 if not self.useSRS then
-self:Transmission(ATIS.Sound.Altimeter,1.0,subtitle)
+self:Transmission(self.Sound.Altimeter,1.0,subtitle)
 if not self.qnhonly then
-self:Transmission(ATIS.Sound.QNH,0.5)
+self:Transmission(self.Sound.QNH,0.5)
 end
 self.radioqueue:Number2Transmission(QNH[1])
 if ATIS.ICAOPhraseology[UTILS.GetDCSMap()]then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 end
 self.radioqueue:Number2Transmission(QNH[2])
 if not self.qnhonly then
-self:Transmission(ATIS.Sound.QFE,0.75)
+self:Transmission(self.Sound.QFE,0.75)
 self.radioqueue:Number2Transmission(QFE[1])
 if ATIS.ICAOPhraseology[UTILS.GetDCSMap()]then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 end
 self.radioqueue:Number2Transmission(QFE[2])
 end
 if self.PmmHg then
-self:Transmission(ATIS.Sound.MillimetersOfMercury,0.1)
+self:Transmission(self.Sound.MillimetersOfMercury,0.1)
 else
 if self.metric then
-self:Transmission(ATIS.Sound.HectoPascal,0.1)
+self:Transmission(self.Sound.HectoPascal,0.1)
 else
-self:Transmission(ATIS.Sound.InchesOfMercury,0.1)
+self:Transmission(self.Sound.InchesOfMercury,0.1)
 end
 end
 end
@@ -64467,7 +65379,7 @@ alltext=alltext..";\n"..subtitle
 local _RUNACT
 if not self.ATISforFARPs then
 local subtitle=""
-if runwayLanding then
+if runwayLanding and runwayLanding~=runwayTakeoff then
 local actrun=self.gettext:GetEntry("ACTIVELANDING",self.locale)
 subtitle=string.format("%s %s",actrun,runwayLanding)
 if rwyLandingLeft==true then
@@ -64476,6 +65388,15 @@ elseif rwyLandingLeft==false then
 subtitle=subtitle.." "..self.gettext:GetEntry("RIGHT",self.locale)
 end
 alltext=alltext..";\n"..subtitle
+if not self.useSRS then
+self:Transmission(self.Sound.ActiveRunwayArrival,1.0,subtitle)
+self.radioqueue:Number2Transmission(runwayLanding)
+if rwyLandingLeft==true then
+self:Transmission(self.Sound.Left,0.2)
+elseif rwyLandingLeft==false then
+self:Transmission(self.Sound.Right,0.2)
+end
+end
 end
 if runwayTakeoff then
 local actrun=self.gettext:GetEntry("ACTIVERUN",self.locale)
@@ -64485,17 +65406,18 @@ subtitle=subtitle.." "..self.gettext:GetEntry("LEFT",self.locale)
 elseif rwyTakeoffLeft==false then
 subtitle=subtitle.." "..self.gettext:GetEntry("RIGHT",self.locale)
 end
-end
-_RUNACT=subtitle
+alltext=alltext..";\n"..subtitle
 if not self.useSRS then
-self:Transmission(ATIS.Sound.ActiveRunway,1.0,subtitle)
-self.radioqueue:Number2Transmission(runwayLanding)
-if rwyLandingLeft==true then
-self:Transmission(ATIS.Sound.Left,0.2)
-elseif rwyLandingLeft==false then
-self:Transmission(ATIS.Sound.Right,0.2)
+self:Transmission(self.Sound.ActiveRunwayDeparture,1.0,subtitle)
+self.radioqueue:Number2Transmission(runwayTakeoff)
+if rwyTakeoffLeft==true then
+self:Transmission(self.Sound.Left,0.2)
+elseif rwyTakeoffLeft==false then
+self:Transmission(self.Sound.Right,0.2)
+end
 end
 end
+_RUNACT=subtitle
 alltext=alltext..";\n"..subtitle
 if self.rwylength then
 local runact=self.airbase:GetActiveRunway(self.runwaym2t)
@@ -64514,19 +65436,19 @@ else
 subtitle=subtitle.." "..feet
 end
 if not self.useSRS then
-self:Transmission(ATIS.Sound.RunwayLength,1.0,subtitle)
+self:Transmission(self.Sound.RunwayLength,1.0,subtitle)
 if tonumber(L1000)>0 then
 self.radioqueue:Number2Transmission(L1000)
-self:Transmission(ATIS.Sound.Thousand,0.1)
+self:Transmission(self.Sound.Thousand,0.1)
 end
 if tonumber(L0100)>0 then
 self.radioqueue:Number2Transmission(L0100)
-self:Transmission(ATIS.Sound.Hundred,0.1)
+self:Transmission(self.Sound.Hundred,0.1)
 end
 if self.metric then
-self:Transmission(ATIS.Sound.Meters,0.1)
+self:Transmission(self.Sound.Meters,0.1)
 else
-self:Transmission(ATIS.Sound.Feet,0.1)
+self:Transmission(self.Sound.Feet,0.1)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64548,19 +65470,19 @@ else
 subtitle=subtitle.." "..feet
 end
 if not self.useSRS then
-self:Transmission(ATIS.Sound.Elevation,1.0,subtitle)
+self:Transmission(self.Sound.Elevation,1.0,subtitle)
 if tonumber(L1000)>0 then
 self.radioqueue:Number2Transmission(L1000)
-self:Transmission(ATIS.Sound.Thousand,0.1)
+self:Transmission(self.Sound.Thousand,0.1)
 end
 if tonumber(L0100)>0 then
 self.radioqueue:Number2Transmission(L0100)
-self:Transmission(ATIS.Sound.Hundred,0.1)
+self:Transmission(self.Sound.Hundred,0.1)
 end
 if self.metric then
-self:Transmission(ATIS.Sound.Meters,0.1)
+self:Transmission(self.Sound.Meters,0.1)
 else
-self:Transmission(ATIS.Sound.Feet,0.1)
+self:Transmission(self.Sound.Feet,0.1)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64576,16 +65498,16 @@ end
 local twrfrq=self.gettext:GetEntry("TOWERFREQ",self.locale)
 subtitle=string.format("%s %s",twrfrq,freqs)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.TowerFrequency,1.0,subtitle)
+self:Transmission(self.Sound.TowerFrequency,1.0,subtitle)
 for _,freq in pairs(self.towerfrequency)do
 local f=string.format("%.3f",freq)
 f=UTILS.Split(f,".")
 self.radioqueue:Number2Transmission(f[1],nil,0.5)
 if tonumber(f[2])>0 then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 self.radioqueue:Number2Transmission(f[2])
 end
-self:Transmission(ATIS.Sound.MegaHertz,0.2)
+self:Transmission(self.Sound.MegaHertz,0.2)
 end
 end
 alltext=alltext..";\n"..subtitle
@@ -64595,15 +65517,15 @@ if ils then
 local ilstxt=self.gettext:GetEntry("ILSFREQ",self.locale)
 subtitle=string.format("%s %.2f MHz",ilstxt,ils.frequency)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.ILSFrequency,1.0,subtitle)
+self:Transmission(self.Sound.ILSFrequency,1.0,subtitle)
 local f=string.format("%.2f",ils.frequency)
 f=UTILS.Split(f,".")
 self.radioqueue:Number2Transmission(f[1],nil,0.5)
 if tonumber(f[2])>0 then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 self.radioqueue:Number2Transmission(f[2])
 end
-self:Transmission(ATIS.Sound.MegaHertz,0.2)
+self:Transmission(self.Sound.MegaHertz,0.2)
 end
 alltext=alltext..";\n"..subtitle
 end
@@ -64612,15 +65534,15 @@ if ndb then
 local ndbtxt=self.gettext:GetEntry("OUTERNDB",self.locale)
 subtitle=string.format("%s %.2f MHz",ndbtxt,ndb.frequency)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.OuterNDBFrequency,1.0,subtitle)
+self:Transmission(self.Sound.OuterNDBFrequency,1.0,subtitle)
 local f=string.format("%.2f",ndb.frequency)
 f=UTILS.Split(f,".")
 self.radioqueue:Number2Transmission(f[1],nil,0.5)
 if tonumber(f[2])>0 then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 self.radioqueue:Number2Transmission(f[2])
 end
-self:Transmission(ATIS.Sound.MegaHertz,0.2)
+self:Transmission(self.Sound.MegaHertz,0.2)
 end
 alltext=alltext..";\n"..subtitle
 end
@@ -64629,15 +65551,15 @@ if ndb then
 local ndbtxt=self.gettext:GetEntry("INNERNDB",self.locale)
 subtitle=string.format("%s %.2f MHz",ndbtxt,ndb.frequency)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.InnerNDBFrequency,1.0,subtitle)
+self:Transmission(self.Sound.InnerNDBFrequency,1.0,subtitle)
 local f=string.format("%.2f",ndb.frequency)
 f=UTILS.Split(f,".")
 self.radioqueue:Number2Transmission(f[1],nil,0.5)
 if tonumber(f[2])>0 then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 self.radioqueue:Number2Transmission(f[2])
 end
-self:Transmission(ATIS.Sound.MegaHertz,0.2)
+self:Transmission(self.Sound.MegaHertz,0.2)
 end
 alltext=alltext..";\n"..subtitle
 end
@@ -64649,15 +65571,15 @@ if self.useSRS then
 subtitle=string.format("%s %.2f MHz",vorttstxt,self.vor)
 end
 if not self.useSRS then
-self:Transmission(ATIS.Sound.VORFrequency,1.0,subtitle)
+self:Transmission(self.Sound.VORFrequency,1.0,subtitle)
 local f=string.format("%.2f",self.vor)
 f=UTILS.Split(f,".")
 self.radioqueue:Number2Transmission(f[1],nil,0.5)
 if tonumber(f[2])>0 then
-self:Transmission(ATIS.Sound.Decimal,0.2)
+self:Transmission(self.Sound.Decimal,0.2)
 self.radioqueue:Number2Transmission(f[2])
 end
-self:Transmission(ATIS.Sound.MegaHertz,0.2)
+self:Transmission(self.Sound.MegaHertz,0.2)
 end
 alltext=alltext..";\n"..subtitle
 end
@@ -64665,9 +65587,9 @@ if self.tacan then
 local tactxt=self.gettext:GetEntry("TACANCH",self.locale)
 subtitle=string.format(tactxt,self.tacan)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.TACANChannel,1.0,subtitle)
+self:Transmission(self.Sound.TACANChannel,1.0,subtitle)
 self.radioqueue:Number2Transmission(tostring(self.tacan),nil,0.2)
-self.radioqueue:NewTransmission("NATO Alphabet/Xray.ogg",0.75,self.soundpath,nil,0.2)
+self.radioqueue:NewTransmission("Xray.ogg",0.75,self.soundpathNato,nil,0.2)
 end
 alltext=alltext..";\n"..subtitle
 end
@@ -64675,7 +65597,7 @@ if self.rsbn then
 local rsbntxt=self.gettext:GetEntry("RSBNCH",self.locale)
 subtitle=string.format("%s %d",rsbntxt,self.rsbn)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.RSBNChannel,1.0,subtitle)
+self:Transmission(self.Sound.RSBNChannel,1.0,subtitle)
 self.radioqueue:Number2Transmission(tostring(self.rsbn),nil,0.2)
 end
 alltext=alltext..";\n"..subtitle
@@ -64685,7 +65607,7 @@ if ndb then
 local prmtxt=self.gettext:GetEntry("PRMGCH",self.locale)
 subtitle=string.format("%s %d",prmtxt,ndb.frequency)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.PRMGChannel,1.0,subtitle)
+self:Transmission(self.Sound.PRMGChannel,1.0,subtitle)
 self.radioqueue:Number2Transmission(tostring(ndb.frequency),nil,0.5)
 end
 alltext=alltext..";\n"..subtitle
@@ -64696,8 +65618,8 @@ end
 local advtxt=self.gettext:GetEntry("ADVISE",self.locale)
 subtitle=string.format("%s %s",advtxt,NATO)
 if not self.useSRS then
-self:Transmission(ATIS.Sound.AdviceOnInitial,0.5,subtitle)
-self.radioqueue:NewTransmission(string.format("NATO Alphabet/%s.ogg",NATO),0.75,self.soundpath)
+self:Transmission(self.Sound.AdviceOnInitial,0.5,subtitle)
+self.radioqueue:NewTransmission(string.format("%s.ogg",NATO),0.75,self.soundpathNato)
 end
 alltext=alltext..";\n"..subtitle
 self:Report(alltext)
@@ -64734,7 +65656,7 @@ text=string.gsub(text,"(%d+)(%.)(%d+)","%1 "..delimiter.." %3")
 end
 local text=string.gsub(text,";"," . ")
 self:T("SRS TTS: "..text)
-local duration=STTS.getSpeechTime(text,0.95)
+local duration=MSRS.getSpeechTime(text,0.95)
 self.msrsQ:NewTransmission(text,duration,self.msrs,nil,2)
 self.SRSText=text
 end
@@ -64917,12 +65839,20 @@ self.Stock=Stock or nil
 self.Mark=nil
 self.Subcategory=Subcategory or"Other"
 self.DontShowInMenu=DontShowInMenu or false
+self.ResourceMap=nil
 if type(Location)=="string"then
 Location=ZONE:New(Location)
 end
 self.Location=Location
 return self
 end
+function CTLD_CARGO:SetStaticResourceMap(ResourceMap)
+self.ResourceMap=ResourceMap
+return self
+end
+function CTLD_CARGO:GetStaticResourceMap()
+return self.ResourceMap
+end
 function CTLD_CARGO:GetLocation()
 return self.Location
 end
@@ -65240,8 +66170,10 @@ CTLD.UnitTypeCapabilities={
 ["AH-64D_BLK_II"]={type="AH-64D_BLK_II",crates=false,troops=true,cratelimit=0,trooplimit=2,length=17,cargoweightlimit=200},
 ["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},
 }
-CTLD.version="1.0.52"
+CTLD.version="1.0.58"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -65364,6 +66296,7 @@ self.subcatsTroop={}
 self.nobuildinloadzones=true
 self.movecratesbeforebuild=true
 self.surfacetypes={land.SurfaceType.LAND,land.SurfaceType.ROAD,land.SurfaceType.RUNWAY,land.SurfaceType.SHALLOW_WATER}
+self.enableChinookGCLoading=true
 local AliaS=string.gsub(self.alias," ","_")
 self.filename=string.format("CTLD_%s_Persist.csv",AliaS)
 self.allowcratepickupagain=true
@@ -65431,7 +66364,7 @@ self.PlayerTaskQueue:Push(PlayerTask,PlayerTask.PlayerTaskNr)
 return self
 end
 function CTLD:_EventHandler(EventData)
-self:T(string.format("%s Event = %d",self.lid,EventData.id))
+self:I(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
@@ -65453,11 +66386,29 @@ self.Loaded_Cargo[unitname]=nil
 self:_RefreshF10Menus()
 end
 return
-elseif event.id==EVENTS.PlayerLeaveUnit then
+elseif event.id==EVENTS.PlayerLeaveUnit or event.id==EVENTS.UnitLost then
 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)
+end
+end
+self:ScheduleOnce(0.5,RegisterDynamicCargo)
 end
 return self
 end
@@ -65888,6 +66839,7 @@ self:_SendMessage("There are enough crates nearby already! Take care of those fi
 return self
 end
 local IsHerc=self:IsHercules(Unit)
+local IsHook=self:IsHook(Unit)
 local cargotype=Cargo
 local number=number or cargotype:GetCratesNeeded()
 local cratesneeded=cargotype:GetCratesNeeded()
@@ -65908,7 +66860,7 @@ local cratedistance=0
 local rheading=0
 local angleOffNose=0
 local addon=0
-if IsHerc then
+if IsHerc or IsHook then
 addon=180
 end
 for i=1,number do
@@ -65952,17 +66904,25 @@ local dist=shipcoord:Get2DDistance(unitcoord)
 dist=dist-(20+math.random(1,10))
 local width=width/2
 local Offy=math.random(-width,width)
-self.Spawned_Crates[self.CrateCounter]=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local spawnstatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
 :InitCargoMass(cgomass)
 :InitCargo(self.enableslingload)
 :InitLinkToUnit(Ship,dist,Offy,0)
-:Spawn(270,cratealias)
+if isstatic then
+local map=cargotype:GetStaticResourceMap()
+spawnstatic.TemplateStaticUnit.resourcePayload=map
+end
+self.Spawned_Crates[self.CrateCounter]=spawnstatic:Spawn(270,cratealias)
 else
-self.Spawned_Crates[self.CrateCounter]=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local spawnstatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
 :InitCoordinate(cratecoord)
 :InitCargoMass(cgomass)
 :InitCargo(self.enableslingload)
-:Spawn(270,cratealias)
+if isstatic then
+local map=cargotype:GetStaticResourceMap()
+spawnstatic.TemplateStaticUnit.resourcePayload=map
+end
+self.Spawned_Crates[self.CrateCounter]=spawnstatic:Spawn(270,cratealias)
 end
 local templ=cargotype:GetTemplates()
 local sorte=cargotype:GetType()
@@ -65971,9 +66931,13 @@ self.CargoCounter=self.CargoCounter+1
 local realcargo=nil
 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)
 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)
 end
 table.insert(self.Spawned_Cargo,realcargo)
 end
@@ -66015,14 +66979,17 @@ if isstatic then
 basetype=cratetemplate
 end
 self.CrateCounter=self.CrateCounter+1
-self.Spawned_Crates[self.CrateCounter]=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
+local spawnstatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
 :InitCargoMass(cgomass)
 :InitCargo(self.enableslingload)
 :InitCoordinate(cratecoord)
-:Spawn(270,cratealias)
+if isstatic then
+local map=cargotype:GetStaticResourceMap()
+spawnstatic.TemplateStaticUnit.resourcePayload=map
+end
+self.Spawned_Crates[self.CrateCounter]=spawnstatic:Spawn(270,cratealias)
 local templ=cargotype:GetTemplates()
 local sorte=cargotype:GetType()
-self.CargoCounter=self.CargoCounter+1
 cargotype.Positionable=self.Spawned_Crates[self.CrateCounter]
 table.insert(self.Spawned_Cargo,cargotype)
 return self
@@ -66036,8 +67003,8 @@ end
 function CTLD:_ListCratesNearby(_group,_unit)
 self:T(self.lid.." _ListCratesNearby")
 local finddist=self.CrateDistance or 35
-local crates,number=self:_FindCratesNearby(_group,_unit,finddist,true)
-if number>0 then
+local crates,number,loadedbygc,indexgc=self:_FindCratesNearby(_group,_unit,finddist,true)
+if number>0 or indexgc>0 then
 local text=REPORT:New("Crates Found Nearby:")
 text:Add("------------------------------------------------------------")
 for _,_entry in pairs(crates)do
@@ -66054,6 +67021,19 @@ if text:GetCount()==1 then
 text:Add("        N O N E")
 end
 text:Add("------------------------------------------------------------")
+if indexgc>0 then
+text:Add("Probably ground crew loaded (F8)")
+for _,_entry in pairs(loadedbygc)do
+local entry=_entry
+local name=entry:GetName()
+local dropped=entry:WasDropped()
+if dropped then
+text:Add(string.format("Dropped crate for %s, %dkg",name,entry.PerCrateMass))
+else
+text:Add(string.format("Crate for %s, %dkg",name,entry.PerCrateMass))
+end
+end
+end
 self:_SendMessage(text:Text(),30,true,_group)
 else
 self:_SendMessage(string.format("No (loadable) crates within %d meters!",finddist),10,false,_group)
@@ -66114,12 +67094,15 @@ local finddist=_dist
 local location=_group:GetCoordinate()
 local existingcrates=self.Spawned_Cargo
 local index=0
+local indexg=0
 local found={}
+local LoadedbyGC={}
 local loadedmass=0
 local unittype="none"
 local capabilities={}
 local maxmass=2000
 local maxloadable=2000
+local IsNoHook=not self:IsHook(_unit)
 if not _ignoreweight then
 maxloadable=self:_GetMaxLoadableMass(_unit)
 end
@@ -66127,20 +67110,46 @@ self:T(self.lid.." Max loadable mass: "..maxloadable)
 for _,_cargoobject in pairs(existingcrates)do
 local cargo=_cargoobject
 local static=cargo:GetPositionable()
-local staticid=cargo:GetID()
 local weight=cargo:GetMass()
+local staticid=cargo:GetID()
 self:T(self.lid.." Found cargo mass: "..weight)
-if static and static:IsAlive()then
-local staticpos=static:GetCoordinate()
+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
 local distance=self:_GetDistance(location,staticpos)
-if distance<=finddist and static and(weight<=maxloadable or _ignoreweight)then
+self:T({name=static:GetName(),IsNoHook=IsNoHook,agl=agl,GCloaded=GCloaded,distance=string.format("%.2f",distance or 0)})
+if(not GCloaded)and distance<=finddist and static and(weight<=maxloadable or _ignoreweight)then
 index=index+1
 table.insert(found,staticid,cargo)
 maxloadable=maxloadable-weight
 end
+if GCloaded==true and distance<10 and static then
+indexg=indexg+1
+table.insert(LoadedbyGC,staticid,cargo)
 end
 end
-return found,index
+end
+return found,index,LoadedbyGC,indexg
 end
 function CTLD:_LoadCratesNearby(Group,Unit)
 self:T(self.lid.." _LoadCratesNearby")
@@ -66153,6 +67162,10 @@ local cancrates=capabilities.crates
 local cratelimit=capabilities.cratelimit
 local grounded=not self:IsUnitInAir(Unit)
 local canhoverload=self:CanHoverLoad(Unit)
+if self.pilotmustopendoors and not UTILS.IsLoadingDoorOpen(Unit:GetName())then
+self:_SendMessage("You need to open the door(s) to load cargo!",10,false,Group)
+if not self.debug then return self end
+end
 if not cancrates then
 self:_SendMessage("Sorry this chopper cannot carry crates!",10,false,Group)
 elseif self.forcehoverload and not canhoverload then
@@ -66294,7 +67307,9 @@ local cratelimit=capabilities.cratelimit
 local loadedcargo=self.Loaded_Cargo[unitname]or{}
 local loadedmass=self:_GetUnitCargoMass(Unit)
 local maxloadable=self:_GetMaxLoadableMass(Unit)
-if self.Loaded_Cargo[unitname]then
+local finddist=self.CrateDistance or 35
+local _,_,loadedgc,loadedno=self:_FindCratesNearby(Group,Unit,finddist,true)
+if self.Loaded_Cargo[unitname]or loadedno>0 then
 local no_troops=loadedcargo.Troopsloaded or 0
 local no_crates=loadedcargo.Cratesloaded or 0
 local cargotable=loadedcargo.Cargo or{}
@@ -66316,7 +67331,7 @@ end
 report:Add("------------------------------------------------------------")
 report:Add("       -- CRATES --")
 local cratecount=0
-for _,_cargo in pairs(cargotable)do
+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
@@ -66327,6 +67342,18 @@ 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()
@@ -66426,6 +67453,13 @@ else
 return false
 end
 end
+function CTLD:IsHook(Unit)
+if string.find(Unit:GetTypeName(),"CH.47")then
+return true
+else
+return false
+end
+end
 function CTLD:_GetUnitPositions(Coordinate,Radius,Heading,Template)
 local Positions={}
 local template=_DATABASE:GetGroupTemplate(Template)
@@ -66462,7 +67496,8 @@ droppingatbase=true
 end
 local hoverunload=self:IsCorrectHover(Unit)
 local IsHerc=self:IsHercules(Unit)
-if IsHerc then
+local IsHook=self:IsHook(Unit)
+if IsHerc and(not IsHook)then
 hoverunload=self:IsCorrectFlightParameters(Unit)
 end
 local grounded=not self:IsUnitInAir(Unit)
@@ -66519,7 +67554,7 @@ end
 end
 else
 self:_SendMessage("Troops have returned to base!",10,false,Group)
-self:__TroopsRTB(1,Group,Unit)
+self:__TroopsRTB(1,Group,Unit,zonename,zone)
 end
 local loaded={}
 loaded.Troopsloaded=0
@@ -66570,9 +67605,14 @@ return self
 end
 end
 end
+if self.pilotmustopendoors and not UTILS.IsLoadingDoorOpen(Unit:GetName())then
+self:_SendMessage("You need to open the door(s) to drop cargo!",10,false,Group)
+if not self.debug then return self end
+end
 local hoverunload=self:IsCorrectHover(Unit)
 local IsHerc=self:IsHercules(Unit)
-if IsHerc then
+local IsHook=self:IsHook(Unit)
+if IsHerc and(not IsHook)then
 hoverunload=self:IsCorrectFlightParameters(Unit)
 end
 local grounded=not self:IsUnitInAir(Unit)
@@ -66856,7 +67896,7 @@ self:T(self.lid.." _MoveGroupToZone")
 local groupname=Group:GetName()or"none"
 local groupcoord=Group:GetCoordinate()
 local outcome,name,zone,distance=self:IsUnitInZone(Group,CTLD.CargoZoneType.MOVE)
-if(distance<=self.movetroopsdistance)and zone then
+if(distance<=self.movetroopsdistance)and outcome==true and zone~=nil then
 local groupname=Group:GetName()
 local zonecoord=zone:GetRandomCoordinate(20,125)
 local coordinate=zonecoord:GetVec2()
@@ -66900,7 +67940,7 @@ local PlayerSet=self.PilotGroups
 local PlayerTable=PlayerSet:GetSetObjects()
 local _UnitList={}
 for _key,_group in pairs(PlayerTable)do
-local _unit=_group:GetUnit(1)
+local _unit=_group:GetFirstUnitAlive()
 if _unit then
 if _unit:IsAlive()and _unit:IsPlayer()then
 if _unit:IsHelicopter()or(self:IsHercules(_unit)and self.enableHercules)then
@@ -66946,6 +67986,8 @@ local unittype=_unit:GetTypeName()
 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 topmenu=MENU_GROUP:New(_group,"CTLD",nil)
 local toptroops=nil
 local topcrates=nil
@@ -66999,7 +68041,9 @@ local unloadmenu1=MENU_GROUP_COMMAND:New(_group,"Drop troops",toptroops,self._Un
 local extractMenu1=MENU_GROUP_COMMAND:New(_group,"Extract troops",toptroops,self._ExtractTroops,self,_group,_unit):Refresh()
 end
 if cancrates then
+if nohookswitch then
 local loadmenu=MENU_GROUP_COMMAND:New(_group,"Load crates",topcrates,self._LoadCratesNearby,self,_group,_unit)
+end
 local cratesmenu=MENU_GROUP:New(_group,"Get Crates",topcrates)
 local packmenu=MENU_GROUP_COMMAND:New(_group,"Pack crates",topcrates,self._PackCratesNearby,self,_group,_unit)
 local removecratesmenu=MENU_GROUP:New(_group,"Remove crates",topcrates)
@@ -67066,11 +68110,14 @@ end
 end
 listmenu=MENU_GROUP_COMMAND:New(_group,"List crates nearby",topcrates,self._ListCratesNearby,self,_group,_unit)
 local removecrates=MENU_GROUP_COMMAND:New(_group,"Remove crates nearby",removecratesmenu,self._RemoveCratesNearby,self,_group,_unit)
-local unloadmenu=MENU_GROUP_COMMAND:New(_group,"Drop crates",topcrates,self._UnloadCrates,self,_group,_unit)
+local unloadmenu
+if nohookswitch then
+unloadmenu=MENU_GROUP_COMMAND:New(_group,"Drop crates",topcrates,self._UnloadCrates,self,_group,_unit)
+end
 if not self.nobuildmenu then
 local buildmenu=MENU_GROUP_COMMAND:New(_group,"Build crates",topcrates,self._BuildCrates,self,_group,_unit)
 local repairmenu=MENU_GROUP_COMMAND:New(_group,"Repair",topcrates,self._RepairCrates,self,_group,_unit):Refresh()
-else
+elseif unloadmenu then
 unloadmenu:Refresh()
 end
 end
@@ -67130,16 +68177,28 @@ self:T(self.lid.." AddStaticsCargo")
 self.CargoCounter=self.CargoCounter+1
 local type=CTLD_CARGO.Enum.STATIC
 local template=STATIC:FindByName(Name,true):GetTypeName()
+local unittemplate=_DATABASE:GetStaticUnitTemplate(Name)
+local ResourceMap=nil
+if unittemplate and unittemplate.resourcePayload then
+ResourceMap=UTILS.DeepCopy(unittemplate.resourcePayload)
+end
 local cargo=CTLD_CARGO:New(self.CargoCounter,Name,template,type,false,false,1,nil,nil,Mass,Stock,SubCategory,DontShowInMenu,Location)
+cargo:SetStaticResourceMap(ResourceMap)
 table.insert(self.Cargo_Statics,cargo)
-return self
+return cargo
 end
 function CTLD:GetStaticsCargoFromTemplate(Name,Mass)
 self:T(self.lid.." GetStaticsCargoFromTemplate")
 self.CargoCounter=self.CargoCounter+1
 local type=CTLD_CARGO.Enum.STATIC
 local template=STATIC:FindByName(Name,true):GetTypeName()
+local unittemplate=_DATABASE:GetStaticUnitTemplate(Name)
+local ResourceMap=nil
+if unittemplate and unittemplate.resourcePayload then
+ResourceMap=UTILS.DeepCopy(unittemplate.resourcePayload)
+end
 local cargo=CTLD_CARGO:New(self.CargoCounter,Name,template,type,false,false,1,nil,nil,Mass,1)
+cargo:SetStaticResourceMap(ResourceMap)
 return cargo
 end
 function CTLD:AddCratesRepair(Name,Template,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
@@ -67487,10 +68546,9 @@ zoneradius=2000
 zonewidth=zoneradius
 end
 local distance=self:_GetDistance(zonecoord,unitcoord)
-if zone:IsVec2InZone(unitVec2)and active then
+self:T("Distance Zone: "..distance)
+if(zone:IsVec2InZone(unitVec2)or Zonetype==CTLD.CargoZoneType.MOVE)and active==true and maxdist>distance then
 outcome=true
-end
-if maxdist>distance then
 maxdist=distance
 zoneret=zone
 zonenameret=zonename
@@ -68113,6 +69171,8 @@ end
 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:__Status(-5)
 if self.enableLoadSave then
 local interval=self.saveinterval
@@ -68252,7 +69312,7 @@ self:_MoveGroupToZone(Vehicle)
 end
 return self
 end
-function CTLD:onbeforeTroopsRTB(From,Event,To,Group,Unit)
+function CTLD:onbeforeTroopsRTB(From,Event,To,Group,Unit,ZoneName,ZoneObject)
 self:T({From,Event,To})
 return self
 end
@@ -68502,6 +69562,8 @@ cargotemplates=UTILS.Split(cargotemplates,";")
 injectstatic=CTLD_CARGO:New(nil,cargoname,cargotemplates,cargotype,true,true,size,nil,true,mass)
 elseif cargotype==CTLD_CARGO.Enum.STATIC or cargotype==CTLD_CARGO.Enum.REPAIR then
 injectstatic=CTLD_CARGO:New(nil,cargoname,cargotemplates,cargotype,true,true,size,nil,true,mass)
+local map=cargotype:GetStaticResourceMap()
+injectstatic:SetStaticResourceMap(map)
 end
 if injectstatic then
 self:InjectStatics(dropzone,injectstatic)
@@ -68704,6 +69766,8 @@ local theStatic=SPAWNSTATIC:NewFromType(basetype,"Cargos",self.cratecountry)
 :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()
+newCargo:SetStaticResourceMap(map)
 table.insert(self.CTLD.Spawned_Cargo,newCargo)
 newCargo:SetWasDropped(true)
 newCargo:SetHasMoved(true)
@@ -68973,7 +70037,9 @@ CSAR.AircraftType["AH-64D_BLK_II"]=2
 CSAR.AircraftType["Bronco-OV-10A"]=2
 CSAR.AircraftType["MH-60R"]=10
 CSAR.AircraftType["OH-6A"]=2
-CSAR.version="1.0.22"
+CSAR.AircraftType["OH-58D"]=2
+CSAR.AircraftType["CH-47Fbl1"]=31
+CSAR.version="1.0.26"
 function CSAR:New(Coalition,Template,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Template,Alias})
@@ -69173,7 +70239,6 @@ local _spawnedGroup=SPAWN
 :NewWithAlias(template,alias)
 :InitCoalition(coalition)
 :InitCountry(country)
-:InitAIOnOff(pilotcacontrol)
 :InitDelayOff()
 :SpawnFromCoordinate(point)
 return _spawnedGroup,alias
@@ -69495,10 +70560,24 @@ local _leadername=_leader:GetName()
 if not _nomessage then
 if _freq~=0 then
 local _text=string.format("%s requests SAR at %s, beacon at %.2f KHz",_groupName,_coordinatesText,_freqk)
+if self.coordtype~=2 then
 self:_DisplayToAllSAR(_text,self.coalition,self.messageTime)
 else
+self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,false,true)
+local coordtext=UTILS.MGRSStringToSRSFriendly(_coordinatesText,true)
+local _text=string.format("%s requests SAR at %s, beacon at %.2f kilo hertz",_groupName,coordtext,_freqk)
+self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,true,false)
+end
+else
 local _text=string.format("Pickup Zone at %s.",_coordinatesText)
+if self.coordtype~=2 then
 self:_DisplayToAllSAR(_text,self.coalition,self.messageTime)
+else
+self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,false,true)
+local coordtext=UTILS.MGRSStringToSRSFriendly(_coordinatesText,true)
+local _text=string.format("Pickup Zone at %s.",coordtext)
+self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,true,false)
+end
 end
 end
 for _,_heliName in pairs(self.csarUnits)do
@@ -70003,23 +71082,26 @@ self:_DisplayMessageToSAR(_heli,string.format("No Pilots within %s",dtext),self.
 end
 return self
 end
-function CSAR:_DisplayToAllSAR(_message,_side,_messagetime)
+function CSAR:_DisplayToAllSAR(_message,_side,_messagetime,ToSRS,ToScreen)
 self:T(self.lid.." _DisplayToAllSAR")
 local messagetime=_messagetime or self.messageTime
-if self.msrs then
+self:T({_message,ToSRS=ToSRS,ToScreen=ToScreen})
+if self.msrs and(ToSRS==true or ToSRS==nil)then
 local voice=self.CSARVoice or MSRS.Voices.Google.Standard.en_GB_Standard_F
 if self.msrs:GetProvider()==MSRS.Provider.WINDOWS then
 voice=self.CSARVoiceMS or MSRS.Voices.Microsoft.Hedda
 end
-self:I("Voice = "..voice)
+self:F("Voice = "..voice)
 self.SRSQueue:NewTransmission(_message,duration,self.msrs,tstart,2,subgroups,subtitle,subduration,self.SRSchannel,self.SRSModulation,gender,culture,voice,volume,label,self.coordinate)
 end
+if ToScreen==true or ToScreen==nil then
 for _,_unitName in pairs(self.csarUnits)do
 local _unit=self:_GetSARHeli(_unitName)
 if _unit and not self.suppressmessages then
 self:_DisplayMessageToSAR(_unit,_message,_messagetime)
 end
 end
+end
 return self
 end
 function CSAR:_Reqsmoke(_unitName)
@@ -70122,7 +71204,7 @@ local allheligroupset=self.allheligroupset
 local _allHeliGroups=allheligroupset:GetSetObjects()
 local _UnitList={}
 for _key,_group in pairs(_allHeliGroups)do
-local _unit=_group:GetUnit(1)
+local _unit=_group:GetFirstUnitAlive()
 if _unit then
 if _unit:IsAlive()and _unit:IsPlayer()then
 local unitName=_unit:GetName()
@@ -80183,6 +81265,9 @@ function SOUNDFILE:GetFileName()
 return self.filename
 end
 function SOUNDFILE:SetDuration(Duration)
+if Duration and type(Duration)=="string"then
+Duration=tonumber(Duration)
+end
 self.duration=Duration or 3
 return self
 end
@@ -80213,7 +81298,7 @@ ClassName="SOUNDTEXT",
 function SOUNDTEXT:New(Text,Duration)
 local self=BASE:Inherit(self,BASE:New())
 self:SetText(Text)
-self:SetDuration(Duration or STTS.getSpeechTime(Text))
+self:SetDuration(Duration or MSRS.getSpeechTime(Text))
 self:T(string.format("New SOUNDTEXT: text=%s, duration=%.1f sec",self.text,self.duration))
 return self
 end
@@ -80248,6 +81333,7 @@ SubtitleDuration=0,
 Power=100,
 Loop=false,
 alias=nil,
+moduhasbeenset=false,
 }
 function RADIO:New(Positionable)
 local self=BASE:Inherit(self,BASE:New())
@@ -80283,12 +81369,13 @@ end
 function RADIO:SetFrequency(Frequency)
 self:F2(Frequency)
 if type(Frequency)=="number"then
-self.Frequency=Frequency*1000000
+self.Frequency=Frequency
+self.HertzFrequency=Frequency*1000000
 if self.Positionable.ClassName=="UNIT"or self.Positionable.ClassName=="GROUP"then
 local commandSetFrequency={
 id="SetFrequency",
 params={
-frequency=self.Frequency,
+frequency=self.HertzFrequency,
 modulation=self.Modulation,
 }
 }
@@ -80305,6 +81392,10 @@ self:F2(Modulation)
 if type(Modulation)=="number"then
 if Modulation==radio.modulation.AM or Modulation==radio.modulation.FM then
 self.Modulation=Modulation
+if self.moduhasbeenset==false and Modulation==radio.modulation.FM then
+self:SetFrequency(self.Frequency)
+end
+self.moduhasbeenset=true
 return self
 end
 end
@@ -80510,7 +81601,7 @@ self:E(self.lid.."ERROR: No duration of transmission specified.")
 return nil
 end
 if type(duration)~="number"then
-self:E(self.lid.."ERROR: Duration specified is NOT a number.")
+self:E(self.lid..string.format("ERROR: Duration specified is NOT a number but type=%s. Filename=%s, duration=%s",type(duration),tostring(filename),tostring(duration)))
 return nil
 end
 local transmission={}
@@ -80554,6 +81645,7 @@ end
 return wait
 end
 function RADIOQUEUE:Broadcast(transmission)
+self:T("Broadcast")
 if((transmission.soundfile and transmission.soundfile.useSRS)or transmission.soundtext)and self.msrs then
 self:_BroadcastSRS(transmission)
 return
@@ -80592,7 +81684,7 @@ local text=string.format("file=%s, freq=%.2f MHz, duration=%.2f sec, subtitle=%s
 MESSAGE:New(text,2,"RADIOQUEUE "..self.alias):ToAll()
 end
 else
-self:T(self.lid..string.format("Broadcasting via trigger.action.radioTransmission()."))
+self:T(self.lid..string.format("Broadcasting via trigger.action.radioTransmission()"))
 local vec3=nil
 if self.sendername then
 vec3=self:_GetRadioSenderCoord()
@@ -80608,6 +81700,8 @@ if self.Debugmode then
 local text=string.format("file=%s, freq=%.2f MHz, duration=%.2f sec, subtitle=%s",filename,self.frequency/1000000,transmission.duration,transmission.subtitle or"")
 MESSAGE:New(string.format(text,filename,transmission.duration,transmission.subtitle or""),5,"RADIOQUEUE "..self.alias):ToAll()
 end
+else
+self:E("ERROR: Could not get vec3 to determine transmission origin! Did you specify a sender and is it still alive?")
 end
 end
 end