@jtff/miztemplate-lib 3.1.6 → 3.1.8

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2023-11-14T11:57:58+01:00-1b8c9367a3b7c7c46eac1c19433a16d32d43b746 ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2023-12-10T14:37:41+01:00-c089e56060974539e58a346665f7536a2898c4cf ***')
 env.info('*** MOOSE STATIC INCLUDE START *** ')
 ENUMS={}
 env.setErrorMessageBoxEnabled(false)
@@ -416,6 +416,12 @@ Reaper="MQ-9",
 Predator="MQ-1A",
 }
 }
+ENUMS.Link16Power={
+none=0,
+low=1,
+medium=2,
+high=3,
+}
 ENUMS.Storage={
 weapons={
 missiles={},
@@ -1277,21 +1283,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 +1835,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
@@ -2479,7 +2503,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 +3015,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={},
@@ -5888,6 +6206,14 @@ UnitDeleteTask=world.event.S_EVENT_UNIT_DELETE_TASK or-1,
 SimulationStart=world.event.S_EVENT_SIMULATION_START or-1,
 WeaponRearm=world.event.S_EVENT_WEAPON_REARM or-1,
 WeaponDrop=world.event.S_EVENT_WEAPON_DROP or-1,
+UnitTaskTimeout=world.event.S_EVENT_UNIT_TASK_TIMEOUT or-1,
+UnitTaskStage=world.event.S_EVENT_UNIT_TASK_STAGE or-1,
+MacSubtaskScore=world.event.S_EVENT_MAC_SUBTASK_SCORE or-1,
+MacExtraScore=world.event.S_EVENT_MAC_EXTRA_SCORE or-1,
+MissionRestart=world.event.S_EVENT_MISSION_RESTART or-1,
+MissionWinner=world.event.S_EVENT_MISSION_WINNER or-1,
+PostponedTakeoff=world.event.S_EVENT_POSTPONED_TAKEOFF or-1,
+PostponedLand=world.event.S_EVENT_POSTPONED_LAND or-1,
 }
 local _EVENTMETA={
 [world.event.S_EVENT_SHOT]={
@@ -6201,6 +6527,54 @@ Side="I",
 Event="OnEventWeaponDrop",
 Text="S_EVENT_WEAPON_DROP"
 },
+[EVENTS.UnitTaskTimeout]={
+Order=1,
+Side="I",
+Event="OnEventUnitTaskTimeout",
+Text="S_EVENT_UNIT_TASK_TIMEOUT "
+},
+[EVENTS.UnitTaskStage]={
+Order=1,
+Side="I",
+Event="OnEventUnitTaskStage",
+Text="S_EVENT_UNIT_TASK_STAGE "
+},
+[EVENTS.MacSubtaskScore]={
+Order=1,
+Side="I",
+Event="OnEventMacSubtaskScore",
+Text="S_EVENT_MAC_SUBTASK_SCORE"
+},
+[EVENTS.MacExtraScore]={
+Order=1,
+Side="I",
+Event="OnEventMacExtraScore",
+Text="S_EVENT_MAC_EXTRA_SCOREP"
+},
+[EVENTS.MissionRestart]={
+Order=1,
+Side="I",
+Event="OnEventMissionRestart",
+Text="S_EVENT_MISSION_RESTART"
+},
+[EVENTS.MissionWinner]={
+Order=1,
+Side="I",
+Event="OnEventMissionWinner",
+Text="S_EVENT_MISSION_WINNER"
+},
+[EVENTS.PostponedTakeoff]={
+Order=1,
+Side="I",
+Event="OnEventPostponedTakeoff",
+Text="S_EVENT_POSTPONED_TAKEOFF"
+},
+[EVENTS.PostponedLand]={
+Order=1,
+Side="I",
+Event="OnEventPostponedLand",
+Text="S_EVENT_POSTPONED_LAND"
+},
 }
 function EVENT:New()
 local self=BASE:Inherit(self,BASE:New())
@@ -6524,11 +6898,13 @@ elseif Event.TgtObjectCategory==Object.Category.STATIC then
 Event.TgtDCSUnit=Event.target
 if Event.target:isExist()and Event.id~=33 then
 Event.TgtDCSUnitName=Event.TgtDCSUnit:getName()
+if Event.TgtDCSUnitName and Event.TgtDCSUnitName~=""then
 Event.TgtUnitName=Event.TgtDCSUnitName
 Event.TgtUnit=STATIC:FindByName(Event.TgtDCSUnitName,false)
 Event.TgtCoalition=Event.TgtDCSUnit:getCoalition()
 Event.TgtCategory=Event.TgtDCSUnit:getDesc().category
 Event.TgtTypeName=Event.TgtDCSUnit:getTypeName()
+end
 else
 Event.TgtDCSUnitName=string.format("No target object for Event ID %s",tostring(Event.id))
 Event.TgtUnitName=Event.TgtDCSUnitName
@@ -6560,7 +6936,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()
@@ -6568,7 +6944,7 @@ end
 if Event.place then
 if Event.id==EVENTS.LandingAfterEjection then
 else
-if Event.place:isExist()and Event.place:getCategory()~=Object.Category.SCENERY then
+if Event.place:isExist()and Object.getCategory(Event.place)~=Object.Category.SCENERY then
 Event.Place=AIRBASE:Find(Event.place)
 Event.PlaceName=Event.Place:GetName()
 end
@@ -8108,7 +8484,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
@@ -8368,7 +8750,7 @@ radius=ZoneRadius,
 }
 local function EvaluateZone(ZoneObject)
 if ZoneObject then
