@jtff/miztemplate-lib 3.1.7 → 3.1.9

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2023-11-19T12:40:22+01:00-522eb8b256f9edfbcb2c8ecfe66861f659c6403c ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-01T00:38:59+01:00-8dcd22f18c9bf740c53b69c7ba3901a9ada0bb2d ***')
 env.info('*** MOOSE STATIC INCLUDE START *** ')
 ENUMS={}
 env.setErrorMessageBoxEnabled(false)
@@ -379,6 +379,7 @@ Galaxy="C-5",
 Hawkeye="E-2D",
 Sentry="E-3A",
 Stratotanker="KC-135",
+Gasstation="KC-135MPRS",
 Extender="KC-10",
 Orion="P-3C",
 Viking="S-3B",
@@ -416,6 +417,12 @@ Reaper="MQ-9",
 Predator="MQ-1A",
 }
 }
+ENUMS.Link16Power={
+none=0,
+low=1,
+medium=2,
+high=3,
+}
 ENUMS.Storage={
 weapons={
 missiles={},
@@ -1277,21 +1284,33 @@ end
 end
 end
 function UTILS.PrintTableToLog(table,indent)
+local text="\n"
 if not table then
-BASE:E("No table passed!")
-return
+env.warning("No table passed!")
+return nil
 end
 if not indent then indent=0 end
 for k,v in pairs(table)do
+if string.find(k," ")then k='"'..k..'"'end
 if type(v)=="table"then
-BASE:I(string.rep("  ",indent)..tostring(k).." = {")
-UTILS.PrintTableToLog(v,indent+1)
-BASE:I(string.rep("  ",indent).."}")
+env.info(string.rep("  ",indent)..tostring(k).." = {")
+text=text..string.rep("  ",indent)..tostring(k).." = {\n"
+text=text..tostring(UTILS.PrintTableToLog(v,indent+1)).."\n"
+env.info(string.rep("  ",indent).."},")
+text=text..string.rep("  ",indent).."},\n"
+else
+local value
+if tostring(v)=="true"or tostring(v)=="false"or tonumber(v)~=nil then
+value=v
 else
-BASE:I(string.rep("  ",indent)..tostring(k).." = "..tostring(v))
+value='"'..tostring(v)..'"'
 end
+env.info(string.rep("  ",indent)..tostring(k).." = "..tostring(value)..",\n")
+text=text..string.rep("  ",indent)..tostring(k).." = "..tostring(value)..",\n"
 end
 end
+return text
+end
 function UTILS.TableShow(tbl,loc,indent,tableshow_tbls)
 tableshow_tbls=tableshow_tbls or{}
 loc=loc or""
@@ -1817,9 +1836,15 @@ end
 function UTILS.VecSubstract(a,b)
 return{x=a.x-b.x,y=a.y-b.y,z=a.z-b.z}
 end
+function UTILS.VecSubtract(a,b)
+return UTILS.VecSubstract(a,b)
+end
 function UTILS.Vec2Substract(a,b)
 return{x=a.x-b.x,y=a.y-b.y}
 end
+function UTILS.Vec2Subtract(a,b)
+return UTILS.Vec2Substract(a,b)
+end
 function UTILS.VecAdd(a,b)
 return{x=a.x+b.x,y=a.y+b.y,z=a.z+b.z}
 end
@@ -2288,15 +2313,15 @@ if string.find(type_name,"Hercules")and(unit:getDrawArgumentValue(1217)==1)then
 BASE:T(unit_name.." side door is open")
 return true
 end
-if string.find(type_name,"Bell-47")then
+if type_name=="Bell-47"then
 BASE:T(unit_name.." door is open")
 return true
 end
-if string.find(type_name,"UH-60L")and(unit:getDrawArgumentValue(401)==1 or unit:getDrawArgumentValue(402)==1)then
+if type_name=="UH-60L"and(unit:getDrawArgumentValue(401)==1 or unit:getDrawArgumentValue(402)==1)then
 BASE:T(unit_name.." cargo door is open")
 return true
 end
-if string.find(type_name,"UH-60L")and(unit:getDrawArgumentValue(38)==1 or unit:getDrawArgumentValue(400)==1)then
+if type_name=="UH-60L"and(unit:getDrawArgumentValue(38)>0 or unit:getDrawArgumentValue(400)==1)then
 BASE:T(unit_name.." front door(s) are open")
 return true
 end
@@ -2479,7 +2504,7 @@ filename=path.."\\"..filename
 end
 local exists=UTILS.CheckFileExists(Path,Filename)
 if not exists then
-BASE:E(string.format("ERROR: File %s does not exist!",filename))
+BASE:I(string.format("ERROR: File %s does not exist!",filename))
 return false
 end
 local file=assert(io.open(filename,"rb"))
@@ -2991,6 +3016,300 @@ point_four:LineToAll(point_three,coalition,color,alpha,lineType)
 circle_center_fix_four:CircleToAll(UTILS.NMToMeters(turn_radius),coalition,color,alpha,nil,0,lineType)
 circle_center_two_three:CircleToAll(UTILS.NMToMeters(turn_radius),coalition,color,alpha,nil,0,lineType)
 end
+function UTILS.TimeNow()
+return UTILS.SecondsToClock(timer.getAbsTime(),false,false)
+end
+function UTILS.TimeDifferenceInSeconds(start_time,end_time)
+return UTILS.ClockToSeconds(end_time)-UTILS.ClockToSeconds(start_time)
+end
+function UTILS.TimeLaterThan(time_string)
+if timer.getAbsTime()>UTILS.ClockToSeconds(time_string)then
+return true
+end
+return false
+end
+function UTILS.TimeBefore(time_string)
+if timer.getAbsTime()<UTILS.ClockToSeconds(time_string)then
+return true
+end
+return false
+end
+function UTILS.CombineTimeStrings(time_string_01,time_string_02)
+local hours1,minutes1,seconds1=time_string_01:match("(%d+):(%d+):(%d+)")
+local hours2,minutes2,seconds2=time_string_02:match("(%d+):(%d+):(%d+)")
+local total_seconds=tonumber(seconds1)+tonumber(seconds2)+tonumber(minutes1)*60+tonumber(minutes2)*60+tonumber(hours1)*3600+tonumber(hours2)*3600
+total_seconds=total_seconds%(24*3600)
+if total_seconds<0 then
+total_seconds=total_seconds+24*3600
+end
+local hours=math.floor(total_seconds/3600)
+total_seconds=total_seconds-hours*3600
+local minutes=math.floor(total_seconds/60)
+local seconds=total_seconds%60
+return string.format("%02d:%02d:%02d",hours,minutes,seconds)
+end
+function UTILS.SubtractTimeStrings(time_string_01,time_string_02)
+local hours1,minutes1,seconds1=time_string_01:match("(%d+):(%d+):(%d+)")
+local hours2,minutes2,seconds2=time_string_02:match("(%d+):(%d+):(%d+)")
+local total_seconds=tonumber(seconds1)-tonumber(seconds2)+tonumber(minutes1)*60-tonumber(minutes2)*60+tonumber(hours1)*3600-tonumber(hours2)*3600
+total_seconds=total_seconds%(24*3600)
+if total_seconds<0 then
+total_seconds=total_seconds+24*3600
+end
+local hours=math.floor(total_seconds/3600)
+total_seconds=total_seconds-hours*3600
+local minutes=math.floor(total_seconds/60)
+local seconds=total_seconds%60
+return string.format("%02d:%02d:%02d",hours,minutes,seconds)
+end
+function UTILS.TimeBetween(start_time,end_time)
+return UTILS.TimeLaterThan(start_time)and UTILS.TimeBefore(end_time)
+end
+function UTILS.PercentageChance(chance)
+chance=chance or math.random(0,100)
+chance=UTILS.Clamp(chance,0,100)
+local percentage=math.random(0,100)
+if percentage<chance then
+return true
+end
+return false
+end
+function UTILS.Clamp(value,min,max)
+if value<min then value=min end
+if value>max then value=max end
+return value
+end
+function UTILS.ClampAngle(value)
+if value>360 then return value-360 end
+if value<0 then return value+360 end
+return value
+end
+function UTILS.RemapValue(value,old_min,old_max,new_min,new_max)
+new_min=new_min or 0
+new_max=new_max or 100
+local old_range=old_max-old_min
+local new_range=new_max-new_min
+local percentage=(value-old_min)/old_range
+return(new_range*percentage)+new_min
+end
+function UTILS.RandomPointInTriangle(pt1,pt2,pt3)
+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*pt1.x+t*pt2.x+u*pt3.x,
+y=s*pt1.y+t*pt2.y+u*pt3.y}
+end
+function UTILS.AngleBetween(angle,min,max)
+angle=(360+(angle%360))%360
+min=(360+min%360)%360
+max=(360+max%360)%360
+if min<max then return min<=angle and angle<=max end
+return min<=angle or angle<=max
+end
+function UTILS.WriteJSON(data,file_path)
+package.path=package.path..";.\\Scripts\\?.lua"
+local JSON=require("json")
+local pretty_json_text=JSON:encode_pretty(data)
+local write_file=io.open(file_path,"w")
+write_file:write(pretty_json_text)
+write_file:close()
+end
+function UTILS.ReadJSON(file_path)
+package.path=package.path..";.\\Scripts\\?.lua"
+local JSON=require("json")
+local read_file=io.open(file_path,"r")
+local contents=read_file:read("*a")
+io.close(read_file)
+return JSON:decode(contents)
+end
+function UTILS.GetZoneProperties(zone_name)
+local return_table={}
+for _,zone in pairs(env.mission.triggers.zones)do
+if zone["name"]==zone_name then
+if table.length(zone["properties"])>0 then
+for _,property in pairs(zone["properties"])do
+return_table[property["key"]]=property["value"]
+end
+return return_table
+else
+BASE:I(string.format("%s doesn't have any properties",zone_name))
+return{}
+end
+end
+end
+end
+function UTILS.RotatePointAroundPivot(point,pivot,angle)
+local radians=math.rad(angle)
+local x=point.x-pivot.x
+local y=point.y-pivot.y
+local rotated_x=x*math.cos(radians)-y*math.sin(radians)
+local rotatex_y=x*math.sin(radians)+y*math.cos(radians)
+local original_x=rotated_x+pivot.x
+local original_y=rotatex_y+pivot.y
+return{x=original_x,y=original_y}
+end
+function UTILS.UniqueName(base)
+base=base or""
+local ran=tostring(math.random(0,1000000))
+if base==""then
+return ran
+end
+return base.."_"..ran
+end
+function string.startswith(str,value)
+return string.sub(str,1,string.len(value))==value
+end
+function string.endswith(str,value)
+return value==""or str:sub(-#value)==value
+end
+function string.split(input,separator)
+local parts={}
+for part in input:gmatch("[^"..separator.."]+")do
+table.insert(parts,part)
+end
+return parts
+end
+function string.contains(str,value)
+return string.match(str,value)
+end
+function table.contains(tbl,element)
+if element==nil or tbl==nil then return false end
+local index=1
+while tbl[index]do
+if tbl[index]==element then
+return true
+end
+index=index+1
+end
+return false
+end
+function table.contains_key(tbl,key)
+if tbl[key]~=nil then return true else return false end
+end
+function table.insert_unique(tbl,element)
+if element==nil or tbl==nil then return end
+if not table.contains(tbl,element)then
+table.insert(tbl,element)
+end
+end
+function table.remove_by_value(tbl,element)
+local indices_to_remove={}
+local index=1
+for _,value in pairs(tbl)do
+if value==element then
+table.insert(indices_to_remove,index)
+end
+index=index+1
+end
+for _,idx in pairs(indices_to_remove)do
+table.remove(tbl,idx)
+end
+end
+function table.remove_key(table,key)
+local element=table[key]
+table[key]=nil
+return element
+end
+function table.index_of(table,element)
+for i,v in ipairs(table)do
+if v==element then
+return i
+end
+end
+return nil
+end
+function table.length(T)
+local count=0
+for _ in pairs(T)do count=count+1 end
+return count
+end
+function table.slice(tbl,first,last)
+local sliced={}
+local start=first or 1
+local stop=last or table.length(tbl)
+local count=1
+for key,value in pairs(tbl)do
+if count>=start and count<=stop then
+sliced[key]=value
+end
+count=count+1
+end
+return sliced
+end
+function table.count_value(tbl,value)
+local count=0
+for _,item in pairs(tbl)do
+if item==value then count=count+1 end
+end
+return count
+end
+function table.combine(t1,t2)
+if t1==nil and t2==nil then
+BASE:E("Both tables were empty!")
+end
+if t1==nil then return t2 end
+if t2==nil then return t1 end
+for i=1,#t2 do
+t1[#t1+1]=t2[i]
+end
+return t1
+end
+function table.merge(t1,t2)
+for k,v in pairs(t2)do
+if(type(v)=="table")and(type(t1[k]or false)=="table")then
+table.merge(t1[k],t2[k])
+else
+t1[k]=v
+end
+end
+return t1
+end
+function table.add(tbl,item)
+tbl[#tbl+1]=item
+end
+function table.shuffle(tbl)
+local new_table={}
+for _,value in ipairs(tbl)do
+local pos=math.random(1,#new_table+1)
+table.insert(new_table,pos,value)
+end
+return new_table
+end
+function table.find_key_value_pair(tbl,key,value)
+for k,v in pairs(tbl)do
+if type(v)=="table"then
+local result=table.find_key_value_pair(v,key,value)
+if result~=nil then
+return result
+end
+elseif k==key and v==value then
+return tbl
+end
+end
+return nil
+end
+function UTILS.DecimalToOctal(Number)
+if Number<8 then return Number end
+local number=tonumber(Number)
+local octal=""
+local n=1
+while number>7 do
+local number1=number%8
+octal=string.format("%d",number1)..octal
+local number2=math.abs(number/8)
+if number2<8 then
+octal=string.format("%d",number2)..octal
+end
+number=number2
+n=n+1
+end
+return tonumber(octal)
+end
+function UTILS.OctalToDecimal(Number)
+return tonumber(Number,8)
+end
 PROFILER={
 ClassName="PROFILER",
 Counters={},
@@ -6618,7 +6937,7 @@ if Event.weapon then
 Event.Weapon=Event.weapon
 Event.WeaponName=Event.Weapon:getTypeName()
 Event.WeaponUNIT=CLIENT:Find(Event.Weapon,'',true)
-Event.WeaponPlayerName=Event.WeaponUNIT and Event.Weapon:getPlayerName()
+Event.WeaponPlayerName=Event.WeaponUNIT and Event.Weapon.getPlayerName and Event.Weapon:getPlayerName()
 Event.WeaponCoalition=Event.WeaponUNIT and Event.Weapon:getCoalition()
 Event.WeaponCategory=Event.WeaponUNIT and Event.Weapon:getDesc().category
 Event.WeaponTypeName=Event.WeaponUNIT and Event.Weapon:getTypeName()
@@ -8166,7 +8485,13 @@ if Delay and Delay>0 then
 self:ScheduleOnce(Delay,ZONE_BASE.UndrawZone,self)
 else
 if self.DrawID then
+if type(self.DrawID)~="table"then
 UTILS.RemoveMark(self.DrawID)
+else
+for _,mark_id in pairs(self.DrawID)do
+UTILS.RemoveMark(mark_id)
+end
+end
 end
 end
 return self
@@ -8881,8 +9206,81 @@ local PointVec2=POINT_VEC2:NewFromVec2(self:GetRandomVec2())
 self:T3({PointVec2})
 return PointVec2
 end
+_ZONE_TRIANGLE={
+ClassName="ZONE_TRIANGLE",
+Points={},
+Coords={},
+CenterVec2={x=0,y=0},
+SurfaceArea=0,
+DrawID={}
+}
+function _ZONE_TRIANGLE:New(p1,p2,p3)
+local self=BASE:Inherit(self,ZONE_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
+return self
+end
+function _ZONE_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 _ZONE_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 _ZONE_TRIANGLE:Draw(Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly)
+Coalition=Coalition or-1
+Color=Color or{1,0,0}
+Alpha=Alpha or 1
+FillColor=FillColor or Color
+if not FillColor then UTILS.DeepCopy(Color)end
+FillAlpha=FillAlpha or Alpha
+if not FillAlpha then FillAlpha=1 end
+for i=1,#self.Coords do
+local c1=self.Coords[i]
+local c2=self.Coords[i%#self.Coords+1]
+local id=c1:LineToAll(c2,Coalition,Color,Alpha,LineType,ReadOnly)
+self.DrawID[#self.DrawID+1]=id
+end
+local newID=self.Coords[1]:MarkupToAllFreeForm({self.Coords[2],self.Coords[3]},Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly)
+self.DrawID[#self.DrawID+1]=newID
+return self.DrawID
+end
+function _ZONE_TRIANGLE:Fill(Coalition,FillColor,FillAlpha,ReadOnly)
+Coalition=Coalition or-1
+FillColor=FillColor
+FillAlpha=FillAlpha
+local newID=self.Coords[1]:MarkupToAllFreeForm({self.Coords[2],self.Coords[3]},Coalition,nil,nil,FillColor,FillAlpha,0,nil)
+self.DrawID[#self.DrawID+1]=newID
+return self.DrawID
+end
 ZONE_POLYGON_BASE={
 ClassName="ZONE_POLYGON_BASE",
+_Triangles={},
+SurfaceArea=0,
+DrawID={},
+FillTriangles={},
+Borderlines={},
 }
 function ZONE_POLYGON_BASE:New(ZoneName,PointsArray)
 local self=BASE:Inherit(self,ZONE_BASE:New(ZoneName))
@@ -8894,9 +9292,84 @@ self._.Polygon[i]={}
 self._.Polygon[i].x=PointsArray[i].x
 self._.Polygon[i].y=PointsArray[i].y
 end
+self._Triangles=self:_Triangulate()
+self.SurfaceArea=self:_CalculateSurfaceArea()
 end
 return self
 end
+function ZONE_POLYGON_BASE:_Triangulate()
+local points=self._.Polygon
+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,_ZONE_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=_ZONE_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
+else
+end
+end
+end
+end
+points=ensure_clockwise(points)
+divide_recursively(points)
+return triangles
+end
 function ZONE_POLYGON_BASE:UpdateFromVec2(Vec2Array)
 self._.Polygon={}
 for i=1,#Vec2Array do
@@ -8904,6 +9377,8 @@ self._.Polygon[i]={}
 self._.Polygon[i].x=Vec2Array[i].x
 self._.Polygon[i].y=Vec2Array[i].y
 end
+self._Triangles=self:_Triangulate()
+self.SurfaceArea=self:_CalculateSurfaceArea()
 return self
 end
 function ZONE_POLYGON_BASE:UpdateFromVec3(Vec3Array)
@@ -8913,8 +9388,17 @@ self._.Polygon[i]={}
 self._.Polygon[i].x=Vec3Array[i].x
 self._.Polygon[i].y=Vec3Array[i].z
 end
+self._Triangles=self:_Triangulate()
+self.SurfaceArea=self:_CalculateSurfaceArea()
 return self
 end
+function ZONE_POLYGON_BASE:_CalculateSurfaceArea()
+local area=0
+for _,triangle in pairs(self._Triangles)do
+area=area+triangle.SurfaceArea
+end
+return area
+end
 function ZONE_POLYGON_BASE:GetVec2()
 self:F(self.ZoneName)
 local Bounds=self:GetBoundingSquare()
@@ -8997,32 +9481,81 @@ i=i+1
 end
 return self
 end
-function ZONE_POLYGON_BASE:DrawZone(Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly)
+function ZONE_POLYGON_BASE:DrawZone(Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly,IncludeTriangles)
 if self._.Polygon and#self._.Polygon>=3 then
-local coordinate=COORDINATE:NewFromVec2(self._.Polygon[1])
 Coalition=Coalition or self:GetDrawCoalition()
 self:SetDrawCoalition(Coalition)
 Color=Color or self:GetColorRGB()
-Alpha=Alpha or 1
-self:SetColor(Color,Alpha)
+Alpha=Alpha or self:GetColorAlpha()
 FillColor=FillColor or self:GetFillColorRGB()
-if not FillColor then UTILS.DeepCopy(Color)end
 FillAlpha=FillAlpha or self:GetFillColorAlpha()
-if not FillAlpha then FillAlpha=0.15 end
-self:SetFillColor(FillColor,FillAlpha)
-if#self._.Polygon==4 then
-local Coord2=COORDINATE:NewFromVec2(self._.Polygon[2])
-local Coord3=COORDINATE:NewFromVec2(self._.Polygon[3])
-local Coord4=COORDINATE:NewFromVec2(self._.Polygon[4])
-self.DrawID=coordinate:QuadToAll(Coord2,Coord3,Coord4,Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly)
-else
-local Coordinates=self:GetVerticiesCoordinates()
-table.remove(Coordinates,1)
-self.DrawID=coordinate:MarkupToAllFreeForm(Coordinates,Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly)
+if FillColor then
+self:ReFill(FillColor,FillAlpha)
+end
+if Color then
+self:ReDrawBorderline(Color,Alpha,LineType)
+end
+end
+if false then
+local coords=self:GetVerticiesCoordinates()
+local coord=coords[1]
+table.remove(coords,1)
+coord:MarkupToAllFreeForm(coords,Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly,"Drew Polygon")
+if true then
+return
+end
+end
+return self
+end
+function ZONE_POLYGON_BASE:ReFill(Color,Alpha)
+local color=Color or self:GetFillColorRGB()or{1,0,0}
+local alpha=Alpha or self:GetFillColorAlpha()or 1
+local coalition=self:GetDrawCoalition()or-1
+if#self.FillTriangles>0 then
+for _,triangle in pairs(self._Triangles)do
+triangle:UndrawZone()
+end
+for _,_value in pairs(self.FillTriangles)do
+table.remove_by_value(self.DrawID,_value)
+end
+self.FillTriangles=nil
+self.FillTriangles={}
+end
+for _,triangle in pairs(self._Triangles)do
+local draw_ids=triangle:Fill(coalition,color,alpha,nil)
+self.FillTriangles=draw_ids
+table.combine(self.DrawID,draw_ids)
+end
+return self
+end
+function ZONE_POLYGON_BASE:ReDrawBorderline(Color,Alpha,LineType)
+local color=Color or self:GetFillColorRGB()or{1,0,0}
+local alpha=Alpha or self:GetFillColorAlpha()or 1
+local coalition=self:GetDrawCoalition()or-1
+local linetype=LineType or 1
+if#self.Borderlines>0 then
+for _,MarkID in pairs(self.Borderlines)do
+trigger.action.removeMark(MarkID)
+end
+for _,_value in pairs(self.Borderlines)do
+table.remove_by_value(self.DrawID,_value)
 end
+self.Borderlines=nil
+self.Borderlines={}
+end
+local coords=self:GetVerticiesCoordinates()
+for i=1,#coords do
+local c1=coords[i]
+local c2=coords[i%#coords+1]
+local newID=c1:LineToAll(c2,coalition,color,alpha,linetype,nil)
+self.DrawID[#self.DrawID+1]=newID
+self.Borderlines[#self.Borderlines+1]=newID
 end
 return self
 end
+function ZONE_POLYGON_BASE:GetSurfaceArea()
+return self.SurfaceArea
+end
 function ZONE_POLYGON_BASE:GetRadius()
 local center=self:GetVec2()
 local radius=0
@@ -9131,17 +9664,18 @@ local InZone=self:IsVec2InZone({x=Vec3.x,y=Vec3.z})
 return InZone
 end
 function ZONE_POLYGON_BASE:GetRandomVec2()
-local BS=self:GetBoundingSquare()
-local Nmax=1000;local n=0
-while n<Nmax do
-local Vec2={x=math.random(BS.x1,BS.x2),y=math.random(BS.y1,BS.y2)}
-if self:IsVec2InZone(Vec2)then
-return Vec2
+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
-n=n+1
 end
-self:E("Could not find a random point in the polygon zone!")
-return nil
 end
 function ZONE_POLYGON_BASE:GetRandomPointVec2()
 self:F2()
@@ -9198,6 +9732,7 @@ Radius=Radius or 1000
 Alpha=Alpha or 1
 Segments=Segments or 10
 Closed=Closed or false
+local Limit
 local i=1
 local j=#self._.Polygon
 if(Closed)then
@@ -9220,6 +9755,7 @@ i=i+1
 end
 return self
 end
+do
 ZONE_POLYGON={
 ClassName="ZONE_POLYGON",
 }
@@ -9244,6 +9780,36 @@ self:F({GroupName,ZoneGroup,self._.Polygon})
 _EVENTDISPATCHER:CreateEventNewZone(self)
 return self
 end
+function ZONE_POLYGON:NewFromDrawing(DrawingName)
+local points={}
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if object["name"]==DrawingName then
+if(object["primitiveType"]=="Line"and object["closed"]==true)or(object["polygonMode"]=="free")then
+for _,point in UTILS.spairs(object["points"])do
+local p={x=object["mapX"]+point["x"],
+y=object["mapY"]+point["y"]}
+table.add(points,p)
+end
+elseif object["polygonMode"]=="rect"then
+local angle=object["angle"]
+local half_width=object["width"]/2
+local half_height=object["height"]/2
+local center={x=object["mapX"],y=object["mapY"]}
+local p1=UTILS.RotatePointAroundPivot({x=center.x-half_height,y=center.y+half_width},center,angle)
+local p2=UTILS.RotatePointAroundPivot({x=center.x+half_height,y=center.y+half_width},center,angle)
+local p3=UTILS.RotatePointAroundPivot({x=center.x+half_height,y=center.y-half_width},center,angle)
+local p4=UTILS.RotatePointAroundPivot({x=center.x-half_height,y=center.y-half_width},center,angle)
+points={p1,p2,p3,p4}
+else
+end
+end
+end
+end
+local self=BASE:Inherit(self,ZONE_POLYGON_BASE:New(DrawingName,points))
+_EVENTDISPATCHER:CreateEventNewZone(self)
+return self
+end
 function ZONE_POLYGON:FindByName(ZoneName)
 local ZoneFound=_DATABASE:FindZone(ZoneName)
 return ZoneFound
@@ -9430,6 +9996,7 @@ end
 function ZONE_POLYGON:IsNoneInZone()
 return self:CountScannedCoalitions()==0
 end
+end
 do
 ZONE_ELASTIC={
 ClassName="ZONE_ELASTIC",
@@ -9523,6 +10090,124 @@ table.remove(h,#h)
 return h
 end
 end
+ZONE_OVAL={
+ClassName="OVAL",
+ZoneName="",
+MajorAxis=nil,
+MinorAxis=nil,
+Angle=0,
+DrawPoly=nil
+}
+function ZONE_OVAL:New(name,vec2,major_axis,minor_axis,angle)
+self=BASE:Inherit(self,ZONE_BASE:New())
+self.ZoneName=name
+self.CenterVec2=vec2
+self.MajorAxis=major_axis
+self.MinorAxis=minor_axis
+self.Angle=angle or 0
+_DATABASE:AddZone(name,self)
+return self
+end
+function ZONE_OVAL:NewFromDrawing(DrawingName)
+self=BASE:Inherit(self,ZONE_BASE:New(DrawingName))
+for _,layer in pairs(env.mission.drawings.layers)do
+for _,object in pairs(layer["objects"])do
+if string.find(object["name"],DrawingName,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
+_DATABASE:AddZone(DrawingName,self)
+return self
+end
+function ZONE_OVAL:GetMajorAxis()
+return self.MajorAxis
+end
+function ZONE_OVAL:GetMinorAxis()
+return self.MinorAxis
+end
+function ZONE_OVAL:GetAngle()
+return self.Angle
+end
+function ZONE_OVAL:GetVec2()
+return self.CenterVec2
+end
+function ZONE_OVAL:IsVec2InZone(vec2)
+local cos,sin=math.cos,math.sin
+local dx=vec2.x-self.CenterVec2.x
+local dy=vec2.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 ZONE_OVAL:GetBoundingSquare()
+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 ZONE_OVAL:PointsOnEdge(num_points)
+num_points=num_points or 40
+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
+function ZONE_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 ZONE_OVAL:GetRandomPointVec2()
+return POINT_VEC2:NewFromVec2(self:GetRandomVec2())
+end
+function ZONE_OVAL:GetRandomPointVec3()
+return POINT_VEC2:NewFromVec3(self:GetRandomVec2())
+end
+function ZONE_OVAL:DrawZone(Coalition,Color,Alpha,FillColor,FillAlpha,LineType)
+Coalition=Coalition or self:GetDrawCoalition()
+self:SetDrawCoalition(Coalition)
+Color=Color or self:GetColorRGB()
+Alpha=Alpha or 1
+self:SetColor(Color,Alpha)
+FillColor=FillColor or self:GetFillColorRGB()
+if not FillColor then
+UTILS.DeepCopy(Color)
+end
+FillAlpha=FillAlpha or self:GetFillColorAlpha()
+if not FillAlpha then
+FillAlpha=0.15
+end
+LineType=LineType or 1
+self:SetFillColor(FillColor,FillAlpha)
+self.DrawPoly=ZONE_POLYGON:NewFromPointsArray(self.ZoneName,self:PointsOnEdge(80))
+self.DrawPoly:DrawZone(Coalition,Color,Alpha,FillColor,FillAlpha,LineType)
+end
+function ZONE_OVAL:UndrawZone()
+if self.DrawPoly then
+self.DrawPoly:UndrawZone()
+end
+end
 do
 ZONE_AIRBASE={
 ClassName="ZONE_AIRBASE",
@@ -9877,6 +10562,23 @@ table.remove(points,#points)
 self:I(string.format("Register ZONE: %s (Polygon (free) drawing with %d vertices)",ZoneName,#points))
 local Zone=ZONE_POLYGON:NewFromPointsArray(ZoneName,points)
 Zone:SetColor({1,0,0},0.15)
+Zone:SetFillColor({1,0,0},0.15)
+if objectData.colorString then
+local color=string.gsub(objectData.colorString,"^0x","")
+local r=tonumber(string.sub(color,1,2),16)/255
+local g=tonumber(string.sub(color,3,4),16)/255
+local b=tonumber(string.sub(color,5,6),16)/255
+local a=tonumber(string.sub(color,7,8),16)/255
+Zone:SetColor({r,g,b},a)
+end
+if objectData.fillColorString then
+local color=string.gsub(objectData.colorString,"^0x","")
+local r=tonumber(string.sub(color,1,2),16)/255
+local g=tonumber(string.sub(color,3,4),16)/255
+local b=tonumber(string.sub(color,5,6),16)/255
+local a=tonumber(string.sub(color,7,8),16)/255
+Zone:SetFillColor({r,g,b},a)
+end
 self.ZONENAMES[ZoneName]=ZoneName
 self:AddZone(ZoneName,Zone)
 elseif objectData.polygonMode and objectData.polygonMode=="rect"then
@@ -9892,6 +10594,22 @@ points[4]={x=vec2.x-h/2,y=vec2.y-w/2}
 self:I(string.format("Register ZONE: %s (Polygon (rect) drawing with %d vertices)",ZoneName,#points))
 local Zone=ZONE_POLYGON:NewFromPointsArray(ZoneName,points)
 Zone:SetColor({1,0,0},0.15)
+if objectData.colorString then
+local color=string.gsub(objectData.colorString,"^0x","")
+local r=tonumber(string.sub(color,1,2),16)/255
+local g=tonumber(string.sub(color,3,4),16)/255
+local b=tonumber(string.sub(color,5,6),16)/255
+local a=tonumber(string.sub(color,7,8),16)/255
+Zone:SetColor({r,g,b},a)
+end
+if objectData.fillColorString then
+local color=string.gsub(objectData.colorString,"^0x","")
+local r=tonumber(string.sub(color,1,2),16)/255
+local g=tonumber(string.sub(color,3,4),16)/255
+local b=tonumber(string.sub(color,5,6),16)/255
+local a=tonumber(string.sub(color,7,8),16)/255
+Zone:SetFillColor({r,g,b},a)
+end
 self.ZONENAMES[ZoneName]=ZoneName
 self:AddZone(ZoneName,Zone)
 elseif objectData.lineMode and(objectData.lineMode=="segments"or objectData.lineMode=="segment"or objectData.lineMode=="free")and objectData.points and#objectData.points>=2 then
@@ -10697,6 +11415,26 @@ self.CallScheduler=SCHEDULER:New(self)
 self:SetEventPriority(2)
 return self
 end
+function SET_BASE:FilterFunction(ConditionFunction,...)
+local condition={}
+condition.func=ConditionFunction
+condition.arg={}
+if arg then
+condition.arg=arg
+end
+if not self.Filter.Functions then self.Filter.Functions={}end
+table.insert(self.Filter.Functions,condition)
+return self
+end
+function SET_BASE:_EvalFilterFunctions(Object)
+for _,_condition in pairs(self.Filter.Functions or{})do
+local condition=_condition
+if condition.func(Object,unpack(condition.arg))==false then
+return false
+end
+end
+return true
+end
 function SET_BASE:Clear(TriggerEvent)
 for Name,Object in pairs(self.Set)do
 self:Remove(Name,not TriggerEvent)
@@ -10834,7 +11572,10 @@ self:T3({LastObject})
 return LastObject
 end
 function SET_BASE:GetRandom()
-local tablemax=table.maxn(self.Index)
+local tablemax=0
+for _,_ind in pairs(self.Index)do
+tablemax=tablemax+1
+end
 local RandomItem=self.Set[self.Index[math.random(1,tablemax)]]
 self:T3({RandomItem})
 return RandomItem
@@ -11057,6 +11798,7 @@ Categories=nil,
 Countries=nil,
 GroupPrefixes=nil,
 Zones=nil,
+Functions=nil,
 },
 FilterMeta={
 Coalitions={
@@ -11506,7 +12248,7 @@ MGroupActive=true
 end
 MGroupInclude=MGroupInclude and MGroupActive
 end
-if self.Filter.Coalitions then
+if self.Filter.Coalitions and MGroupInclude then
 local MGroupCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 self:T3({"Coalition:",MGroup:GetCoalition(),self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
@@ -11516,7 +12258,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupCoalition
 end
-if self.Filter.Categories then
+if self.Filter.Categories and MGroupInclude then
 local MGroupCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 self:T3({"Category:",MGroup:GetCategory(),self.FilterMeta.Categories[CategoryName],CategoryName})
@@ -11526,7 +12268,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupCategory
 end
-if self.Filter.Countries then
+if self.Filter.Countries and MGroupInclude then
 local MGroupCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
 self:T3({"Country:",MGroup:GetCountry(),CountryName})
@@ -11536,7 +12278,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupCountry
 end
-if self.Filter.GroupPrefixes then
+if self.Filter.GroupPrefixes and MGroupInclude then
 local MGroupPrefix=false
 for GroupPrefixId,GroupPrefix in pairs(self.Filter.GroupPrefixes)do
 self:T3({"Prefix:",string.find(MGroup:GetName(),GroupPrefix,1),GroupPrefix})
@@ -11546,7 +12288,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupPrefix
 end
-if self.Filter.Zones then
+if self.Filter.Zones and MGroupInclude then
 local MGroupZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
 if MGroup:IsInZone(Zone)then
@@ -11555,6 +12297,11 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupZone
 end
+if self.Filter.Functions and MGroupInclude then
+local MGroupFunc=false
+MGroupFunc=self:_EvalFilterFunctions(MGroup)
+MGroupInclude=MGroupInclude and MGroupFunc
+end
 self:T2(MGroupInclude)
 return MGroupInclude
 end
@@ -11595,6 +12342,7 @@ Types=nil,
 Countries=nil,
 UnitPrefixes=nil,
 Zones=nil,
+Functions=nil,
 },
 FilterMeta={
 Coalitions={
@@ -11983,46 +12731,40 @@ self:F({MaxThreatLevelA2G=MaxThreatLevelA2G,MaxThreatText=MaxThreatText})
 return MaxThreatLevelA2G,MaxThreatText
 end
 function SET_UNIT:GetCoordinate()
-local Coordinate=nil
-local unit=self:GetRandom()
-if self:Count()==1 and unit then
-return unit:GetCoordinate()
+local function GetSetVec3(units)
+local x=0
+local y=0
+local z=0
+local n=0
+for _,unit in pairs(units)do
+local vec3=nil
+if unit and unit:IsAlive()then
+vec3=unit:GetVec3()
 end
-if unit then
-local Coordinate=unit:GetCoordinate()
-local x1=Coordinate.x
-local x2=Coordinate.x
-local y1=Coordinate.y
-local y2=Coordinate.y
-local z1=Coordinate.z
-local z2=Coordinate.z
-local MaxVelocity=0
-local AvgHeading=nil
-local MovingCount=0
-for UnitName,UnitData in pairs(self:GetAliveSet())do
-local Unit=UnitData
-local Coordinate=Unit:GetCoordinate()
-x1=(Coordinate.x<x1)and Coordinate.x or x1
-x2=(Coordinate.x>x2)and Coordinate.x or x2
-y1=(Coordinate.y<y1)and Coordinate.y or y1
-y2=(Coordinate.y>y2)and Coordinate.y or y2
-z1=(Coordinate.y<z1)and Coordinate.z or z1
-z2=(Coordinate.y>z2)and Coordinate.z or z2
-local Velocity=Coordinate:GetVelocity()
-if Velocity~=0 then
-MaxVelocity=(MaxVelocity<Velocity)and Velocity or MaxVelocity
-local Heading=Coordinate:GetHeading()
-AvgHeading=AvgHeading and(AvgHeading+Heading)or Heading
-MovingCount=MovingCount+1
+if vec3 then
+x=x+vec3.x
+y=y+vec3.y
+z=z+vec3.z
+n=n+1
 end
 end
-AvgHeading=AvgHeading and(AvgHeading/MovingCount)
-Coordinate.x=(x2-x1)/2+x1
-Coordinate.y=(y2-y1)/2+y1
-Coordinate.z=(z2-z1)/2+z1
-Coordinate:SetHeading(AvgHeading)
-Coordinate:SetVelocity(MaxVelocity)
-self:F({Coordinate=Coordinate})
+if n>0 then
+local Vec3={x=x/n,y=y/n,z=z/n}
+return Vec3
+end
+return nil
+end
+local Coordinate=nil
+local Vec3=GetSetVec3(self.Set)
+if Vec3 then
+Coordinate=COORDINATE:NewFromVec3(Vec3)
+end
+if Coordinate then
+local heading=self:GetHeading()or 0
+local velocity=self:GetVelocity()or 0
+Coordinate:SetHeading(heading)
+Coordinate:SetVelocity(velocity)
+self:I(UTILS.PrintTableToLog(Coordinate))
 end
 return Coordinate
 end
@@ -12142,7 +12884,7 @@ MUnitActive=true
 end
 MUnitInclude=MUnitInclude and MUnitActive
 end
-if self.Filter.Coalitions then
+if self.Filter.Coalitions and MUnitInclude then
 local MUnitCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 self:F({"Coalition:",MUnit:GetCoalition(),self.FilterMeta.Coalitions[CoalitionName],CoalitionName})
@@ -12152,7 +12894,7 @@ end
 end
 MUnitInclude=MUnitInclude and MUnitCoalition
 end
-if self.Filter.Categories then
+if self.Filter.Categories and MUnitInclude then
 local MUnitCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 self:T3({"Category:",MUnit:GetDesc().category,self.FilterMeta.Categories[CategoryName],CategoryName})
@@ -12162,7 +12904,7 @@ end
 end
 MUnitInclude=MUnitInclude and MUnitCategory
 end
-if self.Filter.Types then
+if self.Filter.Types and MUnitInclude then
 local MUnitType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
 self:T3({"Type:",MUnit:GetTypeName(),TypeName})
@@ -12172,7 +12914,7 @@ end
 end
 MUnitInclude=MUnitInclude and MUnitType
 end
-if self.Filter.Countries then
+if self.Filter.Countries and MUnitInclude then
 local MUnitCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
 self:T3({"Country:",MUnit:GetCountry(),CountryName})
@@ -12182,7 +12924,7 @@ end
 end
 MUnitInclude=MUnitInclude and MUnitCountry
 end
-if self.Filter.UnitPrefixes then
+if self.Filter.UnitPrefixes and MUnitInclude then
 local MUnitPrefix=false
 for UnitPrefixId,UnitPrefix in pairs(self.Filter.UnitPrefixes)do
 self:T3({"Prefix:",string.find(MUnit:GetName(),UnitPrefix,1),UnitPrefix})
@@ -12192,7 +12934,7 @@ end
 end
 MUnitInclude=MUnitInclude and MUnitPrefix
 end
-if self.Filter.RadarTypes then
+if self.Filter.RadarTypes and MUnitInclude then
 local MUnitRadar=false
 for RadarTypeID,RadarType in pairs(self.Filter.RadarTypes)do
 self:T3({"Radar:",RadarType})
@@ -12205,7 +12947,7 @@ end
 end
 MUnitInclude=MUnitInclude and MUnitRadar
 end
-if self.Filter.SEAD then
+if self.Filter.SEAD and MUnitInclude then
 local MUnitSEAD=false
 if MUnit:HasSEAD()==true then
 self:T3("SEAD Found")
@@ -12214,7 +12956,7 @@ end
 MUnitInclude=MUnitInclude and MUnitSEAD
 end
 end
-if self.Filter.Zones then
+if self.Filter.Zones and MUnitInclude then
 local MGroupZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
 self:T3("Zone:",ZoneName)
@@ -12224,6 +12966,10 @@ end
 end
 MUnitInclude=MUnitInclude and MGroupZone
 end
+if self.Filter.Functions and MUnitInclude then
+local MUnitFunc=self:_EvalFilterFunctions(MUnit)
+MUnitInclude=MUnitInclude and MUnitFunc
+end
 self:T2(MUnitInclude)
 return MUnitInclude
 end
@@ -12974,7 +13720,7 @@ MClientActive=true
 end
 MClientInclude=MClientInclude and MClientActive
 end
-if self.Filter.Coalitions then
+if self.Filter.Coalitions and MClientInclude then
 local MClientCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 local ClientCoalitionID=_DATABASE:GetCoalitionFromClientTemplate(MClientName)
@@ -12986,7 +13732,7 @@ end
 self:T({"Evaluated Coalition",MClientCoalition})
 MClientInclude=MClientInclude and MClientCoalition
 end
-if self.Filter.Categories then
+if self.Filter.Categories and MClientInclude then
 local MClientCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 local ClientCategoryID=_DATABASE:GetCategoryFromClientTemplate(MClientName)
@@ -12998,7 +13744,7 @@ end
 self:T({"Evaluated Category",MClientCategory})
 MClientInclude=MClientInclude and MClientCategory
 end
-if self.Filter.Types then
+if self.Filter.Types and MClientInclude then
 local MClientType=false
 for TypeID,TypeName in pairs(self.Filter.Types)do
 self:T3({"Type:",MClient:GetTypeName(),TypeName})
@@ -13009,7 +13755,7 @@ end
 self:T({"Evaluated Type",MClientType})
 MClientInclude=MClientInclude and MClientType
 end
-if self.Filter.Countries then
+if self.Filter.Countries and MClientInclude then
 local MClientCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
 local ClientCountryID=_DATABASE:GetCountryFromClientTemplate(MClientName)
@@ -13021,7 +13767,7 @@ end
 self:T({"Evaluated Country",MClientCountry})
 MClientInclude=MClientInclude and MClientCountry
 end
-if self.Filter.ClientPrefixes then
+if self.Filter.ClientPrefixes and MClientInclude then
 local MClientPrefix=false
 for ClientPrefixId,ClientPrefix in pairs(self.Filter.ClientPrefixes)do
 self:T3({"Prefix:",string.find(MClient.UnitName,ClientPrefix,1),ClientPrefix})
@@ -13032,7 +13778,7 @@ end
 self:T({"Evaluated Prefix",MClientPrefix})
 MClientInclude=MClientInclude and MClientPrefix
 end
-if self.Filter.Zones then
+if self.Filter.Zones and MClientInclude then
 local MClientZone=false
 for ZoneName,Zone in pairs(self.Filter.Zones)do
 self:T3("Zone:",ZoneName)
@@ -13043,7 +13789,7 @@ end
 end
 MClientInclude=MClientInclude and MClientZone
 end
-if self.Filter.Playernames then
+if self.Filter.Playernames and MClientInclude then
 local MClientPlayername=false
 local playername=MClient:GetPlayerName()or"Unknown"
 for _,_Playername in pairs(self.Filter.Playernames)do
@@ -13054,7 +13800,7 @@ end
 self:T({"Evaluated Playername",MClientPlayername})
 MClientInclude=MClientInclude and MClientPlayername
 end
-if self.Filter.Callsigns then
+if self.Filter.Callsigns and MClientInclude then
 local MClientCallsigns=false
 local callsign=MClient:GetCallsign()
 for _,_Callsign in pairs(self.Filter.Callsigns)do
@@ -13065,6 +13811,10 @@ end
 self:T({"Evaluated Callsign",MClientCallsigns})
 MClientInclude=MClientInclude and MClientCallsigns
 end
+if self.Filter.Functions and MClientInclude then
+local MClientFunc=self:_EvalFilterFunctions(MClient)
+MClientInclude=MClientInclude and MClientFunc
+end
 end
 self:T2(MClientInclude)
 return MClientInclude
@@ -13384,7 +14134,6 @@ return AirbaseFound
 end
 function SET_AIRBASE:GetRandomAirbase()
 local RandomAirbase=self:GetRandom()
-self:F({RandomAirbase=RandomAirbase:GetName()})
 return RandomAirbase
 end
 function SET_AIRBASE:FilterCoalitions(Coalitions)
@@ -13474,7 +14223,7 @@ end
 self:T({"Evaluated Coalition",MAirbaseCoalition})
 MAirbaseInclude=MAirbaseInclude and MAirbaseCoalition
 end
-if self.Filter.Categories then
+if self.Filter.Categories and MAirbaseInclude then
 local MAirbaseCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 local AirbaseCategoryID=_DATABASE:GetCategoryFromAirbase(MAirbaseName)
@@ -14557,7 +15306,7 @@ MGroupActive=true
 end
 MGroupInclude=MGroupInclude and MGroupActive
 end
-if self.Filter.Coalitions then
+if self.Filter.Coalitions and MGroupInclude then
 local MGroupCoalition=false
 for CoalitionID,CoalitionName in pairs(self.Filter.Coalitions)do
 if self.FilterMeta.Coalitions[CoalitionName]and self.FilterMeta.Coalitions[CoalitionName]==MGroup:GetCoalition()then
@@ -14566,7 +15315,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupCoalition
 end
-if self.Filter.Categories then
+if self.Filter.Categories and MGroupInclude then
 local MGroupCategory=false
 for CategoryID,CategoryName in pairs(self.Filter.Categories)do
 if self.FilterMeta.Categories[CategoryName]and self.FilterMeta.Categories[CategoryName]==MGroup:GetCategory()then
@@ -14575,7 +15324,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupCategory
 end
-if self.Filter.Countries then
+if self.Filter.Countries and MGroupInclude then
 local MGroupCountry=false
 for CountryID,CountryName in pairs(self.Filter.Countries)do
 if country.id[CountryName]==MGroup:GetCountry()then
@@ -14584,7 +15333,7 @@ end
 end
 MGroupInclude=MGroupInclude and MGroupCountry
 end
-if self.Filter.GroupPrefixes then
+if self.Filter.GroupPrefixes and MGroupInclude then
 local MGroupPrefix=false
 for GroupPrefixId,GroupPrefix in pairs(self.Filter.GroupPrefixes)do
 if string.find(MGroup:GetName(),GroupPrefix:gsub("-","%%-"),1)then
@@ -15950,11 +16699,14 @@ Color,FillColor,LineType,ReadOnly,Text or"")
 else
 local s=string.format("trigger.action.markupToAll(7, %d, %d,",Coalition,MarkID)
 for _,vec in pairs(vecs)do
-s=s..string.format("%s,",UTILS._OneLineSerialize(vec))
+s=s..string.format("{x=%.1f, y=%.1f, z=%.1f},",vec.x,vec.y,vec.z)
 end
-s=s..string.format("%s, %s, %s, %s",UTILS._OneLineSerialize(Color),UTILS._OneLineSerialize(FillColor),tostring(LineType),tostring(ReadOnly))
-if Text and Text~=""then
-s=s..string.format(", \"%s\"",Text)
+s=s..string.format("{%.3f, %.3f, %.3f, %.3f},",Color[1],Color[2],Color[3],Color[4])
+s=s..string.format("{%.3f, %.3f, %.3f, %.3f},",FillColor[1],FillColor[2],FillColor[3],FillColor[4])
+s=s..string.format("%d,",LineType or 1)
+s=s..string.format("%s",tostring(ReadOnly))
+if Text and type(Text)=="string"and string.len(Text)>0 then
+s=s..string.format(", \"%s\"",tostring(Text))
 end
 s=s..")"
 local success=UTILS.DoString(s)
@@ -16213,6 +16965,9 @@ end
 end
 return BRAANATO
 end
+function COORDINATE.GetBullseyeCoordinate(Coalition)
+return COORDINATE:NewFromVec3(coalition.getMainRefPoint(Coalition))
+end
 function COORDINATE:ToStringBULLS(Coalition,Settings,MagVar)
 local BullsCoordinate=COORDINATE:NewFromVec3(coalition.getMainRefPoint(Coalition))
 local DirectionVec3=BullsCoordinate:GetDirectionVec3(self)
@@ -16261,6 +17016,36 @@ local lat,lon=coord.LOtoLL(self:GetVec3())
 local MGRS=coord.LLtoMGRS(lat,lon)
 return"MGRS "..UTILS.tostringMGRS(MGRS,MGRS_Accuracy)
 end
+function COORDINATE:NewFromMGRSString(MGRSString)
+local myparts=UTILS.Split(MGRSString," ")
+local northing=tostring(myparts[5])or""
+local easting=tostring(myparts[4])or""
+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
+local MGRS={
+UTMZone=myparts[2],
+MGRSDigraph=myparts[3],
+Easting=easting,
+Northing=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: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
+local MGRS={
+UTMZone=UTMZone,
+MGRSDigraph=MGRSDigraph,
+Easting=Easting,
+Northing=Northing,
+}
+local lat,lon=coord.MGRStoLL(MGRS)
+local point=coord.LLtoLO(lat,lon,0)
+local coord=COORDINATE:NewFromVec2({x=point.x,y=point.z})
+end
 function COORDINATE:ToStringFromRP(ReferenceCoord,ReferenceName,Controllable,Settings,MagVar)
 self:F2({ReferenceCoord=ReferenceCoord,ReferenceName=ReferenceName})
 local Settings=Settings or(Controllable and _DATABASE:GetPlayerSettings(Controllable:GetPlayerName()))or _SETTINGS
@@ -16792,7 +17577,7 @@ end
 if CoalitionSide then
 if self.MessageDuration~=0 then
 self:T(self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$","").." / "..self.MessageDuration)
-trigger.action.outTextForCoalition(CoalitionSide,self.MessageText:gsub("\n$",""):gsub("\n$",""),self.MessageDuration,self.ClearScreen)
+trigger.action.outTextForCoalition(CoalitionSide,self.MessageCategory..self.MessageText:gsub("\n$",""):gsub("\n$",""),self.MessageDuration,self.ClearScreen)
 end
 end
 self.CoalitionSide=CoalitionSide
@@ -16848,7 +17633,6 @@ _MESSAGESRS.Culture=Culture or"en-GB"
 _MESSAGESRS.MSRS:SetGender(Gender)
 _MESSAGESRS.Gender=Gender or"female"
 _MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
-_MESSAGESRS.google=PathToCredentials
 _MESSAGESRS.MSRS:SetLabel(Label or"MESSAGE")
 _MESSAGESRS.label=Label or"MESSAGE"
 _MESSAGESRS.MSRS:SetPort(Port or 5002)
@@ -17439,6 +18223,7 @@ self.SpawnInitModexPrefix=nil
 self.SpawnInitModexPostfix=nil
 self.SpawnInitAirbase=nil
 self.TweakedTemplate=false
+self.SpawnRandomCallsign=false
 self.SpawnGroups={}
 else
 error("SPAWN:New: There is no group declared in the mission editor with SpawnTemplatePrefix = '"..SpawnTemplatePrefix.."'")
@@ -17728,6 +18513,18 @@ self:_RandomizeZones(SpawnGroupID)
 end
 return self
 end
+function SPAWN:InitRandomizeCallsign()
+self.SpawnRandomCallsign=true
+return self
+end
+function SPAWN:InitCallSign(ID,Name,Minor,Major)
+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"
+return self
+end
 function SPAWN:InitPositionCoordinate(Coordinate)
 self:T({self.SpawnTemplatePrefix,Coordinate:GetVec2()})
 self:InitPositionVec2(Coordinate:GetVec2())
@@ -18849,19 +19646,133 @@ SpawnTemplate.units[UnitID].name=string.format('%s#%03d-%02d',UnitPrefix,SpawnIn
 SpawnTemplate.units[UnitID].unitId=nil
 end
 end
+if self.SpawnRandomCallsign and SpawnTemplate.units[1].callsign then
+if type(SpawnTemplate.units[1].callsign)~="number"then
+local min=1
+local max=8
+local ctable=CALLSIGN.Aircraft
+if string.find(SpawnTemplate.units[1].type,"A-10",1,true)then
+max=12
+end
+if string.find(SpawnTemplate.units[1].type,"18",1,true)then
+min=9
+max=20
+ctable=CALLSIGN.F18
+end
+if string.find(SpawnTemplate.units[1].type,"16",1,true)then
+min=9
+max=20
+ctable=CALLSIGN.F16
+end
+if SpawnTemplate.units[1].type=="F-15E"then
+min=9
+max=18
+ctable=CALLSIGN.F15E
+end
+local callsignnr=math.random(min,max)
+local callsignname="Enfield"
+for name,value in pairs(ctable)do
+if value==callsignnr then
+callsignname=name
+end
+end
+for UnitID=1,#SpawnTemplate.units do
+SpawnTemplate.units[UnitID].callsign[1]=callsignnr
+SpawnTemplate.units[UnitID].callsign[2]=UnitID
+SpawnTemplate.units[UnitID].callsign[3]="1"
+SpawnTemplate.units[UnitID].callsign["name"]=tostring(callsignname)..tostring(UnitID).."1"
+end
+else
+for UnitID=1,#SpawnTemplate.units do
+SpawnTemplate.units[UnitID].callsign=math.random(1,999)
+end
+end
+end
+if self.SpawnInitCallSign then
+for UnitID=1,#SpawnTemplate.units do
+local Callsign=SpawnTemplate.units[UnitID].callsign
+if Callsign and type(Callsign)~="number"then
+SpawnTemplate.units[UnitID].callsign[1]=self.SpawnInitCallSignID
+SpawnTemplate.units[UnitID].callsign[2]=self.SpawnInitCallSignMinor
+SpawnTemplate.units[UnitID].callsign[3]=self.SpawnInitCallSignMajor
+SpawnTemplate.units[UnitID].callsign["name"]=string.format("%s%d%d",self.SpawnInitCallSignName,self.SpawnInitCallSignMinor,self.SpawnInitCallSignMajor)
+end
+end
+end
 for UnitID=1,#SpawnTemplate.units do
 local Callsign=SpawnTemplate.units[UnitID].callsign
 if Callsign then
-if type(Callsign)~="number"then
+if type(Callsign)~="number"and not self.SpawnInitCallSign then
 Callsign[2]=((SpawnIndex-1)%10)+1
 local CallsignName=SpawnTemplate.units[UnitID].callsign["name"]
 CallsignName=string.match(CallsignName,"^(%a+)")
 local CallsignLen=CallsignName:len()
+SpawnTemplate.units[UnitID].callsign[2]=UnitID
 SpawnTemplate.units[UnitID].callsign["name"]=CallsignName:sub(1,CallsignLen)..SpawnTemplate.units[UnitID].callsign[2]..SpawnTemplate.units[UnitID].callsign[3]
-else
+elseif type(Callsign)=="number"then
 SpawnTemplate.units[UnitID].callsign=Callsign+SpawnIndex
 end
 end
+local AddProps=SpawnTemplate.units[UnitID].AddPropAircraft
+if AddProps then
+if SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16 then
+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))
+else
+local STN=math.floor(UTILS.RandomGaussian(4088/2,nil,1000,4088))
+STN=STN+UnitID-1
+local OSTN=UTILS.DecimalToOctal(STN)
+SpawnTemplate.units[UnitID].AddPropAircraft.STN_L16=string.format("%05d",OSTN)
+end
+end
+if SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN then
+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))
+else
+local STN=math.floor(UTILS.RandomGaussian(504/2,nil,100,504))
+STN=STN+UnitID-1
+local OSTN=UTILS.DecimalToOctal(STN)
+SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN=string.format("%04d",OSTN)
+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
+if SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignLabel and type(Callsign)~="number"then
+local CallsignName=SpawnTemplate.units[UnitID].callsign["name"]
+CallsignName=string.match(CallsignName,"^(%a+)")
+local label="NY"
+if not string.find(CallsignName," ")then
+label=string.upper(string.match(CallsignName,"^%a")..string.match(CallsignName,"%a$"))
+end
+SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignLabel=label
+end
+if SpawnTemplate.units[UnitID].datalinks and SpawnTemplate.units[UnitID].datalinks.Link16 and SpawnTemplate.units[UnitID].datalinks.Link16.settings then
+SpawnTemplate.units[UnitID].datalinks.Link16.settings.flightLead=UnitID==1 and true or false
+end
+if SpawnTemplate.units[UnitID].datalinks and SpawnTemplate.units[UnitID].datalinks.SADL and SpawnTemplate.units[UnitID].datalinks.SADL.settings then
+SpawnTemplate.units[UnitID].datalinks.SADL.settings.flightLead=UnitID==1 and true or false
+end
+end
+end
+for UnitID=1,#SpawnTemplate.units do
+if SpawnTemplate.units[UnitID].datalinks and SpawnTemplate.units[UnitID].datalinks.Link16 and SpawnTemplate.units[UnitID].datalinks.Link16.network then
+local team={}
+local isF16=string.find(SpawnTemplate.units[UnitID].type,"F-16",1,true)and true or false
+for ID=1,#SpawnTemplate.units do
+local member={}
+member.missionUnitId=ID
+if isF16 then
+member.TDOA=true
+end
+table.insert(team,member)
+end
+SpawnTemplate.units[UnitID].datalinks.Link16.network.teamMembers=team
+end
 end
 self:T3({"Template:",SpawnTemplate})
 return SpawnTemplate
@@ -23057,32 +23968,35 @@ self:SetOption(AI.Option.Air.id.PROHIBIT_AB,Prohibit)
 end
 return self
 end
-function CONTROLLABLE:OptionECM_Never()
+function CONTROLLABLE:OptionECM(ECMvalue)
 self:F2({self.ControllableName})
+local DCSControllable=self:GetDCSObject()
+if DCSControllable then
+local Controller=self:_GetController()
 if self:IsAir()then
-self:SetOption(AI.Option.Air.id.ECM_USING,0)
+Controller:setOption(AI.Option.Air.id.ECM_USING,ECMvalue or 1)
+end
 end
 return self
 end
-function CONTROLLABLE:OptionECM_OnlyLockByRadar()
+function CONTROLLABLE:OptionECM_Never()
 self:F2({self.ControllableName})
-if self:IsAir()then
-self:SetOption(AI.Option.Air.id.ECM_USING,1)
+self:OptionECM(0)
+return self
 end
+function CONTROLLABLE:OptionECM_OnlyLockByRadar()
+self:F2({self.ControllableName})
+self:OptionECM(1)
 return self
 end
 function CONTROLLABLE:OptionECM_DetectedLockByRadar()
 self:F2({self.ControllableName})
-if self:IsAir()then
-self:SetOption(AI.Option.Air.id.ECM_USING,2)
-end
+self:OptionECM(2)
 return self
 end
 function CONTROLLABLE:OptionECM_AlwaysOn()
 self:F2({self.ControllableName})
-if self:IsAir()then
-self:SetOption(AI.Option.Air.id.ECM_USING,3)
-end
+self:OptionECM(3)
 return self
 end
 function CONTROLLABLE:WayPointInitialize(WayPoints)
@@ -23166,7 +24080,7 @@ if DCSControllable then
 local Controller=self:_GetController()
 if Controller then
 if self:IsAir()then
-self:SetOption(AI.Option.Air.val.MISSILE_ATTACK,range)
+self:SetOption(AI.Option.Air.id.MISSILE_ATTACK,range)
 end
 end
 return self
@@ -23191,12 +24105,19 @@ return self
 end
 return nil
 end
-function CONTROLLABLE:RelocateGroundRandomInRadius(speed,radius,onroad,shortcut,formation)
+function CONTROLLABLE:RelocateGroundRandomInRadius(speed,radius,onroad,shortcut,formation,onland)
 self:F2({self.ControllableName})
 local _coord=self:GetCoordinate()
 local _radius=radius or 500
 local _speed=speed or 20
 local _tocoord=_coord:GetRandomCoordinateInRadius(_radius,100)
+if onland then
+for i=1,50 do
+local island=_tocoord:GetSurfaceType()==land.SurfaceType.LAND and true or false
+if island then break end
+_tocoord=_coord:GetRandomCoordinateInRadius(_radius,100)
+end
+end
 local _onroad=onroad or true
 local _grptsk={}
 local _candoroad=false
@@ -24100,7 +25021,7 @@ local Task={
 table.insert(TaskAerobatics.params["maneuversSequency"],Task)
 return TaskAerobatics
 end
-function CONTROLLABLE:PatrolRaceTrack(Point1,Point2,Altitude,Speed,Formation,Delay)
+function CONTROLLABLE:PatrolRaceTrack(Point1,Point2,Altitude,Speed,Formation,AGL,Delay)
 local PatrolGroup=self
 if not self:IsInstanceOf("GROUP")then
 PatrolGroup=self:GetGroup()
@@ -24114,8 +25035,10 @@ end
 local FromCoord=PatrolGroup:GetCoordinate()
 local ToCoord=Point1:GetCoordinate()
 if Altitude then
-FromCoord:SetAltitude(Altitude)
-ToCoord:SetAltitude(Altitude)
+local asl=true
+if AGL then asl=false end
+FromCoord:SetAltitude(Altitude,asl)
+ToCoord:SetAltitude(Altitude,asl)
 end
 local Route={}
 Route[#Route+1]=FromCoord:WaypointAir(AltType,COORDINATE.WaypointType.TurningPoint,COORDINATE.WaypointAction.TurningPoint,Speed,true,nil,DCSTasks,description,timeReFuAr)
@@ -24688,6 +25611,7 @@ if vec3 then
 local coord=COORDINATE:NewFromVec3(vec3)
 local Heading=self:GetHeading()
 coord.Heading=Heading
+return coord
 else
 BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()})
 return nil
@@ -25664,6 +26588,60 @@ local tankertask=self:EnRouteTaskTanker()
 self:PushTask(tankertask,delay+2)
 return self
 end
+function GROUP:GetGroupSTN()
+local tSTN={}
+local units=self:GetUnits()
+local gname=self:GetName()
+gname=string.gsub(gname,"(#%d+)$","")
+local report=REPORT:New()
+report:Add("Link16 S/TN Report")
+report:Add("Group: "..gname)
+report:Add("==================")
+for _,_unit in pairs(units)do
+local unit=_unit
+if unit and unit:IsAlive()then
+local STN,VCL,VCN,Lead=unit:GetSTN()
+local name=unit:GetName()
+tSTN[name]={
+STN=STN,
+VCL=VCL,
+VCN=VCN,
+Lead=Lead,
+}
+local lead=Lead==true and"(*)"or""
+report:Add(string.format("| %s%s %s %s",tostring(VCL),tostring(VCN),tostring(STN),lead))
+end
+end
+report:Add("==================")
+local text=report:Text()
+return tSTN,text
+end
+function GROUP:IsSAM()
+local issam=false
+local units=self:GetUnits()
+for _,_unit in pairs(units or{})do
+local unit=_unit
+if unit:HasSEAD()and unit:IsGround()and(not unit:HasAttribute("Mobile AAA"))then
+issam=true
+break
+end
+end
+return issam
+end
+function GROUP:IsAAA()
+local issam=false
+local units=self:GetUnits()
+for _,_unit in pairs(units or{})do
+local unit=_unit
+local desc=unit:GetDesc()or{}
+local attr=desc.attributes or{}
+if unit:HasSEAD()then return false end
+if attr["AAA"]or attr["SAM related"]then
+issam=true
+end
+end
+return issam
+end
 UNIT={
 ClassName="UNIT",
 UnitName=nil,
@@ -26458,6 +27436,30 @@ local name=self.UnitName
 local skill=_DATABASE.Templates.Units[name].Template.skill or"Random"
 return skill
 end
+function UNIT:GetSTN()
+self:F2(self.UnitName)
+local STN=nil
+local VCL=nil
+local VCN=nil
+local FGL=false
+local template=self:GetTemplate()
+if template.AddPropAircraft then
+if template.AddPropAircraft.STN_L16 then
+STN=template.AddPropAircraft.STN_L16
+elseif template.AddPropAircraft.SADL_TN then
+STN=template.AddPropAircraft.SADL_TN
+end
+VCN=template.AddPropAircraft.VoiceCallsignNumber
+VCL=template.AddPropAircraft.VoiceCallsignLabel
+end
+if template.datalinks and template.datalinks.Link16 and template.datalinks.Link16.settings then
+FGL=template.datalinks.Link16.settings.flightLead
+end
+if template.datalinks and template.datalinks.SADL and template.datalinks.SADL.settings then
+FGL=template.datalinks.SADL.settings.flightLead
+end
+return STN,VCL,VCN,FGL
+end
 CLIENT={
 ClassName="CLIENT",
 ClientName=nil,
@@ -26981,6 +27983,13 @@ AIRBASE.Normandy={
 ["Broglie"]="Broglie",
 ["Bernay_Saint_Martin"]="Bernay Saint Martin",
 ["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_Omer_Wizernes"]="Saint-Omer Wizernes",
 }
 AIRBASE.PersianGulf={
 ["Abu_Dhabi_International_Airport"]="Abu Dhabi Intl",
@@ -28501,6 +29510,13 @@ self.launcherUnit=UNIT:Find(self.launcher)
 end
 self.coordinate=COORDINATE:NewFromVec3(self.launcher:getPoint())
 self.lid=string.format("[%s] %s | ",self.typeName,self.name)
+if self.launcherUnit then
+self.releaseHeading=self.launcherUnit:GetHeading()
+self.releaseAltitudeASL=self.launcherUnit:GetAltitude()
+self.releaseAltitudeAGL=self.launcherUnit:GetAltitude(true)
+self.releaseCoordinate=self.launcherUnit:GetCoordinate()
+self.releasePitch=self.launcherUnit:GetPitch()
+end
 self:SetTimeStepTrack()
 self:SetDistanceInterceptPoint()
 local text=string.format("Weapon v%s\nName=%s, TypeName=%s, Category=%s, Coalition=%d, Country=%d, Launcher=%s",
@@ -28646,6 +29662,26 @@ end
 function WEAPON:GetImpactCoordinate()
 return self.impactCoord
 end
+function WEAPON:GetReleaseHeading(AccountForMagneticInclination)
+AccountForMagneticInclination=AccountForMagneticInclination or true
+if AccountForMagneticInclination then return UTILS.ClampAngle(self.releaseHeading-UTILS.GetMagneticDeclination())else return UTILS.ClampAngle(self.releaseHeading)end
+end
+function WEAPON:GetReleaseAltitudeASL()
+return self.releaseAltitudeASL
+end
+function WEAPON:GetReleaseAltitudeAGL()
+return self.releaseAltitudeAGL
+end
+function WEAPON:GetReleaseCoordinate()
+return self.releaseCoordinate
+end
+function WEAPON:GetReleasePitch()
+return self.releasePitch
+end
+function WEAPON:GetImpactHeading(AccountForMagneticInclination)
+AccountForMagneticInclination=AccountForMagneticInclination or true
+if AccountForMagneticInclination then return UTILS.ClampAngle(self.impactHeading-UTILS.GetMagneticDeclination())else return self.impactHeading end
+end
 function WEAPON:InAir()
 local inAir=nil
 if self.weapon then
@@ -28717,6 +29753,7 @@ if status then
 self.pos3=pos3
 self.vec3=UTILS.DeepCopy(self.pos3.p)
 self.coordinate:UpdateFromVec3(self.vec3)
+self.last_velocity=self.weapon:getVelocity()
 self.tracking=true
 if self.trackFunc then
 self.trackFunc(self,unpack(self.trackArg))
@@ -28744,6 +29781,7 @@ self:I(self.lid..string.format("FF d(ip, vec3)=%.3f meters",d))
 end
 self.impactVec3=ip or self.vec3
 self.impactCoord=COORDINATE:NewFromVec3(self.vec3)
+self.impactHeading=UTILS.VecHdg(self.last_velocity)
 if self.impactMark then
 self.impactCoord:MarkToAll(string.format("Impact point of weapon %s\ntype=%s\nlauncher=%s",self.name,self.typeName,self.launcherName))
 end
@@ -29376,7 +30414,7 @@ Reported={},
 }
 function CARGO:New(Type,Name,Weight,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,FSM:New())
-self:F({Type,Name,Weight,LoadRadius,NearRadius})
+self:T({Type,Name,Weight,LoadRadius,NearRadius})
 self:SetStartState("UnLoaded")
 self:AddTransition({"UnLoaded","Boarding"},"Board","Boarding")
 self:AddTransition("Boarding","Boarding","Boarding")
@@ -29521,7 +30559,7 @@ function CARGO:IsDeployed()
 return self.Deployed
 end
 function CARGO:Spawn(PointVec2)
-self:F()
+self:T()
 end
 function CARGO:Flare(FlareColor)
 if self:IsUnLoaded()then
@@ -29571,7 +30609,7 @@ function CARGO:GetLoadRadius()
 return self.LoadRadius
 end
 function CARGO:IsInLoadRadius(Coordinate)
-self:F({Coordinate,LoadRadius=self.LoadRadius})
+self:T({Coordinate,LoadRadius=self.LoadRadius})
 local Distance=0
 if self:IsUnLoaded()then
 local CargoCoordinate=self.CargoObject:GetCoordinate()
@@ -29584,7 +30622,7 @@ end
 return false
 end
 function CARGO:IsInReportRadius(Coordinate)
-self:F({Coordinate})
+self:T({Coordinate})
 local Distance=0
 if self:IsUnLoaded()then
 Distance=Coordinate:Get2DDistance(self.CargoObject:GetCoordinate())
@@ -29686,7 +30724,7 @@ ClassName="CARGO_REPRESENTABLE"
 }
 function CARGO_REPRESENTABLE:New(CargoObject,Type,Name,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,CARGO:New(Type,Name,0,LoadRadius,NearRadius))
-self:F({Type,Name,LoadRadius,NearRadius})
+self:T({Type,Name,LoadRadius,NearRadius})
 local Desc=CargoObject:GetDesc()
 self:T({Desc=Desc})
 local Weight=math.random(80,120)
@@ -29701,7 +30739,7 @@ self:SetWeight(Weight)
 return self
 end
 function CARGO_REPRESENTABLE:Destroy()
-self:F({CargoName=self:GetName()})
+self:T({CargoName=self:GetName()})
 return self
 end
 function CARGO_REPRESENTABLE:RouteTo(ToPointVec2,Speed)
@@ -29719,12 +30757,12 @@ local CoordinateZone=ZONE_RADIUS:New("Zone",self:GetCoordinate():GetVec2(),500)
 CoordinateZone:Scan({Object.Category.UNIT})
 for _,DCSUnit in pairs(CoordinateZone:GetScannedUnits())do
 local NearUnit=UNIT:Find(DCSUnit)
-self:F({NearUnit=NearUnit})
+self:T({NearUnit=NearUnit})
 local NearUnitCoalition=NearUnit:GetCoalition()
 local CargoCoalition=self:GetCoalition()
 if NearUnitCoalition==CargoCoalition then
 local Attributes=NearUnit:GetDesc()
-self:F({Desc=Attributes})
+self:T({Desc=Attributes})
 if NearUnit:HasAttribute("Trucks")then
 MESSAGE:New(Message,20,NearUnit:GetCallsign().." reporting - Cargo "..self:GetName()):ToGroup(TaskGroup)
 break
@@ -29739,7 +30777,7 @@ ClassName="CARGO_REPORTABLE"
 }
 function CARGO_REPORTABLE:New(Type,Name,Weight,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,CARGO:New(Type,Name,Weight,LoadRadius,NearRadius))
-self:F({Type,Name,Weight,LoadRadius,NearRadius})
+self:T({Type,Name,Weight,LoadRadius,NearRadius})
 return self
 end
 function CARGO_REPORTABLE:MessageToGroup(Message,TaskGroup,Name)
@@ -29752,13 +30790,13 @@ ClassName="CARGO_PACKAGE"
 }
 function CARGO_PACKAGE:New(CargoCarrier,Type,Name,Weight,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,CARGO_REPRESENTABLE:New(CargoCarrier,Type,Name,Weight,LoadRadius,NearRadius))
-self:F({Type,Name,Weight,LoadRadius,NearRadius})
+self:T({Type,Name,Weight,LoadRadius,NearRadius})
 self:T(CargoCarrier)
 self.CargoCarrier=CargoCarrier
 return self
 end
 function CARGO_PACKAGE:onafterOnBoard(From,Event,To,CargoCarrier,Speed,BoardDistance,LoadDistance,Angle)
-self:F()
+self:T()
 self.CargoInAir=self.CargoCarrier:InAir()
 self:T(self.CargoInAir)
 if not self.CargoInAir then
@@ -29776,7 +30814,7 @@ end
 self:Boarded(CargoCarrier,Speed,BoardDistance,LoadDistance,Angle)
 end
 function CARGO_PACKAGE:IsNear(CargoCarrier)
-self:F()
+self:T()
 local CargoCarrierPoint=CargoCarrier:GetCoordinate()
 local Distance=CargoCarrierPoint:Get2DDistance(self.CargoCarrier:GetCoordinate())
 self:T(Distance)
@@ -29787,7 +30825,7 @@ return false
 end
 end
 function CARGO_PACKAGE:onafterOnBoarded(From,Event,To,CargoCarrier,Speed,BoardDistance,LoadDistance,Angle)
-self:F()
+self:T()
 if self:IsNear(CargoCarrier)then
 self:__Load(1,CargoCarrier,Speed,LoadDistance,Angle)
 else
@@ -29795,7 +30833,7 @@ self:__Boarded(1,CargoCarrier,Speed,BoardDistance,LoadDistance,Angle)
 end
 end
 function CARGO_PACKAGE:onafterUnBoard(From,Event,To,CargoCarrier,Speed,UnLoadDistance,UnBoardDistance,Radius,Angle)
-self:F()
+self:T()
 self.CargoInAir=self.CargoCarrier:InAir()
 self:T(self.CargoInAir)
 if not self.CargoInAir then
@@ -29814,7 +30852,7 @@ end
 self:__UnBoarded(1,CargoCarrier,Speed)
 end
 function CARGO_PACKAGE:onafterUnBoarded(From,Event,To,CargoCarrier,Speed)
-self:F()
+self:T()
 if self:IsNear(CargoCarrier)then
 self:__UnLoad(1,CargoCarrier,Speed)
 else
@@ -29822,7 +30860,7 @@ self:__UnBoarded(1,CargoCarrier,Speed)
 end
 end
 function CARGO_PACKAGE:onafterLoad(From,Event,To,CargoCarrier,Speed,LoadDistance,Angle)
-self:F()
+self:T()
 self.CargoCarrier=CargoCarrier
 local StartPointVec2=self.CargoCarrier:GetPointVec2()
 local CargoCarrierHeading=self.CargoCarrier:GetHeading()
@@ -29835,7 +30873,7 @@ local TaskRoute=self.CargoCarrier:TaskRoute(Points)
 self.CargoCarrier:SetTask(TaskRoute,1)
 end
 function CARGO_PACKAGE:onafterUnLoad(From,Event,To,CargoCarrier,Speed,Distance,Angle)
-self:F()
+self:T()
 local StartPointVec2=self.CargoCarrier:GetPointVec2()
 local CargoCarrierHeading=self.CargoCarrier:GetHeading()
 local CargoDeployHeading=((CargoCarrierHeading+Angle)>=360)and(CargoCarrierHeading+Angle-360)or(CargoCarrierHeading+Angle)
@@ -29860,7 +30898,7 @@ self:SetEventPriority(5)
 return self
 end
 function CARGO_UNIT:onenterUnBoarding(From,Event,To,ToPointVec2,NearRadius)
-self:F({From,Event,To,ToPointVec2,NearRadius})
+self:T({From,Event,To,ToPointVec2,NearRadius})
 local Angle=180
 local Speed=60
 local DeployDistance=9
@@ -29883,7 +30921,7 @@ self.CargoObject:ReSpawnAt(ToPointVec2,CargoDeployHeading)
 else
 self.CargoObject:ReSpawnAt(FromPointVec2,CargoDeployHeading)
 end
-self:F({"CargoUnits:",self.CargoObject:GetGroup():GetName()})
+self:T({"CargoUnits:",self.CargoObject:GetGroup():GetName()})
 self.CargoCarrier=nil
 local Points={}
 Points[#Points+1]=FromPointVec2:WaypointGround(Speed,"Vee")
@@ -29899,7 +30937,7 @@ end
 end
 end
 function CARGO_UNIT:onleaveUnBoarding(From,Event,To,ToPointVec2,NearRadius)
-self:F({From,Event,To,ToPointVec2,NearRadius})
+self:T({From,Event,To,ToPointVec2,NearRadius})
 local Angle=180
 local Speed=10
 local Distance=5
@@ -29908,7 +30946,7 @@ return true
 end
 end
 function CARGO_UNIT:onafterUnBoarding(From,Event,To,ToPointVec2,NearRadius)
-self:F({From,Event,To,ToPointVec2,NearRadius})
+self:T({From,Event,To,ToPointVec2,NearRadius})
 self.CargoInAir=self.CargoObject:InAir()
 self:T(self.CargoInAir)
 if not self.CargoInAir then
@@ -29916,7 +30954,7 @@ end
 self:__UnLoad(1,ToPointVec2,NearRadius)
 end
 function CARGO_UNIT:onenterUnLoaded(From,Event,To,ToPointVec2)
-self:F({ToPointVec2,From,Event,To})
+self:T({ToPointVec2,From,Event,To})
 local Angle=180
 local Speed=10
 local Distance=5
@@ -29937,7 +30975,7 @@ self.OnUnLoadedCallBack=nil
 end
 end
 function CARGO_UNIT:onafterBoard(From,Event,To,CargoCarrier,NearRadius,...)
-self:F({From,Event,To,CargoCarrier,NearRadius=NearRadius})
+self:T({From,Event,To,CargoCarrier,NearRadius=NearRadius})
 self.CargoInAir=self.CargoObject:InAir()
 local Desc=self.CargoObject:GetDesc()
 local MaxSpeed=Desc.speedMaxOffRoad
@@ -29971,8 +31009,8 @@ end
 end
 end
 function CARGO_UNIT:onafterBoarding(From,Event,To,CargoCarrier,NearRadius,...)
-self:F({From,Event,To,CargoCarrier:GetName(),NearRadius=NearRadius})
-self:F({IsAlive=self.CargoObject:IsAlive()})
+self:T({From,Event,To,CargoCarrier:GetName(),NearRadius=NearRadius})
+self:T({IsAlive=self.CargoObject:IsAlive()})
 if CargoCarrier and CargoCarrier:IsAlive()then
 if(CargoCarrier:IsAir()and not CargoCarrier:InAir())or true then
 local NearRadius=NearRadius or CargoCarrier:GetBoundingRadius(NearRadius)+5
@@ -30010,11 +31048,11 @@ self:CancelBoarding(CargoCarrier,NearRadius,...)
 self.CargoObject:SetCommand(self.CargoObject:CommandStopRoute(true))
 end
 else
-self:E("Something is wrong")
+self:T("Something is wrong")
 end
 end
 function CARGO_UNIT:onenterLoaded(From,Event,To,CargoCarrier)
-self:F({From,Event,To,CargoCarrier})
+self:T({From,Event,To,CargoCarrier})
 self.CargoCarrier=CargoCarrier
 if self.CargoObject then
 self.CargoObject:Destroy(false)
@@ -30041,7 +31079,7 @@ ClassName="CARGO_SLINGLOAD"
 }
 function CARGO_SLINGLOAD:New(CargoStatic,Type,Name,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,CARGO_REPRESENTABLE:New(CargoStatic,Type,Name,nil,LoadRadius,NearRadius))
-self:F({Type,Name,NearRadius})
+self:T({Type,Name,NearRadius})
 self.CargoObject=CargoStatic
 _EVENTDISPATCHER:CreateEventNewCargo(self)
 self:HandleEvent(EVENTS.Dead,self.OnEventCargoDead)
@@ -30152,7 +31190,7 @@ ClassName="CARGO_CRATE"
 }
 function CARGO_CRATE:New(CargoStatic,Type,Name,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,CARGO_REPRESENTABLE:New(CargoStatic,Type,Name,nil,LoadRadius,NearRadius))
-self:F({Type,Name,NearRadius})
+self:T({Type,Name,NearRadius})
 self.CargoObject=CargoStatic
 _EVENTDISPATCHER:CreateEventNewCargo(self)
 self:HandleEvent(EVENTS.Dead,self.OnEventCargoDead)
@@ -30255,21 +31293,21 @@ end
 return Alive
 end
 function CARGO_CRATE:RouteTo(Coordinate)
-self:F({Coordinate=Coordinate})
+self:T({Coordinate=Coordinate})
 end
 function CARGO_CRATE:IsNear(CargoCarrier,NearRadius)
-self:F({NearRadius=NearRadius})
+self:T({NearRadius=NearRadius})
 return self:IsNear(CargoCarrier:GetCoordinate(),NearRadius)
 end
 function CARGO_CRATE:Respawn()
-self:F({"Respawning crate "..self:GetName()})
+self:T({"Respawning crate "..self:GetName()})
 if self.CargoObject then
 self.CargoObject:ReSpawn()
 self:__Reset(-0.1)
 end
 end
 function CARGO_CRATE:onafterReset()
-self:F({"Reset crate "..self:GetName()})
+self:T({"Reset crate "..self:GetName()})
 if self.CargoObject then
 self:SetDeployed(false)
 self:SetStartState("UnLoaded")
@@ -30298,7 +31336,7 @@ ClassName="CARGO_GROUP",
 }
 function CARGO_GROUP:New(CargoGroup,Type,Name,LoadRadius,NearRadius)
 local self=BASE:Inherit(self,CARGO_REPORTABLE:New(Type,Name,0,LoadRadius,NearRadius))
-self:F({Type,Name,LoadRadius})
+self:T({Type,Name,LoadRadius})
 self.CargoSet=SET_CARGO:New()
 self.CargoGroup=CargoGroup
 self.Grouped=true
@@ -30342,7 +31380,7 @@ self:SetEventPriority(4)
 return self
 end
 function CARGO_GROUP:Respawn()
-self:F({"Respawning"})
+self:T({"Respawning"})
 for CargoID,CargoData in pairs(self.CargoSet:GetSet())do
 local Cargo=CargoData
 Cargo:Destroy()
@@ -30383,7 +31421,7 @@ self.CargoObject=nil
 end
 end
 function CARGO_GROUP:Regroup()
-self:F("Regroup")
+self:T("Regroup")
 if self.Grouped==false then
 self.Grouped=true
 local GroupTemplate=UTILS.DeepCopy(self.CargoTemplate)
@@ -30392,7 +31430,7 @@ GroupTemplate.groupId=nil
 GroupTemplate.units={}
 for CargoUnitName,CargoUnit in pairs(self.CargoSet:GetSet())do
 local CargoUnit=CargoUnit
-self:F({CargoUnit:GetName(),UnLoaded=CargoUnit:IsUnLoaded()})
+self:T({CargoUnit:GetName(),UnLoaded=CargoUnit:IsUnLoaded()})
 if CargoUnit:IsUnLoaded()then
 CargoUnit.CargoObject:Destroy()
 GroupTemplate.units[#GroupTemplate.units+1]=self.CargoUnitTemplate[CargoUnitName]
@@ -30403,12 +31441,12 @@ GroupTemplate.units[#GroupTemplate.units].heading=CargoUnit:GetHeading()
 end
 end
 self.CargoGroup=GROUP:NewTemplate(GroupTemplate,GroupTemplate.CoalitionID,GroupTemplate.CategoryID,GroupTemplate.CountryID)
-self:F({"Regroup",GroupTemplate})
+self:T({"Regroup",GroupTemplate})
 self.CargoObject=_DATABASE:Spawn(GroupTemplate)
 end
 end
 function CARGO_GROUP:OnEventCargoDead(EventData)
-self:E(EventData)
+self:T(EventData)
 local Destroyed=false
 if self:IsDestroyed()or self:IsUnLoaded()or self:IsBoarding()or self:IsUnboarding()then
 Destroyed=true
@@ -30430,15 +31468,15 @@ end
 end
 if Destroyed then
 self:Destroyed()
-self:E({"Cargo group destroyed"})
+self:T({"Cargo group destroyed"})
 end
 end
 function CARGO_GROUP:onafterBoard(From,Event,To,CargoCarrier,NearRadius,...)
-self:F({CargoCarrier.UnitName,From,Event,To,NearRadius=NearRadius})
+self:T({CargoCarrier.UnitName,From,Event,To,NearRadius=NearRadius})
 NearRadius=NearRadius or self.NearRadius
 self.CargoSet:ForEach(
 function(Cargo,...)
-self:F({"Board Unit",Cargo:GetName(),Cargo:IsDestroyed(),Cargo.CargoObject:IsAlive()})
+self:T({"Board Unit",Cargo:GetName(),Cargo:IsDestroyed(),Cargo.CargoObject:IsAlive()})
 local CargoGroup=Cargo.CargoObject
 CargoGroup:OptionAlarmStateGreen()
 Cargo:__Board(1,CargoCarrier,NearRadius,...)
@@ -30479,7 +31517,7 @@ if not Cancelled then
 if not Boarded then
 self:__Boarding(-5,CargoCarrier,NearRadius,...)
 else
-self:F("Group Cargo is loaded")
+self:T("Group Cargo is loaded")
 self:__Load(1,CargoCarrier,...)
 end
 else
@@ -30490,7 +31528,7 @@ self:__Destroyed(1,CargoCarrier,NearRadius,...)
 end
 end
 function CARGO_GROUP:onafterUnBoard(From,Event,To,ToPointVec2,NearRadius,...)
-self:F({From,Event,To,ToPointVec2,NearRadius})
+self:T({From,Event,To,ToPointVec2,NearRadius})
 NearRadius=NearRadius or 25
 local Timer=1
 if From=="Loaded"then
@@ -30599,12 +31637,12 @@ end
 )
 end
 function CARGO_GROUP:IsNear(CargoCarrier,NearRadius)
-self:F({NearRadius=NearRadius})
+self:T({NearRadius=NearRadius})
 for _,Cargo in pairs(self.CargoSet:GetSet())do
 local Cargo=Cargo
 if Cargo:IsAlive()then
 if Cargo:IsNear(CargoCarrier:GetCoordinate(),NearRadius)then
-self:F("Near")
+self:T("Near")
 return true
 end
 end
@@ -30626,7 +31664,7 @@ Distance=Coordinate:Get2DDistance(CargoCoordinate)
 else
 return false
 end
-self:F({Distance=Distance,LoadRadius=self.LoadRadius})
+self:T({Distance=Distance,LoadRadius=self.LoadRadius})
 if Distance<=self.LoadRadius then
 return true
 else
@@ -30638,7 +31676,7 @@ end
 function CARGO_GROUP:IsInReportRadius(Coordinate)
 local Cargo=self:GetFirstAlive()
 if Cargo then
-self:F({Cargo})
+self:T({Cargo})
 local Distance=0
 if Cargo:IsUnLoaded()then
 Distance=Coordinate:Get2DDistance(Cargo.CargoObject:GetCoordinate())
@@ -32121,7 +33159,7 @@ self:HandleEvent(EVENTS.Shot,self.HandleEventShot)
 self:SetStartState("Running")
 self:AddTransition("*","ManageEvasion","*")
 self:AddTransition("*","CalculateHitZone","*")
-self:I("*** SEAD - Started Version 0.4.5")
+self:I("*** SEAD - Started Version 0.4.6")
 return self
 end
 function SEAD:UpdateSet(SEADGroupPrefixes)
@@ -32293,7 +33331,7 @@ if self.UseEmissionsOnOff then
 grp:EnableEmission(false)
 end
 grp:OptionAlarmStateGreen()
-grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond")
+grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond",true)
 if self.UseCallBack then
 local object=self.CallBack
 object:SeadSuppressionStart(grp,name,attacker)
@@ -33504,7 +34542,7 @@ AirbaseNames=nil,
 }
 function ATC_GROUND:New(Airbases,AirbaseList)
 local self=BASE:Inherit(self,BASE:New())
-self:E({self.ClassName,Airbases})
+self:T({self.ClassName,Airbases})
 self.Airbases=Airbases
 self.AirbaseList=AirbaseList
 self.SetClient=SET_CLIENT:New():FilterCategories("plane"):FilterStart()
@@ -33583,7 +34621,7 @@ function(Client)
 if Client:IsAlive()then
 local IsOnGround=Client:InAir()==false
 for AirbaseID,AirbaseMeta in pairs(self.Airbases)do
-self:E(AirbaseID,AirbaseMeta.KickSpeed)
+self:T(AirbaseID,AirbaseMeta.KickSpeed)
 if AirbaseMeta.Monitor==true and Client:IsInZone(AirbaseMeta.ZoneBoundary)then
 local NotInRunwayZone=true
 for ZoneRunwayID,ZoneRunway in pairs(AirbaseMeta.ZoneRunways)do
@@ -33592,7 +34630,7 @@ end
 if NotInRunwayZone then
 if IsOnGround then
 local Taxi=Client:GetState(self,"Taxi")
-self:E(Taxi)
+self:T(Taxi)
 if Taxi==false then
 local Velocity=VELOCITY:New(AirbaseMeta.KickSpeed or self.KickSpeed)
 Client:Message("Welcome to "..AirbaseID..". The maximum taxiing speed is "..
@@ -33712,12 +34750,18 @@ KickSpeed=nil,
 }
 function ATC_GROUND_UNIVERSAL:New(AirbaseList)
 local self=BASE:Inherit(self,BASE:New())
-self:E({self.ClassName})
+self:T({self.ClassName})
 self.Airbases={}
 for _name,_ in pairs(_DATABASE.AIRBASES)do
 self.Airbases[_name]={}
 end
 self.AirbaseList=AirbaseList
+if not self.AirbaseList then
+self.AirbaseList={}
+for _name,_ in pairs(_DATABASE.AIRBASES)do
+self.AirbaseList[_name]=_name
+end
+end
 self.SetClient=SET_CLIENT:New():FilterCategories("plane"):FilterStart()
 for AirbaseID,Airbase in pairs(self.Airbases)do
 if Airbase.ZoneBoundary then
@@ -33816,12 +34860,13 @@ self:SetMaximumKickSpeed(UTILS.MiphToMps(MaximumKickSpeedMiph),Airbase)
 return self
 end
 function ATC_GROUND_UNIVERSAL:_AirbaseMonitor()
+self:I("_AirbaseMonitor")
 self.SetClient:ForEachClient(
 function(Client)
 if Client:IsAlive()then
 local IsOnGround=Client:InAir()==false
 for AirbaseID,AirbaseMeta in pairs(self.Airbases)do
-self:E(AirbaseID,AirbaseMeta.KickSpeed)
+self:T(AirbaseID,AirbaseMeta.KickSpeed)
 if AirbaseMeta.Monitor==true and Client:IsInZone(AirbaseMeta.ZoneBoundary)then
 local NotInRunwayZone=true
 if AirbaseMeta.ZoneRunways then
@@ -33833,7 +34878,7 @@ end
 if NotInRunwayZone then
 if IsOnGround then
 local Taxi=Client:GetState(self,"Taxi")
-self:E(Taxi)
+self:T(Taxi)
 if Taxi==false then
 local Velocity=VELOCITY:New(AirbaseMeta.KickSpeed or self.KickSpeed)
 Client:Message("Welcome to "..AirbaseID..". The maximum taxiing speed is "..
@@ -33945,7 +34990,7 @@ return true
 end
 function ATC_GROUND_UNIVERSAL:Start(RepeatScanSeconds)
 RepeatScanSeconds=RepeatScanSeconds or 0.05
-self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,2,RepeatScanSeconds)
+self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,RepeatScanSeconds)
 return self
 end
 ATC_GROUND_CAUCASUS={
@@ -33959,7 +35004,7 @@ return self
 end
 function ATC_GROUND_CAUCASUS:Start(RepeatScanSeconds)
 RepeatScanSeconds=RepeatScanSeconds or 0.05
-self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,2,RepeatScanSeconds)
+self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,RepeatScanSeconds)
 end
 ATC_GROUND_NEVADA={
 ClassName="ATC_GROUND_NEVADA",
@@ -33972,7 +35017,7 @@ return self
 end
 function ATC_GROUND_NEVADA:Start(RepeatScanSeconds)
 RepeatScanSeconds=RepeatScanSeconds or 0.05
-self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,2,RepeatScanSeconds)
+self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,RepeatScanSeconds)
 end
 ATC_GROUND_NORMANDY={
 ClassName="ATC_GROUND_NORMANDY",
@@ -33985,7 +35030,7 @@ return self
 end
 function ATC_GROUND_NORMANDY:Start(RepeatScanSeconds)
 RepeatScanSeconds=RepeatScanSeconds or 0.05
-self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,2,RepeatScanSeconds)
+self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,RepeatScanSeconds)
 end
 ATC_GROUND_PERSIANGULF={
 ClassName="ATC_GROUND_PERSIANGULF",
@@ -33997,20 +35042,20 @@ self:SetMaximumKickSpeedKmph(150)
 end
 function ATC_GROUND_PERSIANGULF:Start(RepeatScanSeconds)
 RepeatScanSeconds=RepeatScanSeconds or 0.05
-self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,2,RepeatScanSeconds)
+self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,RepeatScanSeconds)
 end
 ATC_GROUND_MARIANAISLANDS={
 ClassName="ATC_GROUND_MARIANAISLANDS",
 }
 function ATC_GROUND_MARIANAISLANDS:New(AirbaseNames)
-local self=BASE:Inherit(self,ATC_GROUND_UNIVERSAL:New(self.Airbases,AirbaseNames))
+local self=BASE:Inherit(self,ATC_GROUND_UNIVERSAL:New(AirbaseNames))
 self:SetKickSpeedKmph(50)
 self:SetMaximumKickSpeedKmph(150)
 return self
 end
 function ATC_GROUND_MARIANAISLANDS:Start(RepeatScanSeconds)
 RepeatScanSeconds=RepeatScanSeconds or 0.05
-self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,2,RepeatScanSeconds)
+self.AirbaseMonitor=SCHEDULER:New(self,self._AirbaseMonitor,{self},0,RepeatScanSeconds)
 end
 do
 DETECTION_BASE={
@@ -34163,6 +35208,28 @@ DetectionAccepted=false
 end
 end
 end
+if self.RadarBlur then
+MESSAGE:New("Radar Blur",10):ToLogIf(self.debug):ToAllIf(self.verbose)
+local minheight=self.RadarBlurMinHeight or 250
+local thresheight=self.RadarBlurThresHeight or 90
+local thresblur=self.RadarBlurThresBlur or 85
+local dist=math.floor(Distance)
+if dist<=self.RadarBlurClosing then
+thresheight=(((dist*dist)/self.RadarBlurClosingSquare)*thresheight)
+thresblur=(((dist*dist)/self.RadarBlurClosingSquare)*thresblur)
+end
+local fheight=math.floor(math.random(1,10000)/100)
+local fblur=math.floor(math.random(1,10000)/100)
+local unit=UNIT:FindByName(DetectedObjectName)
+if unit and unit:IsAlive()then
+local AGL=unit:GetAltitude(true)
+MESSAGE:New("Unit "..DetectedObjectName.." is at "..math.floor(AGL).."m. Distance "..math.floor(Distance).."km.",10):ToLogIf(self.debug):ToAllIf(self.verbose)
+MESSAGE:New(string.format("fheight = %d/%d | fblur = %d/%d",fheight,thresheight,fblur,thresblur),10):ToLogIf(self.debug):ToAllIf(self.verbose)
+if fblur>thresblur then DetectionAccepted=false end
+if AGL<=minheight and fheight<thresheight then DetectionAccepted=false end
+MESSAGE:New("Detection Accepted = "..tostring(DetectionAccepted),10):ToLogIf(self.debug):ToAllIf(self.verbose)
+end
+end
 if not self.DetectedObjects[DetectedObjectName]and TargetIsVisible and self.DistanceProbability then
 local DistanceFactor=Distance/4
 local DistanceProbabilityReversed=(1-self.DistanceProbability)*DistanceFactor
@@ -34323,6 +35390,15 @@ self._.FilterCategories[FilterCategories]=FilterCategories
 end
 return self
 end
+function DETECTION_BASE:SetRadarBlur(minheight,thresheight,thresblur,closing)
+self.RadarBlur=true
+self.RadarBlurMinHeight=minheight or 250
+self.RadarBlurThresHeight=thresheight or 90
+self.RadarBlurThresBlur=thresblur or 85
+self.RadarBlurClosing=closing or 20
+self.RadarBlurClosingSquare=self.RadarBlurClosing*self.RadarBlurClosing
+return self
+end
 end
 do
 function DETECTION_BASE:SetRefreshTimeInterval(RefreshTimeInterval)
@@ -37451,7 +38527,7 @@ if takeoff==RAT.wp.air then
 departure=departure:GetZone()
 end
 elseif self:_ZoneExists(_departure)then
-departure=ZONE:New(_departure)
+departure=ZONE:FindByName(_departure)
 else
 local text=string.format("ERROR! Specified departure airport %s does not exist for %s.",_departure,self.alias)
 self:E(RAT.id..text)
@@ -37522,7 +38598,7 @@ if landing==RAT.wp.air or self.returnzone then
 destination=destination:GetZone()
 end
 elseif self:_ZoneExists(_destination)then
-destination=ZONE:New(_destination)
+destination=ZONE:FindByName(_destination)
 else
 local text=string.format("ERROR: Specified destination airport/zone %s does not exist for %s!",_destination,self.alias)
 self:E(RAT.id.."ERROR: "..text)
@@ -37857,7 +38933,7 @@ end
 end
 elseif self:_ZoneExists(name)then
 if takeoff==RAT.wp.air then
-dep=ZONE:New(name)
+dep=ZONE:FindByName(name)
 else
 self:E(RAT.id..string.format("ERROR! Takeoff is not in air. Cannot use %s as departure.",name))
 end
@@ -37929,7 +39005,7 @@ end
 end
 elseif self:_ZoneExists(name)then
 if landing==RAT.wp.air then
-dest=ZONE:New(name)
+dest=ZONE:FindByName(name)
 else
 self:E(RAT.id..string.format("ERROR! Landing is not in air. Cannot use zone %s as destination!",name))
 end
@@ -38891,7 +39967,7 @@ end
 return false
 end
 function RAT:_ZoneExists(name)
-local z=trigger.misc.getZone(name)
+local z=ZONE:FindByName(name)
 if z then
 return true
 end
@@ -39931,15 +41007,15 @@ self.trackmissiles=false
 return self
 end
 function RANGE:SetSRS(PathToSRS,Port,Coalition,Frequency,Modulation,Volume,PathToGoogleKey)
-if PathToSRS then
+if PathToSRS or MSRS.path then
 self.useSRS=true
-self.controlmsrs=MSRS:New(PathToSRS,Frequency or 256,Modulation or radio.modulation.AM,Volume or 1.0)
-self.controlmsrs:SetPort(Port)
+self.controlmsrs=MSRS:New(PathToSRS or MSRS.path,Frequency or 256,Modulation or radio.modulation.AM,Volume or 1.0)
+self.controlmsrs:SetPort(Port or MSRS.port)
 self.controlmsrs:SetCoalition(Coalition or coalition.side.BLUE)
 self.controlmsrs:SetLabel("RANGEC")
 self.controlsrsQ=MSRSQUEUE:New("CONTROL")
-self.instructmsrs=MSRS:New(PathToSRS,Frequency or 305,Modulation or radio.modulation.AM,Volume or 1.0)
-self.instructmsrs:SetPort(Port)
+self.instructmsrs=MSRS:New(PathToSRS or MSRS.path,Frequency or 305,Modulation or radio.modulation.AM,Volume or 1.0)
+self.instructmsrs:SetPort(Port or MSRS.port)
 self.instructmsrs:SetCoalition(Coalition or coalition.side.BLUE)
 self.instructmsrs:SetLabel("RANGEI")
 self.instructsrsQ=MSRSQUEUE:New("INSTRUCT")
@@ -39953,6 +41029,10 @@ end
 return self
 end
 function RANGE:SetSRSRangeControl(frequency,modulation,voice,culture,gender,relayunitname)
+if not self.instructmsrs then
+self:E(self.lid.."Use myrange:SetSRS() once first before using myrange:SetSRSRangeControl!")
+return self
+end
 self.rangecontrolfreq=frequency or 256
 self.controlmsrs:SetFrequencies(self.rangecontrolfreq)
 self.controlmsrs:SetModulations(modulation or radio.modulation.AM)
@@ -39968,6 +41048,10 @@ end
 return self
 end
 function RANGE:SetSRSRangeInstructor(frequency,modulation,voice,culture,gender,relayunitname)
+if not self.instructmsrs then
+self:E(self.lid.."Use myrange:SetSRS() once first before using myrange:SetSRSRangeInstructor!")
+return self
+end
 self.instructorfreq=frequency or 305
 self.instructmsrs:SetFrequencies(self.instructorfreq)
 self.instructmsrs:SetModulations(modulation or radio.modulation.AM)
@@ -40220,6 +41304,7 @@ return fouldist
 end
 function RANGE:OnEventBirth(EventData)
 self:F({eventbirth=EventData})
+if not EventData.IniPlayerName then return end
 local _unitName=EventData.IniUnitName
 local _unit,_playername=self:_GetPlayerUnitAndName(_unitName)
 self:T3(self.lid.."BIRTH: unit   = "..tostring(EventData.IniUnitName))
@@ -40476,7 +41561,7 @@ function RANGE:onafterExitRange(From,Event,To,player)
 if self.instructor then
 if self.useSRS then
 local text="You left the bombing range zone. "
-local r=math.random(2)
+local r=math.random(5)
 if r==1 then
 text=text.."Have a nice day!"
 elseif r==2 then
@@ -48276,11 +49361,22 @@ local _assetattribute
 local _assetcategory
 local _assetairstart=false
 if _nassets>0 then
+local asset=_assets[1]
 _assetattribute=_assets[1].attribute
 _assetcategory=_assets[1].category
 _assetairstart=_assets[1].takeoffType and _assets[1].takeoffType==COORDINATE.WaypointType.TurningPoint or false
 if _assetcategory==Group.Category.AIRPLANE or _assetcategory==Group.Category.HELICOPTER then
 if self.airbase and self.airbase:GetCoalition()==self:GetCoalition()then
+if self.airbase.storage then
+local nS=self.airbase.storage:GetAmount(asset.unittype)
+local nA=asset.nunits*request.nasset
+if nS<nA then
+local text=string.format("Warehouse %s: Request denied! DCS Warehouse has only %d assets of type %s ==> NOT enough to spawn the requested %d asset units (%d groups)",
+self.alias,nS,asset.unittype,nA,request.nasset)
+self:_InfoMessage(text,5)
+return false
+end
+end
 if self:IsRunwayOperational()or _assetairstart then
 if _assetairstart then
 else
@@ -48342,6 +49438,7 @@ local text=string.format("Warehouse %s: Request denied! Not close enough to spaw
 self:_InfoMessage(text,5)
 return false
 end
+elseif _assetcategory==Group.Category.AIRPLANE or _assetcategory==Group.Category.HELICOPTER then
 end
 end
 request.cargoassets=_assets
@@ -50202,7 +51299,7 @@ MANTIS.SamData={
 ["SA-15"]={Range=11,Blindspot=0,Height=6,Type="Short",Radar="Tor 9A331"},
 ["SA-13"]={Range=5,Blindspot=0,Height=3,Type="Short",Radar="Strela"},
 ["Avenger"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Avenger"},
-["Chaparrel"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Chaparral"},
+["Chaparral"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Chaparral"},
 ["Linebacker"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Linebacker"},
 ["Silkworm"]={Range=90,Blindspot=1,Height=0.2,Type="Long",Radar="Silkworm"},
 ["SA-10B"]={Range=75,Blindspot=0,Height=18,Type="Medium",Radar="SA-10B"},
@@ -50360,7 +51457,7 @@ end
 if self.HQ_Template_CC then
 self.HQ_CC=GROUP:FindByName(self.HQ_Template_CC)
 end
-self.version="0.8.15"
+self.version="0.8.16"
 self:I(string.format("***** Starting MANTIS Version %s *****",self.version))
 self:SetStartState("Stopped")
 self:AddTransition("Stopped","Start","Running")
@@ -50621,7 +51718,7 @@ local HQGroup=self.HQ_CC
 if self.autorelocateunits.HQ and self.HQ_CC and HQGroup:IsAlive()then
 local _hqgrp=self.HQ_CC
 local text=self.lid.." Relocating HQ"
-_hqgrp:RelocateGroundRandomInRadius(20,500,true,true)
+_hqgrp:RelocateGroundRandomInRadius(20,500,true,true,nil,true)
 end
 if self.autorelocateunits.EWR then
 local EWR_GRP=SET_GROUP:New():FilterPrefixes(self.EWR_Templates_Prefix):FilterCoalitions(self.Coalition):FilterOnce()
@@ -50631,7 +51728,7 @@ if _grp:IsAlive()and _grp:IsGround()then
 local text=self.lid.." Relocating EWR ".._grp:GetName()
 local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
 if self.verbose then self:I(text)end
-_grp:RelocateGroundRandomInRadius(20,500,true,true)
+_grp:RelocateGroundRandomInRadius(20,500,true,true,nil,true)
 end
 end
 end
@@ -51859,7 +52956,7 @@ HARD="TOPGUN Graduate",
 }
 AIRBOSS.MenuF10={}
 AIRBOSS.MenuF10Root=nil
-AIRBOSS.version="1.3.2"
+AIRBOSS.version="1.3.3"
 function AIRBOSS:New(carriername,alias)
 local self=BASE:Inherit(self,FSM:New())
 self:F2({carriername=carriername,alias=alias})
@@ -52378,6 +53475,7 @@ self.SRS:SetGender(Gender or"male")
 self.SRS:SetPath(PathToSRS)
 self.SRS:SetPort(Port or 5002)
 self.SRS:SetLabel(self.AirbossRadio.alias or"AIRBOSS")
+self.SRS:SetCoordinate(self.carrier:GetCoordinate())
 if GoogleCreds then
 self.SRS:SetGoogle(GoogleCreds)
 end
@@ -55055,7 +56153,7 @@ self:E(self.lid.."ERROR: EventData=nil in event BIRTH!")
 self:E(EventData)
 return
 end
-if EventData.IniUnit==nil then
+if EventData.IniUnit==nil and(not EventData.IniObjectCategory==Object.Category.STATIC)then
 self:E(self.lid.."ERROR: EventData.IniUnit=nil in event BIRTH!")
 self:E(EventData)
 return
@@ -56506,7 +57604,7 @@ text=text..string.format("\nWind Vx=%.1f Vy=%.1f Vz=%.1f m/s",wind.x,wind.y,wind
 end
 text=text..string.format("\nPitch=%.1f° | Roll=%.1f° | Yaw=%.1f°",pitch,roll,yaw)
 text=text..string.format("\nClimb Angle=%.1f° | Rate=%d ft/min",unit:GetClimbAngle(),velo.y*196.85)
-local dist=self:_GetOptLandingCoordinate():Get3DDistance(playerData.unit)
+local dist=self:_GetOptLandingCoordinate():Get3DDistance(playerData.unit:GetVec3())
 local vplayer=playerData.unit:GetVelocityKMH()
 local vcarrier=self.carrier:GetVelocityKMH()
 local dv=math.abs(vplayer-vcarrier)
@@ -58370,7 +59468,7 @@ self.PilotRadio.alias="PILOT"
 self.PilotRadio.voice=Voice or MSRS.Voices.Microsoft.David
 self.PilotRadio.gender=Gender or"male"
 self.PilotRadio.culture=Culture or"en-US"
-if(not Voice)and self.SRS and self.SRS.google then
+if(not Voice)and self.SRS and self.SRS:GetProvider()==MSRS.Provider.GOOGLE then
 self.PilotRadio.voice=MSRS.Voices.Google.Standard.en_US_Standard_J
 end
 return self
@@ -61653,7 +62751,7 @@ DELIMITER="Punto",
 }
 ATIS.locale="en"
 _ATIS={}
-ATIS.version="0.10.3"
+ATIS.version="1.0.0"
 function ATIS:New(AirbaseName,Frequency,Modulation)
 local self=BASE:Inherit(self,FSM:New())
 self.airbasename=AirbaseName
@@ -61962,7 +63060,16 @@ self:E(self.lid..string.format("EXPERIMENTAL: Starting ATIS for Helipad %s! SRS
 self.ATISforFARPs=true
 self.useSRS=true
 end
+if type(self.frequency)=="table"then
+local frequency=table.concat(self.frequency,"/")
+local modulation=self.modulation
+if type(self.modulation)=="table"then
+modulation=table.concat(self.modulation,"/")
+end
+self:I(self.lid..string.format("Starting ATIS v%s for airbase %s on %s MHz Modulation=%s",ATIS.version,self.airbasename,frequency,modulation))
+else
 self:I(self.lid..string.format("Starting ATIS v%s for airbase %s on %.3f MHz Modulation=%d",ATIS.version,self.airbasename,self.frequency,self.modulation))
+end
 if not self.useSRS then
 self.radioqueue=RADIOQUEUE:New(self.frequency,self.modulation,string.format("ATIS %s",self.airbasename))
 self.radioqueue:SetSenderCoordinate(self.airbase:GetCoordinate())
@@ -61994,7 +63101,17 @@ if ru then
 relayunitstatus=tostring(ru:IsAlive())
 end
 end
-local text=string.format("State %s: Freq=%.3f MHz %s",fsmstate,self.frequency,UTILS.GetModulationName(self.modulation))
+local text=""
+if type(self.frequency)=="table"then
+local frequency=table.concat(self.frequency,"/")
+local modulation=self.modulation
+if type(self.modulation)=="table"then
+modulation=table.concat(self.modulation,"/")
+end
+text=string.format("State %s: Freq=%s MHz %s",fsmstate,frequency,modulation)
+else
+text=string.format("State %s: Freq=%.3f MHz %s",fsmstate,self.frequency,UTILS.GetModulationName(self.modulation))
+end
 if self.useSRS then
 text=text..string.format(", SRS path=%s (%s), gender=%s, culture=%s, voice=%s",tostring(self.msrs.path),tostring(self.msrs.port),tostring(self.msrs.gender),tostring(self.msrs.culture),tostring(self.msrs.voice))
 else
@@ -62879,7 +63996,17 @@ function ATIS:UpdateMarker(information,runact,wind,altimeter,temperature)
 if self.markerid then
 self.airbase:GetCoordinate():RemoveMark(self.markerid)
 end
-local text=string.format("ATIS on %.3f %s, %s:\n",self.frequency,UTILS.GetModulationName(self.modulation),tostring(information))
+local text=""
+if type(self.frequency)=="table"then
+local frequency=table.concat(self.frequency,"/")
+local modulation=self.modulation
+if type(modulation)=="table"then
+modulation=table.concat(self.modulation,"/")
+end
+text=string.format("ATIS on %s %s, %s:\n",tostring(frequency),tostring(modulation),tostring(information))
+else
+text=string.format("ATIS on %.3f %s, %s:\n",self.frequency,UTILS.GetModulationName(self.modulation),tostring(information))
+end
 text=text..string.format("%s\n",tostring(runact))
 text=text..string.format("%s\n",tostring(wind))
 text=text..string.format("%s\n",tostring(altimeter))
@@ -63343,7 +64470,7 @@ CTLD.UnitTypeCapabilities={
 ["AH-64D_BLK_II"]={type="AH-64D_BLK_II",crates=false,troops=true,cratelimit=0,trooplimit=2,length=17,cargoweightlimit=200},
 ["Bronco-OV-10A"]={type="Bronco-OV-10A",crates=false,troops=true,cratelimit=0,trooplimit=5,length=13,cargoweightlimit=1450},
 }
-CTLD.version="1.0.42"
+CTLD.version="1.0.45"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -63388,6 +64515,8 @@ self:AddTransition("*","TroopsRTB","*")
 self:AddTransition("*","CratesDropped","*")
 self:AddTransition("*","CratesBuild","*")
 self:AddTransition("*","CratesRepaired","*")
+self:AddTransition("*","CratesBuildStarted","*")
+self:AddTransition("*","CratesRepairStarted","*")
 self:AddTransition("*","Load","*")
 self:AddTransition("*","Save","*")
 self:AddTransition("*","Stop","Stopped")
@@ -63807,6 +64936,7 @@ local desttimer=TIMER:New(function()NearestGroup:Destroy(false)end,self)
 desttimer:Start(self.repairtime-1)
 local buildtimer=TIMER:New(self._BuildObjectFromCrates,self,Group,Unit,object,true,NearestGroup:GetCoordinate())
 buildtimer:Start(self.repairtime)
+self:__CratesRepairStarted(1,Group,Unit)
 else
 if not Engineering then
 self:_SendMessage("Can't repair this unit with "..build.Name,10,false,Group)
@@ -64047,10 +65177,12 @@ realcargo=CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,true,false,crat
 table.insert(droppedcargo,realcargo)
 else
 realcargo=CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,false,false,cratesneeded,self.Spawned_Crates[self.CrateCounter],false,cargotype.PerCrateMass,nil,subcat)
-Cargo:RemoveStock()
 end
 table.insert(self.Spawned_Cargo,realcargo)
 end
+if not(drop or pack)then
+Cargo:RemoveStock()
+end
 local text=string.format("Crates for %s have been positioned near you!",cratename)
 if drop then
 text=string.format("Crates for %s have been dropped!",cratename)
@@ -64131,6 +65263,34 @@ self:_SendMessage(string.format("No (loadable) crates within %d meters!",finddis
 end
 return self
 end
+function CTLD:_RemoveCratesNearby(_group,_unit)
+self:T(self.lid.." _RemoveCratesNearby")
+local finddist=self.CrateDistance or 35
+local crates,number=self:_FindCratesNearby(_group,_unit,finddist,true)
+if number>0 then
+local text=REPORT:New("Removing Crates Found Nearby:")
+text:Add("------------------------------------------------------------")
+for _,_entry in pairs(crates)do
+local entry=_entry
+local name=entry:GetName()
+local dropped=entry:WasDropped()
+if dropped then
+text:Add(string.format("Crate for %s, %dkg removed",name,entry.PerCrateMass))
+else
+text:Add(string.format("Crate for %s, %dkg removed",name,entry.PerCrateMass))
+end
+entry:GetPositionable():Destroy(false)
+end
+if text:GetCount()==1 then
+text:Add("        N O N E")
+end
+text:Add("------------------------------------------------------------")
+self:_SendMessage(text:Text(),30,true,_group)
+else
+self:_SendMessage(string.format("No (loadable) crates within %d meters!",finddist),10,false,_group)
+end
+return self
+end
 function CTLD:_GetDistance(_point1,_point2)
 self:T(self.lid.." _GetDistance")
 if _point1 and _point2 then
@@ -64469,6 +65629,26 @@ else
 return false
 end
 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))
+for i=1,360,math.floor(360/numbertroops)do
+local phead=((Heading+270+i)%360)
+local post=newcenter:Translate(Radius,phead)
+local pos1=post:GetVec2()
+local p1t={
+x=pos1.x,
+y=pos1.y,
+heading=phead,
+}
+table.insert(Positions,p1t)
+end
+UTILS.PrintTableToLog(Positions)
+return Positions
+end
 function CTLD:_UnloadTroops(Group,Unit)
 self:T(self.lid.." _UnloadTroops")
 local droppingatbase=false
@@ -64509,14 +65689,25 @@ factor=cargo:GetCratesNeeded()or 1
 zoneradius=Unit:GetVelocityMPS()or 100
 end
 local zone=ZONE_GROUP:New(string.format("Unload zone-%s",unitname),Group,zoneradius*factor)
-local randomcoord=zone:GetRandomCoordinate(10,30*factor):GetVec2()
+local randomcoord=zone:GetRandomCoordinate(10,30*factor)
+local heading=Group:GetHeading()or 0
+if hoverunload or grounded then
+randomcoord=Group:GetCoordinate()
+local Angle=(heading+270)%360
+local offset=hoverunload and 1.5 or 5
+randomcoord:Translate(offset,Angle,nil,true)
+end
+local tempcount=0
 for _,_template in pairs(temptable)do
 self.TroopCounter=self.TroopCounter+1
+tempcount=tempcount+1
 local alias=string.format("%s-%d",_template,math.random(1,100000))
+local rad=2.5+tempcount
+local Positions=self:_GetUnitPositions(randomcoord,rad,heading,_template)
 self.DroppedTroops[self.TroopCounter]=SPAWN:NewWithAlias(_template,alias)
-:InitRandomizeUnits(true,20,2)
 :InitDelayOff()
-:SpawnFromVec2(randomcoord)
+:InitSetUnitAbsolutePositions(Positions)
+:SpawnFromVec2(randomcoord:GetVec2())
 self:__TroopsDeployed(1,Group,Unit,self.DroppedTroops[self.TroopCounter],type)
 end
 cargo:SetWasDropped(true)
@@ -64715,6 +65906,7 @@ if self.buildtime and self.buildtime>0 then
 local buildtimer=TIMER:New(self._BuildObjectFromCrates,self,Group,Unit,build,false,Group:GetCoordinate())
 buildtimer:Start(self.buildtime)
 self:_SendMessage(string.format("Build started, ready in %d seconds!",self.buildtime),15,false,Group)
+self:__CratesBuildStarted(1,Group,Unit)
 else
 self:_BuildObjectFromCrates(Group,Unit,build)
 end
@@ -65008,6 +66200,7 @@ if cancrates then
 local loadmenu=MENU_GROUP_COMMAND:New(_group,"Load crates",topcrates,self._LoadCratesNearby,self,_group,_unit)
 local cratesmenu=MENU_GROUP:New(_group,"Get Crates",topcrates)
 local packmenu=MENU_GROUP_COMMAND:New(_group,"Pack crates",topcrates,self._PackCratesNearby,self,_group,_unit)
+local removecratesmenu=MENU_GROUP:New(_group,"Remove crates",topcrates)
 if self.usesubcats then
 local subcatmenus={}
 for _name,_entry in pairs(self.subcats)do
@@ -65042,6 +66235,7 @@ menus[menucount]=MENU_GROUP_COMMAND:New(_group,menutext,cratesmenu,self._GetCrat
 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 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)
@@ -77079,6 +78273,15 @@ trigger.action.outSoundForUnit(Unit:GetID(),self.UserSoundFileName)
 end
 return self
 end
+function USERSOUND:ToClient(Client,Delay)
+Delay=Delay or 0
+if Delay>0 then
+SCHEDULER:New(nil,USERSOUND.ToClient,{self,Client},Delay)
+else
+trigger.action.outSoundForUnit(Client:GetID(),self.UserSoundFileName)
+end
+return self
+end
 end
 do
 SOUNDBASE={
@@ -77121,18 +78324,25 @@ subtitle=nil,
 subduration=0,
 useSRS=false,
 }
-function SOUNDFILE:New(FileName,Path,Duration)
+function SOUNDFILE:New(FileName,Path,Duration,UseSrs)
 local self=BASE:Inherit(self,BASE:New())
+self:F({FileName,Path,Duration,UseSrs})
 self:SetFileName(FileName)
+self:SetPlayWithSRS(UseSrs or false)
 self:SetPath(Path)
 self:SetDuration(Duration)
-self:T(string.format("New SOUNDFILE: file name=%s, path=%s",self.filename,self.path))
 return self
 end
 function SOUNDFILE:SetPath(Path)
-self.path=Path or"l10n/DEFAULT/"
-if not Path and self.useSRS then
-self.path=os.getenv('TMP').."\\DCS\\Mission\\l10n\\DEFAULT"
+self:F({Path})
+if not Path then
+if self.useSRS then
+self.path=lfs.tempdir().."Mission\\l10n\\DEFAULT"
+else
+self.path="l10n/DEFAULT/"
+end
+else
+self.path=Path
 end
 local nmax=1000;local n=1
 while(self.path:sub(-1)=="/"or self.path:sub(-1)==[[\]])and n<=nmax do
@@ -77140,6 +78350,7 @@ self.path=self.path:sub(1,#self.path-1)
 n=n+1
 end
 self.path=self.path.."/"
+self:T("self.path="..self.path)
 return self
 end
 function SOUNDFILE:GetPath()
@@ -77167,11 +78378,13 @@ local name=string.format("%s%s",path,filename)
 return name
 end
 function SOUNDFILE:SetPlayWithSRS(Switch)
+self:F({Switch})
 if Switch==true or Switch==nil then
 self.useSRS=true
 else
 self.useSRS=false
 end
+self:T("self.useSRS="..tostring(self.useSRS))
 return self
 end
 end
@@ -77935,6 +79148,7 @@ ClassName="MSRS",
 lid=nil,
 port=5002,
 name="MSRS",
+backend="srsexe",
 frequencies={},
 modulations={},
 coalition=0,
@@ -77944,13 +79158,14 @@ voice=nil,
 volume=1,
 speed=1,
 coordinate=nil,
+provider="win",
 Label="ROBOT",
-AltBackend=nil,
 ConfigFileName="Moose_MSRS.lua",
 ConfigFilePath="Config\\",
 ConfigLoaded=false,
+poptions={},
 }
-MSRS.version="0.1.2"
+MSRS.version="0.3.0"
 MSRS.Voices={
 Microsoft={
 ["Hedda"]="Microsoft Hedda Desktop",
@@ -78049,48 +79264,52 @@ Wavenet={
 },
 },
 }
-MSRS.GRPCOptions={}
-MSRS.GRPCOptions.gcloud={}
-MSRS.GRPCOptions.win={}
-MSRS.GRPCOptions.azure={}
-MSRS.GRPCOptions.aws={}
-MSRS.GRPCOptions.win.defaultVoice="Hedda"
-MSRS.GRPCOptions.win.voice="Hedda"
-MSRS.GRPCOptions.DefaultProvider="win"
-function MSRS:New(PathToSRS,Frequency,Modulation,Volume,AltBackend)
+MSRS.Backend={
+SRSEXE="srsexe",
+GRPC="grpc",
+}
+MSRS.Provider={
+WINDOWS="win",
+GOOGLE="gcloud",
+AZURE="azure",
+AMAZON="aws",
+}
+function MSRS.uuid()
+local random=math.random
+local template='yxxx-xxxxxxxxxxxx'
+return string.gsub(template,'[xy]',function(c)
+local v=(c=='x')and random(0,0xf)or random(8,0xb)
+return string.format('%x',v)
+end)
+end
+function MSRS:New(Path,Frequency,Modulation,Backend)
+local self=BASE:Inherit(self,BASE:New())
+self:F({Path,Frequency,Modulation,Backend})
 Frequency=Frequency or 143
 Modulation=Modulation or radio.modulation.AM
-local self=BASE:Inherit(self,BASE:New())
-if type(AltBackend)=="table"or type(self.AltBackend)=="table"then
-local Backend=UTILS.DeepCopy(AltBackend)or UTILS.DeepCopy(self.AltBackend)
-Backend.Vars=Backend.Vars or{}
-Backend.Vars.PathToSRS=PathToSRS
-Backend.Vars.Frequency=UTILS.DeepCopy(Frequency)
-Backend.Vars.Modulation=UTILS.DeepCopy(Modulation)
-Backend.Vars.Volume=Volume
-Backend.Functions=Backend.Functions or{}
-return self:_NewAltBackend(Backend)
-end
-local success=self:LoadConfigFile(nil,nil,self.ConfigLoaded)
-if(not success)and(not self.ConfigLoaded)then
-self:SetPath(PathToSRS)
+self.lid=string.format("%s-%s | ","unknown",self.version)
+if not self.ConfigLoaded then
+self:SetPath(Path)
 self:SetPort()
 self:SetFrequencies(Frequency)
 self:SetModulations(Modulation)
 self:SetGender()
 self:SetCoalition()
 self:SetLabel()
-self:SetVolume(Volume)
+self:SetVolume()
+self:SetBackend(Backend)
 else
-if PathToSRS then
-self:SetPath(PathToSRS)
+if Path then
+self:SetPath(Path)
 end
 if Frequency then
 self:SetFrequencies(Frequency)
+end
+if Modulation then
 self:SetModulations(Modulation)
 end
-if Volume then
-self:SetVolume(Volume)
+if Backend then
+self:SetBackend(Backend)
 end
 end
 self.lid=string.format("%s-%s | ",self.name,self.version)
@@ -78099,26 +79318,48 @@ self:E(self.lid.."***** ERROR - io or os NOT desanitized! MSRS will not work!")
 end
 return self
 end
-function MSRS:SetPath(Path)
-if Path==nil and not self.path then
-self:E("ERROR: No path to SRS directory specified!")
-return nil
+function MSRS:SetBackend(Backend)
+self:F({Backend=Backend})
+self.backend=Backend or MSRS.Backend.SRSEXE
+return self
 end
-if Path then
-self.path=Path
+function MSRS:SetBackendGRPC()
+self:F()
+self:SetBackend(MSRS.Backend.GRPC)
+return self
+end
+function MSRS:SetBackendSRSEXE()
+self:F()
+self:SetBackend(MSRS.Backend.SRSEXE)
+return self
+end
+function MSRS.SetDefaultBackend(Backend)
+self:F({Backend=Backend})
+MSRS.backend=Backend or MSRS.Backend.SRSEXE
+end
+function MSRS.SetDefaultBackendGRPC()
+self:F()
+MSRS.backend=MSRS.Backend.GRPC
+end
+function MSRS:GetBackend()
+return self.backend
+end
+function MSRS:SetPath(Path)
+self:F({Path=Path})
+self.path=Path or"C:\\Program Files\\DCS-SimpleRadio-Standalone"
 local n=1;local nmax=1000
 while(self.path:sub(-1)=="/"or self.path:sub(-1)==[[\]])and n<=nmax do
 self.path=self.path:sub(1,#self.path-1)
 n=n+1
 end
-self:I(string.format("SRS path=%s",self:GetPath()))
-end
+self:F(string.format("SRS path=%s",self:GetPath()))
 return self
 end
 function MSRS:GetPath()
 return self.path
 end
 function MSRS:SetVolume(Volume)
+self:F({Volume=Volume})
 local volume=Volume or 1
 if volume>1 then volume=1 elseif volume<0 then volume=0 end
 self.volume=volume
@@ -78128,6 +79369,7 @@ function MSRS:GetVolume()
 return self.volume
 end
 function MSRS:SetLabel(Label)
+self:F({Label=Label})
 self.Label=Label or"ROBOT"
 return self
 end
@@ -78135,13 +79377,16 @@ function MSRS:GetLabel()
 return self.Label
 end
 function MSRS:SetPort(Port)
+self:F({Port=Port})
 self.port=Port or 5002
+self:T(string.format("SRS port=%s",self:GetPort()))
 return self
 end
 function MSRS:GetPort()
 return self.port
 end
 function MSRS:SetCoalition(Coalition)
+self:F({Coalition=Coalition})
 self.coalition=Coalition or 0
 return self
 end
@@ -78149,17 +79394,14 @@ function MSRS:GetCoalition()
 return self.coalition
 end
 function MSRS:SetFrequencies(Frequencies)
-if type(Frequencies)~="table"then
-Frequencies={Frequencies}
-end
-self.frequencies=Frequencies
+self:F(Frequencies)
+self.frequencies=UTILS.EnsureTable(Frequencies,false)
 return self
 end
 function MSRS:AddFrequencies(Frequencies)
-if type(Frequencies)~="table"then
-Frequencies={Frequencies}
-end
-for _,_freq in pairs(Frequencies)do
+self:F(Frequencies)
+for _,_freq in pairs(UTILS.EnsureTable(Frequencies,false))do
+self:T(self.lid..string.format("Adding frequency %s",tostring(_freq)))
 table.insert(self.frequencies,_freq)
 end
 return self
@@ -78168,17 +79410,15 @@ function MSRS:GetFrequencies()
 return self.frequencies
 end
 function MSRS:SetModulations(Modulations)
-if type(Modulations)~="table"then
-Modulations={Modulations}
-end
-self.modulations=Modulations
+self:F(Modulations)
+self.modulations=UTILS.EnsureTable(Modulations,false)
+self:T(self.lid.."Modulations:")
+self:T(self.modulations)
 return self
 end
 function MSRS:AddModulations(Modulations)
-if type(Modulations)~="table"then
-Modulations={Modulations}
-end
-for _,_mod in pairs(Modulations)do
+self:F(Modulations)
+for _,_mod in pairs(UTILS.EnsureTable(Modulations,false))do
 table.insert(self.modulations,_mod)
 end
 return self
@@ -78187,83 +79427,176 @@ function MSRS:GetModulations()
 return self.modulations
 end
 function MSRS:SetGender(Gender)
+self:F({Gender=Gender})
 Gender=Gender or"female"
 self.gender=Gender:lower()
 self:T("Setting gender to "..tostring(self.gender))
 return self
 end
 function MSRS:SetCulture(Culture)
+self:F({Culture=Culture})
 self.culture=Culture
 return self
 end
 function MSRS:SetVoice(Voice)
+self:F({Voice=Voice})
 self.voice=Voice
 return self
 end
-function MSRS:SetDefaultVoice(Voice)
-self.defaultVoice=Voice
-local provider=self.provider or self.GRPCOptions.DefaultProvider or MSRS.GRPCOptions.DefaultProvider or"win"
-self.GRPCOptions[provider].defaultVoice=Voice
+function MSRS:SetVoiceProvider(Voice,Provider)
+self:F({Voice=Voice,Provider=Provider})
+self.poptions=self.poptions or{}
+self.poptions[Provider or self:GetProvider()]=Voice
+return self
+end
+function MSRS:SetVoiceWindows(Voice)
+self:F({Voice=Voice})
+self:SetVoiceProvider(Voice or"Microsoft Hazel Desktop",MSRS.Provider.WINDOWS)
 return self
 end
+function MSRS:SetVoiceGoogle(Voice)
+self:F({Voice=Voice})
+self:SetVoiceProvider(Voice or MSRS.Voices.Google.Standard.en_GB_Standard_A,MSRS.Provider.GOOGLE)
+return self
+end
+function MSRS:SetVoiceAzure(Voice)
+self:F({Voice=Voice})
+self:SetVoiceProvider(Voice or"en-US-AriaNeural",MSRS.Provider.AZURE)
+return self
+end
+function MSRS:SetVoiceAmazon(Voice)
+self:F({Voice=Voice})
+self:SetVoiceProvider(Voice or"Brian",MSRS.Provider.AMAZON)
+return self
+end
+function MSRS:GetVoice(Provider)
+Provider=Provider or self.provider
+if Provider and self.poptions[Provider]and self.poptions[Provider].voice then
+return self.poptions[Provider].voice
+else
+return self.voice
+end
+end
 function MSRS:SetCoordinate(Coordinate)
+self:F(Coordinate)
 self.coordinate=Coordinate
 return self
 end
 function MSRS:SetGoogle(PathToCredentials)
+self:F({PathToCredentials=PathToCredentials})
 if PathToCredentials then
-self.google=PathToCredentials
-self.APIKey=PathToCredentials
-self.provider="gcloud"
-self.GRPCOptions.DefaultProvider="gcloud"
-self.GRPCOptions.gcloud.key=PathToCredentials
+self.provider=MSRS.Provider.GOOGLE
+self:SetProviderOptionsGoogle(PathToCredentials,PathToCredentials)
 end
 return self
 end
 function MSRS:SetGoogleAPIKey(APIKey)
+self:F({APIKey=APIKey})
 if APIKey then
-self.APIKey=APIKey
-self.provider="gcloud"
-self.GRPCOptions.DefaultProvider="gcloud"
-self.GRPCOptions.gcloud.key=APIKey
+self.provider=MSRS.Provider.GOOGLE
+if self.poptions[MSRS.Provider.GOOGLE]then
+self.poptions[MSRS.Provider.GOOGLE].key=APIKey
+else
+self:SetProviderOptionsGoogle(nil,APIKey)
+end
+end
+return self
+end
+function MSRS:SetProvider(Provider)
+self:F({Provider=Provider})
+self.provider=Provider or MSRS.Provider.WINDOWS
+return self
+end
+function MSRS:GetProvider()
+return self.provider or MSRS.Provider.WINDOWS
+end
+function MSRS:SetProviderOptions(Provider,CredentialsFile,AccessKey,SecretKey,Region)
+self:F({Provider,CredentialsFile,AccessKey,SecretKey,Region})
+local option=MSRS._CreateProviderOptions(Provider,CredentialsFile,AccessKey,SecretKey,Region)
+if self then
+self.poptions=self.poptions or{}
+self.poptions[Provider]=option
+else
+MSRS.poptions=MSRS.poptions or{}
+MSRS.poptions[Provider]=option
+end
+return option
+end
+function MSRS._CreateProviderOptions(Provider,CredentialsFile,AccessKey,SecretKey,Region)
+self:F({Provider,CredentialsFile,AccessKey,SecretKey,Region})
+local option={}
+option.provider=Provider
+option.credentials=CredentialsFile
+option.key=AccessKey
+option.secret=SecretKey
+option.region=Region
+return option
+end
+function MSRS:SetProviderOptionsGoogle(CredentialsFile,AccessKey)
+self:F({CredentialsFile,AccessKey})
+self:SetProviderOptions(MSRS.Provider.GOOGLE,CredentialsFile,AccessKey)
+return self
+end
+function MSRS:SetProviderOptionsAmazon(AccessKey,SecretKey,Region)
+self:F({AccessKey,SecretKey,Region})
+self:SetProviderOptions(MSRS.Provider.AMAZON,nil,AccessKey,SecretKey,Region)
+return self
 end
+function MSRS:SetProviderOptionsAzure(AccessKey,Region)
+self:F({AccessKey,Region})
+self:SetProviderOptions(MSRS.Provider.AZURE,nil,AccessKey,nil,Region)
+return self
+end
+function MSRS:GetProviderOptions(Provider)
+return self.poptions[Provider or self.provider]or{}
+end
+function MSRS:SetTTSProviderGoogle()
+self:F()
+self:SetProvider(MSRS.Provider.GOOGLE)
+return self
+end
+function MSRS:SetTTSProviderMicrosoft()
+self:F()
+self:SetProvider(MSRS.Provider.WINDOWS)
+return self
+end
+function MSRS:SetTTSProviderAzure()
+self:F()
+self:SetProvider(MSRS.Provider.AZURE)
+return self
+end
+function MSRS:SetTTSProviderAmazon()
+self:F()
+self:SetProvider(MSRS.Provider.AMAZON)
 return self
 end
 function MSRS:Help()
-local path=self:GetPath()or STTS.DIRECTORY
-local exe=STTS.EXECUTABLE or"DCS-SR-ExternalAudio.exe"
-local filename=os.getenv('TMP').."\\MSRS-help-"..STTS.uuid()..".txt"
+self:F()
+local path=self:GetPath()
+local exe="DCS-SR-ExternalAudio.exe"
+local filename=os.getenv('TMP').."\\MSRS-help-"..MSRS.uuid()..".txt"
 local command=string.format("%s/%s --help > %s",path,exe,filename)
 os.execute(command)
 local f=assert(io.open(filename,"rb"))
 local data=f:read("*all")
 f:close()
-env.info("SRS STTS help output:")
+env.info("SRS help output:")
 env.info("======================================================================")
 env.info(data)
 env.info("======================================================================")
 return self
 end
-function MSRS.SetDefaultBackend(Backend)
-if type(Backend)=="table"then
-MSRS.AltBackend=UTILS.DeepCopy(Backend)
-else
-return false
-end
-return true
-end
-function MSRS.ResetDefaultBackend()
-MSRS.AltBackend=nil
-return true
-end
-function MSRS.SetDefaultBackendGRPC()
-return MSRS.SetDefaultBackend(MSRS_BACKEND_DCSGRPC)
-end
 function MSRS:PlaySoundFile(Soundfile,Delay)
+self:F({Soundfile,Delay})
+local soundfile=Soundfile:GetName()
+local exists=UTILS.FileExists(soundfile)
+if not exists then
+self:E("ERROR: MSRS sound file does not exist! File="..soundfile)
+return self
+end
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,MSRS.PlaySoundFile,self,Soundfile,0)
 else
-local soundfile=Soundfile:GetName()
 local command=self:_GetCommand()
 command=command..' --file="'..tostring(soundfile)..'"'
 self:_ExecCommand(command)
@@ -78271,42 +79604,53 @@ end
 return self
 end
 function MSRS:PlaySoundText(SoundText,Delay)
+self:F({SoundText,Delay})
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,MSRS.PlaySoundText,self,SoundText,0)
 else
+if self.backend==MSRS.Backend.GRPC then
+self:_DCSgRPCtts(SoundText.text,nil,SoundText.gender,SoundText.culture,SoundText.voice,SoundText.volume,SoundText.label,SoundText.coordinate)
+else
 local command=self:_GetCommand(nil,nil,nil,SoundText.gender,SoundText.voice,SoundText.culture,SoundText.volume,SoundText.speed)
 command=command..string.format(" --text=\"%s\"",tostring(SoundText.text))
 self:_ExecCommand(command)
 end
+end
 return self
 end
 function MSRS:PlayText(Text,Delay,Coordinate)
+self:F({Text,Delay,Coordinate})
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,MSRS.PlayText,self,Text,nil,Coordinate)
 else
-local command=self:_GetCommand(nil,nil,nil,nil,nil,nil,nil,nil,nil,nil,Coordinate)
-command=command..string.format(" --text=\"%s\"",tostring(Text))
-self:_ExecCommand(command)
+if self.backend==MSRS.Backend.GRPC then
+self:T(self.lid.."Transmitting")
+self:_DCSgRPCtts(Text,nil,nil,nil,nil,nil,nil,Coordinate)
+else
+self:PlayTextExt(Text,Delay,nil,nil,nil,nil,nil,nil,nil,Coordinate)
+end
 end
 return self
 end
 function MSRS:PlayTextExt(Text,Delay,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate)
+self:F({Text,Delay,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate})
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,MSRS.PlayTextExt,self,Text,0,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate)
 else
-if Frequencies and type(Frequencies)~="table"then
-Frequencies={Frequencies}
-end
-if Modulations and type(Modulations)~="table"then
-Modulations={Modulations}
-end
-local command=self:_GetCommand(Frequencies,Modulations,nil,Gender,Voice,Culture,Volume,nil,nil,Label,Coordinate)
+Frequencies=Frequencies or self:GetFrequencies()
+Modulations=Modulations or self:GetModulations()
+if self.backend==MSRS.Backend.SRSEXE then
+local command=self:_GetCommand(UTILS.EnsureTable(Frequencies,false),UTILS.EnsureTable(Modulations,false),nil,Gender,Voice,Culture,Volume,nil,nil,Label,Coordinate)
 command=command..string.format(" --text=\"%s\"",tostring(Text))
 self:_ExecCommand(command)
+elseif self.backend==MSRS.Backend.GRPC then
+self:_DCSgRPCtts(Text,Frequencies,Gender,Culture,Voice,Volume,Label,Coordinate)
+end
 end
 return self
 end
 function MSRS:PlayTextFile(TextFile,Delay)
+self:F({TextFile,Delay})
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,MSRS.PlayTextFile,self,TextFile,0)
 else
@@ -78319,51 +79663,96 @@ local command=self:_GetCommand()
 command=command..string.format(" --textFile=\"%s\"",tostring(TextFile))
 self:T(string.format("MSRS TextFile command=%s",command))
 local l=string.len(command)
+self:T(string.format("Command length=%d",l))
 self:_ExecCommand(command)
 end
 return self
 end
-function MSRS:_NewAltBackend(Backend)
-BASE:T('Entering MSRS:_NewAltBackend()')
-for funcName,funcDef in pairs(Backend.Functions)do
-if type(funcDef)=='function'then
-BASE:T('MSRS (re-)defining function MSRS:'..funcName)
-self[funcName]=funcDef
+function MSRS:_GetLatLongAlt(Coordinate)
+self:F({Coordinate=Coordinate})
+local lat=0.0
+local lon=0.0
+local alt=0.0
+if Coordinate then
+lat,lon,alt=coord.LOtoLL(Coordinate)
+end
+return lat,lon,math.floor(alt)
+end
+function MSRS:_GetCommand(freqs,modus,coal,gender,voice,culture,volume,speed,port,label,coordinate)
+self:F({freqs,modus,coal,gender,voice,culture,volume,speed,port,label,coordinate})
+local path=self:GetPath()
+local exe="DCS-SR-ExternalAudio.exe"
+local fullPath=string.format("%s\\%s",path,exe)
+freqs=table.concat(freqs or self.frequencies,",")
+modus=table.concat(modus or self.modulations,",")
+coal=coal or self.coalition
+gender=gender or self.gender
+voice=voice or self:GetVoice(self.provider)or self.voice
+culture=culture or self.culture
+volume=volume or self.volume
+speed=speed or self.speed
+port=port or self.port
+label=label or self.Label
+coordinate=coordinate or self.coordinate
+modus=modus:gsub("0","AM")
+modus=modus:gsub("1","FM")
+local command=string.format('"%s\\%s" -f "%s" -m "%s" -c %s -p %s -n "%s" -v "%.1f"',path,exe,freqs,modus,coal,port,label,volume)
+if voice then
+command=command..string.format(" --voice=\"%s\"",tostring(voice))
+else
+if gender and gender~="female"then
+command=command..string.format(" -g %s",tostring(gender))
+end
+if culture and culture~="en-GB"then
+command=command..string.format(" -l %s",tostring(culture))
 end
 end
-for varName,varVal in pairs(Backend.Vars)do
-BASE:T('MSRS setting self.'..varName)
-self[varName]=UTILS.DeepCopy(varVal)
+if coordinate then
+local lat,lon,alt=self:_GetLatLongAlt(coordinate)
+command=command..string.format(" -L %.4f -O %.4f -A %d",lat,lon,alt)
 end
-if self._MSRSbackendInit and type(self._MSRSbackendInit)=='function'then
-return self:_MSRSbackendInit()
+if self.provider==MSRS.Provider.GOOGLE then
+local pops=self:GetProviderOptions()
+command=command..string.format(' --ssml -G "%s"',pops.credentials)
+elseif self.provider==MSRS.Provider.WINDOWS then
+else
+self:E("ERROR: SRS only supports WINWOWS and GOOGLE as TTS providers! Use DCS-gRPC backend for other providers such as ")
 end
-return self
+if not UTILS.FileExists(fullPath)then
+self:E("ERROR: MSRS SRS executable does not exist! FullPath="..fullPath)
+command="CommandNotFound"
+end
+self:T("MSRS command from _GetCommand="..command)
+return command
 end
 function MSRS:_ExecCommand(command)
-self:T("SRS TTS command="..command)
-local filename=os.getenv('TMP').."\\MSRS-"..STTS.uuid()..".bat"
+self:F({command=command})
+if string.find(command,"CommandNotFound")then return 0 end
+local batContent=command.." && exit"
+local filename=os.getenv('TMP').."\\MSRS-"..MSRS.uuid()..".bat"
 local script=io.open(filename,"w+")
-script:write(command.." && exit")
+script:write(batContent)
 script:close()
-command=string.format('start /b "" "%s"',filename)
+self:T("MSRS batch file created: "..filename)
+self:T("MSRS batch content: "..batContent)
 local res=nil
 if true then
-local filenvbs=os.getenv('TMP').."\\MSRS-"..STTS.uuid()..".vbs"
+local filenvbs=os.getenv('TMP').."\\MSRS-"..MSRS.uuid()..".vbs"
 local script=io.open(filenvbs,"w+")
 script:write(string.format('Dim WinScriptHost\n'))
 script:write(string.format('Set WinScriptHost = CreateObject("WScript.Shell")\n'))
 script:write(string.format('WinScriptHost.Run Chr(34) & "%s" & Chr(34), 0\n',filename))
 script:write(string.format('Set WinScriptHost = Nothing'))
 script:close()
+self:T("MSRS vbs file created to start batch="..filenvbs)
 local runvbs=string.format('cscript.exe //Nologo //B "%s"',filenvbs)
-self:T("MSRS execute command="..command)
 self:T("MSRS execute VBS command="..runvbs)
 res=os.execute(runvbs)
 timer.scheduleFunction(os.remove,filename,timer.getTime()+1)
 timer.scheduleFunction(os.remove,filenvbs,timer.getTime()+1)
+self:T("MSRS vbs and batch file removed")
 elseif false then
-local filenvbs=os.getenv('TMP').."\\MSRS-"..STTS.uuid()..".vbs"
+local filenvbs=os.getenv('TMP').."\\MSRS-"..MSRS.uuid()..".vbs"
 local script=io.open(filenvbs,"w+")
 script:write(string.format('Set oShell = CreateObject ("Wscript.Shell")\n'))
 script:write(string.format('Dim strArgs\n'))
@@ -78373,261 +79762,118 @@ script:close()
 local runvbs=string.format('cscript.exe //Nologo //B "%s"',filenvbs)
 res=os.execute(runvbs)
 else
+command=string.format('start /b "" "%s"',filename)
 self:T("MSRS execute command="..command)
 res=os.execute(command)
 timer.scheduleFunction(os.remove,filename,timer.getTime()+1)
 end
 return res
 end
-function MSRS:_GetLatLongAlt(Coordinate)
-local lat,lon,alt=coord.LOtoLL(Coordinate)
-return lat,lon,math.floor(alt)
+function MSRS:_DCSgRPCtts(Text,Frequencies,Gender,Culture,Voice,Volume,Label,Coordinate)
+self:F("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
+self:F({Text,Frequencies,Gender,Culture,Voice,Volume,Label,Coordinate})
+local options={}
+local ssml=Text or''
+Frequencies=UTILS.EnsureTable(Frequencies,true)or self:GetFrequencies()
+options.plaintext=Text
+options.srsClientName=Label or self.Label
+if self.coordinate then
+options.position={}
+options.position.lat,options.position.lon,options.position.alt=self:_GetLatLongAlt(self.coordinate)
 end
-function MSRS:_GetCommand(freqs,modus,coal,gender,voice,culture,volume,speed,port,label,coordinate)
-local path=self:GetPath()or STTS.DIRECTORY
-local exe=STTS.EXECUTABLE or"DCS-SR-ExternalAudio.exe"
-freqs=table.concat(freqs or self.frequencies,",")
-modus=table.concat(modus or self.modulations,",")
-coal=coal or self.coalition
-gender=gender or self.gender
-voice=voice or self.voice
-culture=culture or self.culture
-volume=volume or self.volume
-speed=speed or self.speed
-port=port or self.port
-label=label or self.Label
-coordinate=coordinate or self.coordinate
-modus=modus:gsub("0","AM")
-modus=modus:gsub("1","FM")
-local command=string.format('"%s\\%s" -f "%s" -m "%s" -c %s -p %s -n "%s" -v "%.1f"',path,exe,freqs,modus,coal,port,label,volume)
-if voice then
-command=command..string.format(" --voice=\"%s\"",tostring(voice))
+options.coalition=UTILS.GetCoalitionName(self.coalition):lower()
+local provider=self.provider or MSRS.Provider.WINDOWS
+self:F({provider=provider})
+options.provider={}
+options.provider[provider]=self:GetProviderOptions(provider)
+Voice=Voice or self:GetVoice(self.provider)or self.voice
+if Voice then
+options.provider[provider].voice=Voice
 else
-if gender and gender~="female"then
-command=command..string.format(" -g %s",tostring(gender))
+local preTag,genderProp,langProp,postTag='','','',''
+local gender=""
+if self.gender then
+gender=string.format(' gender=\"%s\"',self.gender)
 end
-if culture and culture~="en-GB"then
-command=command..string.format(" -l %s",tostring(culture))
+local language=""
+if self.culture then
+language=string.format(' language=\"%s\"',self.culture)
 end
+if self.gender or self.culture then
+ssml=string.format("<voice%s%s>%s</voice>",gender,language,Text)
 end
-if coordinate then
-local lat,lon,alt=self:_GetLatLongAlt(coordinate)
-command=command..string.format(" -L %.4f -O %.4f -A %d",lat,lon,alt)
 end
-if self.google then
-command=command..string.format(' --ssml -G "%s"',self.google)
+for _,freq in pairs(Frequencies)do
+self:F("Calling GRPC.tts with the following parameter:")
+self:F({ssml=ssml,freq=freq,options=options})
+self:F(options.provider[provider])
+GRPC.tts(ssml,freq*1e6,options)
 end
-self:I("MSRS command="..command)
-return command
 end
-function MSRS:LoadConfigFile(Path,Filename,ConfigLoaded)
+function MSRS:LoadConfigFile(Path,Filename)
+if lfs==nil then
+env.info("*****Note - lfs and os need to be desanitized for MSRS to work!")
+return false
+end
 local path=Path or lfs.writedir()..MSRS.ConfigFilePath
 local file=Filename or MSRS.ConfigFileName or"Moose_MSRS.lua"
-if UTILS.CheckFileExists(path,file)and not ConfigLoaded then
+local pathandfile=path..file
+local filexsists=UTILS.FileExists(pathandfile)
+if filexsists and not MSRS.ConfigLoaded then
+env.info("FF reading config file")
 assert(loadfile(path..file))()
 if MSRS_Config then
-if self then
-self.path=MSRS_Config.Path or"C:\\Program Files\\DCS-SimpleRadio-Standalone"
-self.port=MSRS_Config.Port or 5002
-self.frequencies=MSRS_Config.Frequency or{127,243}
-self.modulations=MSRS_Config.Modulation or{0,0}
-self.coalition=MSRS_Config.Coalition or 0
+local Self=self or MSRS
+Self.path=MSRS_Config.Path or"C:\\Program Files\\DCS-SimpleRadio-Standalone"
+Self.port=MSRS_Config.Port or 5002
+Self.backend=MSRS_Config.Backend or MSRS.Backend.SRSEXE
+Self.frequencies=MSRS_Config.Frequency or{127,243}
+Self.modulations=MSRS_Config.Modulation or{0,0}
+Self.coalition=MSRS_Config.Coalition or 0
 if MSRS_Config.Coordinate then
-self.coordinate=COORDINATE:New(MSRS_Config.Coordinate[1],MSRS_Config.Coordinate[2],MSRS_Config.Coordinate[3])
-end
-self.culture=MSRS_Config.Culture or"en-GB"
-self.gender=MSRS_Config.Gender or"male"
-self.google=MSRS_Config.Google
-self.Label=MSRS_Config.Label or"MSRS"
-self.voice=MSRS_Config.Voice
-if MSRS_Config.GRPC then
-self.provider=MSRS_Config.GRPC.DefaultProvider
-if MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider]then
-self.APIKey=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].key
-self.defaultVoice=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].defaultVoice
-self.region=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].secret
-self.secret=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].region
-end
-end
-self.ConfigLoaded=true
-else
-MSRS.path=MSRS_Config.Path or"C:\\Program Files\\DCS-SimpleRadio-Standalone"
-MSRS.port=MSRS_Config.Port or 5002
-MSRS.frequencies=MSRS_Config.Frequency or{127,243}
-MSRS.modulations=MSRS_Config.Modulation or{0,0}
-MSRS.coalition=MSRS_Config.Coalition or 0
-if MSRS_Config.Coordinate then
-MSRS.coordinate=COORDINATE:New(MSRS_Config.Coordinate[1],MSRS_Config.Coordinate[2],MSRS_Config.Coordinate[3])
+Self.coordinate=COORDINATE:New(MSRS_Config.Coordinate[1],MSRS_Config.Coordinate[2],MSRS_Config.Coordinate[3])
 end
-MSRS.culture=MSRS_Config.Culture or"en-GB"
-MSRS.gender=MSRS_Config.Gender or"male"
-MSRS.google=MSRS_Config.Google
-MSRS.Label=MSRS_Config.Label or"MSRS"
-MSRS.voice=MSRS_Config.Voice
-if MSRS_Config.GRPC then
-MSRS.provider=MSRS_Config.GRPC.DefaultProvider
-if MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider]then
-MSRS.APIKey=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].key
-MSRS.defaultVoice=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].defaultVoice
-MSRS.region=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].secret
-MSRS.secret=MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].region
+Self.culture=MSRS_Config.Culture or"en-GB"
+Self.gender=MSRS_Config.Gender or"male"
+Self.Label=MSRS_Config.Label or"MSRS"
+Self.voice=MSRS_Config.Voice
+Self.provider=MSRS_Config.Provider or MSRS.Provider.WINDOWS
+for _,provider in pairs(MSRS.Provider)do
+if MSRS_Config[provider]then
+Self.poptions[provider]=MSRS_Config[provider]
 end
 end
-MSRS.ConfigLoaded=true
+Self.ConfigLoaded=true
 end
+env.info("MSRS - Successfully loaded default configuration from disk!",false)
 end
-env.info("MSRS - Sucessfully loaded default configuration from disk!",false)
-else
-env.info("MSRS - Cannot load default configuration from disk!",false)
+if not filexsists then
+env.info("MSRS - Cannot find default configuration file!",false)
 return false
 end
 return true
 end
-MSRS_BACKEND_DCSGRPC={}
-MSRS_BACKEND_DCSGRPC.version=0.1
-MSRS_BACKEND_DCSGRPC.Functions={}
-MSRS_BACKEND_DCSGRPC.Vars={provider='win'}
-MSRS_BACKEND_DCSGRPC.Functions._MSRSbackendInit=function(self)
-BASE:I('Loaded MSRS DCS-gRPC alternate backend version '..self.AltBackend.version or'unspecified')
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetPath=function(self)
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.GetPath=function(self)
-return''
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetVolume=function(self)
-BASE:I('NOTE: MSRS:SetVolume() not used with DCS-gRPC backend.')
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.GetVolume=function(self)
-BASE:I('NOTE: MSRS:GetVolume() not used with DCS-gRPC backend.')
-return 1
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetGender=function(self,Gender)
-if Gender then
-self.gender=Gender:lower()
-end
-self:T("Setting gender to "..tostring(self.gender))
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetGoogle=function(self)
-self.provider='gcloud'
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetAPIKey=function(self,key)
-self.APIKey=key
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetDefaultVoice=function(self,voice)
-self.defaultVoice=voice
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetAWS=function(self)
-self.provider='aws'
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetAzure=function(self)
-self.provider='azure'
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.SetWin=function(self)
-self.provider='win'
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.Help=function(self)
-env.info('For DCS-gRPC help, please see: https://github.com/DCS-gRPC/rust-server')
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.PlaySoundFile=function(self)
-BASE:E("ERROR: MSRS:PlaySoundFile() is not supported by the DCS-gRPC backend.")
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.PlaySoundText=function(self,SoundText,Delay)
-if Delay and Delay>0 then
-self:ScheduleOnce(Delay,self.PlaySoundText,self,SoundText,0)
-else
-self:_DCSgRPCtts(tostring(SoundText.text))
-end
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.PlayText=function(self,Text,Delay)
-if Delay and Delay>0 then
-self:ScheduleOnce(Delay,self.PlayText,self,Text,0)
-else
-self:_DCSgRPCtts(tostring(Text))
-end
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.PlayTextExt=function(self,Text,Delay,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label)
-if Delay and Delay>0 then
-self:ScheduleOnce(Delay,self.PlayTextExt,self,Text,0,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label)
+function MSRS.getSpeechTime(length,speed,isGoogle)
+local maxRateRatio=3
+speed=speed or 1.0
+isGoogle=isGoogle or false
+local speedFactor=1.0
+if isGoogle then
+speedFactor=speed
 else
-self:_DCSgRPCtts(tostring(Text),nil,Frequencies,Voice,Label)
-end
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions.PlayTextFile=function(self,TextFile,Delay)
-BASE:E("ERROR: MSRS:PlayTextFile() is not supported by the DCS-gRPC backend.")
-return self
-end
-MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts=function(self,Text,Plaintext,Frequencies,Voice,Label)
-BASE:T("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
-BASE:T({Text,Plaintext,Frequencies,Voice,Label})
-local options=self.ProviderOptions or MSRS.ProviderOptions or{}
-local ssml=Text or''
-local XmitFrequencies=Frequencies or self.Frequency
-if type(XmitFrequencies)~="table"then
-XmitFrequencies={XmitFrequencies}
-end
-options.plaintext=Plaintext
-options.srsClientName=Label or self.Label
-options.position={}
-if self.coordinate then
-options.position.lat,options.position.lon,options.position.alt=self:_GetLatLongAlt(self.coordinate)
-end
-options.position.lat=options.position.lat or 0.0
-options.position.lon=options.position.lon or 0.0
-options.position.alt=options.position.alt or 0.0
-if UTILS.GetCoalitionName(self.coalition)=='Blue'then
-options.coalition='blue'
-elseif UTILS.GetCoalitionName(self.coalition)=='Red'then
-options.coalition='red'
-end
-local provider=self.provider or self.GRPCOptions.DefaultProvider or MSRS.GRPCOptions.DefaultProvider
-options.provider={}
-options.provider[provider]={}
-if self.APIKey then
-options.provider[provider].key=self.APIKey
-end
-if self.defaultVoice then
-options.provider[provider].defaultVoice=self.defaultVoice
-end
-if self.voice then
-options.provider[provider].voice=Voice or self.voice or self.defaultVoice
-elseif ssml then
-local preTag,genderProp,langProp,postTag='','','',''
-if self.gender then
-genderProp=' gender=\"'..self.gender..'\"'
-end
-if self.culture then
-langProp=' language=\"'..self.culture..'\"'
+if speed~=0 then
+speedFactor=math.abs(speed)*(maxRateRatio-1)/10+1
 end
-if self.culture or self.gender then
-preTag='<voice'..langProp..genderProp..'>'
-postTag='</voice>'
-ssml=preTag..Text..postTag
+if speed<0 then
+speedFactor=1/speedFactor
 end
 end
-for _,_freq in ipairs(XmitFrequencies)do
-local freq=_freq*1000000
-BASE:T("GRPC.tts")
-BASE:T(ssml)
-BASE:T(freq)
-BASE:T({options})
-GRPC.tts(ssml,freq,options)
+local wpm=math.ceil(100*speedFactor)
+local cps=math.floor((wpm*5)/60)
+if type(length)=="string"then
+length=string.len(length)
 end
+return length/cps
 end
 MSRSQUEUE={
 ClassName="MSRSQUEUE",
@@ -78688,7 +79934,7 @@ return nil
 end
 local transmission={}
 transmission.text=text
-transmission.duration=duration or STTS.getSpeechTime(text)
+transmission.duration=duration or MSRS.getSpeechTime(text)
 transmission.msrs=msrs
 transmission.Tplay=tstart or timer.getAbsTime()
 transmission.subtitle=subtitle
@@ -78811,6 +80057,7 @@ end
 self:_CheckRadioQueue(dt)
 end
 end
+MSRS.LoadConfigFile()
 COMMANDCENTER={
 ClassName="COMMANDCENTER",
 CommandCenterName="",