@jtff/miztemplate-lib 3.2.1 → 3.2.3

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-03T12:48:41+01:00-86e13df3039b95b46af4786cb3196cb931175778 ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-05-04T14:54:20+02:00-044fb66ca064687a743791e5a4a5d02c109ca9c1 ***')
 if not MOOSE_DEVELOPMENT_FOLDER then
 MOOSE_DEVELOPMENT_FOLDER='Scripts'
 end
@@ -1315,9 +1315,9 @@ return s
 end
 end
 end
-function UTILS.PrintTableToLog(table,indent)
+function UTILS.PrintTableToLog(table,indent,noprint)
 local text="\n"
-if not table then
+if not table or type(table)~="table"then
 env.warning("No table passed!")
 return nil
 end
@@ -1325,11 +1325,16 @@ 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 not noprint then
 env.info(string.rep("  ",indent)..tostring(k).." = {")
+end
 text=text..string.rep("  ",indent)..tostring(k).." = {\n"
 text=text..tostring(UTILS.PrintTableToLog(v,indent+1)).."\n"
+if not noprint then
 env.info(string.rep("  ",indent).."},")
+end
 text=text..string.rep("  ",indent).."},\n"
+elseif type(v)=="function"then
 else
 local value
 if tostring(v)=="true"or tostring(v)=="false"or tonumber(v)~=nil then
@@ -1337,7 +1342,9 @@ value=v
 else
 value='"'..tostring(v)..'"'
 end
+if not noprint then
 env.info(string.rep("  ",indent)..tostring(k).." = "..tostring(value)..",\n")
+end
 text=text..string.rep("  ",indent)..tostring(k).." = "..tostring(value)..",\n"
 end
 end
@@ -2402,6 +2409,10 @@ if type_name=="Bronco-OV-10A"then
 BASE:T(unit_name.." front door(s) are open")
 return true
 end
+if type_name=="MH-60R"and(unit:getDrawArgumentValue(403)>0 or unit:getDrawArgumentValue(403)==-1)then
+BASE:T(unit_name.." cargo door is open")
+return true
+end
 return false
 end
 return nil
@@ -3255,6 +3266,18 @@ end
 function string.contains(str,value)
 return string.match(str,value)
 end
+function table.move_object(obj,from_table,to_table)
+local index
+for i,v in pairs(from_table)do
+if v==obj then
+index=i
+end
+end
+if index then
+local moved=table.remove(from_table,index)
+table.insert_unique(to_table,moved)
+end
+end
 function table.contains(tbl,element)
 if element==nil or tbl==nil then return false end
 local index=1
@@ -3391,6 +3414,90 @@ end
 function UTILS.OctalToDecimal(Number)
 return tonumber(Number,8)
 end