-local ObjectCategory=ZoneObject:getCategory()
+local ObjectCategory=Object.getCategory(ZoneObject)
 if(ObjectCategory==Object.Category.UNIT and ZoneObject:isExist()and ZoneObject:isActive())or(ObjectCategory==Object.Category.STATIC and ZoneObject:isExist())then
 local CoalitionDCSUnit=ZoneObject:getCoalition()
 local Include=false
@@ -8823,8 +9205,68 @@ 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,
+DrawIDs={}
+}
+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]
+table.add(self.DrawIDs,c1:LineToAll(c2,Coalition,Color,Alpha,LineType,ReadOnly))
+end
+return self.DrawIDs
+end
 ZONE_POLYGON_BASE={
 ClassName="ZONE_POLYGON_BASE",
+_Triangles={},
+SurfaceArea=0,
+DrawID={}
 }
 function ZONE_POLYGON_BASE:New(ZoneName,PointsArray)
 local self=BASE:Inherit(self,ZONE_BASE:New(ZoneName))
@@ -8836,9 +9278,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
@@ -8846,6 +9363,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)
@@ -8855,8 +9374,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()
@@ -8939,32 +9467,42 @@ 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)
 FillColor=FillColor or self:GetFillColorRGB()
-if not FillColor then UTILS.DeepCopy(Color)end
+if not FillColor then
+UTILS.DeepCopy(Color)
+end
 FillAlpha=FillAlpha or self:GetFillColorAlpha()
-if not FillAlpha then FillAlpha=0.15 end
+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)
+IncludeTriangles=IncludeTriangles or false
+if IncludeTriangles then
+for _,triangle in pairs(self._Triangles)do
+local draw_ids=triangle:Draw()
+table.combine(self.DrawID,draw_ids)
+end
 else
-local Coordinates=self:GetVerticiesCoordinates()
-table.remove(Coordinates,1)
-self.DrawID=coordinate:MarkupToAllFreeForm(Coordinates,Coalition,Color,Alpha,FillColor,FillAlpha,LineType,ReadOnly)
+local coords=self:GetVerticiesCoordinates()
+for i=1,#coords do
+local c1=coords[i]
+local c2=coords[i%#coords+1]
+table.add(self.DrawID,c1:LineToAll(c2,Coalition,Color,Alpha,LineType,ReadOnly))
+end
 end
 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
@@ -9073,17 +9611,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()
@@ -9162,6 +9701,7 @@ i=i+1
 end
 return self
 end
+do
 ZONE_POLYGON={
 ClassName="ZONE_POLYGON",
 }
@@ -9186,6 +9726,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
@@ -9212,7 +9782,7 @@ radius=ZoneRadius,
 }
 local function EvaluateZone(ZoneObject)
 if ZoneObject then
-local ObjectCategory=ZoneObject:getCategory()
+local ObjectCategory=Object.getCategory(ZoneObject)
 if(ObjectCategory==Object.Category.UNIT and ZoneObject:isExist()and ZoneObject:isActive())or(ObjectCategory==Object.Category.STATIC and ZoneObject:isExist())then
 local CoalitionDCSUnit=ZoneObject:getCoalition()
 local Include=false
@@ -9372,6 +9942,7 @@ end
 function ZONE_POLYGON:IsNoneInZone()
 return self:CountScannedCoalitions()==0
 end
+end
 do
 ZONE_ELASTIC={
 ClassName="ZONE_ELASTIC",
@@ -9465,6 +10036,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",
@@ -10776,7 +11465,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
@@ -11691,6 +12383,16 @@ end
 end
 return CountU
 end
+function SET_UNIT:GetAliveSet()
+local AliveSet=SET_UNIT:New()
+for GroupName,GroupObject in pairs(self.Set)do
+local GroupObject=GroupObject
+if GroupObject and GroupObject:IsAlive()then
+AliveSet:Add(GroupName,GroupObject)
+end
+end
+return AliveSet.Set or{},AliveSet
+end
 function SET_UNIT:_ContinousZoneFilter()
 local Database=_DATABASE.UNITS
 for ObjectName,Object in pairs(Database)do
@@ -11915,40 +12617,41 @@ self:F({MaxThreatLevelA2G=MaxThreatLevelA2G,MaxThreatText=MaxThreatText})
 return MaxThreatLevelA2G,MaxThreatText
 end
 function SET_UNIT:GetCoordinate()
-local Coordinate=self:GetRandom():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:GetSet())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
+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 vec3 then
+x=x+vec3.x
+y=y+vec3.y
+z=z+vec3.z
+n=n+1
+end
+end
+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
-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})
 return Coordinate
 end
 function SET_UNIT:GetVelocity()
@@ -12805,6 +13508,31 @@ self:_FilterStart()
 end
 return self
 end
+function SET_CLIENT:_EventPlayerEnterUnit(Event)
+self:I("_EventPlayerEnterUnit")
+if Event.IniDCSUnit then
+if Event.IniObjectCategory==1 and Event.IniGroup and Event.IniGroup:IsGround()then
+local ObjectName,Object=self:AddInDatabase(Event)
+self:I(ObjectName,UTILS.PrintTableToLog(Object))
+if Object and self:IsIncludeObject(Object)then
+self:Add(ObjectName,Object)
+end
+end
+end
+return self
+end
+function SET_CLIENT:_EventPlayerLeaveUnit(Event)
+self:I("_EventPlayerLeaveUnit")
+if Event.IniDCSUnit then
+if Event.IniObjectCategory==1 and Event.IniGroup and Event.IniGroup:IsGround()then
+local ObjectName,Object=self:FindInDatabase(Event)
+if ObjectName then
+self:Remove(ObjectName)
+end
+end
+end
+return self
+end
 function SET_CLIENT:AddInDatabase(Event)
 self:F3({Event})
 return Event.IniDCSUnitName,self.Database[Event.IniDCSUnitName]
@@ -14886,7 +15614,7 @@ local gotunits=false
 local gotscenery=false
 local function EvaluateZone(ZoneObject)
 if ZoneObject then
-local ObjectCategory=ZoneObject:getCategory()
+local ObjectCategory=Object.getCategory(ZoneObject)
 if ObjectCategory==Object.Category.UNIT and ZoneObject:isExist()then
 table.insert(Units,UNIT:Find(ZoneObject))
 gotunits=true
@@ -16113,6 +16841,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)
@@ -16692,7 +17423,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
@@ -16736,29 +17467,40 @@ return self
 end
 _MESSAGESRS={}
 function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate)
-_MESSAGESRS.MSRS=MSRS:New(PathToSRS,Frequency,Modulation,Volume)
-_MESSAGESRS.MSRS:SetCoalition(Coalition)
+_MESSAGESRS.MSRS=MSRS:New(PathToSRS,Frequency or 243,Modulation or radio.modulation.AM,Volume)
+_MESSAGESRS.frequency=Frequency
+_MESSAGESRS.modulation=Modulation or radio.modulation.AM
+_MESSAGESRS.MSRS:SetCoalition(Coalition or coalition.side.NEUTRAL)
+_MESSAGESRS.coalition=Coalition or coalition.side.NEUTRAL
+_MESSAGESRS.coordinate=Coordinate
 _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
 _MESSAGESRS.MSRS:SetCulture(Culture)
-_MESSAGESRS.Culture=Culture
+_MESSAGESRS.Culture=Culture or"en-GB"
 _MESSAGESRS.MSRS:SetGender(Gender)
-_MESSAGESRS.Gender=Gender
+_MESSAGESRS.Gender=Gender or"female"
 _MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
+_MESSAGESRS.google=PathToCredentials
 _MESSAGESRS.MSRS:SetLabel(Label or"MESSAGE")
-_MESSAGESRS.MSRS:SetPort(Port)
-_MESSAGESRS.MSRS:SetVoice(Voice)
-_MESSAGESRS.Voice=Voice
+_MESSAGESRS.label=Label or"MESSAGE"
+_MESSAGESRS.MSRS:SetPort(Port or 5002)
+_MESSAGESRS.port=Port or 5002
+_MESSAGESRS.volume=Volume or 1
+_MESSAGESRS.MSRS:SetVolume(_MESSAGESRS.volume)
+if Voice then _MESSAGESRS.MSRS:SetVoice(Voice)end
+_MESSAGESRS.voice=Voice
 _MESSAGESRS.SRSQ=MSRSQUEUE:New(Label or"MESSAGE")
-env.info(_MESSAGESRS.MSRS.provider,false)
 end
 function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volume,coordinate)