+function UTILS.HexToRGBA(hex_string)
+local hexNumber=tonumber(string.sub(hex_string,3),16)
+local alpha=hexNumber%256
+hexNumber=(hexNumber-alpha)/256
+local blue=hexNumber%256
+hexNumber=(hexNumber-blue)/256
+local green=hexNumber%256
+hexNumber=(hexNumber-green)/256
+local red=hexNumber%256
+return{R=red,G=green,B=blue,A=alpha}
+end
+function UTILS.SaveSetOfOpsGroups(Set,Path,Filename,Structured)
+local filename=Filename or"SetOfGroups"
+local data="--Save SET of groups: (name,legion,template,alttemplate,units,position.x,position.y,position.z,strucdata) "..Filename.."\n"
+local List=Set:GetSetObjects()
+for _,_group in pairs(List)do
+local group=_group:GetGroup()
+if group and group:IsAlive()then
+local name=group:GetName()
+local template=string.gsub(name,"(.AID.%d+$","")
+if string.find(template,"#")then
+template=string.gsub(name,"#(%d+)$","")
+end
+local alttemplate=_group.templatename or"none"
+local legiono=_group.legion
+local legion="none"
+if legiono and type(legiono)=="table"and legiono.ClassName then
+legion=legiono:GetName()
+local asset=legiono:GetAssetByName(name)
+alttemplate=asset.templatename
+end
+local units=group:CountAliveUnits()
+local position=group:GetVec3()
+if Structured then
+local structure=UTILS.GetCountPerTypeName(group)
+local strucdata=""
+for typen,anzahl in pairs(structure)do
+strucdata=strucdata..typen.."=="..anzahl..";"
+end
+data=string.format("%s%s,%s,%s,%s,%d,%d,%d,%d,%s\n",data,name,legion,template,alttemplate,units,position.x,position.y,position.z,strucdata)
+else
+data=string.format("%s%s,%s,%s,%s,%d,%d,%d,%d\n",data,name,legion,template,alttemplate,units,position.x,position.y,position.z)
+end
+end
+end
+local outcome=UTILS.SaveToFile(Path,Filename,data)
+return outcome
+end
+function UTILS.LoadSetOfOpsGroups(Path,Filename)
+local filename=Filename or"SetOfGroups"
+local datatable={}
+if UTILS.CheckFileExists(Path,filename)then
+local outcome,loadeddata=UTILS.LoadFromFile(Path,Filename)
+table.remove(loadeddata,1)
+for _id,_entry in pairs(loadeddata)do
+local dataset=UTILS.Split(_entry,",")
+local groupname=dataset[1]
+local legion=dataset[2]
+local template=dataset[3]
+local alttemplate=dataset[4]
+local size=tonumber(dataset[5])
+local posx=tonumber(dataset[6])
+local posy=tonumber(dataset[7])
+local posz=tonumber(dataset[8])
+local structure=dataset[9]
+local coordinate=COORDINATE:NewFromVec3({x=posx,y=posy,z=posz})
+if size>0 then
+local data={groupname=groupname,size=size,coordinate=coordinate,template=template,structure=structure,legion=legion,alttemplate=alttemplate}
+table.insert(datatable,data)
+end
+end
+else
+return nil
+end
+return datatable
+end
+function UTILS.ClockHeadingString(refHdg,tgtHdg)
+local relativeAngle=tgtHdg-refHdg
+if relativeAngle<0 then
+relativeAngle=relativeAngle+360
+end
+local clockPos=math.ceil((relativeAngle%360)/30)
+return clockPos.." o'clock"
+end
 PROFILER={
 ClassName="PROFILER",
 Counters={},
@@ -5006,6 +5113,14 @@ end
 _TraceClassMethod[Class].Method[Method]=true
 self:I("Tracing method "..Method.." of class "..Class)
 end
+function BASE:_Serialize(Arguments)
+local text=UTILS.PrintTableToLog({Arguments},0,true)
+text=string.gsub(text,"(\n+)","")
+text=string.gsub(text,"%(%(","%(")
+text=string.gsub(text,"%)%)","%)")
+text=string.gsub(text,"(%s+)"," ")
+return text
+end
 function BASE:_F(Arguments,DebugInfoCurrentParam,DebugInfoFromParam)
 if BASE.Debug and(_TraceAll==true)or(_TraceClass[self.ClassName]or _TraceClassMethod[self.ClassName])then
 local DebugInfoCurrent=DebugInfoCurrentParam and DebugInfoCurrentParam or BASE.Debug.getinfo(2,"nl")
@@ -5023,7 +5138,7 @@ local LineFrom=0
 if DebugInfoFrom then
 LineFrom=DebugInfoFrom.currentline
 end
-env.info(string.format("%6d(%6d)/%1s:%30s%05d.%s(%s)",LineCurrent,LineFrom,"F",self.ClassName,self.ClassID,Function,UTILS.BasicSerialize(Arguments)))
+env.info(string.format("%6d(%6d)/%1s:%30s%05d.%s(%s)",LineCurrent,LineFrom,"F",self.ClassName,self.ClassID,Function,BASE:_Serialize(Arguments)))
 end
 end
 end
@@ -5071,7 +5186,7 @@ local LineFrom=0
 if DebugInfoFrom then
 LineFrom=DebugInfoFrom.currentline
 end
-env.info(string.format("%6d(%6d)/%1s:%30s%05d.%s",LineCurrent,LineFrom,"T",self.ClassName,self.ClassID,UTILS.BasicSerialize(Arguments)))
+env.info(string.format("%6d(%6d)/%1s:%30s%05d.%s",LineCurrent,LineFrom,"T",self.ClassName,self.ClassID,BASE:_Serialize(Arguments)))
 end
 end
 end
@@ -5117,7 +5232,7 @@ LineFrom=DebugInfoFrom.currentline
 end
 env.info(string.format("%6d(%6d)/%1s:%30s%05d.%s(%s)",LineCurrent,LineFrom,"E",self.ClassName,self.ClassID,Function,UTILS.BasicSerialize(Arguments)))
 else
-env.info(string.format("%1s:%30s%05d(%s)","E",self.ClassName,self.ClassID,UTILS.BasicSerialize(Arguments)))
+env.info(string.format("%1s:%30s%05d(%s)","E",self.ClassName,self.ClassID,BASE:_Serialize(Arguments)))
 end
 end
 function BASE:I(Arguments)
@@ -5135,7 +5250,7 @@ LineFrom=DebugInfoFrom.currentline
 end
 env.info(string.format("%6d(%6d)/%1s:%30s%05d.%s(%s)",LineCurrent,LineFrom,"I",self.ClassName,self.ClassID,Function,UTILS.BasicSerialize(Arguments)))
 else
-env.info(string.format("%1s:%30s%05d(%s)","I",self.ClassName,self.ClassID,UTILS.BasicSerialize(Arguments)))
+env.info(string.format("%1s:%30s%05d(%s)","I",self.ClassName,self.ClassID,BASE:_Serialize(Arguments)))
 end
 end
 ASTAR={
@@ -5503,6 +5618,7 @@ BEACON={
 ClassName="BEACON",
 Positionable=nil,
 name=nil,
+UniqueName=0,
 }
 BEACON.Type={
 NULL=0,
@@ -5607,6 +5723,7 @@ return self
 end
 function BEACON:AATACAN(TACANChannel,Message,Bearing,BeaconDuration)
 self:F({TACANChannel,Message,Bearing,BeaconDuration})
+self:E("This method is DEPRECATED! Please use ActivateTACAN() instead.")
 local IsValid=true
 if not self.Positionable:IsAir()then
 self:E({"The POSITIONABLE you want to attach the AA Tacan Beacon is not an aircraft ! The BEACON is not emitting",self.Positionable})
@@ -5661,6 +5778,7 @@ end
 function BEACON:RadioBeacon(FileName,Frequency,Modulation,Power,BeaconDuration)
 self:F({FileName,Frequency,Modulation,Power,BeaconDuration})
 local IsValid=false
+Modulation=Modulation or radio.modulation.AM
 if type(FileName)=="string"then
 if FileName:find(".ogg")or FileName:find(".wav")then
 if not FileName:find("l10n/DEFAULT/")then
@@ -5670,7 +5788,7 @@ IsValid=true
 end
 end
 if not IsValid then
-self:E({"File name invalid. Maybe something wrong with the extension ? ",FileName})
+self:E({"File name invalid. Maybe something wrong with the extension? ",FileName})
 end
 if type(Frequency)~="number"and IsValid then
 self:E({"Frequency invalid. ",Frequency})
@@ -5688,7 +5806,9 @@ end
 Power=math.floor(math.abs(Power))
 if IsValid then
 self:T2({"Activating Beacon on ",Frequency,Modulation})
-trigger.action.radioTransmission(FileName,self.Positionable:GetPositionVec3(),Modulation,true,Frequency,Power,tostring(self.ID))
+BEACON.UniqueName=BEACON.UniqueName+1
+self.BeaconName="MooseBeacon"..tostring(BEACON.UniqueName)
+trigger.action.radioTransmission(FileName,self.Positionable:GetPositionVec3(),Modulation,true,Frequency,Power,self.BeaconName)
 if BeaconDuration then
 SCHEDULER:New(nil,
 function()
@@ -5696,10 +5816,11 @@ self:StopRadioBeacon()
 end,{},BeaconDuration)
 end
 end
+return self
 end
 function BEACON:StopRadioBeacon()
 self:F()
-trigger.action.stopRadioTransmission(tostring(self.ID))
+trigger.action.stopRadioTransmission(self.BeaconName)
 return self
 end
 function BEACON:_TACANToFrequency(TACANChannel,TACANMode)
@@ -7038,6 +7159,7 @@ Event.MarkVec3=Event.pos
 Event.MarkCoordinate=COORDINATE:NewFromVec3(Event.pos)
 Event.MarkText=Event.text
 Event.MarkCoalition=Event.coalition
+Event.IniCoalition=Event.coalition
 Event.MarkGroupID=Event.groupID
 end
 if Event.cargo then
@@ -8726,6 +8848,7 @@ end
 function ZONE_RADIUS:BoundZone(Points,CountryID,UnBound)
 local Point={}
 local Vec2=self:GetVec2()
+local countryID=CountryID or country.id.USA
 Points=Points and Points or 360
 local Angle
 local RadialBase=math.pi*2
@@ -8733,7 +8856,7 @@ for Angle=0,360,(360/Points)do
 local Radial=Angle*RadialBase/360
 Point.x=Vec2.x+math.cos(Radial)*self:GetRadius()
 Point.y=Vec2.y+math.sin(Radial)*self:GetRadius()
-local CountryName=_DATABASE.COUNTRY_NAME[CountryID]
+local CountryName=_DATABASE.COUNTRY_NAME[countryID]
 local Tire={
 ["country"]=CountryName,
 ["category"]="Fortifications",
@@ -8745,7 +8868,7 @@ local Tire={
 ["name"]=string.format("%s-Tire #%0d",self:GetName(),Angle),
 ["heading"]=0,
 }
-local Group=coalition.addStaticObject(CountryID,Tire)
+local Group=coalition.addStaticObject(countryID,Tire)
 if UnBound and UnBound==true then
 Group:destroy()
 end
@@ -10263,7 +10386,7 @@ function ZONE_OVAL:GetRandomPointVec2()
 return POINT_VEC2:NewFromVec2(self:GetRandomVec2())
 end
 function ZONE_OVAL:GetRandomPointVec3()
-return POINT_VEC2:NewFromVec3(self:GetRandomVec2())
+return POINT_VEC3:NewFromVec3(self:GetRandomVec2())
 end
 function ZONE_OVAL:DrawZone(Coalition,Color,Alpha,FillColor,FillAlpha,LineType)
 Coalition=Coalition or self:GetDrawCoalition()
@@ -10472,6 +10595,8 @@ FLIGHTCONTROLS={},
 OPSZONES={},
 PATHLINES={},
 STORAGES={},
+STNS={},
+SADL={},
 }
 local _DATABASECoalition=
 {
@@ -10853,7 +10978,7 @@ local SpawnCategoryID=SpawnTemplate.CategoryID
 SpawnTemplate.CoalitionID=nil
 SpawnTemplate.CountryID=nil
 SpawnTemplate.CategoryID=nil
-self:_RegisterGroupTemplate(SpawnTemplate,SpawnCoalitionID,SpawnCategoryID,SpawnCountryID)
+self:_RegisterGroupTemplate(SpawnTemplate,SpawnCoalitionID,SpawnCategoryID,SpawnCountryID,SpawnTemplate.name)
 self:T3(SpawnTemplate)
 coalition.addGroup(SpawnCountryID,SpawnCategoryID,SpawnTemplate)
 SpawnTemplate.CoalitionID=SpawnCoalitionID
@@ -10916,6 +11041,26 @@ self.Templates.ClientsByName[UnitTemplate.name].CoalitionID=CoalitionSide
 self.Templates.ClientsByName[UnitTemplate.name].CountryID=CountryID
 self.Templates.ClientsByID[UnitTemplate.unitId]=UnitTemplate
 end
+if UnitTemplate.AddPropAircraft then
+if UnitTemplate.AddPropAircraft.STN_L16 then
+local stn=UTILS.OctalToDecimal(UnitTemplate.AddPropAircraft.STN_L16)
+if stn==nil or stn<1 then
+self:E("WARNING: Invalid STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for "..UnitTemplate.name)
+else
+self.STNS[stn]=UnitTemplate.name
+self:I("Register STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for "..UnitTemplate.name)
+end
+end
+if UnitTemplate.AddPropAircraft.SADL_TN then
+local sadl=UTILS.OctalToDecimal(UnitTemplate.AddPropAircraft.SADL_TN)
+if sadl==nil or sadl<1 then
+self:E("WARNING: Invalid SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for "..UnitTemplate.name)
+else
+self.SADL[sadl]=UnitTemplate.name
+self:I("Register SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for "..UnitTemplate.name)
+end
+end
+end
 UnitNames[#UnitNames+1]=self.Templates.Units[UnitTemplate.name].UnitName
 end
 self:T({Group=self.Templates.Groups[GroupTemplateName].GroupName,
@@ -10926,6 +11071,66 @@ Units=UnitNames
 }
 )
 end
+function DATABASE:GetNextSTN(octal,unitname)
+local first=UTILS.OctalToDecimal(octal)or 0
+if self.STNS[first]==unitname then return octal end
+local nextoctal=77777
+local found=false
+if 32767-first<10 then
+first=0
+end
+for i=first+1,32767 do
+if self.STNS[i]==nil then
+found=true
+nextoctal=UTILS.DecimalToOctal(i)
+self.STNS[i]=unitname
+self:T("Register STN "..tostring(nextoctal).." for "..unitname)
+break
+end
+end
+if not found then
+self:E(string.format("WARNING: No next free STN past %05d found!",octal))
+local NewSTNS={}
+for _id,_name in pairs(self.STNS)do
+if self.UNITS[_name]~=nil then
+NewSTNS[_id]=_name
+end
+end
+self.STNS=nil
+self.STNS=NewSTNS
+end
+return nextoctal
+end
+function DATABASE:GetNextSADL(octal,unitname)
+local first=UTILS.OctalToDecimal(octal)or 0
+if self.SADL[first]==unitname then return octal end
+local nextoctal=7777
+local found=false
+if 4095-first<10 then
+first=0
+end
+for i=first+1,4095 do
+if self.STNS[i]==nil then
+found=true
+nextoctal=UTILS.DecimalToOctal(i)
+self.SADL[i]=unitname
+self:T("Register SADL "..tostring(nextoctal).." for "..unitname)
+break
+end
+end
+if not found then
+self:E(string.format("WARNING: No next free SADL past %04d found!",octal))
+local NewSTNS={}
+for _id,_name in pairs(self.SADL)do
+if self.UNITS[_name]~=nil then
+NewSTNS[_id]=_name
+end
+end
+self.SADL=nil
+self.SADL=NewSTNS
+end
+return nextoctal
+end
 function DATABASE:GetGroupTemplate(GroupName)
 local GroupTemplate=self.Templates.Groups[GroupName].Template
 GroupTemplate.SpawnCoalitionID=self.Templates.Groups[GroupName].CoalitionID
@@ -11208,7 +11413,7 @@ return playername
 end
 if Event.IniUnit then
 if Event.IniObjectCategory==1 then
-local PlayerName=Event.IniUnit:GetPlayerName()or FindPlayerName(Event.IniUnitName)
+local PlayerName=Event.IniPlayerName or Event.IniUnit:GetPlayerName()or FindPlayerName(Event.IniUnitName)
 if PlayerName then
 self:I(string.format("Player '%s' left unit %s",tostring(PlayerName),tostring(Event.IniUnitName)))
 local Settings=SETTINGS:Set(PlayerName)
@@ -11896,6 +12101,7 @@ Countries=nil,
 GroupPrefixes=nil,
 Zones=nil,
 Functions=nil,
+Alive=nil,
 },
 FilterMeta={
 Coalitions={
@@ -12102,6 +12308,10 @@ Active=Active or not(Active==false)
 self.Filter.Active=Active
 return self
 end
+function SET_GROUP:FilterAlive()
+self.Filter.Alive=true
+return self
+end
 function SET_GROUP:FilterStart()
 if _DATABASE then
 self:_FilterStart()
@@ -12337,6 +12547,14 @@ end
 function SET_GROUP:IsIncludeObject(MGroup)
 self:F2(MGroup)
 local MGroupInclude=true
+if self.Filter.Alive==true then
+local MGroupAlive=false
+self:F({Active=self.Filter.Active})
+if MGroup and MGroup:IsAlive()then
+MGroupAlive=true
+end
+MGroupInclude=MGroupInclude and MGroupAlive
+end
 if self.Filter.Active~=nil then
 local MGroupActive=false
 self:F({Active=self.Filter.Active})
@@ -12861,7 +13079,7 @@ local heading=self:GetHeading()or 0
 local velocity=self:GetVelocity()or 0
 Coordinate:SetHeading(heading)
 Coordinate:SetVelocity(velocity)
-self:I(UTILS.PrintTableToLog(Coordinate))
+self:T(UTILS.PrintTableToLog(Coordinate))
 end
 return Coordinate
 end
@@ -13728,7 +13946,7 @@ self:I("_EventPlayerEnterUnit")
 if Event.IniDCSUnit then
 if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround()then
 local ObjectName,Object=self:AddInDatabase(Event)
-self:I(ObjectName,UTILS.PrintTableToLog(Object))
+self:T(ObjectName,UTILS.PrintTableToLog(Object))
 if Object and self:IsIncludeObject(Object)then
 self:Add(ObjectName,Object)
 end
@@ -15951,6 +16169,7 @@ return umin
 end
 function COORDINATE:DistanceFromPointVec2(PointVec2Reference)
 self:F2(PointVec2Reference)
+if not PointVec2Reference then return math.huge end
 local Distance=((PointVec2Reference.x-self.x)^2+(PointVec2Reference.z-self.z)^2)^0.5
 self:T2(Distance)
 return Distance
@@ -17154,17 +17373,18 @@ local coord=COORDINATE:NewFromVec2({x=point.x,y=point.z})
 return coord
 end
 function COORDINATE:NewFromMGRS(UTMZone,MGRSDigraph,Easting,Northing)
-if string.len(Easting)<5 then Easting=Easting..string.rep("0",5-string.len(Easting))end
-if string.len(Northing)<5 then Northing=Northing..string.rep("0",5-string.len(Northing))end
+if string.len(Easting)<5 then Easting=tostring(Easting..string.rep("0",5-string.len(Easting)))end
+if string.len(Northing)<5 then Northing=tostring(Northing..string.rep("0",5-string.len(Northing)))end
 local MGRS={
 UTMZone=UTMZone,
 MGRSDigraph=MGRSDigraph,
-Easting=Easting,
-Northing=Northing,
+Easting=tostring(Easting),
+Northing=tostring(Northing),
 }
 local lat,lon=coord.MGRStoLL(MGRS)
 local point=coord.LLtoLO(lat,lon,0)
 local coord=COORDINATE:NewFromVec2({x=point.x,y=point.z})
+return coord
 end
 function COORDINATE:ToStringFromRP(ReferenceCoord,ReferenceName,Controllable,Settings,MagVar)
 self:F2({ReferenceCoord=ReferenceCoord,ReferenceName=ReferenceName})
@@ -18408,7 +18628,7 @@ BASE:I("ERROR: in function NewFromTemplate, required parameter SpawnTemplatePref
 return nil
 end
 if SpawnTemplate then
-self.SpawnTemplate=SpawnTemplate
+self.SpawnTemplate=UTILS.DeepCopy(SpawnTemplate)
 self.SpawnTemplatePrefix=SpawnTemplatePrefix
 self.SpawnAliasPrefix=SpawnAliasPrefix or SpawnTemplatePrefix
 self.SpawnTemplate.name=SpawnTemplatePrefix
@@ -18525,6 +18745,56 @@ self.SpawnInitSkill="High"
 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
+self:E("WARNING - STN "..tostring(Octal).." is not valid!")
+return self
+end
+if _DATABASE.STNS[num]~=nil then
+self:E("WARNING - STN already assigned: "..tostring(Octal).." is used for ".._DATABASE.STNS[Octal])
+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
+self:E("WARNING - SADL "..tostring(Octal).." is not valid!")
+return self
+end
+if _DATABASE.SADL[num]~=nil then
+self:E("WARNING - SADL already assigned: "..tostring(Octal).." is used for ".._DATABASE.SADL[Octal])
+end
+return self
+end
+function SPAWN:InitSpeedMps(MPS)
+self:F({MPS=MPS})
+if MPS==nil or tonumber(MPS)<0 then
+MPS=125
+end
+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
+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
+self.InitSpeed=UTILS.KmphToMps(KPH)
+return self
+end
 function SPAWN:InitRadioCommsOnOff(switch)
 self:F({switch=switch})
 self.SpawnInitRadio=switch or true
@@ -18644,11 +18914,12 @@ self.SpawnRandomCallsign=true
 return self
 end
 function SPAWN:InitCallSign(ID,Name,Minor,Major)
+local Name=Name or"Enfield"
 self.SpawnInitCallSign=true
 self.SpawnInitCallSignID=ID or 1
 self.SpawnInitCallSignMinor=Minor or 1
 self.SpawnInitCallSignMajor=Major or 1
-self.SpawnInitCallSignName=string.lower(Name)or"enfield"
+self.SpawnInitCallSignName=string.lower(Name):gsub("^%l",string.upper)
 return self
 end
 function SPAWN:InitPositionCoordinate(Coordinate)
@@ -18761,6 +19032,18 @@ function SPAWN:InitDelayOff()
 return self:InitDelayOnOff(false)
 end
 end
+function SPAWN:InitHiddenOnMap()
+self.SpawnHiddenOnMap=true
+return self
+end
+function SPAWN:InitHiddenOnMFD()
+self.SpawnHiddenOnMFD=true
+return self
+end
+function SPAWN:InitHiddenOnPlanner()
+self.SpawnHiddenOnPlanner=true
+return self
+end
 function SPAWN:Spawn()
 self:F({self.SpawnTemplatePrefix,self.SpawnIndex,self.AliveUnits})
 if self.SpawnInitAirbase then
@@ -18953,6 +19236,15 @@ end
 if self.SpawnInitModu then
 SpawnTemplate.modulation=self.SpawnInitModu
 end
+if self.SpawnHiddenOnPlanner then
+SpawnTemplate.hiddenOnPlanner=true
+end
+if self.SpawnHiddenOnMFD then
+SpawnTemplate.hiddenOnMFD=true
+end
+if self.SpawnHiddenOnMap then
+SpawnTemplate.hidden=true
+end
 SpawnTemplate.CategoryID=self.SpawnInitCategory or SpawnTemplate.CategoryID
 SpawnTemplate.CountryID=self.SpawnInitCountry or SpawnTemplate.CountryID
 SpawnTemplate.CoalitionID=self.SpawnInitCoalition or SpawnTemplate.CoalitionID
@@ -18981,6 +19273,7 @@ self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[se
 end
 end
 self.SpawnGroups[self.SpawnIndex].Spawned=true
+self.SpawnGroups[self.SpawnIndex].Group.TemplateDonor=self.SpawnTemplatePrefix
 return self.SpawnGroups[self.SpawnIndex].Group
 else
 end
@@ -19786,8 +20079,17 @@ SpawnTemplate.units[UnitID].unitId=nil
 end
 else
 for UnitID=1,#SpawnTemplate.units do
-local UnitPrefix,Rest=string.match(SpawnTemplate.units[UnitID].name,"^([^#]+)#?"):gsub("^%s*(.-)%s*$","%1")
+local SpawnInitKeepUnitIFF=false
+if string.find(SpawnTemplate.units[UnitID].name,"#IFF_",1,true)then
+SpawnInitKeepUnitIFF=true
+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)
 SpawnTemplate.units[UnitID].unitId=nil
 end
@@ -19859,32 +20161,54 @@ elseif type(Callsign)=="number"then
 SpawnTemplate.units[UnitID].callsign=Callsign+SpawnIndex
 end
 end
+if self.InitSpeed then
+SpawnTemplate.units[UnitID].speed=self.InitSpeed
+end
 local AddProps=SpawnTemplate.units[UnitID].AddPropAircraft
 if AddProps then
 if SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16 then
+if self.SpawnInitSTN then
+local octal=self.SpawnInitSTN
+if UnitID>1 then
+octal=_DATABASE:GetNextSTN(self.SpawnInitSTN,SpawnTemplate.units[UnitID].name)
+end
+SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16=string.format("%05d",octal)
+else
 if tonumber(SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16)~=nil then
 local octal=SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16
-local decimal=UTILS.OctalToDecimal(octal)+UnitID-1
-SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16=string.format("%05d",UTILS.DecimalToOctal(decimal))
+local num=UTILS.OctalToDecimal(octal)
+if _DATABASE.STNS[num]~=nil or UnitID>1 then
+octal=_DATABASE:GetNextSTN(octal,SpawnTemplate.units[UnitID].name)
+end
+SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16=string.format("%05d",octal)
 else
-local STN=math.floor(UTILS.RandomGaussian(4088/2,nil,1000,4088))
-STN=STN+UnitID-1
-local OSTN=UTILS.DecimalToOctal(STN)
+local OSTN=_DATABASE:GetNextSTN(1,SpawnTemplate.units[UnitID].name)
 SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16=string.format("%05d",OSTN)
 end
 end
+end
 if SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN then
+if self.SpawnInitSADL then
+local octal=self.SpawnInitSADL
+if UnitID>1 then
+octal=_DATABASE:GetNextSADL(self.SpawnInitSADL,SpawnTemplate.units[UnitID].name)
+end
+SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN=string.format("%04d",octal)
+else
 if tonumber(SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN)~=nil then
 local octal=SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN
-local decimal=UTILS.OctalToDecimal(octal)+UnitID-1
-SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN=string.format("%04d",UTILS.DecimalToOctal(decimal))
+local num=UTILS.OctalToDecimal(octal)
+self.SpawnInitSADL=num
+if _DATABASE.SADL[num]~=nil or UnitID>1 then
+octal=_DATABASE:GetNextSADL(self.SpawnInitSADL,SpawnTemplate.units[UnitID].name)
+end
+SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN=string.format("%04d",octal)
 else
-local STN=math.floor(UTILS.RandomGaussian(504/2,nil,100,504))
-STN=STN+UnitID-1
-local OSTN=UTILS.DecimalToOctal(STN)
+local OSTN=_DATABASE:GetNextSADL(1,SpawnTemplate.units[UnitID].name)
 SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN=string.format("%04d",OSTN)
 end
 end
+end
 if SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignNumber and type(Callsign)~="number"then
 SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignNumber=SpawnTemplate.units[UnitID].callsign[2]..SpawnTemplate.units[UnitID].callsign[3]
 end
@@ -20648,7 +20972,7 @@ MARKEROPS_BASE={
 ClassName="MARKEROPS",
 Tag="mytag",
 Keywords={},
-version="0.1.1",
+version="0.1.3",
 debug=false,
 Casesensitive=true,
 }
@@ -20688,26 +21012,27 @@ local coordtext=coord:ToStringLLDDM()
 local text=tostring(Event.text)
 local m=MESSAGE:New(string.format("Mark added at %s with text: %s",coordtext,text),10,"Info",false):ToAll()
 end
+local coalition=Event.MarkCoalition
 if Event.id==world.event.S_EVENT_MARK_ADDED then
-self:T({event="S_EVENT_MARK_ADDED",carrier=self.groupname,vec3=Event.pos})
+self:T({event="S_EVENT_MARK_ADDED",carrier=Event.IniGroupName,vec3=Event.pos})
 local Eventtext=tostring(Event.text)
 if Eventtext~=nil then
 if self:_MatchTag(Eventtext)then
 local matchtable=self:_MatchKeywords(Eventtext)
-self:MarkAdded(Eventtext,matchtable,coord)
+self:MarkAdded(Eventtext,matchtable,coord,Event.idx,coalition)
 end
 end
 elseif Event.id==world.event.S_EVENT_MARK_CHANGE then
-self:T({event="S_EVENT_MARK_CHANGE",carrier=self.groupname,vec3=Event.pos})
+self:T({event="S_EVENT_MARK_CHANGE",carrier=Event.IniGroupName,vec3=Event.pos})
 local Eventtext=tostring(Event.text)
 if Eventtext~=nil then
 if self:_MatchTag(Eventtext)then
 local matchtable=self:_MatchKeywords(Eventtext)
-self:MarkChanged(Eventtext,matchtable,coord,Event.idx)
+self:MarkChanged(Eventtext,matchtable,coord,Event.idx,coalition)
 end
 end
 elseif Event.id==world.event.S_EVENT_MARK_REMOVED then
-self:T({event="S_EVENT_MARK_REMOVED",carrier=self.groupname,vec3=Event.pos})
+self:T({event="S_EVENT_MARK_REMOVED",carrier=Event.IniGroupName,vec3=Event.pos})
 local Eventtext=tostring(Event.text)
 if Eventtext~=nil then
 if self:_MatchTag(Eventtext)then
@@ -20741,10 +21066,10 @@ end
 end
 return matchtable
 end
-function MARKEROPS_BASE:onbeforeMarkAdded(From,Event,To,Text,Keywords,Coord)
+function MARKEROPS_BASE:onbeforeMarkAdded(From,Event,To,Text,Keywords,Coord,MarkerID,CoalitionNumber)
 self:T({self.lid,From,Event,To,Text,Keywords,Coord:ToStringLLDDM()})
 end
-function MARKEROPS_BASE:onbeforeMarkChanged(From,Event,To,Text,Keywords,Coord)
+function MARKEROPS_BASE:onbeforeMarkChanged(From,Event,To,Text,Keywords,Coord,MarkerID,CoalitionNumber)
 self:T({self.lid,From,Event,To,Text,Keywords,Coord:ToStringLLDDM()})
 end
 function MARKEROPS_BASE:onbeforeMarkDeleted(From,Event,To)
@@ -23225,7 +23550,7 @@ local TaskRoute=PatrolGroup:TaskFunction("CONTROLLABLE.PatrolRoute")
 self:F({Waypoints=Waypoints})
 local Waypoint=Waypoints[#Waypoints]
 PatrolGroup:SetTaskWaypoint(Waypoint,TaskRoute)
-PatrolGroup:Route(Waypoints)
+PatrolGroup:Route(Waypoints,2)
 end
 end
 function CONTROLLABLE:PatrolRouteRandom(Speed,Formation,ToWaypoint)
@@ -24183,6 +24508,9 @@ return nil
 end
 function CONTROLLABLE:WayPointFunction(WayPoint,WayPointIndex,WayPointFunction,...)
 self:F2({WayPoint,WayPointIndex,WayPointFunction})
+if not self.WayPoints then
+self:WayPointInitialize()
+end
 table.insert(self.WayPoints[WayPoint].task.params.tasks,WayPointIndex)
 self.WayPoints[WayPoint].task.params.tasks[WayPointIndex]=self:TaskFunction(WayPointFunction,arg)
 return self
@@ -24306,6 +24634,49 @@ self:SetOption(AI.Option.Air.id.RADAR_USING,3)
 end
 return self
 end
+function CONTROLLABLE:SetOptionWaypointPassReport(OnOff)
+self:F2({self.ControllableName})
+local onoff=(OnOff==nil or OnOff==true)and false or true
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.PROHIBIT_WP_PASS_REPORT,onoff)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadioSilence(OnOff)
+local onoff=(OnOff==true or OnOff==nil)and true or false
+self:F2({self.ControllableName})
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.SILENCE,onoff)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadioContact(Objects)
+self:F2({self.ControllableName})
+if not Objects then Objects={"Air"}end
+if type(Objects)~="table"then Objects={Objects}end
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.OPTION_RADIO_USAGE_CONTACT,Objects)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadioEngage(Objects)
+self:F2({self.ControllableName})
+if not Objects then Objects={"Air"}end
+if type(Objects)~="table"then Objects={Objects}end
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.OPTION_RADIO_USAGE_ENGAGE,Objects)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadioKill(Objects)
+self:F2({self.ControllableName})
+if not Objects then Objects={"Air"}end
+if type(Objects)~="table"then Objects={Objects}end
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.OPTION_RADIO_USAGE_KILL,Objects)
+end
+return self
+end
 function CONTROLLABLE:RelocateGroundRandomInRadius(speed,radius,onroad,shortcut,formation,onland)
 self:F2({self.ControllableName})
 local _coord=self:GetCoordinate()
@@ -25377,7 +25748,7 @@ end
 function GROUP:IsActive()
 self:F2(self.GroupName)
 local DCSGroup=self:GetDCSObject()
-if DCSGroup then
+if DCSGroup and DCSGroup:isExist()then
 local unit=DCSGroup:getUnit(1)
 if unit then
 local GroupIsActive=unit:isActive()
@@ -25835,7 +26206,7 @@ function GROUP:GetCoordinate()
 local Units=self:GetUnits()or{}
 for _,_unit in pairs(Units)do
 local FirstUnit=_unit
-if FirstUnit then
+if FirstUnit and FirstUnit:IsAlive()then
 local FirstUnitCoordinate=FirstUnit:GetCoordinate()
 if FirstUnitCoordinate then
 local Heading=self:GetHeading()
@@ -25844,6 +26215,18 @@ return FirstUnitCoordinate
 end
 end
 end
+local DCSGroup=Group.getByName(self.GroupName)
+local DCSUnits=DCSGroup:getUnits()or{}
+for _,_unit in pairs(DCSUnits)do
+if Object.isExist(_unit)then
+local position=_unit:getPosition()
+local point=position.p~=nil and position.p or _unit:GetPoint()
+if point then
+local coord=COORDINATE:NewFromVec3(point)
+return coord
+end
+end
+end
 BASE:E({"Cannot GetCoordinate",Group=self,Alive=self:IsAlive()})
 end
 function GROUP:GetRandomVec3(Radius)
@@ -26705,6 +27088,9 @@ end
 return self
 end
 function GROUP:SetCommandInvisible(switch)
+return self:CommandSetInvisible(switch)
+end
+function GROUP:CommandSetInvisible(switch)
 self:F2(self.GroupName)
 if switch==nil then
 switch=false
@@ -26714,6 +27100,9 @@ self:SetCommand(SetInvisible)
 return self
 end
 function GROUP:SetCommandImmortal(switch)
+return self:CommandSetImmortal(switch)
+end
+function GROUP:CommandSetImmortal(switch)
 self:F2(self.GroupName)
 if switch==nil then
 switch=false
@@ -27445,7 +27834,9 @@ local ThreatLevels={
 }
 if Attributes["Fighters"]then ThreatLevel=10
 elseif Attributes["Multirole fighters"]then ThreatLevel=9
+elseif Attributes["Interceptors"]then ThreatLevel=9
 elseif Attributes["Battleplanes"]then ThreatLevel=8
+elseif Attributes["Battle airplanes"]then ThreatLevel=8
 elseif Attributes["Attack helicopters"]then ThreatLevel=7
 elseif Attributes["Strategic bombers"]then ThreatLevel=6
 elseif Attributes["Bombers"]then ThreatLevel=5
@@ -28075,6 +28466,25 @@ SpawnStatic:SpawnFromCoordinate(Coordinate,Heading,self.StaticName)
 end
 return self
 end
+function STATIC:FindByMatching(Pattern)
+local GroupFound=nil
+for name,static in pairs(_DATABASE.STATICS)do
+if string.match(name,Pattern)then
+GroupFound=static
+break
+end
+end
+return GroupFound
+end
+function STATIC:FindAllByMatching(Pattern)
+local GroupsFound={}
+for name,static in pairs(_DATABASE.STATICS)do
+if string.match(name,Pattern)then
+GroupsFound[#GroupsFound+1]=static
+end
+end
+return GroupsFound
+end
 AIRBASE={
 ClassName="AIRBASE",
 CategoryName={
@@ -28085,152 +28495,155 @@ CategoryName={
 activerwyno=nil,
 }
 AIRBASE.Caucasus={
+["Anapa_Vityazevo"]="Anapa-Vityazevo",
+["Batumi"]="Batumi",
+["Beslan"]="Beslan",
 ["Gelendzhik"]="Gelendzhik",
-["Krasnodar_Pashkovsky"]="Krasnodar-Pashkovsky",
-["Sukhumi_Babushara"]="Sukhumi-Babushara",
 ["Gudauta"]="Gudauta",
-["Batumi"]="Batumi",
-["Senaki_Kolkhi"]="Senaki-Kolkhi",
 ["Kobuleti"]="Kobuleti",
-["Kutaisi"]="Kutaisi",
-["Tbilisi_Lochini"]="Tbilisi-Lochini",
-["Soganlug"]="Soganlug",
-["Vaziani"]="Vaziani",
-["Anapa_Vityazevo"]="Anapa-Vityazevo",
 ["Krasnodar_Center"]="Krasnodar-Center",
-["Novorossiysk"]="Novorossiysk",
+["Krasnodar_Pashkovsky"]="Krasnodar-Pashkovsky",
 ["Krymsk"]="Krymsk",
+["Kutaisi"]="Kutaisi",
 ["Maykop_Khanskaya"]="Maykop-Khanskaya",
-["Sochi_Adler"]="Sochi-Adler",
 ["Mineralnye_Vody"]="Mineralnye Vody",
-["Nalchik"]="Nalchik",
 ["Mozdok"]="Mozdok",
-["Beslan"]="Beslan",
+["Nalchik"]="Nalchik",
+["Novorossiysk"]="Novorossiysk",
+["Senaki_Kolkhi"]="Senaki-Kolkhi",
+["Sochi_Adler"]="Sochi-Adler",
+["Soganlug"]="Soganlug",
+["Sukhumi_Babushara"]="Sukhumi-Babushara",
+["Tbilisi_Lochini"]="Tbilisi-Lochini",
+["Vaziani"]="Vaziani",
 }
 AIRBASE.Nevada={
-["Creech_AFB"]="Creech",
-["Groom_Lake_AFB"]="Groom Lake",
-["McCarran_International_Airport"]="McCarran International",
-["Nellis_AFB"]="Nellis",
-["Beatty_Airport"]="Beatty",
-["Boulder_City_Airport"]="Boulder City",
+["Beatty"]="Beatty",
+["Boulder_City"]="Boulder City",
+["Creech"]="Creech",
 ["Echo_Bay"]="Echo Bay",
-["Henderson_Executive_Airport"]="Henderson Executive",
-["Jean_Airport"]="Jean",
-["Laughlin_Airport"]="Laughlin",
+["Groom_Lake"]="Groom Lake",
+["Henderson_Executive"]="Henderson Executive",
+["Jean"]="Jean",
+["Laughlin"]="Laughlin",
 ["Lincoln_County"]="Lincoln County",
+["McCarran_International"]="McCarran International",
 ["Mesquite"]="Mesquite",
-["Mina_Airport"]="Mina",
+["Mina"]="Mina",
+["Nellis"]="Nellis",
 ["North_Las_Vegas"]="North Las Vegas",
-["Pahute_Mesa_Airstrip"]="Pahute Mesa",
-["Tonopah_Airport"]="Tonopah",
-["Tonopah_Test_Range_Airfield"]="Tonopah Test Range",
+["Pahute_Mesa"]="Pahute Mesa",
+["Tonopah"]="Tonopah",
+["Tonopah_Test_Range"]="Tonopah Test Range",
 }
 AIRBASE.Normandy={
-["Saint_Pierre_du_Mont"]="Saint Pierre du Mont",
-["Lignerolles"]="Lignerolles",
-["Cretteville"]="Cretteville",
-["Maupertus"]="Maupertus",
-["Brucheville"]="Brucheville",
-["Meautis"]="Meautis",
-["Cricqueville_en_Bessin"]="Cricqueville-en-Bessin",
-["Lessay"]="Lessay",
-["Sainte_Laurent_sur_Mer"]="Sainte-Laurent-sur-Mer",
-["Biniville"]="Biniville",
-["Cardonville"]="Cardonville",
-["Deux_Jumeaux"]="Deux Jumeaux",
-["Chippelle"]="Chippelle",
-["Beuzeville"]="Beuzeville",
+["Abbeville_Drucat"]="Abbeville Drucat",
+["Amiens_Glisy"]="Amiens-Glisy",
+["Argentan"]="Argentan",
+["Avranches_Le_Val_Saint_Pere"]="Avranches Le Val-Saint-Pere",
 ["Azeville"]="Azeville",
-["Picauville"]="Picauville",
-["Le_Molay"]="Le Molay",
-["Longues_sur_Mer"]="Longues-sur-Mer",
-["Carpiquet"]="Carpiquet",
+["Barville"]="Barville",
 ["Bazenville"]="Bazenville",
-["Sainte_Croix_sur_Mer"]="Sainte-Croix-sur-Mer",
+["Beaumont_le_Roger"]="Beaumont-le-Roger",
+["Beauvais_Tille"]="Beauvais-Tille",
 ["Beny_sur_Mer"]="Beny-sur-Mer",
-["Rucqueville"]="Rucqueville",
-["Sommervieu"]="Sommervieu",
-["Lantheuil"]="Lantheuil",
-["Evreux"]="Evreux",
+["Bernay_Saint_Martin"]="Bernay Saint Martin",
+["Beuzeville"]="Beuzeville",
+["Biggin_Hill"]="Biggin Hill",
+["Biniville"]="Biniville",
+["Broglie"]="Broglie",
+["Brucheville"]="Brucheville",
+["Cardonville"]="Cardonville",
+["Carpiquet"]="Carpiquet",
 ["Chailey"]="Chailey",
-["Needs_Oar_Point"]="Needs Oar Point",
-["Funtington"]="Funtington",
-["Tangmere"]="Tangmere",
-["Ford"]="Ford",
-["Argentan"]="Argentan",
-["Goulet"]="Goulet",
-["Barville"]="Barville",
-["Essay"]="Essay",
-["Hauterive"]="Hauterive",
-["Lymington"]="Lymington",
-["Vrigny"]="Vrigny",
-["Odiham"]="Odiham",
+["Chippelle"]="Chippelle",
 ["Conches"]="Conches",
-["West_Malling"]="West Malling",
-["Villacoublay"]="Villacoublay",
-["Kenley"]="Kenley",
-["Beauvais_Tille"]="Beauvais-Tille",
 ["Cormeilles_en_Vexin"]="Cormeilles-en-Vexin",
 ["Creil"]="Creil",
-["Guyancourt"]="Guyancourt",
-["Lonrai"]="Lonrai",
+["Cretteville"]="Cretteville",
+["Cricqueville_en_Bessin"]="Cricqueville-en-Bessin",
+["Deanland"]="Deanland",
+["Deauville"]="Deauville",
+["Detling"]="Detling",
+["Deux_Jumeaux"]="Deux Jumeaux",
 ["Dinan_Trelivan"]="Dinan-Trelivan",
-["Heathrow"]="Heathrow",
-["Fecamp_Benouville"]="Fecamp-Benouville",
+["Dunkirk_Mardyck"]="Dunkirk-Mardyck",
+["Essay"]="Essay",
+["Evreux"]="Evreux",
 ["Farnborough"]="Farnborough",
+["Fecamp_Benouville"]="Fecamp-Benouville",
+["Flers"]="Flers",
+["Ford"]="Ford",
 ["Friston"]="Friston",
-["Deanland "]="Deanland ",
-["Triqueville"]="Triqueville",
-["Poix"]="Poix",
+["Funtington"]="Funtington",
+["Goulet"]="Goulet",
+["Gravesend"]="Gravesend",
+["Guyancourt"]="Guyancourt",
+["Hauterive"]="Hauterive",
+["Heathrow"]="Heathrow",
+["High_Halden"]="High Halden",
+["Kenley"]="Kenley",
+["Lantheuil"]="Lantheuil",
+["Le_Molay"]="Le Molay",
+["Lessay"]="Lessay",
+["Lignerolles"]="Lignerolles",
+["Longues_sur_Mer"]="Longues-sur-Mer",
+["Lonrai"]="Lonrai",
+["Lymington"]="Lymington",
+["Lympne"]="Lympne",
+["Manston"]="Manston",
+["Maupertus"]="Maupertus",
+["Meautis"]="Meautis",
+["Merville_Calonne"]="Merville Calonne",
+["Needs_Oar_Point"]="Needs Oar Point",
+["Odiham"]="Odiham",
 ["Orly"]="Orly",
-["Stoney_Cross"]="Stoney Cross",
-["Amiens_Glisy"]="Amiens-Glisy",
+["Picauville"]="Picauville",
+["Poix"]="Poix",
 ["Ronai"]="Ronai",
 ["Rouen_Boos"]="Rouen-Boos",
-["Deauville"]="Deauville",
-["Saint_Aubin"]="Saint-Aubin",
-["Flers"]="Flers",
-["Avranches_Le_Val_Saint_Pere"]="Avranches Le Val-Saint-Pere",
-["Gravesend"]="Gravesend",
-["Beaumont_le_Roger"]="Beaumont-le-Roger",
-["Broglie"]="Broglie",
-["Bernay_Saint_Martin"]="Bernay Saint Martin",
+["Rucqueville"]="Rucqueville",
 ["Saint_Andre_de_lEure"]="Saint-Andre-de-lEure",
-["Biggin_Hill"]="Biggin Hill",
-["Manston"]="Manston",
-["Detling"]="Detling",
-["Lympne"]="Lympne",
-["Abbeville_Drucat"]="Abbeville Drucat",
-["Merville_Calonne"]="Merville Calonne",
+["Saint_Aubin"]="Saint-Aubin",
 ["Saint_Omer_Wizernes"]="Saint-Omer Wizernes",
+["Saint_Pierre_du_Mont"]="Saint Pierre du Mont",
+["Sainte_Croix_sur_Mer"]="Sainte-Croix-sur-Mer",
+["Sainte_Laurent_sur_Mer"]="Sainte-Laurent-sur-Mer",
+["Sommervieu"]="Sommervieu",
+["Stoney_Cross"]="Stoney Cross",
+["Tangmere"]="Tangmere",
+["Triqueville"]="Triqueville",
+["Villacoublay"]="Villacoublay",
+["Vrigny"]="Vrigny",
+["West_Malling"]="West Malling",
 }
 AIRBASE.PersianGulf={
-["Abu_Dhabi_International_Airport"]="Abu Dhabi Intl",
-["Abu_Musa_Island_Airport"]="Abu Musa Island",
-["Al_Ain_International_Airport"]="Al Ain Intl",
-["Al_Bateen_Airport"]="Al-Bateen",
-["Al_Dhafra_AB"]="Al Dhafra AFB",
+["Abu_Dhabi_Intl"]="Abu Dhabi Intl",
+["Abu_Musa_Island"]="Abu Musa Island",
+["Al_Ain_Intl"]="Al Ain Intl",
+["Al_Bateen"]="Al-Bateen",
+["Al_Dhafra_AFB"]="Al Dhafra AFB",
 ["Al_Maktoum_Intl"]="Al Maktoum Intl",
-["Al_Minhad_AB"]="Al Minhad AFB",
+["Al_Minhad_AFB"]="Al Minhad AFB",
 ["Bandar_Abbas_Intl"]="Bandar Abbas Intl",
 ["Bandar_Lengeh"]="Bandar Lengeh",
-["Bandar_e_Jask_airfield"]="Bandar-e-Jask",
+["Bandar_e_Jask"]="Bandar-e-Jask",
 ["Dubai_Intl"]="Dubai Intl",
 ["Fujairah_Intl"]="Fujairah Intl",
 ["Havadarya"]="Havadarya",
-["Jiroft_Airport"]="Jiroft",
-["Kerman_Airport"]="Kerman",
+["Jiroft"]="Jiroft",
+["Kerman"]="Kerman",
 ["Khasab"]="Khasab",
-["Kish_International_Airport"]="Kish Intl",
-["Lar_Airbase"]="Lar",
-["Lavan_Island_Airport"]="Lavan Island",
-["Liwa_Airbase"]="Liwa AFB",
+["Kish_Intl"]="Kish Intl",
+["Lar"]="Lar",
+["Lavan_Island"]="Lavan Island",
+["Liwa_AFB"]="Liwa AFB",
 ["Qeshm_Island"]="Qeshm Island",
-["Ras_Al_Khaimah"]="Ras Al Khaimah Intl",
-["Sas_Al_Nakheel_Airport"]="Sas Al Nakheel",
+["Quasoura_airport"]="Quasoura_airport",
+["Ras_Al_Khaimah_Intl"]="Ras Al Khaimah Intl",
+["Sas_Al_Nakheel"]="Sas Al Nakheel",
 ["Sharjah_Intl"]="Sharjah Intl",
-["Shiraz_International_Airport"]="Shiraz Intl",
+["Shiraz_Intl"]="Shiraz Intl",
 ["Sir_Abu_Nuayr"]="Sir Abu Nuayr",
 ["Sirri_Island"]="Sirri Island",
 ["Tunb_Island_AFB"]="Tunb Island AFB",
@@ -28238,156 +28651,178 @@ AIRBASE.PersianGulf={
 }
 AIRBASE.TheChannel={
 ["Abbeville_Drucat"]="Abbeville Drucat",
-["Merville_Calonne"]="Merville Calonne",
-["Saint_Omer_Longuenesse"]="Saint Omer Longuenesse",
-["Dunkirk_Mardyck"]="Dunkirk Mardyck",
-["Manston"]="Manston",
-["Hawkinge"]="Hawkinge",
-["Lympne"]="Lympne",
-["Detling"]="Detling",
-["High_Halden"]="High Halden",
 ["Biggin_Hill"]="Biggin Hill",
+["Detling"]="Detling",
+["Dunkirk_Mardyck"]="Dunkirk Mardyck",
 ["Eastchurch"]="Eastchurch",
+["Hawkinge"]="Hawkinge",
 ["Headcorn"]="Headcorn",
+["High_Halden"]="High Halden",
+["Lympne"]="Lympne",
+["Manston"]="Manston",
+["Merville_Calonne"]="Merville Calonne",
+["Saint_Omer_Longuenesse"]="Saint Omer Longuenesse",
 }
 AIRBASE.Syria={
-["Kuweires"]="Kuweires",
-["Marj_Ruhayyil"]="Marj Ruhayyil",
-["Kiryat_Shmona"]="Kiryat Shmona",
-["Marj_as_Sultan_North"]="Marj as Sultan North",
-["Eyn_Shemer"]="Eyn Shemer",
-["Incirlik"]="Incirlik",
-["Damascus"]="Damascus",
-["Bassel_Al_Assad"]="Bassel Al-Assad",
-["Rosh_Pina"]="Rosh Pina",
-["Aleppo"]="Aleppo",
-["Al_Qusayr"]="Al Qusayr",
-["Wujah_Al_Hajar"]="Wujah Al Hajar",
+["Abu_al_Duhur"]="Abu al-Duhur",
+["Adana_Sakirpasa"]="Adana Sakirpasa",
+["Akrotiri"]="Akrotiri",
 ["Al_Dumayr"]="Al-Dumayr",
+["Al_Qusayr"]="Al Qusayr",
+["Aleppo"]="Aleppo",
+["Amman"]="Amman",
+["An_Nasiriyah"]="An Nasiriyah",
+["At_Tanf"]="At Tanf",
+["Bassel_Al_Assad"]="Bassel Al-Assad",
+["Beirut_Rafic_Hariri"]="Beirut-Rafic Hariri",
+["Damascus"]="Damascus",
+["Deir_ez_Zor"]="Deir ez-Zor",
+["Ercan"]="Ercan",
+["Eyn_Shemer"]="Eyn Shemer",
+["Gaziantep"]="Gaziantep",
 ["Gazipasa"]="Gazipasa",
-["Hatay"]="Hatay",
-["Pinarbashi"]="Pinarbashi",
-["Paphos"]="Paphos",
-["Kingsfield"]="Kingsfield",
-["Thalah"]="Tha'lah",
+["Gecitkale"]="Gecitkale",
+["H3"]="H3",
+["H3_Northwest"]="H3 Northwest",
+["H3_Southwest"]="H3 Southwest",
+["H4"]="H4",
 ["Haifa"]="Haifa",
+["Hama"]="Hama",
+["Hatay"]="Hatay",
+["Herzliya"]="Herzliya",
+["Incirlik"]="Incirlik",
+["Jirah"]="Jirah",
 ["Khalkhalah"]="Khalkhalah",
-["Megiddo"]="Megiddo",
+["Kharab_Ishk"]="Kharab Ishk",
+["King_Abdullah_II"]="King Abdullah II",
+["King_Hussein_Air_College"]="King Hussein Air College",
+["Kingsfield"]="Kingsfield",
+["Kiryat_Shmona"]="Kiryat Shmona",
+["Kuweires"]="Kuweires",
 ["Lakatamia"]="Lakatamia",
-["Rayak"]="Rayak",
 ["Larnaca"]="Larnaca",
+["Marj_Ruhayyil"]="Marj Ruhayyil",
+["Marj_as_Sultan_North"]="Marj as Sultan North",
+["Marj_as_Sultan_South"]="Marj as Sultan South",
+["Megiddo"]="Megiddo",
 ["Mezzeh"]="Mezzeh",
-["Gecitkale"]="Gecitkale",
-["Akrotiri"]="Akrotiri",
-["Naqoura"]="Naqoura",
-["Gaziantep"]="Gaziantep",
-["Sayqal"]="Sayqal",
-["Tiyas"]="Tiyas",
-["Shayrat"]="Shayrat",
-["Taftanaz"]="Taftanaz",
-["H4"]="H4",
-["King_Hussein_Air_College"]="King Hussein Air College",
-["Rene_Mouawad"]="Rene Mouawad",
-["Jirah"]="Jirah",
-["Ramat_David"]="Ramat David",
-["Qabr_as_Sitt"]="Qabr as Sitt",
 ["Minakh"]="Minakh",
-["Adana_Sakirpasa"]="Adana Sakirpasa",
+["Muwaffaq_Salti"]="Muwaffaq Salti",
+["Naqoura"]="Naqoura",
+["Nicosia"]="Nicosia",
 ["Palmyra"]="Palmyra",
-["Hama"]="Hama",
-["Ercan"]="Ercan",
-["Marj_as_Sultan_South"]="Marj as Sultan South",
-["Tabqa"]="Tabqa",
-["Beirut_Rafic_Hariri"]="Beirut-Rafic Hariri",
-["An_Nasiriyah"]="An Nasiriyah",
-["Abu_al_Duhur"]="Abu al-Duhur",
-["At_Tanf"]="At Tanf",
-["H3"]="H3",
-["H3_Northwest"]="H3 Northwest",
-["H3_Southwest"]="H3 Southwest",
-["Kharab_Ishk"]="Kharab Ishk",
+["Paphos"]="Paphos",
+["Pinarbashi"]="Pinarbashi",
+["Prince_Hassan"]="Prince Hassan",
+["Qabr_as_Sitt"]="Qabr as Sitt",
+["Ramat_David"]="Ramat David",
+["Rayak"]="Rayak",
+["Rene_Mouawad"]="Rene Mouawad",
+["Rosh_Pina"]="Rosh Pina",
 ["Ruwayshid"]="Ruwayshid",
 ["Sanliurfa"]="Sanliurfa",
+["Sayqal"]="Sayqal",
+["Shayrat"]="Shayrat",
+["Tabqa"]="Tabqa",
+["Taftanaz"]="Taftanaz",
 ["Tal_Siman"]="Tal Siman",
-["Deir_ez_Zor"]="Deir ez-Zor",
+["Tha_lah"]="Tha'lah",
+["Tiyas"]="Tiyas",
+["Wujah_Al_Hajar"]="Wujah Al Hajar",
 }
 AIRBASE.MarianaIslands={
-["Rota_Intl"]="Rota Intl",
 ["Andersen_AFB"]="Andersen AFB",
 ["Antonio_B_Won_Pat_Intl"]="Antonio B. Won Pat Intl",
-["Saipan_Intl"]="Saipan Intl",
-["Tinian_Intl"]="Tinian Intl",
+["North_West_Field"]="North West Field",
 ["Olf_Orote"]="Olf Orote",
 ["Pagan_Airstrip"]="Pagan Airstrip",
-["North_West_Field"]="North West Field",
+["Rota_Intl"]="Rota Intl",
+["Saipan_Intl"]="Saipan Intl",
+["Tinian_Intl"]="Tinian Intl",
 }
 AIRBASE.SouthAtlantic={
-["Port_Stanley"]="Port Stanley",
+["Almirante_Schroeders"]="Almirante Schroeders",
+["Caleta_Tortel"]="Caleta Tortel",
+["Comandante_Luis_Piedrabuena"]="Comandante Luis Piedrabuena",
+["Cullen"]="Cullen",
+["El_Calafate"]="El Calafate",
+["Franco_Bianco"]="Franco Bianco",
+["Gobernador_Gregores"]="Gobernador Gregores",
+["Goose_Green"]="Goose Green",
+["Gull_Point"]="Gull Point",
+["Hipico_Flying_Club"]="Hipico Flying Club",
 ["Mount_Pleasant"]="Mount Pleasant",
-["San_Carlos_FOB"]="San Carlos FOB",
-["Rio_Grande"]="Rio Grande",
-["Rio_Gallegos"]="Rio Gallegos",
-["Ushuaia"]="Ushuaia",
-["Ushuaia_Helo_Port"]="Ushuaia Helo Port",
-["Punta_Arenas"]="Punta Arenas",
+["O_Higgins"]="O'Higgins",
 ["Pampa_Guanaco"]="Pampa Guanaco",
-["San_Julian"]="San Julian",
-["Puerto_Williams"]="Puerto Williams",
+["Port_Stanley"]="Port Stanley",
+["Porvenir"]="Porvenir",
 ["Puerto_Natales"]="Puerto Natales",
-["El_Calafate"]="El Calafate",
 ["Puerto_Santa_Cruz"]="Puerto Santa Cruz",
-["Comandante_Luis_Piedrabuena"]="Comandante Luis Piedrabuena",
-["Aerodromo_De_Tolhuin"]="Aerodromo De Tolhuin",
-["Porvenir_Airfield"]="Porvenir Airfield",
-["Almirante_Schroeders"]="Almirante Schroeders",
-["Rio_Turbio"]="Rio Turbio",
+["Puerto_Williams"]="Puerto Williams",
+["Punta_Arenas"]="Punta Arenas",
 ["Rio_Chico"]="Rio Chico",
-["Franco_Bianco"]="Franco Bianco",
-["Goose_Green"]="Goose Green",
-["Hipico_Flying_Club"]="Hipico Flying Club",
-["CaletaTortel"]="CaletaTortel",
-["Aeropuerto_de_Gobernador_Gregores"]="Aeropuerto de Gobernador Gregores",
-["Aerodromo_O_Higgins"]="Aerodromo O'Higgins",
-["Cullen_Airport"]="Cullen Airport",
-["Gull_Point"]="Gull Point",
+["Rio_Gallegos"]="Rio Gallegos",
+["Rio_Grande"]="Rio Grande",
+["Rio_Turbio"]="Rio Turbio",
+["San_Carlos_FOB"]="San Carlos FOB",
+["San_Julian"]="San Julian",
+["Tolhuin"]="Tolhuin",
+["Ushuaia"]="Ushuaia",
+["Ushuaia_Helo_Port"]="Ushuaia Helo Port",
 }
 AIRBASE.Sinai={
-["Hatzerim"]="Hatzerim",
+["Abu_Rudeis"]="Abu Rudeis",
 ["Abu_Suwayr"]="Abu Suwayr",
-["Sde_Dov"]="Sde Dov",
-["AzZaqaziq"]="AzZaqaziq",
-["Hatzor"]="Hatzor",
-["Kedem"]="Kedem",
-["Nevatim"]="Nevatim",
-["Cairo_International_Airport"]="Cairo International Airport",
 ["Al_Ismailiyah"]="Al Ismailiyah",
+["Al_Mansurah"]="Al Mansurah",
 ["As_Salihiyah"]="As Salihiyah",
-["Fayed"]="Fayed",
+["AzZaqaziq"]="AzZaqaziq",
+["Baluza"]="Baluza",
+["Ben_Gurion"]="Ben-Gurion",
 ["Bilbeis_Air_Base"]="Bilbeis Air Base",
-["Ramon_Airbase"]="Ramon Airbase",
-["Kibrit_Air_Base"]="Kibrit Air Base",
+["Bir_Hasanah"]="Bir Hasanah",
+["Cairo_International_Airport"]="Cairo International Airport",
+["Cairo_West"]="Cairo West",
+["Difarsuwar_Airfield"]="Difarsuwar Airfield",
 ["El_Arish"]="El Arish",
-["Ovda"]="Ovda",
+["El_Gora"]="El Gora",
+["Fayed"]="Fayed",
+["Hatzerim"]="Hatzerim",
+["Hatzor"]="Hatzor",
+["Inshas_Airbase"]="Inshas Airbase",
+["Kedem"]="Kedem",
+["Kibrit_Air_Base"]="Kibrit Air Base",
 ["Melez"]="Melez",
-["Al_Mansurah"]="Al Mansurah",
+["Nevatim"]="Nevatim",
+["Ovda"]="Ovda",
 ["Palmahim"]="Palmahim",
-["Baluza"]="Baluza",
-["El_Gora"]="El Gora",
-["Difarsuwar_Airfield"]="Difarsuwar Airfield",
-["Wadi_al_Jandali"]="Wadi al Jandali",
+["Ramon_Airbase"]="Ramon Airbase",
+["Sde_Dov"]="Sde Dov",
 ["St_Catherine"]="St Catherine",
 ["Tel_Nof"]="Tel Nof",
-["Abu_Rudeis"]="Abu Rudeis",
-["Inshas_Airbase"]="Inshas Airbase",
-["Ben_Gurion"]="Ben-Gurion",
-["Bir_Hasanah"]="Bir Hasanah",
-["Cairo_West"]="Cairo West",
+["Wadi_al_Jandali"]="Wadi al Jandali",
+}
+AIRBASE.Kola={
+["Bas_100"]="Bas 100",
+["Bodo"]="Bodo",
+["Jokkmokk"]="Jokkmokk",
+["Kalixfors"]="Kalixfors",
+["Kemi_Tornio"]="Kemi Tornio",
+["Kiruna"]="Kiruna",
+["Lakselv"]="Lakselv",
+["Monchegorsk"]="Monchegorsk",
+["Murmansk_International"]="Murmansk International",
+["Olenegorsk"]="Olenegorsk",
+["Rovaniemi"]="Rovaniemi",
+["Severomorsk1"]="Severomorsk1",
+["Severomorsk3"]="Severomorsk3",
 }
 AIRBASE.TerminalType={
 Runway=16,
 HelicopterOnly=40,
 Shelter=68,
 OpenMed=72,
+SmallSizeFighter=100,
 OpenBig=104,
 OpenMedOrBig=176,
 HelicopterUsable=216,
@@ -28946,7 +29381,7 @@ if Term_Type==AIRBASE.TerminalType.OpenMed or Term_Type==AIRBASE.TerminalType.Op
 match=true
 end
 elseif termtype==AIRBASE.TerminalType.FighterAircraft then
-if Term_Type==AIRBASE.TerminalType.OpenMed or Term_Type==AIRBASE.TerminalType.OpenBig or Term_Type==AIRBASE.TerminalType.Shelter then
+if Term_Type==AIRBASE.TerminalType.OpenMed or Term_Type==AIRBASE.TerminalType.OpenBig or Term_Type==AIRBASE.TerminalType.Shelter or Term_Type==AIRBASE.TerminalType.SmallSizeFighter then
 match=true
 end
 end
@@ -29730,6 +30165,9 @@ self.desc=WeaponObject:getDesc()
 self.category=self.desc.category
 if self:IsMissile()and self.desc.missileCategory then
 self.categoryMissile=self.desc.missileCategory
+if self.desc.guidance then
+self.guidance=self.desc.guidance
+end
 end
 self.typeName=WeaponObject:getTypeName()or"Unknown Type"
 self.name=WeaponObject:getName()
@@ -29944,6 +30382,15 @@ end
 function WEAPON:IsTorpedo()
 return self.category==Weapon.Category.TORPEDO
 end
+function WEAPON:IsFoxOne()
+return self.guidance==Weapon.GuidanceType.RADAR_SEMI_ACTIVE
+end
+function WEAPON:IsFoxTwo()
+return self.guidance==Weapon.GuidanceType.IR
+end
+function WEAPON:IsFoxThree()
+return self.guidance==Weapon.GuidanceType.RADAR_ACTIVE
+end
 function WEAPON:Destroy(Delay)
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,WEAPON.Destroy,self,0)
@@ -30409,7 +30856,7 @@ end
 function NET.Lua2Json(Lua)
 return net.lua2json(Lua)
 end
-function NET.Lua2Json(Json)
+function NET.Json2Lua(Json)
 return net.json2lua(Json)
 end
 function NET:DoStringIn(State,DoString)
@@ -31959,7 +32406,7 @@ ClassName="SCORING",
 ClassID=0,
 Players={},
 AutoSave=true,
-version="1.17.1"
+version="1.18.4"
 }
 local _SCORINGCoalition={
 [1]="Red",
@@ -31972,7 +32419,7 @@ local _SCORINGCategory={
 [Unit.Category.SHIP]="Ship",
 [Unit.Category.STRUCTURE]="Structure",
 }
-function SCORING:New(GameName)
+function SCORING:New(GameName,SavePath,AutoSave)
 local self=BASE:Inherit(self,BASE:New())
 if GameName then
 self.GameName=GameName
@@ -32005,7 +32452,8 @@ self:_AddPlayerFromUnit(PlayerUnit)
 self:SetScoringMenu(PlayerUnit:GetGroup())
 end
 end)
-self.AutoSave=true
+self.AutoSavePath=SavePath
+self.AutoSave=AutoSave or true
 self:OpenCSV(GameName)
 return self
 end
@@ -32049,6 +32497,21 @@ self.ScoringObjects[UnitName]=Score
 end
 return self
 end
+function SCORING:AddScoreSetGroup(Set,Score)
+local set=Set:GetSetObjects()
+for _,_group in pairs(set)do
+if _group and _group:IsAlive()then
+self:AddScoreGroup(_group,Score)
+end
+end
+local function AddScore(group)
+self:AddScoreGroup(group,Score)
+end
+function Set:OnAfterAdded(From,Event,To,ObjectName,Object)
+AddScore(Object)
+end
+return self
+end
 function SCORING:AddZoneScore(ScoreZone,Score)
 local ZoneName=ScoreZone:GetName()
 self.ScoringZones[ZoneName]={}
@@ -32380,7 +32843,7 @@ PlayerHit.TimeStamp=PlayerHit.TimeStamp or 0
 PlayerHit.UNIT=PlayerHit.UNIT or TargetUNIT
 if PlayerHit.UNIT.ThreatType==nil then
 PlayerHit.ThreatLevel,PlayerHit.ThreatType=PlayerHit.UNIT:GetThreatLevel()
-if PlayerHit.ThreatType==nil then
+if PlayerHit.ThreatType==nil or PlayerHit.ThreatType==""then
 PlayerHit.ThreatLevel=1
 PlayerHit.ThreatType="Unknown"
 end
@@ -32572,16 +33035,15 @@ self:F({ThreatLevel=ThreatPenalty,ThreatLevelTarget=ThreatLevelTarget,ThreatType
 Player.Penalty=Player.Penalty+ThreatPenalty
 TargetDestroy.Penalty=TargetDestroy.Penalty+ThreatPenalty
 TargetDestroy.PenaltyDestroy=TargetDestroy.PenaltyDestroy+1
-self:OnKillPvP(Player,TargetPlayerName,true,TargetThreatLevel,Player.ThreatLevel,ThreatPenalty)
 if Player.HitPlayers[TargetPlayerName]then
-self:OnKillPvP(Player,TargetPlayerName,true)
+self:OnKillPvP(PlayerName,TargetPlayerName,true)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed friendly player '"..TargetPlayerName.."' "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Penalty: -"..ThreatPenalty.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
 :ToAllIf(self:IfMessagesDestroy()and self:IfMessagesToAll())
 :ToCoalitionIf(InitCoalition,self:IfMessagesDestroy()and self:IfMessagesToCoalition())
 else
-self:OnKillPvE(Player,TargetUnitName,true,TargetThreatLevel,Player.ThreatLevel,ThreatPenalty)
+self:OnKillPvE(PlayerName,TargetUnitName,true,TargetThreatLevel,Player.ThreatLevel,ThreatPenalty)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed friendly target "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Penalty: -"..ThreatPenalty.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
@@ -32605,14 +33067,14 @@ Player.PlayerKills=Player.PlayerKills+1
 else
 Player.PlayerKills=1
 end
-self:OnKillPvP(Player,TargetPlayerName,false,TargetThreatLevel,Player.ThreatLevel,ThreatScore)
+self:OnKillPvP(PlayerName,TargetPlayerName,false,TargetThreatLevel,Player.ThreatLevel,ThreatScore)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed enemy player '"..TargetPlayerName.."' "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Score: +"..ThreatScore.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
 :ToAllIf(self:IfMessagesDestroy()and self:IfMessagesToAll())
 :ToCoalitionIf(InitCoalition,self:IfMessagesDestroy()and self:IfMessagesToCoalition())
 else
-self:OnKillPvE(Player,TargetUnitName,false,TargetThreatLevel,Player.ThreatLevel,ThreatScore)
+self:OnKillPvE(PlayerName,TargetUnitName,false,TargetThreatLevel,Player.ThreatLevel,ThreatScore)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed enemy "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Score: +"..ThreatScore.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
@@ -32954,10 +33416,11 @@ end
 end
 function SCORING:OpenCSV(ScoringCSV)
 self:F(ScoringCSV)
-if lfs and io and os and self.AutoSave then
+if lfs and io and os and self.AutoSave==true then
 if ScoringCSV then
 self.ScoringCSV=ScoringCSV
-local fdir=lfs.writedir()..[[Logs\]]..self.ScoringCSV.." "..os.date("%Y-%m-%d %H-%M-%S")..".csv"
+local path=self.AutoSavePath or lfs.writedir()..[[Logs\]]
+local fdir=path..self.ScoringCSV.." "..os.date("%Y-%m-%d %H-%M-%S")..".csv"
 self.CSVFile,self.err=io.open(fdir,"w+")
 if not self.CSVFile then
 error("Error: Cannot open CSV file in "..lfs.writedir())
@@ -33036,9 +33499,9 @@ function SCORING:SwitchAutoSave(OnOff)
 self.AutoSave=OnOff
 return self
 end
-function SCORING:OnKillPvP(Player,TargetPlayerName,IsTeamKill,TargetThreatLevel,PlayerThreatLevel,Score)
+function SCORING:OnKillPvP(PlayerName,TargetPlayerName,IsTeamKill,TargetThreatLevel,PlayerThreatLevel,Score)
 end
-function SCORING:OnKillPvE(Player,TargetUnitName,IsTeamKill,TargetThreatLevel,PlayerThreatLevel,Score)
+function SCORING:OnKillPvE(PlayerName,TargetUnitName,IsTeamKill,TargetThreatLevel,PlayerThreatLevel,Score)
 end
 CLEANUP_AIRBASE={
 ClassName="CLEANUP_AIRBASE",
@@ -33528,7 +33991,6 @@ predpos:MarkToAll(string.format("height=%dm | heading=%d | velocity=%ddeg | Ropt
 targetzone:DrawZone(coalition.side.BLUE,{0,0,1},0.2,nil,nil,3,true)
 end
 local seadset=SET_GROUP:New():FilterPrefixes(self.SEADGroupPrefixes):FilterZones({targetzone}):FilterOnce()
-local tgtcoord=targetzone:GetRandomPointVec2()
 local tgtgrp=seadset:GetRandom()
 local _targetgroup=nil
 local _targetgroupname="none"
@@ -57204,7 +57666,7 @@ local rho=groovedata.Rho
 local lineupError=groovedata.LUE
 local glideslopeError=groovedata.GSE
 local AoA=groovedata.AoA
-if rho<=RXX and playerData.step==AIRBOSS.PatternStep.GROOVE_XX and(math.abs(groovedata.Roll)<=4.0 or playerData.unit:IsInZone(self:_GetZoneLineup()))then
+if rho<=RXX and playerData.step==AIRBOSS.PatternStep.GROOVE_XX and(math.abs(groovedata.Roll)<=4.0 and playerData.unit:IsInZone(self:_GetZoneLineup()))then
 playerData.TIG0=timer.getTime()
 self:RadioTransmission(self.LSORadio,self.LSOCall.CALLTHEBALL,nil,nil,nil,true)
 playerData.Tlso=timer.getTime()
@@ -64426,6 +64888,8 @@ HasBeenDropped=false,
 PerCrateMass=0,
 Stock=nil,
 Mark=nil,
+DontShowInMenu=false,
+Location=nil,
 }
 CTLD_CARGO.Enum={
 VEHICLE="Vehicle",
@@ -64436,7 +64900,7 @@ REPAIR="Repair",
 ENGINEERS="Engineers",
 STATIC="Static",
 }
-function CTLD_CARGO:New(ID,Name,Templates,Sorte,HasBeenMoved,LoadDirectly,CratesNeeded,Positionable,Dropped,PerCrateMass,Stock,Subcategory)
+function CTLD_CARGO:New(ID,Name,Templates,Sorte,HasBeenMoved,LoadDirectly,CratesNeeded,Positionable,Dropped,PerCrateMass,Stock,Subcategory,DontShowInMenu,Location)
 local self=BASE:Inherit(self,BASE:New())
 self:T({ID,Name,Templates,Sorte,HasBeenMoved,LoadDirectly,CratesNeeded,Positionable,Dropped})
 self.ID=ID or math.random(100000,1000000)
@@ -64452,8 +64916,16 @@ self.PerCrateMass=PerCrateMass or 0
 self.Stock=Stock or nil
 self.Mark=nil
 self.Subcategory=Subcategory or"Other"
+self.DontShowInMenu=DontShowInMenu or false
+if type(Location)=="string"then
+Location=ZONE:New(Location)
+end
+self.Location=Location
 return self
 end
+function CTLD_CARGO:GetLocation()
+return self.Location
+end
 function CTLD_CARGO:GetID()
 return self.ID
 end
@@ -64763,10 +65235,13 @@ CTLD.UnitTypeCapabilities={
 ["Mi-24V"]={type="Mi-24V",crates=true,troops=true,cratelimit=2,trooplimit=8,length=18,cargoweightlimit=700},
 ["Hercules"]={type="Hercules",crates=true,troops=true,cratelimit=7,trooplimit=64,length=25,cargoweightlimit=19000},
 ["UH-60L"]={type="UH-60L",crates=true,troops=true,cratelimit=2,trooplimit=20,length=16,cargoweightlimit=3500},
+["MH-60R"]={type="MH-60R",crates=true,troops=true,cratelimit=2,trooplimit=20,length=16,cargoweightlimit=3500},
+["SH-60B"]={type="SH-60B",crates=true,troops=true,cratelimit=2,trooplimit=20,length=16,cargoweightlimit=3500},
 ["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},
 }
-CTLD.version="1.0.45"
+CTLD.version="1.0.52"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -65269,7 +65744,9 @@ local distancekeys={}
 local extractdistance=self.CrateDistance*self.ExtractFactor
 for k,v in pairs(self.DroppedTroops)do
 local distance=self:_GetDistance(v:GetCoordinate(),unitcoord)
-if distance<=extractdistance and distance~=-1 then
+local TNow=timer.getTime()
+local vtime=v.ExtractTime or TNow-310
+if distance<=extractdistance and distance~=-1 and(TNow-vtime>300)then
 nearestGroup=v
 nearestGroupIndex=k
 nearestDistance=distance
@@ -65312,22 +65789,36 @@ loaded.Cargo={}
 end
 if troopsize+numberonboard>trooplimit then
 self:_SendMessage("Sorry, we\'re crammed already!",10,false,Group)
+nearestGroup.ExtractTime=0
 else
 self.CargoCounter=self.CargoCounter+1
+nearestGroup.ExtractTime=timer.getTime()
 local loadcargotype=CTLD_CARGO:New(self.CargoCounter,Cargotype.Name,Cargotype.Templates,Cargotype.CargoType,true,true,Cargotype.CratesNeeded,nil,nil,Cargotype.PerCrateMass)
 self:T({cargotype=loadcargotype})
+local running=math.floor(nearestDistance/4)+10
 loaded.Troopsloaded=loaded.Troopsloaded+troopsize
 table.insert(loaded.Cargo,loadcargotype)
 self.Loaded_Cargo[unitname]=loaded
-self:_SendMessage("Troops boarded!",10,false,Group)
+self:ScheduleOnce(running,self._SendMessage,self,"Troops boarded!",10,false,Group)
+self:_SendMessage("Troops boarding!",10,false,Group)
 self:_UpdateUnitCargoMass(Unit)
-self:__TroopsExtracted(1,Group,Unit,nearestGroup)
+self:__TroopsExtracted(running,Group,Unit,nearestGroup)
+local coord=Unit:GetCoordinate()or Group:GetCoordinate()
+local Point
+if coord then
+local heading=unit:GetHeading()or 0
+local Angle=math.floor((heading+160)%360)
+Point=coord:Translate(8,Angle):GetVec2()
+if Point then
+nearestGroup:RouteToVec2(Point,4)
+end
+end
 if type(Cargotype.Templates)=="table"and Cargotype.Templates[2]then
 for _,_key in pairs(Cargotype.Templates)do
 table.insert(secondarygroups,_key)
 end
 end
-nearestGroup:Destroy(false)
+nearestGroup:Destroy(false,running)
 end
 end
 end
@@ -65336,7 +65827,7 @@ for _,_group in pairs(nearestList)do
 if _group and _group:IsAlive()then
 local groupname=string.match(_group:GetName(),"(.+)-(.+)$")
 if _name==groupname then
-_group:Destroy(false)
+_group:Destroy(false,15)
 end
 end
 end
@@ -65378,6 +65869,16 @@ if not inzone then
 self:_SendMessage("You are not close enough to a logistics zone!",10,false,Group)
 if not self.debug then return self end
 end
+local location=Cargo:GetLocation()
+if location then
+local unitcoord=Unit:GetCoordinate()or Group:GetCoordinate()
+if unitcoord then
+if not location:IsCoordinateInZone(unitcoord)then
+self:_SendMessage("The requested cargo is not available in this zone!",10,false,Group)
+if not self.debug then return self end
+end
+end
+end
 local capabilities=self:_GetUnitCapabilities(Unit)
 local canloadcratesno=capabilities.cratelimit
 local loaddist=self.CrateDistance or 35
@@ -65928,9 +66429,9 @@ end
 function CTLD:_GetUnitPositions(Coordinate,Radius,Heading,Template)
 local Positions={}
 local template=_DATABASE:GetGroupTemplate(Template)
-UTILS.PrintTableToLog(template)
 local numbertroops=#template.units
-local newcenter=Coordinate:Translate(Radius,((Heading+270)%360))
+local slightshift=math.abs(math.random(0,200)/100)
+local newcenter=Coordinate:Translate(Radius+slightshift,((Heading+270)%360))
 for i=1,360,math.floor(360/numbertroops)do
 local phead=((Heading+270+i)%360)
 local post=newcenter:Translate(Radius,phead)
@@ -65942,7 +66443,6 @@ heading=phead,
 }
 table.insert(Positions,p1t)
 end
-UTILS.PrintTableToLog(Positions)
 return Positions
 end
 function CTLD:_UnloadTroops(Group,Unit)
@@ -66479,16 +66979,22 @@ end
 for _,_entry in pairs(self.Cargo_Troops)do
 local entry=_entry
 local subcat=entry.Subcategory
+local noshow=entry.DontShowInMenu
+if not noshow then
 menucount=menucount+1
 menus[menucount]=MENU_GROUP_COMMAND:New(_group,entry.Name,subcatmenus[subcat],self._LoadTroops,self,_group,_unit,entry)
 end
+end
 else
 for _,_entry in pairs(self.Cargo_Troops)do
 local entry=_entry
+local noshow=entry.DontShowInMenu
+if not noshow then
 menucount=menucount+1
 menus[menucount]=MENU_GROUP_COMMAND:New(_group,entry.Name,troopsmenu,self._LoadTroops,self,_group,_unit,entry)
 end
 end
+end
 local unloadmenu1=MENU_GROUP_COMMAND:New(_group,"Drop troops",toptroops,self._UnloadTroops,self,_group,_unit):Refresh()
 local extractMenu1=MENU_GROUP_COMMAND:New(_group,"Extract troops",toptroops,self._ExtractTroops,self,_group,_unit):Refresh()
 end
@@ -66505,33 +67011,61 @@ end
 for _,_entry in pairs(self.Cargo_Crates)do
 local entry=_entry
 local subcat=entry.Subcategory
+local noshow=entry.DontShowInMenu
+local zone=entry.Location
+if not noshow then
 menucount=menucount+1
 local menutext=string.format("Crate %s (%dkg)",entry.Name,entry.PerCrateMass or 0)
+if zone then
+menutext=string.format("Crate %s (%dkg)[R]",entry.Name,entry.PerCrateMass or 0)
+end
 menus[menucount]=MENU_GROUP_COMMAND:New(_group,menutext,subcatmenus[subcat],self._GetCrates,self,_group,_unit,entry)
 end
+end
 for _,_entry in pairs(self.Cargo_Statics)do
 local entry=_entry
 local subcat=entry.Subcategory
+local noshow=entry.DontShowInMenu
+local zone=entry.Location
+if not noshow then
 menucount=menucount+1
 local menutext=string.format("Crate %s (%dkg)",entry.Name,entry.PerCrateMass or 0)
+if zone then
+menutext=string.format("Crate %s (%dkg)[R]",entry.Name,entry.PerCrateMass or 0)
+end
 menus[menucount]=MENU_GROUP_COMMAND:New(_group,menutext,subcatmenus[subcat],self._GetCrates,self,_group,_unit,entry)
 end
+end
 else
 for _,_entry in pairs(self.Cargo_Crates)do
 local entry=_entry
+local noshow=entry.DontShowInMenu
+local zone=entry.Location
+if not noshow then
 menucount=menucount+1
 local menutext=string.format("Crate %s (%dkg)",entry.Name,entry.PerCrateMass or 0)
+if zone then
+menutext=string.format("Crate %s (%dkg)[R]",entry.Name,entry.PerCrateMass or 0)
+end
 menus[menucount]=MENU_GROUP_COMMAND:New(_group,menutext,cratesmenu,self._GetCrates,self,_group,_unit,entry)
 end
+end
 for _,_entry in pairs(self.Cargo_Statics)do
 local entry=_entry
+local noshow=entry.DontShowInMenu
+local zone=entry.Location
+if not noshow then
 menucount=menucount+1
 local menutext=string.format("Crate %s (%dkg)",entry.Name,entry.PerCrateMass or 0)
+if zone then
+menutext=string.format("Crate %s (%dkg)[R]",entry.Name,entry.PerCrateMass or 0)
+end
 menus[menucount]=MENU_GROUP_COMMAND:New(_group,menutext,cratesmenu,self._GetCrates,self,_group,_unit,entry)
 end
 end
+end
 listmenu=MENU_GROUP_COMMAND:New(_group,"List crates nearby",topcrates,self._ListCratesNearby,self,_group,_unit)
-removecrates=MENU_GROUP_COMMAND:New(_group,"Remove crates nearby",removecratesmenu,self._RemoveCratesNearby,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)
 if not self.nobuildmenu then
 local buildmenu=MENU_GROUP_COMMAND:New(_group,"Build crates",topcrates,self._BuildCrates,self,_group,_unit)
@@ -66580,23 +67114,23 @@ local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,true,NoTr
 table.insert(self.Cargo_Troops,cargo)
 return self
 end
-function CTLD:AddCratesCargo(Name,Templates,Type,NoCrates,PerCrateMass,Stock,SubCategory)
+function CTLD:AddCratesCargo(Name,Templates,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
 self:T(self.lid.." AddCratesCargo")
 if not self:_CheckTemplates(Templates)then
 self:E(self.lid.."Crates Cargo for "..Name.." has missing template(s)!")
 return self
 end
 self.CargoCounter=self.CargoCounter+1
-local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,false,NoCrates,nil,nil,PerCrateMass,Stock,SubCategory)
+local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Templates,Type,false,false,NoCrates,nil,nil,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
 table.insert(self.Cargo_Crates,cargo)
 return self
 end
-function CTLD:AddStaticsCargo(Name,Mass,Stock,SubCategory)
+function CTLD:AddStaticsCargo(Name,Mass,Stock,SubCategory,DontShowInMenu,Location)
 self:T(self.lid.." AddStaticsCargo")
 self.CargoCounter=self.CargoCounter+1
 local type=CTLD_CARGO.Enum.STATIC
 local template=STATIC:FindByName(Name,true):GetTypeName()
-local cargo=CTLD_CARGO:New(self.CargoCounter,Name,template,type,false,false,1,nil,nil,Mass,Stock,SubCategory)
+local cargo=CTLD_CARGO:New(self.CargoCounter,Name,template,type,false,false,1,nil,nil,Mass,Stock,SubCategory,DontShowInMenu,Location)
 table.insert(self.Cargo_Statics,cargo)
 return self
 end
@@ -66608,14 +67142,14 @@ local template=STATIC:FindByName(Name,true):GetTypeName()
 local cargo=CTLD_CARGO:New(self.CargoCounter,Name,template,type,false,false,1,nil,nil,Mass,1)
 return cargo
 end
-function CTLD:AddCratesRepair(Name,Template,Type,NoCrates,PerCrateMass,Stock,SubCategory)
+function CTLD:AddCratesRepair(Name,Template,Type,NoCrates,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
 self:T(self.lid.." AddCratesRepair")
 if not self:_CheckTemplates(Template)then
 self:E(self.lid.."Repair Cargo for "..Name.." has a missing template!")
 return self
 end
 self.CargoCounter=self.CargoCounter+1
-local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Template,Type,false,false,NoCrates,nil,nil,PerCrateMass,Stock,SubCategory)
+local cargo=CTLD_CARGO:New(self.CargoCounter,Name,Template,Type,false,false,NoCrates,nil,nil,PerCrateMass,Stock,SubCategory,DontShowInMenu,Location)
 table.insert(self.Cargo_Crates,cargo)
 return self
 end
@@ -68437,7 +68971,9 @@ CSAR.AircraftType["Bell-47"]=2
 CSAR.AircraftType["UH-60L"]=10
 CSAR.AircraftType["AH-64D_BLK_II"]=2
 CSAR.AircraftType["Bronco-OV-10A"]=2
-CSAR.version="1.0.19"
+CSAR.AircraftType["MH-60R"]=10
+CSAR.AircraftType["OH-6A"]=2
+CSAR.version="1.0.22"
 function CSAR:New(Coalition,Template,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Template,Alias})
@@ -68549,7 +69085,7 @@ self.SRSchannel=300
 self.SRSModulation=radio.modulation.AM
 self.SRSport=5002
 self.SRSCulture="en-GB"
-self.SRSVoice=nil
+self.SRSVoice=MSRS.Voices.Google.Standard.en_GB_Standard_B
 self.SRSGPathToCredentials=nil
 self.SRSVolume=1.0
 self.SRSGender="male"
@@ -68925,7 +69461,7 @@ return self
 end
 if _place:GetCoalition()==self.coalition or _place:GetCoalition()==coalition.side.NEUTRAL then
 self:__Landed(2,_event.IniUnitName,_place)
-self:_ScheduledSARFlight(_event.IniUnitName,_event.IniGroupName,true)
+self:_ScheduledSARFlight(_event.IniUnitName,_event.IniGroupName,true,true)
 else
 self:T(string.format("Airfield %d, Unit %d",_place:GetCoalition(),_unit:GetCoalition()))
 end
@@ -69148,6 +69684,7 @@ local _found,_pilotable=self:_CheckNameInDownedPilots(_woundedGroupName)
 local _pilotName=_pilotable.desc
 local _reset=true
 if(_distance<500)then
+self:T(self.lid.."[Pickup Debug] Helo closer than 500m: ".._lookupKeyHeli)
 if self.heliCloseMessage[_lookupKeyHeli]==nil then
 if self.autosmoke==true then
 self:_DisplayMessageToSAR(_heliUnit,string.format("%s: %s. You\'re close now! Land or hover at the smoke.",self:_GetCustomCallSign(_heliName),_pilotName),self.messageTime,false,true)
@@ -69156,11 +69693,15 @@ self:_DisplayMessageToSAR(_heliUnit,string.format("%s: %s. You\'re close now! La
 end
 self.heliCloseMessage[_lookupKeyHeli]=true
 end
+self:T(self.lid.."[Pickup Debug] Checking landed vs Hover for ".._lookupKeyHeli)
 if not _heliUnit:InAir()then
+self:T(self.lid.."[Pickup Debug] Helo landed: ".._lookupKeyHeli)
 if self.pilotRuntoExtractPoint==true then
 if(_distance<self.extractDistance)then
 local _time=self.landedStatus[_lookupKeyHeli]
+self:T(self.lid.."[Pickup Debug] Check pilot running or arrived ".._lookupKeyHeli)
 if _time==nil then
+self:T(self.lid.."[Pickup Debug] Pilot running not arrived yet ".._lookupKeyHeli)
 self.landedStatus[_lookupKeyHeli]=math.floor((_distance-self.loadDistance)/3.6)
 _time=self.landedStatus[_lookupKeyHeli]
 _woundedGroup:OptionAlarmStateGreen()
@@ -69170,11 +69711,15 @@ else
 _time=self.landedStatus[_lookupKeyHeli]-10
 self.landedStatus[_lookupKeyHeli]=_time
 end
+self:T(self.lid.."[Pickup Debug] Pilot close enough? ".._lookupKeyHeli)
 if _distance<self.loadDistance+5 or _distance<=13 then
+self:T(self.lid.."[Pickup Debug] Pilot close enough - YES ".._lookupKeyHeli)
 if self.pilotmustopendoors and(self:_IsLoadingDoorOpen(_heliName)==false)then
 self:_DisplayMessageToSAR(_heliUnit,"Open the door to let me in!",self.messageTime,true,true)
+self:T(self.lid.."[Pickup Debug] Door closed, try again next loop ".._lookupKeyHeli)
 return false
 else
+self:T(self.lid.."[Pickup Debug] Pick up Pilot ".._lookupKeyHeli)
 self.landedStatus[_lookupKeyHeli]=nil
 self:_PickupUnit(_heliUnit,_pilotName,_woundedGroup,_woundedGroupName)
 return true
@@ -69182,28 +69727,36 @@ end
 end
 end
 else
+self:T(self.lid.."[Pickup Debug] Helo landed, pilot NOT set to run to helo ".._lookupKeyHeli)
 if(_distance<self.loadDistance)then
+self:T(self.lid.."[Pickup Debug] Helo close enough, door check ".._lookupKeyHeli)
 if self.pilotmustopendoors and(self:_IsLoadingDoorOpen(_heliName)==false)then
+self:T(self.lid.."[Pickup Debug] Door closed, try again next loop ".._lookupKeyHeli)
 self:_DisplayMessageToSAR(_heliUnit,"Open the door to let me in!",self.messageTime,true,true)
 return false
 else
+self:T(self.lid.."[Pickup Debug] Pick up Pilot ".._lookupKeyHeli)
 self:_PickupUnit(_heliUnit,_pilotName,_woundedGroup,_woundedGroupName)
 return true
 end
 end
 end
 else
+self:T(self.lid.."[Pickup Debug] Helo hovering".._lookupKeyHeli)
 local _unitsInHelicopter=self:_PilotsOnboard(_heliName)
 local _maxUnits=self.AircraftType[_heliUnit:GetTypeName()]
 if _maxUnits==nil then
 _maxUnits=self.max_units
 end
+self:T(self.lid.."[Pickup Debug] Check capacity and close enough for winching ".._lookupKeyHeli)
 if _heliUnit:InAir()and _unitsInHelicopter+1<=_maxUnits then
 if _distance<self.rescuehoverdistance then
+self:T(self.lid.."[Pickup Debug] Helo hovering close enough ".._lookupKeyHeli)
 local leaderheight=_woundedLeader:GetHeight()
 if leaderheight<0 then leaderheight=0 end
 local _height=_heliUnit:GetHeight()-leaderheight
 if _height<=self.rescuehoverheight then
+self:T(self.lid.."[Pickup Debug] Helo hovering low enough ".._lookupKeyHeli)
 local _time=self.hoverStatus[_lookupKeyHeli]
 if _time==nil then
 self.hoverStatus[_lookupKeyHeli]=10
@@ -69212,21 +69765,28 @@ else
 _time=self.hoverStatus[_lookupKeyHeli]-10
 self.hoverStatus[_lookupKeyHeli]=_time
 end
+self:T(self.lid.."[Pickup Debug] Check hover timer ".._lookupKeyHeli)
 if _time>0 then
+self:T(self.lid.."[Pickup Debug] Helo hovering not long enough ".._lookupKeyHeli)
 self:_DisplayMessageToSAR(_heliUnit,"Hovering above ".._pilotName..". \n\nHold hover for ".._time.." seconds to winch them up. \n\nIf the countdown stops you\'re too far away!",self.messageTime,true)
 else
+self:T(self.lid.."[Pickup Debug] Helo hovering long enough - door check ".._lookupKeyHeli)
 if self.pilotmustopendoors and(self:_IsLoadingDoorOpen(_heliName)==false)then
 self:_DisplayMessageToSAR(_heliUnit,"Open the door to let me in!",self.messageTime,true,true)
+self:T(self.lid.."[Pickup Debug] Door closed, try again next loop ".._lookupKeyHeli)
 return false
 else
 self.hoverStatus[_lookupKeyHeli]=nil
 self:_PickupUnit(_heliUnit,_pilotName,_woundedGroup,_woundedGroupName)
+self:T(self.lid.."[Pickup Debug] Pilot picked up ".._lookupKeyHeli)
 return true
 end
 end
 _reset=false
 else
+self:T(self.lid.."[Pickup Debug] Helo hovering too high ".._lookupKeyHeli)
 self:_DisplayMessageToSAR(_heliUnit,"Too high to winch ".._pilotName.." \nReduce height and hover for 10 seconds!",self.messageTime,true,true)
+self:T(self.lid.."[Pickup Debug] Hovering too high, try again next loop ".._lookupKeyHeli)
 return false
 end
 end
@@ -69242,7 +69802,7 @@ else
 return false
 end
 end
-function CSAR:_ScheduledSARFlight(heliname,groupname,isairport)
+function CSAR:_ScheduledSARFlight(heliname,groupname,isairport,noreschedule)
 self:T(self.lid.." _ScheduledSARFlight")
 self:T({heliname,groupname})
 local _heliUnit=self:_GetSARHeli(heliname)
@@ -69256,17 +69816,25 @@ return
 end
 local _dist=self:_GetClosestMASH(_heliUnit)
 if _dist==-1 then
+self:T(self.lid.."[Drop off debug] Check distance to MASH for "..heliname.." Distance can not be determined!")
 return
 end
+self:T(self.lid.."[Drop off debug] Check distance to MASH for "..heliname.." Distance km: "..math.floor(_dist/1000))
 if(_dist<self.FARPRescueDistance or isairport)and _heliUnit:InAir()==false then
+self:T(self.lid.."[Drop off debug] Distance ok, door check")
 if self.pilotmustopendoors and self:_IsLoadingDoorOpen(heliname)==false then
 self:_DisplayMessageToSAR(_heliUnit,"Open the door to let me out!",self.messageTime,true,true)
+self:T(self.lid.."[Drop off debug] Door closed, try again next loop")
 else
+self:T(self.lid.."[Drop off debug] Rescued!")
 self:_RescuePilots(_heliUnit)
 return
 end
 end
-self:__Returning(-5,heliname,_woundedGroupName,isairport)
+if not noreschedule then
+self:__Returning(5,heliname,_woundedGroupName,isairport)
+self:ScheduleOnce(5,self._ScheduledSARFlight,self,heliname,groupname,isairport,noreschedule)
+end
 return self
 end
 function CSAR:_RescuePilots(_heliUnit)
@@ -69308,7 +69876,6 @@ self.msrs:SetCoordinate(coord)
 end
 _text=string.gsub(_text,"km"," kilometer")
 _text=string.gsub(_text,"nm"," nautical miles")
-self:I("Voice = "..self.SRSVoice)
 self.SRSQueue:NewTransmission(_text,duration,self.msrs,tstart,2,subgroups,subtitle,subduration,self.SRSchannel,self.SRSModulation,gender,culture,self.SRSVoice,volume,label,coord)
 end
 return self
@@ -69670,7 +70237,7 @@ self:T(self.lid.." _RefreshRadioBeacons")
 if self:_CountActiveDownedPilots()>0 then
 local PilotTable=self.downedPilots
 for _,_pilot in pairs(PilotTable)do
-self:T({_pilot})
+self:T({_pilot.name})
 local pilot=_pilot
 local group=pilot.group
 local frequency=pilot.frequency or 0
@@ -69872,7 +70439,6 @@ return self
 end
 function CSAR:onbeforeReturning(From,Event,To,Heliname,Woundedgroupname,IsAirPort)
 self:T({From,Event,To,Heliname,Woundedgroupname})
-self:_ScheduledSARFlight(Heliname,Woundedgroupname,IsAirPort)
 return self
 end
 function CSAR:onbeforeRescued(From,Event,To,HeliUnit,HeliName,PilotsSaved)
@@ -70279,7 +70845,7 @@ local DistanceFromHomeBase=self.HomeAirbase:GetCoordinate():Get2DDistance(self.C
 if not self:Is("Holding")and not self:Is("Returning")then
 local DistanceFromHomeBase=self.HomeAirbase:GetCoordinate():Get2DDistance(self.Controllable:GetCoordinate())
 if DistanceFromHomeBase>self.DisengageRadius then
-self:I(self.Controllable:GetName().." is too far from home base, RTB!")
+self:T(self.Controllable:GetName().." is too far from home base, RTB!")
 self:Hold(300)
 RTB=false
 end
@@ -70288,10 +70854,10 @@ if not self:Is("Fuel")and not self:Is("Home")and not self:is("Refuelling")then
 local Fuel=self.Controllable:GetFuelMin()
 if Fuel<self.FuelThresholdPercentage then
 if self.TankerName then
-self:I(self.Controllable:GetName().." is out of fuel: "..Fuel.." ... Refuelling at Tanker!")
+self:T(self.Controllable:GetName().." is out of fuel: "..Fuel.." ... Refuelling at Tanker!")
 self:Refuel()
 else
-self:I(self.Controllable:GetName().." is out of fuel: "..Fuel.." ... RTB!")
+self:T(self.Controllable:GetName().." is out of fuel: "..Fuel.." ... RTB!")
 local OldAIControllable=self.Controllable
 local OrbitTask=OldAIControllable:TaskOrbitCircle(math.random(self.PatrolFloorAltitude,self.PatrolCeilingAltitude),self.PatrolMinSpeed)
 local TimedOrbitTask=OldAIControllable:TaskControlled(OrbitTask,OldAIControllable:TaskCondition(nil,nil,nil,nil,self.OutOfFuelOrbitTime,nil))
@@ -70308,7 +70874,7 @@ end
 local Damage=self.Controllable:GetLife()
 local InitialLife=self.Controllable:GetLife0()
 if(Damage/InitialLife)<self.PatrolDamageThreshold then
-self:I(self.Controllable:GetName().." is damaged: "..Damage.." ... RTB!")
+self:T(self.Controllable:GetName().." is damaged: "..Damage.." ... RTB!")
 self:Damaged()
 RTB=true
 self:SetStatusOff()
@@ -70323,7 +70889,7 @@ if self.IdleCount>=10 then
 if Damage~=InitialLife then
 self:Damaged()
 else
-self:I(self.Controllable:GetName().." control lost! ")
+self:T(self.Controllable:GetName().." control lost! ")
 self:LostControl()
 end
 else
@@ -70369,6 +70935,7 @@ self:ClearTargetDistance()
 AIGroup:OptionProhibitAfterburner(true)
 local EngageRoute={}
 local FromCoord=AIGroup:GetCoordinate()
+if not FromCoord then return end
 local ToTargetCoord=self.HomeAirbase:GetCoordinate()
 local ToTargetVec3=ToTargetCoord:GetVec3()
 ToTargetVec3.y=ToTargetCoord:GetLandHeight()+3000
@@ -70383,12 +70950,12 @@ local RTBSpeed=math.random(self.RTBMinSpeed,self.RTBMaxSpeed)
 local Distance=FromCoord:Get2DDistance(ToTargetCoord2)
 local ToAirbaseCoord=ToTargetCoord2
 if Distance<5000 then
-self:I("RTB and near the airbase!")
+self:T("RTB and near the airbase!")
 self:Home()
 return
 end
 if not AIGroup:InAir()==true then
-self:I("Not anymore in the air, considered Home.")
+self:T("Not anymore in the air, considered Home.")
 self:Home()
 return
 end
@@ -70418,15 +70985,17 @@ end
 end
 function AI_AIR:onafterHome(AIGroup,From,Event,To)
 self:F({AIGroup,From,Event,To})
-self:I("Group "..self.Controllable:GetName().." ... Home! ( "..self:GetState().." )")
+self:T("Group "..self.Controllable:GetName().." ... Home! ( "..self:GetState().." )")
 if AIGroup and AIGroup:IsAlive()then
 end
 end
 function AI_AIR:onafterHold(AIGroup,From,Event,To,HoldTime)
 self:F({AIGroup,From,Event,To})
-self:I("Group "..self.Controllable:GetName().." ... Holding! ( "..self:GetState().." )")
+self:T("Group "..self.Controllable:GetName().." ... Holding! ( "..self:GetState().." )")
 if AIGroup and AIGroup:IsAlive()then
-local OrbitTask=AIGroup:TaskOrbitCircle(math.random(self.PatrolFloorAltitude,self.PatrolCeilingAltitude),self.PatrolMinSpeed)
+local Coordinate=AIGroup:GetCoordinate()
+if Coordinate==nil then return end
+local OrbitTask=AIGroup:TaskOrbitCircle(math.random(self.PatrolFloorAltitude,self.PatrolCeilingAltitude),self.PatrolMinSpeed,Coordinate)
 local TimedOrbitTask=AIGroup:TaskControlled(OrbitTask,AIGroup:TaskCondition(nil,nil,nil,nil,HoldTime,nil))
 local RTBTask=AIGroup:TaskFunction("AI_AIR.RTBHold",self)
 local OrbitHoldTask=AIGroup:TaskOrbitCircle(4000,self.PatrolMinSpeed)
@@ -70434,7 +71003,7 @@ AIGroup:SetTask(AIGroup:TaskCombo({TimedOrbitTask,RTBTask,OrbitHoldTask}),1)
 end
 end
 function AI_AIR.Resume(AIGroup,Fsm)
-AIGroup:I({"AI_AIR.Resume:",AIGroup:GetName()})
+AIGroup:T({"AI_AIR.Resume:",AIGroup:GetName()})
 if AIGroup:IsAlive()then
 Fsm:__RTB(Fsm.TaskDelay)
 end
@@ -70444,7 +71013,7 @@ self:F({AIGroup,From,Event,To})
 if AIGroup and AIGroup:IsAlive()then
 local Tanker=GROUP:FindByName(self.TankerName)
 if Tanker and Tanker:IsAlive()and Tanker:IsAirPlane()then
-self:I("Group "..self.Controllable:GetName().." ... Refuelling! State="..self:GetState()..", Refuelling tanker "..self.TankerName)
+self:T("Group "..self.Controllable:GetName().." ... Refuelling! State="..self:GetState()..", Refuelling tanker "..self.TankerName)
 local RefuelRoute={}
 local FromRefuelCoord=AIGroup:GetCoordinate()
 local ToRefuelCoord=Tanker:GetCoordinate()
@@ -70657,13 +71226,13 @@ end
 end
 end
 function AI_AIR_ENGAGE.___EngageRoute(AIGroup,Fsm,AttackSetUnit)
-Fsm:I(string.format("AI_AIR_ENGAGE.___EngageRoute: %s",tostring(AIGroup:GetName())))
+Fsm:T(string.format("AI_AIR_ENGAGE.___EngageRoute: %s",tostring(AIGroup:GetName())))
 if AIGroup and AIGroup:IsAlive()then
 Fsm:__EngageRoute(Fsm.TaskDelay or 0.1,AttackSetUnit)
 end
 end
 function AI_AIR_ENGAGE:onafterEngageRoute(DefenderGroup,From,Event,To,AttackSetUnit)
-self:I({DefenderGroup,From,Event,To,AttackSetUnit})
+self:T({DefenderGroup,From,Event,To,AttackSetUnit})
 local DefenderGroupName=DefenderGroup:GetName()
 self.AttackSetUnit=AttackSetUnit
 local AttackCount=AttackSetUnit:CountAlive()
@@ -70673,7 +71242,11 @@ local EngageAltitude=math.random(self.EngageFloorAltitude,self.EngageCeilingAlti
 local EngageSpeed=math.random(self.EngageMinSpeed,self.EngageMaxSpeed)
 local DefenderCoord=DefenderGroup:GetPointVec3()
 DefenderCoord:SetY(EngageAltitude)
-local TargetCoord=AttackSetUnit:GetFirst():GetPointVec3()
+local TargetCoord=AttackSetUnit:GetRandomSurely():GetPointVec3()
+if TargetCoord==nil then
+self:Return()
+return
+end
 TargetCoord:SetY(EngageAltitude)
 local TargetDistance=DefenderCoord:Get2DDistance(TargetCoord)
 local EngageDistance=(DefenderGroup:IsHelicopter()and 5000)or(DefenderGroup:IsAirPlane()and 10000)
@@ -70697,12 +71270,12 @@ DefenderGroup:Route(EngageRoute,self.TaskDelay or 0.1)
 end
 end
 else
-self:I(DefenderGroupName..": No targets found -> Going RTB")
+self:T(DefenderGroupName..": No targets found -> Going RTB")
 self:Return()
 end
 end
 function AI_AIR_ENGAGE.___Engage(AIGroup,Fsm,AttackSetUnit)
-Fsm:I(string.format("AI_AIR_ENGAGE.___Engage: %s",tostring(AIGroup:GetName())))
+Fsm:T(string.format("AI_AIR_ENGAGE.___Engage: %s",tostring(AIGroup:GetName())))
 if AIGroup and AIGroup:IsAlive()then
 local delay=Fsm.TaskDelay or 0.1
 Fsm:__Engage(delay,AttackSetUnit)
@@ -70720,7 +71293,7 @@ local EngageAltitude=math.random(self.EngageFloorAltitude or 500,self.EngageCeil
 local EngageSpeed=math.random(self.EngageMinSpeed,self.EngageMaxSpeed)
 local DefenderCoord=DefenderGroup:GetPointVec3()
 DefenderCoord:SetY(EngageAltitude)
-local TargetCoord=AttackSetUnit:GetFirst():GetPointVec3()
+local TargetCoord=AttackSetUnit:GetRandomSurely():GetPointVec3()
 if not TargetCoord then
 self:Return()
 return
@@ -70740,12 +71313,12 @@ EngageRoute[#EngageRoute+1]=ToWP
 if TargetDistance<=EngageDistance*9 then
 local AttackUnitTasks=self:CreateAttackUnitTasks(AttackSetUnit,DefenderGroup,EngageAltitude)
 if#AttackUnitTasks==0 then
-self:I(DefenderGroupName..": No valid targets found -> Going RTB")
+self:T(DefenderGroupName..": No valid targets found -> Going RTB")
 self:Return()
 return
 else
 local text=string.format("%s: Engaging targets at distance %.2f NM",DefenderGroupName,UTILS.MetersToNM(TargetDistance))
-self:I(text)
+self:T(text)
 DefenderGroup:OptionROEOpenFire()
 DefenderGroup:OptionROTEvadeFire()
 DefenderGroup:OptionKeepWeaponsOnThreat()
@@ -70757,7 +71330,7 @@ EngageRoute[#EngageRoute].task=DefenderGroup:TaskCombo(AttackTasks)
 DefenderGroup:Route(EngageRoute,self.TaskDelay or 0.1)
 end
 else
-self:I(DefenderGroupName..": No targets found -> returning.")
+self:T(DefenderGroupName..": No targets found -> returning.")
 self:Return()
 return
 end
@@ -71018,12 +71591,12 @@ end
 end
 function AI_A2A_DISPATCHER:OnEventBaseCaptured(EventData)
 local AirbaseName=EventData.PlaceName
-self:I("Captured "..AirbaseName)
+self:T("Captured "..AirbaseName)
 for SquadronName,Squadron in pairs(self.DefenderSquadrons)do
 if Squadron.AirbaseName==AirbaseName then
 Squadron.ResourceCount=-999
 Squadron.Captured=true
-self:I("Squadron "..SquadronName.." captured.")
+self:T("Squadron "..SquadronName.." captured.")
 end
 end
 end
@@ -71260,7 +71833,7 @@ Cap.PatrolCeilingAltitude=PatrolCeilingAltitude
 Cap.PatrolAltType=PatrolAltType
 Cap.EngageAltType=EngageAltType
 self:SetSquadronCapInterval(SquadronName,self.DefenderDefault.CapLimit,self.DefenderDefault.CapMinSeconds,self.DefenderDefault.CapMaxSeconds,1)
-self:I({CAP={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,Zone,PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageAltType}})
+self:T({CAP={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,Zone,PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageAltType}})
 local RecceSet=self.Detection:GetDetectionSet()
 RecceSet:FilterPrefixes(DefenderSquadron.TemplatePrefixes)
 RecceSet:FilterStart()
@@ -71378,7 +71951,7 @@ Intercept.EngageMaxSpeed=EngageMaxSpeed
 Intercept.EngageFloorAltitude=EngageFloorAltitude
 Intercept.EngageCeilingAltitude=EngageCeilingAltitude
 Intercept.EngageAltType=EngageAltType
-self:I({GCI={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({GCI={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 end
 function AI_A2A_DISPATCHER:SetSquadronGci(SquadronName,EngageMinSpeed,EngageMaxSpeed)
 self.DefenderSquadrons[SquadronName]=self.DefenderSquadrons[SquadronName]or{}
@@ -72255,22 +72828,22 @@ table.insert(AirbaseNames,AirbaseName)
 end
 end
 self.Templates=SET_GROUP:New():FilterPrefixes(TemplatePrefixes):FilterOnce()
-self:I({Airbases=AirbaseNames})
-self:I("Defining Templates for Airbases ...")
+self:T({Airbases=AirbaseNames})
+self:T("Defining Templates for Airbases ...")
 for AirbaseID,AirbaseName in pairs(AirbaseNames)do
 local Airbase=_DATABASE:FindAirbase(AirbaseName)
 local AirbaseName=Airbase:GetName()
 local AirbaseCoord=Airbase:GetCoordinate()
 local AirbaseZone=ZONE_RADIUS:New("Airbase",AirbaseCoord:GetVec2(),3000)
 local Templates=nil
-self:I({Airbase=AirbaseName})
+self:T({Airbase=AirbaseName})
 for TemplateID,Template in pairs(self.Templates:GetSet())do
 local Template=Template
 local TemplateCoord=Template:GetCoordinate()
 if AirbaseZone:IsVec2InZone(TemplateCoord:GetVec2())then
 Templates=Templates or{}
 table.insert(Templates,Template:GetName())
-self:I({Template=Template:GetName()})
+self:T({Template=Template:GetName()})
 end
 end
 if Templates then
@@ -72280,12 +72853,12 @@ end
 self.CAPTemplates=SET_GROUP:New()
 self.CAPTemplates:FilterPrefixes(CapPrefixes)
 self.CAPTemplates:FilterOnce()
-self:I("Setting up CAP ...")
+self:T("Setting up CAP ...")
 for CAPID,CAPTemplate in pairs(self.CAPTemplates:GetSet())do
 local CAPZone=ZONE_POLYGON:New(CAPTemplate:GetName(),CAPTemplate)
 local AirbaseDistance=99999999
 local AirbaseClosest=nil
-self:I({CAPZoneGroup=CAPID})
+self:T({CAPZoneGroup=CAPID})
 for AirbaseID,AirbaseName in pairs(AirbaseNames)do
 local Airbase=_DATABASE:FindAirbase(AirbaseName)
 local AirbaseName=Airbase:GetName()
@@ -72293,7 +72866,7 @@ local AirbaseCoord=Airbase:GetCoordinate()
 local Squadron=self.DefenderSquadrons[AirbaseName]
 if Squadron then
 local Distance=AirbaseCoord:Get2DDistance(CAPZone:GetCoordinate())
-self:I({AirbaseDistance=Distance})
+self:T({AirbaseDistance=Distance})
 if Distance<AirbaseDistance then
 AirbaseDistance=Distance
 AirbaseClosest=Airbase
@@ -72301,19 +72874,19 @@ end
 end
 end
 if AirbaseClosest then
-self:I({CAPAirbase=AirbaseClosest:GetName()})
+self:T({CAPAirbase=AirbaseClosest:GetName()})
 self:SetSquadronCap(AirbaseClosest:GetName(),CAPZone,6000,10000,500,800,800,1200,"RADIO")
 self:SetSquadronCapInterval(AirbaseClosest:GetName(),CapLimit,300,600,1)
 end
 end
-self:I("Setting up GCI ...")
+self:T("Setting up GCI ...")
 for AirbaseID,AirbaseName in pairs(AirbaseNames)do
 local Airbase=_DATABASE:FindAirbase(AirbaseName)
 local AirbaseName=Airbase:GetName()
 local Squadron=self.DefenderSquadrons[AirbaseName]
 self:F({Airbase=AirbaseName})
 if Squadron then
-self:I({GCIAirbase=AirbaseName})
+self:T({GCIAirbase=AirbaseName})
 self:SetSquadronGci(AirbaseName,800,1200)
 end
 end
@@ -72476,7 +73049,7 @@ DefenderSquadron.Resource={}
 for Resource=1,DefenderSquadron.ResourceCount or 0 do
 self:ResourcePark(DefenderSquadron)
 end
-self:I("Parked resources for squadron "..DefenderSquadron.Name)
+self:T("Parked resources for squadron "..DefenderSquadron.Name)
 end
 end
 function AI_A2G_DISPATCHER:Lock(DetectedItemIndex)
@@ -72520,12 +73093,12 @@ end
 end
 function AI_A2G_DISPATCHER:OnEventBaseCaptured(EventData)
 local AirbaseName=EventData.PlaceName
-self:I("Captured "..AirbaseName)
+self:T("Captured "..AirbaseName)
 for SquadronName,Squadron in pairs(self.DefenderSquadrons)do
 if Squadron.AirbaseName==AirbaseName then
 Squadron.ResourceCount=-999
 Squadron.Captured=true
-self:I("Squadron "..SquadronName.." captured.")
+self:T("Squadron "..SquadronName.." captured.")
 end
 end
 end
@@ -72546,7 +73119,7 @@ if DefenderSize==1 then
 self:RemoveDefenderFromSquadron(Squadron,Defender)
 end
 DefenderUnit:Destroy()
-self:ResourcePark(Squadron,Defender)
+self:ResourcePark(Squadron)
 return
 end
 if DefenderUnit:GetLife()~=DefenderUnit:GetLife0()then
@@ -72569,7 +73142,7 @@ if DefenderSize==1 then
 self:RemoveDefenderFromSquadron(Squadron,Defender)
 end
 DefenderUnit:Destroy()
-self:ResourcePark(Squadron,Defender)
+self:ResourcePark(Squadron)
 end
 end
 end
@@ -72592,7 +73165,7 @@ self.DisengageRadius=DisengageRadius or 300000
 return self
 end
 function AI_A2G_DISPATCHER:SetDefenseRadius(DefenseRadius)
-self.DefenseRadius=DefenseRadius or 100000
+self.DefenseRadius=DefenseRadius or 40000
 self.Detection:SetAcceptRange(self.DefenseRadius)
 return self
 end
@@ -72861,7 +73434,7 @@ Sead.EngageFloorAltitude=EngageFloorAltitude or 500
 Sead.EngageCeilingAltitude=EngageCeilingAltitude or 1000
 Sead.EngageAltType=EngageAltType
 Sead.Defend=true
-self:I({SEAD={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({SEAD={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 return self
 end
 function AI_A2G_DISPATCHER:SetSquadronSead(SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude)
@@ -72888,7 +73461,7 @@ SeadPatrol.PatrolAltType=PatrolAltType
 SeadPatrol.EngageAltType=EngageAltType
 SeadPatrol.Patrol=true
 self:SetSquadronPatrolInterval(SquadronName,self.DefenderDefault.PatrolLimit,self.DefenderDefault.PatrolMinSeconds,self.DefenderDefault.PatrolMaxSeconds,1,"SEAD")
-self:I({SEAD={Zone:GetName(),PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({SEAD={Zone:GetName(),PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 end
 function AI_A2G_DISPATCHER:SetSquadronSeadPatrol(SquadronName,Zone,FloorAltitude,CeilingAltitude,PatrolMinSpeed,PatrolMaxSpeed,EngageMinSpeed,EngageMaxSpeed,AltType)
 self:SetSquadronSeadPatrol2(SquadronName,Zone,PatrolMinSpeed,PatrolMaxSpeed,FloorAltitude,CeilingAltitude,AltType,EngageMinSpeed,EngageMaxSpeed,FloorAltitude,CeilingAltitude,AltType)
@@ -72904,7 +73477,7 @@ Cas.EngageFloorAltitude=EngageFloorAltitude or 500
 Cas.EngageCeilingAltitude=EngageCeilingAltitude or 1000
 Cas.EngageAltType=EngageAltType
 Cas.Defend=true
-self:I({CAS={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({CAS={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 return self
 end
 function AI_A2G_DISPATCHER:SetSquadronCas(SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude)
@@ -72931,7 +73504,7 @@ CasPatrol.PatrolAltType=PatrolAltType
 CasPatrol.EngageAltType=EngageAltType
 CasPatrol.Patrol=true
 self:SetSquadronPatrolInterval(SquadronName,self.DefenderDefault.PatrolLimit,self.DefenderDefault.PatrolMinSeconds,self.DefenderDefault.PatrolMaxSeconds,1,"CAS")
-self:I({CAS={Zone:GetName(),PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({CAS={Zone:GetName(),PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 end
 function AI_A2G_DISPATCHER:SetSquadronCasPatrol(SquadronName,Zone,FloorAltitude,CeilingAltitude,PatrolMinSpeed,PatrolMaxSpeed,EngageMinSpeed,EngageMaxSpeed,AltType)
 self:SetSquadronCasPatrol2(SquadronName,Zone,PatrolMinSpeed,PatrolMaxSpeed,FloorAltitude,CeilingAltitude,AltType,EngageMinSpeed,EngageMaxSpeed,FloorAltitude,CeilingAltitude,AltType)
@@ -72947,7 +73520,7 @@ Bai.EngageFloorAltitude=EngageFloorAltitude or 500
 Bai.EngageCeilingAltitude=EngageCeilingAltitude or 1000
 Bai.EngageAltType=EngageAltType
 Bai.Defend=true
-self:I({BAI={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({BAI={SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 return self
 end
 function AI_A2G_DISPATCHER:SetSquadronBai(SquadronName,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude)
@@ -72974,7 +73547,7 @@ BaiPatrol.PatrolAltType=PatrolAltType
 BaiPatrol.EngageAltType=EngageAltType
 BaiPatrol.Patrol=true
 self:SetSquadronPatrolInterval(SquadronName,self.DefenderDefault.PatrolLimit,self.DefenderDefault.PatrolMinSeconds,self.DefenderDefault.PatrolMaxSeconds,1,"BAI")
-self:I({BAI={Zone:GetName(),PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
+self:T({BAI={Zone:GetName(),PatrolMinSpeed,PatrolMaxSpeed,PatrolFloorAltitude,PatrolCeilingAltitude,PatrolAltType,EngageMinSpeed,EngageMaxSpeed,EngageFloorAltitude,EngageCeilingAltitude,EngageAltType}})
 end
 function AI_A2G_DISPATCHER:SetSquadronBaiPatrol(SquadronName,Zone,FloorAltitude,CeilingAltitude,PatrolMinSpeed,PatrolMaxSpeed,EngageMinSpeed,EngageMaxSpeed,AltType)
 self:SetSquadronBaiPatrol2(SquadronName,Zone,PatrolMinSpeed,PatrolMaxSpeed,FloorAltitude,CeilingAltitude,AltType,EngageMinSpeed,EngageMaxSpeed,FloorAltitude,CeilingAltitude,AltType)
@@ -73514,7 +74087,7 @@ local DefenderName=DefenderGroup:GetCallsign()
 local Dispatcher=AI_A2G_Fsm:GetDispatcher()
 local Squadron=Dispatcher:GetSquadronFromDefender(DefenderGroup)
 if Squadron then
-local FirstUnit=AttackSetUnit:GetFirst()
+local FirstUnit=AttackSetUnit:GetRandomSurely()
 local Coordinate=FirstUnit:GetCoordinate()
 if self.SetSendPlayerMessages then
 Dispatcher:MessageToPlayers(Squadron,DefenderName..", on route to ground target at "..Coordinate:ToStringA2G(DefenderGroup),DefenderGroup)
@@ -74333,7 +74906,7 @@ if self.Controllable and self.Controllable:IsAlive()then
 local RTB=false
 local Fuel=self.Controllable:GetFuelMin()
 if Fuel<self.PatrolFuelThresholdPercentage then
-self:I(self.Controllable:GetName().." is out of fuel:"..Fuel..", RTB!")
+self:T(self.Controllable:GetName().." is out of fuel:"..Fuel..", RTB!")
 local OldAIControllable=self.Controllable
 local OrbitTask=OldAIControllable:TaskOrbitCircle(math.random(self.PatrolFloorAltitude,self.PatrolCeilingAltitude),self.PatrolMinSpeed)
 local TimedOrbitTask=OldAIControllable:TaskControlled(OrbitTask,OldAIControllable:TaskCondition(nil,nil,nil,nil,self.PatrolOutOfFuelOrbitTime,nil))
@@ -74343,7 +74916,7 @@ else
 end
 local Damage=self.Controllable:GetLife()
 if Damage<=self.PatrolDamageThreshold then
-self:I(self.Controllable:GetName().." is damaged:"..Damage..", RTB!")
+self:T(self.Controllable:GetName().." is damaged:"..Damage..", RTB!")
 RTB=true
 end
 if RTB==true then
@@ -76509,11 +77082,11 @@ function AI_ESCORT_DISPATCHER:OnEventExit(EventData)
 local PlayerGroupName=EventData.IniGroupName
 local PlayerGroup=EventData.IniGroup
 local PlayerUnit=EventData.IniUnit
-self:I({EscortAirbase=self.EscortAirbase})
-self:I({PlayerGroupName=PlayerGroupName})
-self:I({PlayerGroup=PlayerGroup})
-self:I({FirstGroup=self.CarrierSet:GetFirst()})
-self:I({FindGroup=self.CarrierSet:FindGroup(PlayerGroupName)})
+self:T({EscortAirbase=self.EscortAirbase})
+self:T({PlayerGroupName=PlayerGroupName})
+self:T({PlayerGroup=PlayerGroup})
+self:T({FirstGroup=self.CarrierSet:GetFirst()})
+self:T({FindGroup=self.CarrierSet:FindGroup(PlayerGroupName)})
 if self.CarrierSet:FindGroup(PlayerGroupName)then
 if self.AI_Escorts[PlayerGroupName]then
 self.AI_Escorts[PlayerGroupName]:Stop()
@@ -76525,16 +77098,16 @@ function AI_ESCORT_DISPATCHER:OnEventBirth(EventData)
 local PlayerGroupName=EventData.IniGroupName
 local PlayerGroup=EventData.IniGroup
 local PlayerUnit=EventData.IniUnit
-self:I({EscortAirbase=self.EscortAirbase})
-self:I({PlayerGroupName=PlayerGroupName})
-self:I({PlayerGroup=PlayerGroup})
-self:I({FirstGroup=self.CarrierSet:GetFirst()})
-self:I({FindGroup=self.CarrierSet:FindGroup(PlayerGroupName)})
+self:T({EscortAirbase=self.EscortAirbase})
+self:T({PlayerGroupName=PlayerGroupName})
+self:T({PlayerGroup=PlayerGroup})
+self:T({FirstGroup=self.CarrierSet:GetFirst()})
+self:T({FindGroup=self.CarrierSet:FindGroup(PlayerGroupName)})
 if self.CarrierSet:FindGroup(PlayerGroupName)then
 if not self.AI_Escorts[PlayerGroupName]then
 local LeaderUnit=PlayerUnit
 local EscortGroup=self.EscortSpawn:SpawnAtAirbase(self.EscortAirbase,SPAWN.Takeoff.Hot)
-self:I({EscortGroup=EscortGroup})
+self:T({EscortGroup=EscortGroup})
 self:ScheduleOnce(1,
 function(EscortGroup)
 local EscortSet=SET_GROUP:New()
@@ -76833,7 +77406,7 @@ if Carrier and Carrier:IsAlive()then
 for _,CarrierUnit in pairs(Carrier:GetUnits())do
 local CarrierUnit=CarrierUnit
 local IsEmpty=CarrierUnit:IsCargoEmpty()
-self:I({IsEmpty=IsEmpty})
+self:T({IsEmpty=IsEmpty})
 if not IsEmpty then
 AllUnloaded=false
 break
@@ -77921,7 +78494,7 @@ break
 else
 local text=string.format("WARNING: Cargo %s is too heavy to be loaded into transport. Cargo weight %.1f > %.1f load capacity of carrier %s.",
 tostring(Cargo:GetName()),Cargo:GetWeight(),LargestLoadCapacity,tostring(Carrier:GetName()))
-self:I(text)
+self:T(text)
 end
 end
 end
@@ -78527,6 +79100,954 @@ end
 )
 end
 end
+SHAPE_BASE={
+ClassName="SHAPE_BASE",
+Name="",
+CenterVec2=nil,
+Points={},
+Coords={},
+MarkIDs={},
+ColorString="",
+ColorRGBA={}
+}
+function SHAPE_BASE:New()
+local self=BASE:Inherit(self,BASE:New())
+return self
+end
+function SHAPE_BASE:FindOnMap(shape_name)
+local self=BASE:Inherit(self,BASE:New())
+local found=false
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if object["name"]==shape_name then
+self.Name=object["name"]
+self.CenterVec2={x=object["mapX"],y=object["mapY"]}
+self.ColorString=object["colorString"]
+self.ColorRGBA=UTILS.HexToRGBA(self.ColorString)
+found=true
+end
+end
+end
+if not found then
+self:E("Can't find a shape with name "..shape_name)
+end
+return self
+end
+function SHAPE_BASE:GetAllShapes(filter)
+filter=filter or""
+local return_shapes={}
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if string.contains(object["name"],filter)then
+table.add(return_shapes,object)
+end
+end
+end
+return return_shapes
+end
+function SHAPE_BASE:Offset(new_vec2)
+local offset_vec2=UTILS.Vec2Subtract(new_vec2,self.CenterVec2)
+self.CenterVec2=new_vec2
+if self.ClassName=="POLYGON"then
+for _,point in pairs(self.Points)do
+point.x=point.x+offset_vec2.x
+point.y=point.y+offset_vec2.y
+end
+end
+end
+function SHAPE_BASE:GetName()
+return self.Name
+end
+function SHAPE_BASE:GetColorString()
+return self.ColorString
+end
+function SHAPE_BASE:GetColorRGBA()
+return self.ColorRGBA
+end
+function SHAPE_BASE:GetColorRed()
+return self.ColorRGBA.R
+end
+function SHAPE_BASE:GetColorGreen()
+return self.ColorRGBA.G
+end
+function SHAPE_BASE:GetColorBlue()
+return self.ColorRGBA.B
+end
+function SHAPE_BASE:GetColorAlpha()
+return self.ColorRGBA.A
+end
+function SHAPE_BASE:GetCenterVec2()
+return self.CenterVec2
+end
+function SHAPE_BASE:GetCenterCoordinate()
+return COORDINATE:NewFromVec2(self.CenterVec2)
+end
+function SHAPE_BASE:GetCoordinate()
+return self:GetCenterCoordinate()
+end
+function SHAPE_BASE:ContainsPoint(_)
+self:E("This needs to be set in the derived class")
+end
+function SHAPE_BASE:ContainsUnit(unit_name)
+local unit=UNIT:FindByName(unit_name)
+if unit==nil or not unit:IsAlive()then
+return false
+end
+if self:ContainsPoint(unit:GetVec2())then
+return true
+end
+return false
+end
+function SHAPE_BASE:ContainsAnyOfGroup(group_name)
+local group=GROUP:FindByName(group_name)
+if group==nil or not group:IsAlive()then
+return false
+end
+for _,unit in pairs(group:GetUnits())do
+if self:ContainsPoint(unit:GetVec2())then
+return true
+end
+end
+return false
+end
+function SHAPE_BASE:ContainsAllOfGroup(group_name)
+local group=GROUP:FindByName(group_name)
+if group==nil or not group:IsAlive()then
+return false
+end
+for _,unit in pairs(group:GetUnits())do
+if not self:ContainsPoint(unit:GetVec2())then
+return false
+end
+end
+return true
+end
+CIRCLE={
+ClassName="CIRCLE",
+Radius=nil,
+}
+function CIRCLE:FindOnMap(shape_name)
+local self=BASE:Inherit(self,SHAPE_BASE:FindOnMap(shape_name))
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if string.find(object["name"],shape_name,1,true)then
+if object["polygonMode"]=="circle"then
+self.Radius=object["radius"]
+end
+end
+end
+end
+return self
+end
+function CIRCLE:Find(shape_name)
+return _DATABASE:FindShape(shape_name)
+end
+function CIRCLE:New(vec2,radius)
+local self=BASE:Inherit(self,SHAPE_BASE:New())
+self.CenterVec2=vec2
+self.Radius=radius
+return self
+end
+function CIRCLE:GetRadius()
+return self.Radius
+end
+function CIRCLE:ContainsPoint(point)
+if((point.x-self.CenterVec2.x)^2+(point.y-self.CenterVec2.y)^2)^0.5<=self.Radius then
+return true
+end
+return false
+end
+function CIRCLE:PointInSector(point,sector_start,sector_end,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+local function are_clockwise(v1,v2)
+return-v1.x*v2.y+v1.y*v2.x>0
+end
+local function is_in_radius(rp)
+return rp.x*rp.x+rp.y*rp.y<=radius^2
+end
+local rel_pt={
+x=point.x-center.x,
+y=point.y-center.y
+}
+local rel_sector_start={
+x=sector_start.x-center.x,
+y=sector_start.y-center.y,
+}
+local rel_sector_end={
+x=sector_end.x-center.x,
+y=sector_end.y-center.y,
+}
+return not are_clockwise(rel_sector_start,rel_pt)and
+are_clockwise(rel_sector_end,rel_pt)and
+is_in_radius(rel_pt,radius)
+end
+function CIRCLE:UnitInSector(unit_name,sector_start,sector_end,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+if self:PointInSector(UNIT:FindByName(unit_name):GetVec2(),sector_start,sector_end,center,radius)then
+return true
+end
+return false
+end
+function CIRCLE:AnyOfGroupInSector(group_name,sector_start,sector_end,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+for _,unit in pairs(GROUP:FindByName(group_name):GetUnits())do
+if self:PointInSector(unit:GetVec2(),sector_start,sector_end,center,radius)then
+return true
+end
+end
+return false
+end
+function CIRCLE:AllOfGroupInSector(group_name,sector_start,sector_end,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+for _,unit in pairs(GROUP:FindByName(group_name):GetUnits())do
+if not self:PointInSector(unit:GetVec2(),sector_start,sector_end,center,radius)then
+return false
+end
+end
+return true
+end
+function CIRCLE:UnitInRadius(unit_name,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+if UTILS.IsInRadius(center,UNIT:FindByName(unit_name):GetVec2(),radius)then
+return true
+end
+return false
+end
+function CIRCLE:AnyOfGroupInRadius(group_name,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+for _,unit in pairs(GROUP:FindByName(group_name):GetUnits())do
+if UTILS.IsInRadius(center,unit:GetVec2(),radius)then
+return true
+end
+end
+return false
+end
+function CIRCLE:AllOfGroupInRadius(group_name,center,radius)
+center=center or self.CenterVec2
+radius=radius or self.Radius
+for _,unit in pairs(GROUP:FindByName(group_name):GetUnits())do
+if not UTILS.IsInRadius(center,unit:GetVec2(),radius)then
+return false
+end
+end
+return true
+end
+function CIRCLE:GetRandomVec2()
+local angle=math.random()*2*math.pi
+local rx=math.random(0,self.Radius)*math.cos(angle)+self.CenterVec2.x
+local ry=math.random(0,self.Radius)*math.sin(angle)+self.CenterVec2.y
+return{x=rx,y=ry}
+end
+function CIRCLE:GetRandomVec2OnBorder()
+local angle=math.random()*2*math.pi
+local rx=self.Radius*math.cos(angle)+self.CenterVec2.x
+local ry=self.Radius*math.sin(angle)+self.CenterVec2.y
+return{x=rx,y=ry}
+end
+function CIRCLE:GetBoundingBox()
+local min_x=self.CenterVec2.x-self.Radius
+local min_y=self.CenterVec2.y-self.Radius
+local max_x=self.CenterVec2.x+self.Radius
+local max_y=self.CenterVec2.y+self.Radius
+return{
+{x=min_x,y=min_x},{x=max_x,y=min_y},{x=max_x,y=max_y},{x=min_x,y=max_y}
+}
+end
+CUBE={
+ClassName="CUBE",
+Points={},
+Coords={}
+}
+function CUBE:New(p1,p2,p3,p4,p5,p6,p7,p8)
+local self=BASE:Inherit(self,SHAPE_BASE)
+self.Points={p1,p2,p3,p4,p5,p6,p7,p8}
+for _,point in spairs(self.Points)do
+table.insert(self.Coords,COORDINATE:NewFromVec3(point))
+end
+return self
+end
+function CUBE:GetCenter()
+local center={x=0,y=0,z=0}
+for _,point in pairs(self.Points)do
+center.x=center.x+point.x
+center.y=center.y+point.y
+center.z=center.z+point.z
+end
+center.x=center.x/8
+center.y=center.y/8
+center.z=center.z/8
+return center
+end
+function CUBE:ContainsPoint(point,cube_points)
+cube_points=cube_points or self.Points
+local min_x,min_y,min_z=math.huge,math.huge,math.huge
+local max_x,max_y,max_z=-math.huge,-math.huge,-math.huge
+for _,p in ipairs(cube_points)do
+if p.x<min_x then min_x=p.x end
+if p.y<min_y then min_y=p.y end
+if p.z<min_z then min_z=p.z end
+if p.x>max_x then max_x=p.x end
+if p.y>max_y then max_y=p.y end
+if p.z>max_z then max_z=p.z end
+end
+return point.x>=min_x and point.x<=max_x and point.y>=min_y and point.y<=max_y and point.z>=min_z and point.z<=max_z
+end
+LINE={
+ClassName="LINE",
+Points={},
+Coords={},
+}
+function LINE:FindOnMap(line_name)
+local self=BASE:Inherit(self,SHAPE_BASE:FindOnMap(line_name))
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if object["name"]==line_name then
+if object["primitiveType"]=="Line"then
+for _,point in UTILS.spairs(object["points"])do
+local p={x=object["mapX"]+point["x"],
+y=object["mapY"]+point["y"]}
+local coord=COORDINATE:NewFromVec2(p)
+table.insert(self.Points,p)
+table.insert(self.Coords,coord)
+end
+end
+end
+end
+end
+self:I(#self.Points)
+if#self.Points==0 then
+return nil
+end
+self.MarkIDs={}
+return self
+end
+function LINE:Find(shape_name)
+return _DATABASE:FindShape(shape_name)
+end
+function LINE:New(...)
+local self=BASE:Inherit(self,SHAPE_BASE:New())
+self.Points={...}
+self:I(self.Points)
+for _,point in UTILS.spairs(self.Points)do
+table.insert(self.Coords,COORDINATE:NewFromVec2(point))
+end
+return self
+end
+function LINE:NewFromCircle(center_point,radius,angle_degrees)
+local self=BASE:Inherit(self,SHAPE_BASE:New())
+self.CenterVec2=center_point
+local angleRadians=math.rad(angle_degrees)
+local point1={
+x=center_point.x+radius*math.cos(angleRadians),
+y=center_point.y+radius*math.sin(angleRadians)
+}
+local point2={
+x=center_point.x+radius*math.cos(angleRadians+math.pi),
+y=center_point.y+radius*math.sin(angleRadians+math.pi)
+}
+for _,point in pairs{point1,point2}do
+table.insert(self.Points,point)
+table.insert(self.Coords,COORDINATE:NewFromVec2(point))
+end
+return self
+end
+function LINE:Coordinates()
+return self.Coords
+end
+function LINE:GetStartCoordinate()
+return self.Coords[1]
+end
+function LINE:GetEndCoordinate()
+return self.Coords[#self.Coords]
+end
+function LINE:GetStartPoint()
+return self.Points[1]
+end
+function LINE:GetEndPoint()
+return self.Points[#self.Points]
+end
+function LINE:GetLength()
+local total_length=0
+for i=1,#self.Points-1 do
+local x1,y1=self.Points[i]["x"],self.Points[i]["y"]
+local x2,y2=self.Points[i+1]["x"],self.Points[i+1]["y"]
+local segment_length=math.sqrt((x2-x1)^2+(y2-y1)^2)
+total_length=total_length+segment_length
+end
+return total_length
+end
+function LINE:GetRandomPoint(points)
+points=points or self.Points
+local rand=math.random()
+local random_x=points[1].x+rand*(points[2].x-points[1].x)
+local random_y=points[1].y+rand*(points[2].y-points[1].y)
+return{x=random_x,y=random_y}
+end
+function LINE:GetHeading(points)
+points=points or self.Points
+local angle=math.atan2(points[2].y-points[1].y,points[2].x-points[1].x)
+angle=math.deg(angle)
+if angle<0 then
+angle=angle+360
+end
+return angle
+end
+function LINE:GetIndividualParts()
+local parts={}
+if#self.Points==2 then
+parts={self}
+end
+for i=1,#self.Points-1 do
+local p1=self.Points[i]
+local p2=self.Points[i%#self.Points+1]
+table.add(parts,LINE:New(p1,p2))
+end
+return parts
+end
+function LINE:GetPointsInbetween(amount,start_point,end_point)
+start_point=start_point or self:GetStartPoint()
+end_point=end_point or self:GetEndPoint()
+if amount==0 then return{start_point,end_point}end
+amount=amount+1
+local points={}
+local difference={x=end_point.x-start_point.x,y=end_point.y-start_point.y}
+local divided={x=difference.x/amount,y=difference.y/amount}
+for j=0,amount do
+local part_pos={x=divided.x*j,y=divided.y*j}
+local point={x=start_point.x+part_pos.x,y=start_point.y+part_pos.y}
+table.insert(points,point)
+end
+return points
+end
+function LINE:GetCoordinatesInBetween(amount,start_point,end_point)
+local coords={}
+for _,pt in pairs(self:GetPointsInbetween(amount,start_point,end_point))do
+table.add(coords,COORDINATE:NewFromVec2(pt))
+end
+return coords
+end
+function LINE:GetRandomPoint(start_point,end_point)
+start_point=start_point or self:GetStartPoint()
+end_point=end_point or self:GetEndPoint()
+local fraction=math.random()
+local difference={x=end_point.x-start_point.x,y=end_point.y-start_point.y}
+local part_pos={x=difference.x*fraction,y=difference.y*fraction}
+local random_point={x=start_point.x+part_pos.x,y=start_point.y+part_pos.y}
+return random_point
+end
+function LINE:GetRandomCoordinate(start_point,end_point)
+start_point=start_point or self:GetStartPoint()
+end_point=end_point or self:GetEndPoint()
+return COORDINATE:NewFromVec2(self:GetRandomPoint(start_point,end_point))
+end
+function LINE:GetPointsBetweenAsSineWave(amount,start_point,end_point,frequency,phase,amplitude)
+amount=amount or 20
+start_point=start_point or self:GetStartPoint()
+end_point=end_point or self:GetEndPoint()
+frequency=frequency or 1
+phase=phase or 0
+amplitude=amplitude or 100
+local points={}
+local function sine_wave(x)
+return amplitude*math.sin(2*math.pi*frequency*(x-start_point.x)+phase)
+end
+local x=start_point.x
+local step=(end_point.x-start_point.x)/20
+for _=1,amount do
+local y=sine_wave(x)
+x=x+step
+table.add(points,{x=x,y=y})
+end
+return points
+end
+function LINE:GetBoundingBox()
+local min_x,min_y,max_x,max_y=self.Points[1].x,self.Points[1].y,self.Points[2].x,self.Points[2].y
+for i=2,#self.Points do
+local x,y=self.Points[i].x,self.Points[i].y
+if x<min_x then
+min_x=x
+end
+if y<min_y then
+min_y=y
+end
+if x>max_x then
+max_x=x
+end
+if y>max_y then
+max_y=y
+end
+end
+return{
+{x=min_x,y=min_x},{x=max_x,y=min_y},{x=max_x,y=max_y},{x=min_x,y=max_y}
+}
+end
+function LINE:Draw()
+for i=1,#self.Coords-1 do
+local c1=self.Coords[i]
+local c2=self.Coords[i%#self.Coords+1]
+table.add(self.MarkIDs,c1:LineToAll(c2))
+end
+end
+function LINE:RemoveDraw()
+for _,mark_id in pairs(self.MarkIDs)do
+UTILS.RemoveMark(mark_id)
+end
+end
+OVAL={
+ClassName="OVAL",
+MajorAxis=nil,
+MinorAxis=nil,
+Angle=0,
+DrawPoly=nil
+}
+function OVAL:FindOnMap(shape_name)
+local self=BASE:Inherit(self,SHAPE_BASE:FindOnMap(shape_name))
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if string.find(object["name"],shape_name,1,true)then
+if object["polygonMode"]=="oval"then
+self.CenterVec2={x=object["mapX"],y=object["mapY"]}
+self.MajorAxis=object["r1"]
+self.MinorAxis=object["r2"]
+self.Angle=object["angle"]
+end
+end
+end
+end
+return self
+end
+function OVAL:Find(shape_name)
+return _DATABASE:FindShape(shape_name)
+end
+function OVAL:New(vec2,major_axis,minor_axis,angle)
+local self=BASE:Inherit(self,SHAPE_BASE:New())
+self.CenterVec2=vec2
+self.MajorAxis=major_axis
+self.MinorAxis=minor_axis
+self.Angle=angle or 0
+return self
+end
+function OVAL:GetMajorAxis()
+return self.MajorAxis
+end
+function OVAL:GetMinorAxis()
+return self.MinorAxis
+end
+function OVAL:GetAngle()
+return self.Angle
+end
+function OVAL:SetMajorAxis(value)
+self.MajorAxis=value
+end
+function OVAL:SetMinorAxis(value)
+self.MinorAxis=value
+end
+function OVAL:SetAngle(value)
+self.Angle=value
+end
+function OVAL:ContainsPoint(point)
+local cos,sin=math.cos,math.sin
+local dx=point.x-self.CenterVec2.x
+local dy=point.y-self.CenterVec2.y
+local rx=dx*cos(self.Angle)+dy*sin(self.Angle)
+local ry=-dx*sin(self.Angle)+dy*cos(self.Angle)
+return rx*rx/(self.MajorAxis*self.MajorAxis)+ry*ry/(self.MinorAxis*self.MinorAxis)<=1
+end
+function OVAL:GetRandomVec2()
+local theta=math.rad(self.Angle)
+local random_point=math.sqrt(math.random())
+local phi=math.random()*2*math.pi
+local x_c=random_point*math.cos(phi)
+local y_c=random_point*math.sin(phi)
+local x_e=x_c*self.MajorAxis
+local y_e=y_c*self.MinorAxis
+local rx=(x_e*math.cos(theta)-y_e*math.sin(theta))+self.CenterVec2.x
+local ry=(x_e*math.sin(theta)+y_e*math.cos(theta))+self.CenterVec2.y
+return{x=rx,y=ry}
+end
+function OVAL:GetBoundingBox()
+local min_x=self.CenterVec2.x-self.MajorAxis
+local min_y=self.CenterVec2.y-self.MinorAxis
+local max_x=self.CenterVec2.x+self.MajorAxis
+local max_y=self.CenterVec2.y+self.MinorAxis
+return{
+{x=min_x,y=min_x},{x=max_x,y=min_y},{x=max_x,y=max_y},{x=min_x,y=max_y}
+}
+end
+function OVAL:Draw()
+self.DrawPoly=POLYGON:NewFromPoints(self:PointsOnEdge(20))
+self.DrawPoly:Draw(true)
+end
+function OVAL:RemoveDraw()
+self.DrawPoly:RemoveDraw()
+end
+function OVAL:PointsOnEdge(num_points)
+num_points=num_points or 20
+local points={}
+local dtheta=2*math.pi/num_points
+for i=0,num_points-1 do
+local theta=i*dtheta
+local x=self.CenterVec2.x+self.MajorAxis*math.cos(theta)*math.cos(self.Angle)-self.MinorAxis*math.sin(theta)*math.sin(self.Angle)
+local y=self.CenterVec2.y+self.MajorAxis*math.cos(theta)*math.sin(self.Angle)+self.MinorAxis*math.sin(theta)*math.cos(self.Angle)
+table.insert(points,{x=x,y=y})
+end
+return points
+end
+POLYGON={
+ClassName="POLYGON",
+Points={},
+Coords={},
+Triangles={},
+SurfaceArea=0,
+TriangleMarkIDs={},
+OutlineMarkIDs={},
+Angle=nil,
+Heading=nil
+}
+function POLYGON:FindOnMap(shape_name)
+local self=BASE:Inherit(self,SHAPE_BASE:FindOnMap(shape_name))
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if object["name"]==shape_name then
+if(object["primitiveType"]=="Line"and object["closed"]==true)or(object["polygonMode"]=="free")then
+for _,point in UTILS.spairs(object["points"])do
+local p={x=object["mapX"]+point["x"],
+y=object["mapY"]+point["y"]}
+local coord=COORDINATE:NewFromVec2(p)
+self.Points[#self.Points+1]=p
+self.Coords[#self.Coords+1]=coord
+end
+elseif object["polygonMode"]=="rect"then
+local angle=object["angle"]
+local half_width=object["width"]/2
+local half_height=object["height"]/2
+local p1=UTILS.RotatePointAroundPivot({x=self.CenterVec2.x-half_height,y=self.CenterVec2.y+half_width},self.CenterVec2,angle)
+local p2=UTILS.RotatePointAroundPivot({x=self.CenterVec2.x+half_height,y=self.CenterVec2.y+half_width},self.CenterVec2,angle)
+local p3=UTILS.RotatePointAroundPivot({x=self.CenterVec2.x+half_height,y=self.CenterVec2.y-half_width},self.CenterVec2,angle)
+local p4=UTILS.RotatePointAroundPivot({x=self.CenterVec2.x-half_height,y=self.CenterVec2.y-half_width},self.CenterVec2,angle)
+self.Points={p1,p2,p3,p4}
+for _,point in pairs(self.Points)do
+self.Coords[#self.Coords+1]=COORDINATE:NewFromVec2(point)
+end
+elseif object["polygonMode"]=="arrow"then
+for _,point in UTILS.spairs(object["points"])do
+local p={x=object["mapX"]+point["x"],
+y=object["mapY"]+point["y"]}
+local coord=COORDINATE:NewFromVec2(p)
+self.Points[#self.Points+1]=p
+self.Coords[#self.Coords+1]=coord
+end
+self.Angle=object["angle"]
+self.Heading=UTILS.ClampAngle(self.Angle+90)
+end
+end
+end
+end
+if#self.Points==0 then
+return nil
+end
+self.CenterVec2=self:GetCentroid()
+self.Triangles=self:Triangulate()
+self.SurfaceArea=self:__CalculateSurfaceArea()
+self.TriangleMarkIDs={}
+self.OutlineMarkIDs={}
+return self
+end
+function POLYGON:FromZone(zone_name)
+for _,zone in pairs(env.mission.triggers.zones)do
+if zone["name"]==zone_name then
+return POLYGON:New(unpack(zone["verticies"]or{}))
+end
+end
+end
+function POLYGON:Find(shape_name)
+return _DATABASE:FindShape(shape_name)
+end
+function POLYGON:New(...)
+local self=BASE:Inherit(self,SHAPE_BASE:New())
+self.Points={...}
+self.Coords={}
+for _,point in UTILS.spairs(self.Points)do
+table.insert(self.Coords,COORDINATE:NewFromVec2(point))
+end
+self.Triangles=self:Triangulate()
+self.SurfaceArea=self:__CalculateSurfaceArea()
+return self
+end
+function POLYGON:GetCentroid()
+local function sum(t)
+local total=0
+for _,value in pairs(t)do
+total=total+value
+end
+return total
+end
+local x_values={}
+local y_values={}
+local length=table.length(self.Points)
+for _,point in pairs(self.Points)do
+table.insert(x_values,point.x)
+table.insert(y_values,point.y)
+end
+local x=sum(x_values)/length
+local y=sum(y_values)/length
+return{
+["x"]=x,
+["y"]=y
+}
+end
+function POLYGON:GetCoordinates()
+return self.Coords
+end
+function POLYGON:GetStartCoordinate()
+return self.Coords[1]
+end
+function POLYGON:GetEndCoordinate()
+return self.Coords[#self.Coords]
+end
+function POLYGON:GetStartPoint()
+return self.Points[1]
+end
+function POLYGON:GetEndPoint()
+return self.Points[#self.Points]
+end
+function POLYGON:GetPoints()
+return self.Points
+end
+function POLYGON:GetSurfaceArea()
+return self.SurfaceArea
+end
+function POLYGON:GetBoundingBox()
+local min_x,min_y,max_x,max_y=self.Points[1].x,self.Points[1].y,self.Points[1].x,self.Points[1].y
+for i=2,#self.Points do
+local x,y=self.Points[i].x,self.Points[i].y
+if x<min_x then
+min_x=x
+end
+if y<min_y then
+min_y=y
+end
+if x>max_x then
+max_x=x
+end
+if y>max_y then
+max_y=y
+end
+end
+return{
+{x=min_x,y=min_x},{x=max_x,y=min_y},{x=max_x,y=max_y},{x=min_x,y=max_y}
+}
+end
+function POLYGON:Triangulate(points)
+points=points or self.Points
+local triangles={}
+local function get_orientation(shape_points)
+local sum=0
+for i=1,#shape_points do
+local j=i%#shape_points+1
+sum=sum+(shape_points[j].x-shape_points[i].x)*(shape_points[j].y+shape_points[i].y)
+end
+return sum>=0 and"clockwise"or"counter-clockwise"
+end
+local function ensure_clockwise(shape_points)
+local orientation=get_orientation(shape_points)
+if orientation=="counter-clockwise"then
+local reversed={}
+for i=#shape_points,1,-1 do
+table.insert(reversed,shape_points[i])
+end
+return reversed
+end
+return shape_points
+end
+local function is_clockwise(p1,p2,p3)
+local cross_product=(p2.x-p1.x)*(p3.y-p1.y)-(p2.y-p1.y)*(p3.x-p1.x)
+return cross_product<0
+end
+local function divide_recursively(shape_points)
+if#shape_points==3 then
+table.insert(triangles,TRIANGLE:New(shape_points[1],shape_points[2],shape_points[3]))
+elseif#shape_points>3 then
+for i,p1 in ipairs(shape_points)do
+local p2=shape_points[(i%#shape_points)+1]
+local p3=shape_points[(i+1)%#shape_points+1]
+local triangle=TRIANGLE:New(p1,p2,p3)
+local is_ear=true
+if not is_clockwise(p1,p2,p3)then
+is_ear=false
+else
+for _,point in ipairs(shape_points)do
+if point~=p1 and point~=p2 and point~=p3 and triangle:ContainsPoint(point)then
+is_ear=false
+break
+end
+end
+end
+if is_ear then
+local is_valid_triangle=true
+for _,point in ipairs(points)do
+if point~=p1 and point~=p2 and point~=p3 and triangle:ContainsPoint(point)then
+is_valid_triangle=false
+break
+end
+end
+if is_valid_triangle then
+table.insert(triangles,triangle)
+local remaining_points={}
+for j,point in ipairs(shape_points)do
+if point~=p2 then
+table.insert(remaining_points,point)
+end
+end
+divide_recursively(remaining_points)
+break
+end
+end
+end
+end
+end
+points=ensure_clockwise(points)
+divide_recursively(points)
+return triangles
+end
+function POLYGON:CovarianceMatrix()
+local cx,cy=self:GetCentroid()
+local covXX,covYY,covXY=0,0,0
+for _,p in ipairs(self.points)do
+covXX=covXX+(p.x-cx)^2
+covYY=covYY+(p.y-cy)^2
+covXY=covXY+(p.x-cx)*(p.y-cy)
+end
+covXX=covXX/(#self.points-1)
+covYY=covYY/(#self.points-1)
+covXY=covXY/(#self.points-1)
+return covXX,covYY,covXY
+end
+function POLYGON:Direction()
+local covXX,covYY,covXY=self:CovarianceMatrix()
+local theta=0.5*math.atan2(2*covXY,covXX-covYY)
+return math.cos(theta),math.sin(theta)
+end
+function POLYGON:GetRandomVec2()
+local weights={}
+for _,triangle in pairs(self.Triangles)do
+weights[triangle]=triangle.SurfaceArea/self.SurfaceArea
+end
+local random_weight=math.random()
+local accumulated_weight=0
+for triangle,weight in pairs(weights)do
+accumulated_weight=accumulated_weight+weight
+if accumulated_weight>=random_weight then
+return triangle:GetRandomVec2()
+end
+end
+end
+function POLYGON:GetRandomNonWeightedVec2()
+return self.Triangles[math.random(1,#self.Triangles)]:GetRandomVec2()
+end
+function POLYGON:ContainsPoint(point,polygon_points)
+local x=point.x
+local y=point.y
+polygon_points=polygon_points or self.Points
+local counter=0
+local num_points=#polygon_points
+for current_index=1,num_points do
+local next_index=(current_index%num_points)+1
+local current_x,current_y=polygon_points[current_index].x,polygon_points[current_index].y
+local next_x,next_y=polygon_points[next_index].x,polygon_points[next_index].y
+if((current_y>y)~=(next_y>y))and(x<(next_x-current_x)*(y-current_y)/(next_y-current_y)+current_x)then
+counter=counter+1
+end
+end
+return counter%2==1
+end
+function POLYGON:Draw(include_inner_triangles)
+include_inner_triangles=include_inner_triangles or false
+for i=1,#self.Coords do
+local c1=self.Coords[i]
+local c2=self.Coords[i%#self.Coords+1]
+table.add(self.OutlineMarkIDs,c1:LineToAll(c2))
+end
+if include_inner_triangles then
+for _,triangle in ipairs(self.Triangles)do
+triangle:Draw()
+end
+end
+end
+function POLYGON:RemoveDraw()
+for _,triangle in pairs(self.Triangles)do
+triangle:RemoveDraw()
+end
+for _,mark_id in pairs(self.OutlineMarkIDs)do
+UTILS.RemoveMark(mark_id)
+end
+end
+function POLYGON:__CalculateSurfaceArea()
+local area=0
+for _,triangle in pairs(self.Triangles)do
+area=area+triangle.SurfaceArea
+end
+return area
+end
+TRIANGLE={
+ClassName="TRIANGLE",
+Points={},
+Coords={},
+SurfaceArea=0
+}
+function TRIANGLE:New(p1,p2,p3)
+local self=BASE:Inherit(self,SHAPE_BASE:New())
+self.Points={p1,p2,p3}
+local center_x=(p1.x+p2.x+p3.x)/3
+local center_y=(p1.y+p2.y+p3.y)/3
+self.CenterVec2={x=center_x,y=center_y}
+for _,pt in pairs({p1,p2,p3})do
+table.add(self.Coords,COORDINATE:NewFromVec2(pt))
+end
+self.SurfaceArea=math.abs((p2.x-p1.x)*(p3.y-p1.y)-(p3.x-p1.x)*(p2.y-p1.y))*0.5
+self.MarkIDs={}
+return self
+end
+function TRIANGLE:ContainsPoint(pt,points)
+points=points or self.Points
+local function sign(p1,p2,p3)
+return(p1.x-p3.x)*(p2.y-p3.y)-(p2.x-p3.x)*(p1.y-p3.y)
+end
+local d1=sign(pt,self.Points[1],self.Points[2])
+local d2=sign(pt,self.Points[2],self.Points[3])
+local d3=sign(pt,self.Points[3],self.Points[1])
+local has_neg=(d1<0)or(d2<0)or(d3<0)
+local has_pos=(d1>0)or(d2>0)or(d3>0)
+return not(has_neg and has_pos)
+end
+function TRIANGLE:GetRandomVec2(points)
+points=points or self.Points
+local pt={math.random(),math.random()}
+table.sort(pt)
+local s=pt[1]
+local t=pt[2]-pt[1]
+local u=1-pt[2]
+return{x=s*points[1].x+t*points[2].x+u*points[3].x,
+y=s*points[1].y+t*points[2].y+u*points[3].y}
+end
+function TRIANGLE:Draw()
+for i=1,#self.Coords do
+local c1=self.Coords[i]
+local c2=self.Coords[i%#self.Coords+1]
+table.add(self.MarkIDs,c1:LineToAll(c2))
+end
+end
+function TRIANGLE:RemoveDraw()
+for _,mark_id in pairs(self.MarkIDs)do
+UTILS.RemoveMark(mark_id)
+end
+end
 do
 USERSOUND={
 ClassName="USERSOUND",
@@ -79788,7 +81309,7 @@ end
 function MSRS:SetVoiceProvider(Voice,Provider)
 self:F({Voice=Voice,Provider=Provider})
 self.poptions=self.poptions or{}
-self.poptions[Provider or self:GetProvider()]=Voice
+self.poptions[Provider or self:GetProvider()].voice=Voice
 return self
 end
 function MSRS:SetVoiceWindows(Voice)
@@ -82636,7 +84157,7 @@ local ActRouteTarget=ProcessUnit:GetProcess("Engaging","RouteToTargetZone")
 return ActRouteTarget:GetZone()
 end
 function TASK_A2G:SetGoalTotal()
-self.GoalTotal=self.TargetSetUnit:Count()
+self.GoalTotal=self.TargetSetUnit:CountAlive()
 end
 function TASK_A2G:GetGoalTotal()
 return self.GoalTotal
@@ -82649,7 +84170,7 @@ return Distance
 end
 function TASK_A2G:onafterGoal(TaskUnit,From,Event,To)
 local TargetSetUnit=self.TargetSetUnit
-if TargetSetUnit:Count()==0 then
+if TargetSetUnit:CountAlive()==0 then
 self:Success()
 end
 self:__Goal(-10)
@@ -82667,7 +84188,7 @@ ThreatLevel,ThreatText=self.TargetSetUnit:CalculateThreatLevelA2G()
 end
 self.TaskInfo:AddThreat(ThreatText,ThreatLevel,10,"MOD",true)
 if self.Detection then
-local DetectedItemsCount=self.TargetSetUnit:Count()
+local DetectedItemsCount=self.TargetSetUnit:CountAlive()
 local ReportTypes=REPORT:New()
 local TargetTypes={}
 for TargetUnitName,TargetUnit in pairs(self.TargetSetUnit:GetSet())do
@@ -82680,7 +84201,7 @@ end
 self.TaskInfo:AddTargetCount(DetectedItemsCount,11,"O",true)
 self.TaskInfo:AddTargets(DetectedItemsCount,ReportTypes:Text(", "),20,"D",true)
 else
-local DetectedItemsCount=self.TargetSetUnit:Count()
+local DetectedItemsCount=self.TargetSetUnit:CountAlive()
 local DetectedItemsTypes=self.TargetSetUnit:GetTypeNames()
 self.TaskInfo:AddTargetCount(DetectedItemsCount,11,"O",true)
 self.TaskInfo:AddTargets(DetectedItemsCount,DetectedItemsTypes,20,"D",true)