+local tgender=gender or _MESSAGESRS.Gender
 if _MESSAGESRS.SRSQ then
-_MESSAGESRS.MSRS:SetVoice(voice or _MESSAGESRS.Voice)
+if voice then
+_MESSAGESRS.MSRS:SetVoice(voice or _MESSAGESRS.voice)
+end
 if coordinate then
 _MESSAGESRS.MSRS:SetCoordinate(coordinate)
 end
 local category=string.gsub(self.MessageCategory,":","")
-_MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency,modulation,gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,voice or _MESSAGESRS.Voice,volume,category,coordinate)
+_MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency or _MESSAGESRS.frequency,modulation or _MESSAGESRS.modulation,gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,nil,volume or _MESSAGESRS.volume,category,coordinate or _MESSAGESRS.coordinate)
 end
 return self
 end
@@ -17328,6 +18070,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.."'")
@@ -17617,6 +18360,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())
@@ -18738,19 +19493,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
@@ -19437,11 +20306,11 @@ function SPOT:onafterLasing(From,Event,To)
 self:T({From,Event,To})
 if self.Lasing then
 if self.Target and self.Target:IsAlive()then
-self.SpotIR:setPoint(self.Target:GetPointVec3():AddY(1):AddY(math.random(-100,100)/100):AddX(math.random(-100,100)/100):GetVec3())
+self.SpotIR:setPoint(self.Target:GetPointVec3():AddY(1):AddY(math.random(-100,100)/200):AddX(math.random(-100,100)/200):GetVec3())
 self.SpotLaser:setPoint(self.Target:GetPointVec3():AddY(1):GetVec3())
 self:__Lasing(0.2)
 elseif self.TargetCoord then
-local irvec3={x=self.TargetCoord.x+math.random(-100,100)/100,y=self.TargetCoord.y+math.random(-100,100)/100,z=self.TargetCoord.z}
+local irvec3={x=self.TargetCoord.x+math.random(-100,100)/200,y=self.TargetCoord.y+math.random(-100,100)/200,z=self.TargetCoord.z}
 local lsvec3={x=self.TargetCoord.x,y=self.TargetCoord.y,z=self.TargetCoord.z}
 self.SpotIR:setPoint(irvec3)
 self.SpotLaser:setPoint(lsvec3)
@@ -19824,7 +20693,7 @@ OBJECT={
 ClassName="OBJECT",
 ObjectName="",
 }
-function OBJECT:New(ObjectName,Test)
+function OBJECT:New(ObjectName)
 local self=BASE:Inherit(self,BASE:New())
 self:F2(ObjectName)
 self.ObjectName=ObjectName
@@ -19836,7 +20705,7 @@ if DCSObject then
 local ObjectID=DCSObject:getID()
 return ObjectID
 end
-BASE:E({"Cannot GetID",Name=self.ObjectName,Class=self:GetClassName()})
+self:E({"Cannot GetID",Name=self.ObjectName,Class=self:GetClassName()})
 return nil
 end
 function OBJECT:Destroy()
@@ -19845,7 +20714,7 @@ if DCSObject then
 DCSObject:destroy(false)
 return true
 end
-BASE:E({"Cannot Destroy",Name=self.ObjectName,Class=self:GetClassName()})
+self:E({"Cannot Destroy",Name=self.ObjectName,Class=self:GetClassName()})
 return nil
 end
 IDENTIFIABLE={
@@ -23055,7 +23924,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
@@ -24577,6 +25446,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
@@ -25553,6 +26423,34 @@ 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
 UNIT={
 ClassName="UNIT",
 UnitName=nil,
@@ -26347,6 +27245,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,
@@ -26870,6 +27792,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",
@@ -27140,7 +28069,7 @@ end
 function AIRBASE:GetWarehouse()
 local warehouse=nil
 local airbase=self:GetDCSObject()
-if airbase then
+if airbase and Airbase.getWarehouse then
 warehouse=airbase:getWarehouse()
 end
 return warehouse
@@ -28390,6 +29319,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",
@@ -28445,7 +29381,7 @@ local target=nil
 if self.weapon then
 local object=self.weapon:getTarget()
 if object then
-local category=object:getCategory()
+local category=Object.getCategory(object)
 local name=object:getName()
 self:T(self.lid..string.format("Got Target Object %s, category=%d",object:getName(),category))
 if category==Object.Category.UNIT then
@@ -28535,6 +29471,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
@@ -28606,6 +29562,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))
@@ -28633,6 +29590,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
@@ -29102,7 +30060,9 @@ STORAGE.version="0.0.1"
 function STORAGE:New(AirbaseName)
 local self=BASE:Inherit(self,BASE:New())
 self.airbase=Airbase.getByName(AirbaseName)
+if Airbase.getWarehouse then
 self.warehouse=self.airbase:getWarehouse()
+end
 self.lid=string.format("STORAGE %s",AirbaseName)
 return self
 end
@@ -32248,7 +33208,7 @@ self:__CalculateHitZone(20,SEADWeapon,pos0,fheight,SEADGroup,SEADWeaponName)
 end
 return self
 end
-local targetcat=_target:getCategory()
+local targetcat=Object.getCategory(_target)
 local _targetUnit=nil
 local _targetgroup=nil
 self:T(string.format("*** Targetcat = %d",targetcat))
@@ -33391,7 +34351,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()
@@ -33470,7 +34430,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
@@ -33479,7 +34439,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 "..
@@ -33599,12 +34559,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
@@ -33703,12 +34669,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
@@ -33720,7 +34687,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 "..
@@ -33832,7 +34799,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={
@@ -33846,7 +34813,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",
@@ -33859,7 +34826,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",
@@ -33872,7 +34839,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",
@@ -33884,20 +34851,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={
@@ -34050,6 +35017,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<=20 then
+thresheight=(((dist*dist)/400)*thresheight)
+thresblur=(((dist*dist)/400)*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
@@ -34210,6 +35199,13 @@ self._.FilterCategories[FilterCategories]=FilterCategories
 end
 return self
 end
+function DETECTION_BASE:SetRadarBlur(minheight,thresheight,thresblur)
+self.RadarBlur=true
+self.RadarBlurMinHeight=minheight or 250
+self.RadarBlurThresHeight=thresheight or 90
+self.RadarBlurThresBlur=thresblur or 85
+return self
+end
 end
 do
 function DETECTION_BASE:SetRefreshTimeInterval(RefreshTimeInterval)
@@ -39511,6 +40507,7 @@ soundpath="Range Soundfiles/",
 targetsheet=nil,
 targetpath=nil,
 targetprefix=nil,
+Coalition=nil,
 }
 RANGE.Defaults={
 goodhitrange=25,
@@ -39580,10 +40577,11 @@ IRExitRange={filename="IR-ExitRange.ogg",duration=3.10},
 RANGE.Names={}
 RANGE.MenuF10={}
 RANGE.MenuF10Root=nil
-RANGE.version="2.7.1"
-function RANGE:New(RangeName)
+RANGE.version="2.7.3"
+function RANGE:New(RangeName,Coalition)
 local self=BASE:Inherit(self,FSM:New())
 self.rangename=RangeName or"Practice Range"
+self.Coalition=Coalition
 self.lid=string.format("RANGE %s | ",self.rangename)
 local text=string.format("Script version %s - creating new RANGE object %s.",RANGE.version,self.rangename)
 self:I(self.lid..text)
@@ -39838,6 +40836,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)
@@ -39853,6 +40855,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)
@@ -40118,7 +41124,13 @@ local _callsign=_unit:GetCallsign()
 local text=string.format("Player %s, callsign %s entered unit %s (UID %d) of group %s (GID %d)",_playername,_callsign,_unitName,_uid,_group:GetName(),_gid)
 self:T(self.lid..text)
 self.strafeStatus[_uid]=nil
+if self.Coalition then
+if EventData.IniCoalition==self.Coalition then
 self:ScheduleOnce(0.1,self._AddF10Commands,self,_unitName)
+end
+else
+self:ScheduleOnce(0.1,self._AddF10Commands,self,_unitName)
+end
 self.PlayerSettings[_playername]={}
 self.PlayerSettings[_playername].smokebombimpact=self.defaultsmokebomb
 self.PlayerSettings[_playername].flaredirecthits=false
@@ -48155,11 +49167,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
@@ -48221,6 +49244,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
@@ -50089,7 +51113,9 @@ MANTIS.SamData={
 ["SA-20A"]={Range=150,Blindspot=5,Height=27,Type="Long",Radar="S-300PMU1"},
 ["SA-20B"]={Range=200,Blindspot=4,Height=27,Type="Long",Radar="S-300PMU2"},
 ["HQ-2"]={Range=50,Blindspot=6,Height=35,Type="Medium",Radar="HQ_2_Guideline_LN"},
-["SHORAD"]={Range=3,Blindspot=0,Height=3,Type="Short",Radar="Igla"}
+["SHORAD"]={Range=3,Blindspot=0,Height=3,Type="Short",Radar="Igla"},
+["TAMIR IDFA"]={Range=20,Blindspot=0.6,Height=12.3,Type="Short",Radar="IRON_DOME_LN"},
+["STUNNER IDFA"]={Range=250,Blindspot=1,Height=45,Type="Long",Radar="DAVID_SLING_LN"},
 }
 MANTIS.SamDataHDS={
 ["SA-2 HDS"]={Range=56,Blindspot=7,Height=30,Type="Medium",Radar="V759"},
@@ -50237,7 +51263,7 @@ end
 if self.HQ_Template_CC then
 self.HQ_CC=GROUP:FindByName(self.HQ_Template_CC)
 end
-self.version="0.8.14"
+self.version="0.8.15"
 self:I(string.format("***** Starting MANTIS Version %s *****",self.version))
 self:SetStartState("Stopped")
 self:AddTransition("Stopped","Start","Running")
@@ -50268,11 +51294,13 @@ local radius=radius or 5000
 self.grouping=radius
 return self
 end
-function MANTIS:AddScootZones(ZoneSet,Number)
+function MANTIS:AddScootZones(ZoneSet,Number,Random,Formation)
 self:T(self.lid.." AddScootZones")
 self.SkateZones=ZoneSet
 self.SkateNumber=Number or 3
 self.shootandscoot=true
+self.ScootRandom=Random
+self.ScootFormation=Formation or"Cone"
 return self
 end
 function MANTIS:AddZones(AcceptZones,RejectZones,ConflictZones)
@@ -50972,8 +52000,8 @@ self.ShoradLink=true
 self.Shorad.Groupset=self.ShoradGroupSet
 self.Shorad.debug=self.debug
 end
-if self.shootandscoot and self.SkateZones then
-self.Shorad:AddScootZones(self.SkateZones,self.SkateNumber or 3)
+if self.shootandscoot and self.SkateZones and self.Shorad then
+self.Shorad:AddScootZones(self.SkateZones,self.SkateNumber or 3,self.ScootRandom,self.ScootFormation)
 end
 self:__Status(-math.random(1,10))
 return self
@@ -51080,6 +52108,9 @@ UseEmOnOff=true,
 shootandscoot=false,
 SkateNumber=3,
 SkateZones=nil,
+minscootdist=100,
+minscootdist=3000,
+scootrandomcoord=false,
 }
 do
 SHORAD.Harms={
@@ -51123,7 +52154,7 @@ self.DefenseLowProb=70
 self.DefenseHighProb=90
 self.UseEmOnOff=true
 if UseEmOnOff==false then self.UseEmOnOff=UseEmOnOff end
-self:I("*** SHORAD - Started Version 0.3.2")
+self:I("*** SHORAD - Started Version 0.3.4")
 self.lid=string.format("SHORAD %s | ",self.name)
 self:_InitState()
 self:HandleEvent(EVENTS.Shot,self.HandleEventShot)
@@ -51153,11 +52184,13 @@ math.random()
 end
 return self
 end
-function SHORAD:AddScootZones(ZoneSet,Number)
+function SHORAD:AddScootZones(ZoneSet,Number,Random,Formation)
 self:T(self.lid.." AddScootZones")
 self.SkateZones=ZoneSet
 self.SkateNumber=Number or 3
 self.shootandscoot=true
+self.scootrandomcoord=Random
+self.scootformation=Formation or"Cone"
 return self
 end
 function SHORAD:SwitchDebug(onoff)
@@ -51421,8 +52454,8 @@ end
 function SHORAD:onafterShootAndScoot(From,Event,To,Shorad)
 self:T({From,Event,To})
 local possibleZones={}
-local mindist=100
-local maxdist=3000
+local mindist=self.minscootdist or 100
+local maxdist=self.maxscootdist or 3000
 if Shorad and Shorad:IsAlive()then
 local NowCoord=Shorad:GetCoordinate()
 for _,_zone in pairs(self.SkateZones.Set)do
@@ -51438,7 +52471,11 @@ local rand=math.floor(math.random(1,#possibleZones*1000)/1000+0.5)
 if rand==0 then rand=1 end
 self:T(self.lid.." ShootAndScoot to zone "..rand)
 local ToCoordinate=possibleZones[rand]:GetCoordinate()
-Shorad:RouteGroundTo(ToCoordinate,20,"Cone",1)
+if self.scootrandomcoord then
+ToCoordinate=possibleZones[rand]:GetRandomCoordinate(nil,nil,{land.SurfaceType.LAND,land.SurfaceType.ROAD})
+end
+local formation=self.scootformation or"Cone"
+Shorad:RouteGroundTo(ToCoordinate,20,formation,1)
 end
 end
 return self
@@ -51469,7 +52506,7 @@ self:__CalculateHitZone(20,ShootingWeapon,pos0,fheight,EventData.IniGroup)
 end
 return self
 end
-local targetcat=targetdata:getCategory()
+local targetcat=Object.getCategory(targetdata)
 self:T(string.format("Target Category (3=STATIC, 1=UNIT)= %s",tostring(targetcat)))
 self:T({targetdata})
 local targetunit=nil
@@ -61519,7 +62556,7 @@ DELIMITER="Punto",
 }
 ATIS.locale="en"
 _ATIS={}
-ATIS.version="0.10.3"
+ATIS.version="0.10.4"
 function ATIS:New(AirbaseName,Frequency,Modulation)
 local self=BASE:Inherit(self,FSM:New())
 self.airbasename=AirbaseName
@@ -61828,7 +62865,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())
@@ -61860,7 +62906,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
@@ -62457,7 +63513,7 @@ end
 alltext=alltext..";\n"..subtitle
 local _RUNACT
 if not self.ATISforFARPs then
-local subtitle
+local subtitle=""
 if runwayLanding then
 local actrun=self.gettext:GetEntry("ACTIVELANDING",self.locale)
 subtitle=string.format("%s %s",actrun,runwayLanding)
@@ -62745,7 +63801,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))
@@ -63192,7 +64258,7 @@ MOVE="move",
 SHIP="ship",
 BEACON="beacon",
 }
-CTLD.UnitTypes={
+CTLD.UnitTypeCapabilities={
 ["SA342Mistral"]={type="SA342Mistral",crates=false,troops=true,cratelimit=0,trooplimit=4,length=12,cargoweightlimit=400},
 ["SA342L"]={type="SA342L",crates=false,troops=true,cratelimit=0,trooplimit=2,length=12,cargoweightlimit=400},
 ["SA342M"]={type="SA342M",crates=false,troops=true,cratelimit=0,trooplimit=4,length=12,cargoweightlimit=400},
@@ -63209,7 +64275,7 @@ CTLD.UnitTypes={
 ["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.41"
+CTLD.version="1.0.44"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -63254,6 +64320,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")
@@ -63349,7 +64417,7 @@ function CTLD:_GetUnitCapabilities(Unit)
 self:T(self.lid.." _GetUnitCapabilities")
 local _unit=Unit
 local unittype=_unit:GetTypeName()
-local capabilities=self.UnitTypes[unittype]
+local capabilities=self.UnitTypeCapabilities[unittype]
 if not capabilities or capabilities=={}then
 capabilities={}
 capabilities.troops=false
@@ -63673,6 +64741,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)
@@ -63997,6 +65066,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
@@ -64335,6 +65432,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
@@ -64375,14 +65492,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)
@@ -64581,6 +65709,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
@@ -64825,8 +65954,14 @@ local capabilities=self:_GetUnitCapabilities(_unit)
 local cantroops=capabilities.troops
 local cancrates=capabilities.crates
 local topmenu=MENU_GROUP:New(_group,"CTLD",nil)
-local toptroops=MENU_GROUP:New(_group,"Manage Troops",topmenu)
-local topcrates=MENU_GROUP:New(_group,"Manage Crates",topmenu)
+local toptroops=nil
+local topcrates=nil
+if cantroops then
+toptroops=MENU_GROUP:New(_group,"Manage Troops",topmenu)
+end
+if cancrates then
+topcrates=MENU_GROUP:New(_group,"Manage Crates",topmenu)
+end
 local listmenu=MENU_GROUP_COMMAND:New(_group,"List boarded cargo",topmenu,self._ListCargo,self,_group,_unit)
 local invtry=MENU_GROUP_COMMAND:New(_group,"Inventory",topmenu,self._ListInventory,self,_group,_unit)
 local rbcns=MENU_GROUP_COMMAND:New(_group,"List active zone beacons",topmenu,self._ListRadioBeacons,self,_group,_unit)
@@ -64868,6 +66003,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
@@ -64902,6 +66038,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)
@@ -65402,7 +66539,7 @@ self:_SendMessage(string.format("Negative, need to be closer than %dnm to a zone
 end
 return self
 end
-function CTLD:UnitCapabilities(Unittype,Cancrates,Cantroops,Cratelimit,Trooplimit,Length,Maxcargoweight)
+function CTLD:SetUnitCapabilities(Unittype,Cancrates,Cantroops,Cratelimit,Trooplimit,Length,Maxcargoweight)
 self:T(self.lid.." UnitCapabilities")
 local unittype=nil
 local unit=nil
@@ -65416,7 +66553,7 @@ return self
 end
 local length=20
 local maxcargo=500
-local existingcaps=self.UnitTypes[unittype]
+local existingcaps=self.UnitTypeCapabilities[unittype]
 if existingcaps then
 length=existingcaps.length or 20
 maxcargo=existingcaps.cargoweightlimit or 500
@@ -65429,7 +66566,12 @@ capabilities.cratelimit=Cratelimit or 0
 capabilities.trooplimit=Trooplimit or 0
 capabilities.length=Length or length
 capabilities.cargoweightlimit=Maxcargoweight or maxcargo
-self.UnitTypes[unittype]=capabilities
+self.UnitTypeCapabilities[unittype]=capabilities
+return self
+end
+function CTLD:UnitCapabilities(Unittype,Cancrates,Cantroops,Cratelimit,Trooplimit,Length,Maxcargoweight)
+self:I(self.lid.."This function been replaced with `SetUnitCapabilities()` - pls use the new one going forward!")
+self:SetUnitCapabilities(Unittype,Cancrates,Cantroops,Cratelimit,Trooplimit,Length,Maxcargoweight)
 return self
 end
 function CTLD:IsCorrectHover(Unit)
@@ -77804,8 +78946,9 @@ AltBackend=nil,
 ConfigFileName="Moose_MSRS.lua",
 ConfigFilePath="Config\\",
 ConfigLoaded=false,
+ttsprovider="Microsoft",
 }
-MSRS.version="0.1.2"
+MSRS.version="0.1.3"
 MSRS.Voices={
 Microsoft={
 ["Hedda"]="Microsoft Hedda Desktop",
@@ -77926,8 +79069,7 @@ 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
+if not self.ConfigLoaded then
 self:SetPath(PathToSRS)
 self:SetPort()
 self:SetFrequencies(Frequency)
@@ -77966,7 +79108,7 @@ 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()))
+self:T(string.format("SRS path=%s",self:GetPath()))
 end
 return self
 end
@@ -78072,6 +79214,7 @@ self.APIKey=PathToCredentials
 self.provider="gcloud"
 self.GRPCOptions.DefaultProvider="gcloud"
 self.GRPCOptions.gcloud.key=PathToCredentials
+self.ttsprovider="Google"
 end
 return self
 end
@@ -78084,6 +79227,14 @@ self.GRPCOptions.gcloud.key=APIKey
 end
 return self
 end
+function MSRS:SetTTSProviderGoogle()
+self.ttsprovider="Google"
+return self
+end
+function MSRS:SetTTSProviderMicrosoft()
+self.ttsprovider="Microsoft"
+return self
+end
 function MSRS:Help()
 local path=self:GetPath()or STTS.DIRECTORY
 local exe=STTS.EXECUTABLE or"DCS-SR-ExternalAudio.exe"
@@ -78269,16 +79420,22 @@ 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
+if self.google and self.ttsprovider=="Google"then
 command=command..string.format(' --ssml -G "%s"',self.google)
 end
 self:T("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
 assert(loadfile(path..file))()
 if MSRS_Config then
 if self then
@@ -78293,8 +79450,11 @@ end
 self.culture=MSRS_Config.Culture or"en-GB"
 self.gender=MSRS_Config.Gender or"male"
 self.google=MSRS_Config.Google
+if MSRS_Config.Provider then
+self.ttsprovider=MSRS_Config.Provider
+end
 self.Label=MSRS_Config.Label or"MSRS"
-self.voice=MSRS_Config.Voice or MSRS.Voices.Microsoft.Hazel
+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
@@ -78317,8 +79477,11 @@ end
 MSRS.culture=MSRS_Config.Culture or"en-GB"
 MSRS.gender=MSRS_Config.Gender or"male"
 MSRS.google=MSRS_Config.Google
+if MSRS_Config.Provider then
+MSRS.ttsprovider=MSRS_Config.Provider
+end
 MSRS.Label=MSRS_Config.Label or"MSRS"
-MSRS.voice=MSRS_Config.Voice or MSRS.Voices.Microsoft.Hazel
+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
@@ -78331,9 +79494,10 @@ end
 MSRS.ConfigLoaded=true
 end
 end
-env.info("MSRS - Sucessfully loaded default configuration from disk!",false)
-else
-env.info("MSRS - Cannot load default configuration from disk!",false)
+env.info("MSRS - Successfully loaded default configuration from disk!",false)
+end
+if not filexsists then
+env.info("MSRS - Cannot find default configuration file!",false)
 return false
 end
 return true
@@ -78502,7 +79666,7 @@ self.lid=string.format("MSRSQUEUE %s | ",self.alias)
 return self
 end
 function MSRSQUEUE:Clear()
-self:I(self.lid.."Clearning MSRSQUEUE")
+self:I(self.lid.."Clearing MSRSQUEUE")
 self.queue={}
 return self
 end
@@ -78559,7 +79723,7 @@ end
 transmission.gender=gender
 transmission.culture=culture
 transmission.voice=voice
-transmission.gender=volume
+transmission.volume=volume
 transmission.label=label
 transmission.coordinate=coordinate
 self:AddTransmission(transmission)
@@ -78666,6 +79830,7 @@ end
 self:_CheckRadioQueue(dt)
 end
 end
+MSRS.LoadConfigFile()
 COMMANDCENTER={
 ClassName="COMMANDCENTER",
 CommandCenterName="",