@jtff/miztemplate-lib 3.1.10 → 3.2.0

package/lua/lib/Moose_.lua

@@ -1,4 +1,36 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-01T00:38:59+01:00-8dcd22f18c9bf740c53b69c7ba3901a9ada0bb2d ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-03T12:48:41+01:00-86e13df3039b95b46af4786cb3196cb931175778 ***')
+if not MOOSE_DEVELOPMENT_FOLDER then
+MOOSE_DEVELOPMENT_FOLDER='Scripts'
+end
+ModuleLoader=MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua'
+if io then
+local f=io.open(ModuleLoader,"r")
+if f~=nil then
+io.close(f)
+env.info('*** MOOSE DYNAMIC INCLUDE START *** ')
+local base=_G
+__Moose={}
+__Moose.Include=function(IncludeFile)
+if not __Moose.Includes[IncludeFile]then
+__Moose.Includes[IncludeFile]=IncludeFile
+local f=assert(base.loadfile(IncludeFile))
+if f==nil then
+error("Moose: Could not load Moose file "..IncludeFile)
+else
+env.info("Moose: "..IncludeFile.." dynamically loaded.")
+return f()
+end
+end
+end
+__Moose.Includes={}
+__Moose.Include(MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua')
+BASE:TraceOnOff(true)
+env.info('*** MOOSE INCLUDE END *** ')
+do return end
+end
+else
+env.info('*** MOOSE DYNAMIC INCLUDE NOT POSSIBLE (Desanitize io to use it) *** ')
+end
 env.info('*** MOOSE STATIC INCLUDE START *** ')
 ENUMS={}
 env.setErrorMessageBoxEnabled(false)
@@ -1542,6 +1574,43 @@ return string.format('%03d°',latDeg)..' '..string.format(minFrmtStr,latMin)..'\
 ..string.format('%03d°',lonDeg)..' '..string.format(minFrmtStr,lonMin)..'\''..lonHemi
 end
 end
+UTILS.tostringLLM2KData=function(lat,lon,acc)
+local latHemi,lonHemi
+if lat>0 then
+latHemi='N'
+else
+latHemi='S'
+end
+if lon>0 then
+lonHemi='E'
+else
+lonHemi='W'
+end
+lat=math.abs(lat)
+lon=math.abs(lon)
+local latDeg=math.floor(lat)
+local latMin=(lat-latDeg)*60
+local lonDeg=math.floor(lon)
+local lonMin=(lon-lonDeg)*60
+latMin=UTILS.Round(latMin,acc)
+lonMin=UTILS.Round(lonMin,acc)
+if latMin==60 then
+latMin=0
+latDeg=latDeg+1
+end
+if lonMin==60 then
+lonMin=0
+lonDeg=lonDeg+1
+end
+local minFrmtStr
+if acc<=0 then
+minFrmtStr='%02d'
+else
+local width=3+acc
+minFrmtStr='%0'..width..'.'..acc..'f'
+end
+return latHemi..string.format('%02d:',latDeg)..string.format(minFrmtStr,latMin),lonHemi..string.format('%02d:',lonDeg)..string.format(minFrmtStr,lonMin)
+end
 UTILS.tostringMGRS=function(MGRS,acc)
 if acc<=0 then
 return MGRS.UTMZone..' '..MGRS.MGRSDigraph
@@ -2410,15 +2479,27 @@ _start=_start+50000
 end
 return FreeVHFFrequencies
 end
-function UTILS.GenerateUHFrequencies()
+function UTILS.GenerateUHFrequencies(Start,End)
 local FreeUHFFrequencies={}
 local _start=220000000
+if not Start then
 while _start<399000000 do
 if _start~=243000000 then
 table.insert(FreeUHFFrequencies,_start)
 end
 _start=_start+500000
 end
+else
+local myend=End*1000000 or 399000000
+local mystart=Start*1000000 or 220000000
+while _start<399000000 do
+if _start~=243000000 and(_start<mystart or _start>myend)then
+print(_start)
+table.insert(FreeUHFFrequencies,_start)
+end
+_start=_start+500000
+end
+end
 return FreeUHFFrequencies
 end
 function UTILS.GenerateLaserCodes()
@@ -11004,7 +11085,12 @@ local DCSAirbaseName=airbase:getName()
 local airbaseID=airbase:getID()
 local airbase=self:AddAirbase(DCSAirbaseName)
 local airbaseUID=airbase:GetID(true)
-local text=string.format("Register %s: %s (UID=%d), Runways=%d, Parking=%d [",AIRBASE.CategoryName[airbase.category],tostring(DCSAirbaseName),airbaseUID,#airbase.runways,airbase.NparkingTotal)
+local typename=airbase:GetTypeName()
+local category=airbase.category
+if category==Airbase.Category.SHIP and typename=="FARP_SINGLE_01"then
+category=Airbase.Category.HELIPAD
+end
+local text=string.format("Register %s: %s (UID=%d), Runways=%d, Parking=%d [",AIRBASE.CategoryName[category],tostring(DCSAirbaseName),airbaseUID,#airbase.runways,airbase.NparkingTotal)
 for _,terminalType in pairs(AIRBASE.TerminalType)do
 if airbase.NparkingTerminal and airbase.NparkingTerminal[terminalType]then
 text=text..string.format("%d=%d ",terminalType,airbase.NparkingTerminal[terminalType])
@@ -11580,6 +11666,17 @@ local RandomItem=self.Set[self.Index[math.random(1,tablemax)]]
 self:T3({RandomItem})
 return RandomItem
 end
+function SET_BASE:GetRandomSurely()
+local tablemax=0
+local sorted={}
+for _,_obj in pairs(self.Set)do
+tablemax=tablemax+1
+sorted[tablemax]=_obj
+end
+local RandomItem=sorted[math.random(1,tablemax)]
+self:T3({RandomItem})
+return RandomItem
+end
 function SET_BASE:Count()
 return self.Index and table.maxn(self.Index)or 0
 end
@@ -11859,7 +11956,7 @@ end
 function SET_GROUP:AddGroup(group,DontSetCargoBayLimit)
 self:Add(group:GetName(),group)
 if not DontSetCargoBayLimit then
-for UnitID,UnitData in pairs(group:GetUnits())do
+for UnitID,UnitData in pairs(group:GetUnits()or{})do
 if UnitData and UnitData:IsAlive()then
 UnitData:SetCargoBayWeightLimit()
 end
@@ -12053,7 +12150,7 @@ end
 end
 function SET_GROUP:AddInDatabase(Event)
 self:F3({Event})
-if Event.IniObjectCategory==1 then
+if Event.IniObjectCategory==Object.Category.UNIT then
 if not self.Database[Event.IniDCSGroupName]then
 self.Database[Event.IniDCSGroupName]=GROUP:Register(Event.IniDCSGroupName)
 self:T3(self.Database[Event.IniDCSGroupName])
@@ -12551,7 +12648,7 @@ return self
 end
 function SET_UNIT:AddInDatabase(Event)
 self:F3({Event})
-if Event.IniObjectCategory==1 then
+if Event.IniObjectCategory==Object.Category.UNIT then
 if not self.Database[Event.IniDCSUnitName]then
 self.Database[Event.IniDCSUnitName]=UNIT:Register(Event.IniDCSUnitName)
 self:T3(self.Database[Event.IniDCSUnitName])
@@ -13629,7 +13726,7 @@ 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
+if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround()then
 local ObjectName,Object=self:AddInDatabase(Event)
 self:I(ObjectName,UTILS.PrintTableToLog(Object))
 if Object and self:IsIncludeObject(Object)then
@@ -13642,7 +13739,7 @@ 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
+if Event.IniObjectCategory==Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround()then
 local ObjectName,Object=self:FindInDatabase(Event)
 if ObjectName then
 self:Remove(ObjectName)
@@ -15271,6 +15368,20 @@ end
 end
 return self
 end
+function SET_OPSGROUP:_EventOnBirth(Event)
+self:F3({Event})
+if Event.IniDCSUnit and Event.IniDCSGroup then
+local DCSgroup=Event.IniDCSGroup
+if DCSgroup:getInitialSize()==DCSgroup:getSize()then
+local groupname,group=self:AddInDatabase(Event)
+if group and group:CountAliveUnits()==DCSgroup:getInitialSize()then
+if group and self:IsIncludeObject(group)then
+self:Add(groupname,group)
+end
+end
+end
+end
+end
 function SET_OPSGROUP:_EventOnDeadOrCrash(Event)
 self:F({Event})
 if Event.IniDCSUnit then
@@ -15283,7 +15394,7 @@ end
 end
 end
 function SET_OPSGROUP:AddInDatabase(Event)
-if Event.IniObjectCategory==1 then
+if Event.IniObjectCategory==Object.Category.UNIT then
 if not self.Database[Event.IniDCSGroupName]then
 self.Database[Event.IniDCSGroupName]=GROUP:Register(Event.IniDCSGroupName)
 end
@@ -15473,7 +15584,11 @@ self:ForEach(IteratorFunction,arg,self:GetSet())
 return self
 end
 function SET_SCENERY:GetCoordinate()
-local Coordinate=self:GetRandom():GetCoordinate()
+local Coordinate=COORDINATE:New({0,0,0})
+local Item=self:GetRandomSurely()
+if Item then
+Coordinate:GetCoordinate()
+end
 local x1=Coordinate.x
 local x2=Coordinate.x
 local y1=Coordinate.y
@@ -17000,6 +17115,11 @@ end
 function COORDINATE:GetLLDDM()
 return coord.LOtoLL(self:GetVec3())
 end
+function COORDINATE:ToStringLL(Settings)
+local LL_Accuracy=Settings and Settings.LL_Accuracy or _SETTINGS.LL_Accuracy
+local lat,lon=coord.LOtoLL(self:GetVec3())
+return string.format('%f',lat)..' '..string.format('%f',lon)
+end
 function COORDINATE:ToStringLLDMS(Settings)
 local LL_Accuracy=Settings and Settings.LL_Accuracy or _SETTINGS.LL_Accuracy
 local lat,lon=coord.LOtoLL(self:GetVec3())
@@ -17621,27 +17741,33 @@ 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 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.PathToSRS=PathToSRS or MSRS.path or"C:\\Program Files\\DCS-SimpleRadio-Standalone"
+_MESSAGESRS.frequency=Frequency or MSRS.frequencies or 243
+_MESSAGESRS.modulation=Modulation or MSRS.modulations or radio.modulation.AM
+_MESSAGESRS.MSRS=MSRS:New(_MESSAGESRS.PathToSRS,_MESSAGESRS.frequency,_MESSAGESRS.modulation)
+_MESSAGESRS.coalition=Coalition or MSRS.coalition or coalition.side.NEUTRAL
+_MESSAGESRS.MSRS:SetCoalition(_MESSAGESRS.coalition)
 _MESSAGESRS.coordinate=Coordinate
+if Coordinate then
 _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
+end
+_MESSAGESRS.Culture=Culture or MSRS.culture or"en-GB"
 _MESSAGESRS.MSRS:SetCulture(Culture)
-_MESSAGESRS.Culture=Culture or"en-GB"
+_MESSAGESRS.Gender=Gender or MSRS.gender or"female"
 _MESSAGESRS.MSRS:SetGender(Gender)
-_MESSAGESRS.Gender=Gender or"female"
-_MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
+if PathToCredentials then
+_MESSAGESRS.MSRS:SetProviderOptionsGoogle(PathToCredentials)
+_MESSAGESRS.MSRS:SetProvider(MSRS.Provider.GOOGLE)
+end
+_MESSAGESRS.label=Label or MSRS.Label or"MESSAGE"
 _MESSAGESRS.MSRS:SetLabel(Label or"MESSAGE")
-_MESSAGESRS.label=Label or"MESSAGE"
+_MESSAGESRS.port=Port or MSRS.port or 5002
 _MESSAGESRS.MSRS:SetPort(Port or 5002)
-_MESSAGESRS.port=Port or 5002
-_MESSAGESRS.volume=Volume or 1
+_MESSAGESRS.volume=Volume or MSRS.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")
+_MESSAGESRS.voice=Voice or MSRS.voice
+_MESSAGESRS.SRSQ=MSRSQUEUE:New(_MESSAGESRS.label)
 end
 function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volume,coordinate)
 local tgender=gender or _MESSAGESRS.Gender
@@ -17653,7 +17779,7 @@ 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 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)
+_MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,0.5,1,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
@@ -18680,6 +18806,7 @@ if self.SpawnGroups[self.SpawnIndex].Visible then
 self.SpawnGroups[self.SpawnIndex].Group:Activate()
 else
 local SpawnTemplate=self.SpawnGroups[self.SpawnIndex].SpawnTemplate
+local SpawnZone=self.SpawnGroups[self.SpawnIndex].SpawnZone
 self:T(SpawnTemplate.name)
 if SpawnTemplate then
 local PointVec3=POINT_VEC3:New(SpawnTemplate.route.points[1].x,SpawnTemplate.route.points[1].alt,SpawnTemplate.route.points[1].y)
@@ -18699,6 +18826,23 @@ end
 if self.SpawnRandomizeUnits then
 for UnitID=1,#SpawnTemplate.units do
 local RandomVec2=PointVec3:GetRandomVec2InRadius(self.SpawnOuterRadius,self.SpawnInnerRadius)
+if(SpawnZone)then
+local inZone=SpawnZone:IsVec2InZone(RandomVec2)
+local numTries=1
+while(not inZone)and(numTries<20)do
+if not inZone then
+RandomVec2=PointVec3:GetRandomVec2InRadius(self.SpawnOuterRadius,self.SpawnInnerRadius)
+numTries=numTries+1
+inZone=SpawnZone:IsVec2InZone(RandomVec2)
+self:I("Retrying "..numTries.."spawn "..SpawnTemplate.name.." in Zone "..SpawnZone:GetName().."!")
+self:I(SpawnZone)
+end
+end
+if(not inZone)then
+self:I("Could not place unit within zone and within radius!")
+RandomVec2=SpawnZone:GetRandomVec2()
+end
+end
 SpawnTemplate.units[UnitID].x=RandomVec2.x
 SpawnTemplate.units[UnitID].y=RandomVec2.y
 self:T('SpawnTemplate.units['..UnitID..'].x = '..SpawnTemplate.units[UnitID].x..', SpawnTemplate.units['..UnitID..'].y = '..SpawnTemplate.units[UnitID].y)
@@ -18736,12 +18880,14 @@ local cosHeading=math.cos(headingRad)
 local sinHeading=math.sin(headingRad)
 local unitVarRad=math.rad(self.SpawnInitGroupUnitVar or 0)
 for UnitID=1,#SpawnTemplate.units do
+if not self.SpawnRandomizeUnits then
 if UnitID>1 then
 local unitXOff=SpawnTemplate.units[UnitID].x-pivotX
 local unitYOff=SpawnTemplate.units[UnitID].y-pivotY
 SpawnTemplate.units[UnitID].x=pivotX+(unitXOff*cosHeading)-(unitYOff*sinHeading)
 SpawnTemplate.units[UnitID].y=pivotY+(unitYOff*cosHeading)+(unitXOff*sinHeading)
 end
+end
 local unitHeading=SpawnTemplate.units[UnitID].heading+headingRad
 SpawnTemplate.units[UnitID].heading=_HeadingRad(_RandomInRange(unitHeading-unitVarRad,unitHeading+unitVarRad))
 SpawnTemplate.units[UnitID].psi=-SpawnTemplate.units[UnitID].heading
@@ -18831,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff)
 end
 self:T3(SpawnTemplate.name)
 if self.SpawnFunctionHook then
-self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1)
+self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3)
 end
 end
 self.SpawnGroups[self.SpawnIndex].Spawned=true
@@ -19866,6 +20012,7 @@ self:T("Preparing Spawn in Zone",SpawnZone:GetName())
 local SpawnVec2=SpawnZone:GetRandomVec2()
 self:T({SpawnVec2=SpawnVec2})
 local SpawnTemplate=self.SpawnGroups[SpawnIndex].SpawnTemplate
+self.SpawnGroups[SpawnIndex].SpawnZone=SpawnZone
 self:T({Route=SpawnTemplate.route})
 for UnitID=1,#SpawnTemplate.units do
 local UnitTemplate=SpawnTemplate.units[UnitID]
@@ -20713,7 +20860,7 @@ ClassName="PATHLINE",
 lid=nil,
 points={},
 }
-PATHLINE.version="0.1.0"
+PATHLINE.version="0.1.1"
 function PATHLINE:New(Name)
 local self=BASE:Inherit(self,BASE:New())
 self.name=Name or"Unknown Path"
@@ -20778,11 +20925,12 @@ table.insert(vecs,point.vec2)
 end
 return vecs
 end
-function PATHLINE:GetCoordinats()
+function PATHLINE:GetCoordinates()
 local vecs={}
 for _,_point in pairs(self.points)do
 local point=_point
 local coord=COORDINATE:NewFromVec3(point.vec3)
+table.insert(vecs,coord)
 end
 return vecs
 end
@@ -20791,7 +20939,7 @@ local N=self:GetNumberOfPoints()
 n=n or 1
 local point=nil
 if n>=1 and n<=N then
-point=self.point[n]
+point=self.points[n]
 else
 self:E(self.lid..string.format("ERROR: No point in pathline for N=%s",tostring(n)))
 end
@@ -22454,21 +22602,39 @@ self:SetCommand(CommandSetFuel)
 end
 return self
 end
-function CONTROLLABLE:CommandSetFrequency(Frequency,Modulation,Delay)
+function CONTROLLABLE:CommandSetFrequency(Frequency,Modulation,Power,Delay)
 local CommandSetFrequency={
 id='SetFrequency',
 params={
 frequency=Frequency*1000000,
 modulation=Modulation or radio.modulation.AM,
+power=Power or 10,
 },
 }
 if Delay and Delay>0 then
-SCHEDULER:New(nil,self.CommandSetFrequency,{self,Frequency,Modulation},Delay)
+SCHEDULER:New(nil,self.CommandSetFrequency,{self,Frequency,Modulation,Power})
 else
 self:SetCommand(CommandSetFrequency)
 end
 return self
 end
+function CONTROLLABLE:CommandSetFrequencyForUnit(Frequency,Modulation,Power,UnitID,Delay)
+local CommandSetFrequencyForUnit={
+id='SetFrequencyForUnit',
+params={
+frequency=Frequency*1000000,
+modulation=Modulation or radio.modulation.AM,
+unitId=UnitID or self:GetID(),
+power=Power or 10,
+},
+}
+if Delay and Delay>0 then
+SCHEDULER:New(nil,self.CommandSetFrequencyForUnit,{self,Frequency,Modulation,Power,UnitID})
+else
+self:SetCommand(CommandSetFrequencyForUnit)
+end
+return self
+end
 function CONTROLLABLE:TaskEPLRS(SwitchOnOff,idx)
 if SwitchOnOff==nil then
 SwitchOnOff=true
@@ -24105,6 +24271,41 @@ return self
 end
 return nil
 end
+function CONTROLLABLE:SetOptionRadarUsing(Option)
+self:F2({self.ControllableName})
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.RADAR_USING,Option)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadarUsingNever()
+self:F2({self.ControllableName})
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.RADAR_USING,0)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadarUsingForAttackOnly()
+self:F2({self.ControllableName})
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.RADAR_USING,1)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadarUsingForSearchIfRequired()
+self:F2({self.ControllableName})
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.RADAR_USING,2)
+end
+return self
+end
+function CONTROLLABLE:SetOptionRadarUsingForContinousSearch()
+self:F2({self.ControllableName})
+if self:IsAir()then
+self:SetOption(AI.Option.Air.id.RADAR_USING,3)
+end
+return self
+end
 function CONTROLLABLE:RelocateGroundRandomInRadius(speed,radius,onroad,shortcut,formation,onland)
 self:F2({self.ControllableName})
 local _coord=self:GetCoordinate()
@@ -25327,7 +25528,14 @@ if DCSGroup then
 local DCSUnits=DCSGroup:getUnits()or{}
 local Units={}
 for Index,UnitData in pairs(DCSUnits)do
+local unit=UNIT:Find(UnitData)
+if unit then
 Units[#Units+1]=UNIT:Find(UnitData)
+else
+local UnitName=UnitData:getName()
+unit=_DATABASE:AddUnit(UnitName)
+Units[#Units+1]=unit
+end
 end
 self:T3(Units)
 return Units
@@ -25591,8 +25799,9 @@ end
 if n>0 then
 local Vec3={x=x/n,y=y/n,z=z/n}
 return Vec3
+else
+return self:GetVec3()
 end
-return nil
 end
 function GROUP:GetPointVec2()
 self:F2(self.GroupName)
@@ -25613,10 +25822,15 @@ local Heading=self:GetHeading()
 coord.Heading=Heading
 return coord
 else
+local coord=self:GetCoordinate()
+if coord then
+return coord
+else
 BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()})
 return nil
 end
 end
+end
 function GROUP:GetCoordinate()
 local Units=self:GetUnits()or{}
 for _,_unit in pairs(Units)do
@@ -28770,7 +28984,12 @@ local function _createRunway(name,course,width,length,center)
 local bearing=-1*course
 local heading=math.deg(bearing)
 local runway={}
+local namefromheading=math.floor(heading/10)
+if self.AirbaseName==AIRBASE.Syria.Beirut_Rafic_Hariri and math.abs(namefromheading-name)>1 then
+runway.name=string.format("%02d",tonumber(namefromheading))
+else
 runway.name=string.format("%02d",tonumber(name))
+end
 runway.magheading=tonumber(runway.name)*10
 runway.heading=heading
 runway.width=width or 0
@@ -29132,11 +29351,25 @@ end
 function SCENERY:GetLife0()
 return self.Life0 or 0
 end
-function SCENERY:IsAlive()
+function SCENERY:IsAlive(Threshold)
+if not Threshold then
 return self:GetLife()>=1 and true or false
+else
+return self:GetRelativeLife()>Threshold and true or false
+end
 end
-function SCENERY:IsDead()
+function SCENERY:IsDead(Threshold)
+if not Threshold then
 return self:GetLife()<1 and true or false
+else
+return self:GetRelativeLife()<=Threshold and true or false
+end
+end
+function SCENERY:GetRelativeLife()
+local life=self:GetLife()
+local life0=self:GetLife0()
+local rlife=math.floor((life/life0)*100)
+return rlife
 end
 function SCENERY:GetThreatLevel()
 return 0,"Scenery"
@@ -31755,6 +31988,7 @@ self:SetMessagesScore(true)
 self:SetMessagesZone(true)
 self:SetScaleDestroyScore(10)
 self:SetScaleDestroyPenalty(30)
+self:SetScoreIncrementOnHit(0)
 self:SetFratricide(self.ScaleDestroyPenalty*3)
 self.penaltyonfratricide=true
 self:SetCoalitionChangePenalty(self.ScaleDestroyPenalty)
@@ -31831,6 +32065,10 @@ function SCORING:SetMessagesHit(OnOff)
 self.MessagesHit=OnOff
 return self
 end
+function SCORING:SetScoreIncrementOnHit(score)
+self.ScoreIncrementOnHit=score
+return self
+end
 function SCORING:IfMessagesHit()
 return self.MessagesHit
 end
@@ -32053,6 +32291,7 @@ local PlayerName=Event.IniUnit:GetPlayerName()
 Event.IniUnit.BirthTime=timer.getTime()
 if PlayerName then
 self:_AddPlayerFromUnit(Event.IniUnit)
+self.Players[PlayerName].PlayerKills=0
 self:SetScoringMenu(Event.IniGroup)
 end
 end
@@ -32176,6 +32415,8 @@ MESSAGE.Type.Update)
 end
 self:ScoreCSV(InitPlayerName,TargetPlayerName,"HIT_PENALTY",1,-10,InitUnitName,InitUnitCoalition,InitUnitCategory,InitUnitType,TargetUnitName,TargetUnitCoalition,TargetUnitCategory,TargetUnitType)
 else
+Player.Score=Player.Score+self.ScoreIncrementOnHit
+PlayerHit.Score=PlayerHit.Score+self.ScoreIncrementOnHit
 PlayerHit.ScoreHit=PlayerHit.ScoreHit+1
 if TargetPlayerName~=nil then
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..InitPlayerName.."' hit enemy player '"..TargetPlayerName.."' "..TargetUnitCategory.." ( "..TargetType.." ) "..PlayerHit.ScoreHit.." times. "..
@@ -32251,6 +32492,8 @@ MESSAGE.Type.Update
 :ToCoalitionIf(Event.WeaponCoalition,self:IfMessagesHit()and self:IfMessagesToCoalition())
 self:ScoreCSV(Event.WeaponPlayerName,TargetPlayerName,"HIT_PENALTY",1,-10,Event.WeaponName,Event.WeaponCoalition,Event.WeaponCategory,Event.WeaponTypeName,TargetUnitName,TargetUnitCoalition,TargetUnitCategory,TargetUnitType)
 else
+Player.Score=Player.Score+self.ScoreIncrementOnHit
+PlayerHit.Score=PlayerHit.Score+self.ScoreIncrementOnHit
 PlayerHit.ScoreHit=PlayerHit.ScoreHit+1
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..Event.WeaponPlayerName.."' hit enemy target "..TargetUnitCategory.." ( "..TargetType.." ) "..
 "Score: "..PlayerHit.Score..".  Score Total:"..Player.Score-Player.Penalty,
@@ -32329,13 +32572,16 @@ self:F({ThreatLevel=ThreatPenalty,ThreatLevelTarget=ThreatLevelTarget,ThreatType
 Player.Penalty=Player.Penalty+ThreatPenalty
 TargetDestroy.Penalty=TargetDestroy.Penalty+ThreatPenalty
 TargetDestroy.PenaltyDestroy=TargetDestroy.PenaltyDestroy+1
+self:OnKillPvP(Player,TargetPlayerName,true,TargetThreatLevel,Player.ThreatLevel,ThreatPenalty)
 if Player.HitPlayers[TargetPlayerName]then
+self:OnKillPvP(Player,TargetPlayerName,true)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed friendly player '"..TargetPlayerName.."' "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Penalty: -"..ThreatPenalty.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
 :ToAllIf(self:IfMessagesDestroy()and self:IfMessagesToAll())
 :ToCoalitionIf(InitCoalition,self:IfMessagesDestroy()and self:IfMessagesToCoalition())
 else
+self:OnKillPvE(Player,TargetUnitName,true,TargetThreatLevel,Player.ThreatLevel,ThreatPenalty)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed friendly target "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Penalty: -"..ThreatPenalty.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
@@ -32354,12 +32600,19 @@ Player.Score=Player.Score+ThreatScore
 TargetDestroy.Score=TargetDestroy.Score+ThreatScore
 TargetDestroy.ScoreDestroy=TargetDestroy.ScoreDestroy+1
 if Player.HitPlayers[TargetPlayerName]then
+if Player.PlayerKills~=nil then
+Player.PlayerKills=Player.PlayerKills+1
+else
+Player.PlayerKills=1
+end
+self:OnKillPvP(Player,TargetPlayerName,false,TargetThreatLevel,Player.ThreatLevel,ThreatScore)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed enemy player '"..TargetPlayerName.."' "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Score: +"..ThreatScore.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
 :ToAllIf(self:IfMessagesDestroy()and self:IfMessagesToAll())
 :ToCoalitionIf(InitCoalition,self:IfMessagesDestroy()and self:IfMessagesToCoalition())
 else
+self:OnKillPvE(Player,TargetUnitName,false,TargetThreatLevel,Player.ThreatLevel,ThreatScore)
 MESSAGE:NewType(self.DisplayMessagePrefix.."Player '"..PlayerName.."' destroyed enemy "..TargetUnitCategory.." ( "..ThreatTypeTarget.." ) "..
 "Score: +"..ThreatScore.." = "..Player.Score-Player.Penalty,
 MESSAGE.Type.Information)
@@ -32783,6 +33036,10 @@ function SCORING:SwitchAutoSave(OnOff)
 self.AutoSave=OnOff
 return self
 end
+function SCORING:OnKillPvP(Player,TargetPlayerName,IsTeamKill,TargetThreatLevel,PlayerThreatLevel,Score)
+end
+function SCORING:OnKillPvE(Player,TargetUnitName,IsTeamKill,TargetThreatLevel,PlayerThreatLevel,Score)
+end
 CLEANUP_AIRBASE={
 ClassName="CLEANUP_AIRBASE",
 TimeInterval=0.2,
@@ -41009,15 +41266,17 @@ end
 function RANGE:SetSRS(PathToSRS,Port,Coalition,Frequency,Modulation,Volume,PathToGoogleKey)
 if PathToSRS or MSRS.path then
 self.useSRS=true
-self.controlmsrs=MSRS:New(PathToSRS or MSRS.path,Frequency or 256,Modulation or radio.modulation.AM,Volume or 1.0)
+self.controlmsrs=MSRS:New(PathToSRS or MSRS.path,Frequency or 256,Modulation or radio.modulation.AM)
 self.controlmsrs:SetPort(Port or MSRS.port)
 self.controlmsrs:SetCoalition(Coalition or coalition.side.BLUE)
 self.controlmsrs:SetLabel("RANGEC")
+self.controlmsrs:SetVolume(Volume or 1.0)
 self.controlsrsQ=MSRSQUEUE:New("CONTROL")
-self.instructmsrs=MSRS:New(PathToSRS or MSRS.path,Frequency or 305,Modulation or radio.modulation.AM,Volume or 1.0)
+self.instructmsrs=MSRS:New(PathToSRS or MSRS.path,Frequency or 305,Modulation or radio.modulation.AM)
 self.instructmsrs:SetPort(Port or MSRS.port)
 self.instructmsrs:SetCoalition(Coalition or coalition.side.BLUE)
 self.instructmsrs:SetLabel("RANGEI")
+self.instructmsrs:SetVolume(Volume or 1.0)
 self.instructsrsQ=MSRSQUEUE:New("INSTRUCT")
 if PathToGoogleKey then
 self.controlmsrs:SetGoogle(PathToGoogleKey)
@@ -44526,7 +44785,7 @@ end
 end
 function ARTY:onafterRespawn(Controllable,From,Event,To)
 self:_EventFromTo("onafterRespawn",Event,From,To)
-env.info("FF Respawning arty group")
+self:I("Respawning arty group")
 local group=self.Controllable
 self.Controllable=group:Respawn()
 self.respawning=false
@@ -47467,6 +47726,7 @@ if self:IsRunwayOperational()==false then
 local Trepair=self:GetRunwayRepairtime()
 self:I(self.lid..string.format("Runway destroyed! Will be repaired in %d sec",Trepair))
 if Trepair==0 then
+self.runwaydestroyed=nil
 self:RunwayRepaired()
 end
 end
@@ -48367,11 +48627,13 @@ function WAREHOUSE:onafterRunwayDestroyed(From,Event,To)
 local text=string.format("Warehouse %s: Runway %s destroyed!",self.alias,self.airbasename)
 self:_InfoMessage(text)
 self.runwaydestroyed=timer.getAbsTime()
+return self
 end
 function WAREHOUSE:onafterRunwayRepaired(From,Event,To)
 local text=string.format("Warehouse %s: Runway %s repaired!",self.alias,self.airbasename)
 self:_InfoMessage(text)
 self.runwaydestroyed=nil
+return self
 end
 function WAREHOUSE:onafterAssetSpawned(From,Event,To,group,asset,request)
 local text=string.format("Asset %s from request id=%d was spawned!",asset.spawngroupname,request.uid)
@@ -51281,17 +51543,17 @@ MEDIUM="Medium",
 LONG="Long",
 }
 MANTIS.SamData={
-["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"},
-["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"},
-["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"},
-["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"},
+["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"},
+["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"},
+["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"},
+["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"},
 ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"},
 ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"},
 ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"},
 ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"},
 ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"},
 ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"},
-["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"},
+["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"},
 ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"},
 ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"},
 ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"},
@@ -53467,7 +53729,7 @@ end
 function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volume,AltBackend)
 local Frequency=self.AirbossRadio.frequency
 local Modulation=self.AirbossRadio.modulation
-self.SRS=MSRS:New(PathToSRS,Frequency,Modulation,Volume,AltBackend)
+self.SRS=MSRS:New(PathToSRS,Frequency,Modulation,AltBackend)
 self.SRS:SetCoalition(self:GetCoalition())
 self.SRS:SetCoordinate(self:GetCoordinate())
 self.SRS:SetCulture(Culture or"en-US")
@@ -53476,6 +53738,7 @@ self.SRS:SetPath(PathToSRS)
 self.SRS:SetPort(Port or 5002)
 self.SRS:SetLabel(self.AirbossRadio.alias or"AIRBOSS")
 self.SRS:SetCoordinate(self.carrier:GetCoordinate())
+self.SRS:SetVolume(Volume or 1)
 if GoogleCreds then
 self.SRS:SetGoogle(GoogleCreds)
 end
@@ -58002,13 +58265,12 @@ local GXX,nXX=self:_Flightdata2Text(playerData,AIRBOSS.GroovePos.XX)
 local GIM,nIM=self:_Flightdata2Text(playerData,AIRBOSS.GroovePos.IM)
 local GIC,nIC=self:_Flightdata2Text(playerData,AIRBOSS.GroovePos.IC)
 local GAR,nAR=self:_Flightdata2Text(playerData,AIRBOSS.GroovePos.AR)
+local vtol=playerData.actype==AIRBOSS.AircraftCarrier.AV8B
 local G=GXX.." "..GIM.." ".." "..GIC.." "..GAR
 local N=nXX+nIM+nIC+nAR
-local Nv=nXX+nIM
 local nL=count(G,'_')/2
 local nS=count(G,'%(')
 local nN=N-nS-nL
-local nNv=Nv-nS-nL
 local Tgroove=playerData.Tgroove
 local TgrooveUnicorn=Tgroove and(Tgroove>=15.0 and Tgroove<=18.99)or false
 local TgrooveVstolUnicorn=Tgroove and(Tgroove>=60.0 and Tgroove<=65.0)and playerData.actype==AIRBOSS.AircraftCarrier.AV8B or false
@@ -58019,16 +58281,29 @@ grade="_OK_"
 points=5.0
 G="Unicorn"
 else
-if nL>1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+if vtol then
+local Gb=GXX.." "..GIM
+local N=nXX+nIM
+local nL=count(Gb,'_')/2
+local nS=count(Gb,'%(')
+local nN=N-nS-nL
+local Gv=GIC.." "..GAR
+local Nv=nIC+nAR
+local nLv=count(Gv,'_')/2
+local nSv=count(Gv,'%(')
+local nNv=Nv-nSv-nLv
+if nL>0 or nLv>1 then
 grade="--"
 points=2.0
-elseif nNv>=1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+elseif nN>0 or nNv>1 or nLv==1 then
 grade="(OK)"
 points=3.0
-elseif nNv<1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+else
 grade="OK"
 points=4.0
-elseif nL>0 then
+end
+else
+if nL>0 then
 grade="--"
 points=2.0
 elseif nN>0 then
@@ -58039,6 +58314,7 @@ grade="OK"
 points=4.0
 end
 end
+end
 G=G:gsub("%)%(","")
 G=G:gsub("__","")
 local text="LSO grade:\n"
@@ -59795,6 +60071,10 @@ end
 if pilotcall then
 Sender="PilotCall"
 end
+if Sender==""then
+self:E(self.lid..string.format("ERROR: Sender unknown!"))
+return
+end
 local numbers=_split(number)
 local wait=0
 for i=1,#numbers do
@@ -62571,7 +62851,7 @@ ATIS.Messages={
 EN=
 {
 HOURS="hours",
-TIME="hours",
+TIME="Hours",
 NOCLOUDINFO="Cloud coverage information not available",
 OVERCAST="Overcast",
 BROKEN="Broken clouds",
@@ -63020,24 +63300,40 @@ end
 end
 end
 function ATIS:SetSRS(PathToSRS,Gender,Culture,Voice,Port,GoogleKey)
-if PathToSRS or MSRS.path then
 self.useSRS=true
-self.msrs=MSRS:New(PathToSRS,self.frequency,self.modulation)
-self.msrs:SetGender(Gender)
-self.msrs:SetCulture(Culture)
-self.msrs:SetVoice(Voice)
-self.msrs:SetPort(Port)
+local path=PathToSRS or MSRS.path
+local gender=Gender or MSRS.gender
+local culture=Culture or MSRS.culture
+local voice=Voice or MSRS.voice
+local port=Port or MSRS.port or 5002
+self.msrs=MSRS:New(path,self.frequency,self.modulation)
+self.msrs:SetGender(gender)
+self.msrs:SetCulture(culture)
+self.msrs:SetPort(port)
 self.msrs:SetCoalition(self:GetCoalition())
 self.msrs:SetLabel("ATIS")
-self.msrs:SetGoogle(GoogleKey)
+if GoogleKey then
+self.msrs:SetProviderOptionsGoogle(GoogleKey,GoogleKey)
+self.msrs:SetProvider(MSRS.Provider.GOOGLE)
+end
+if(not GoogleKey)and self.msrs:GetProvider()==MSRS.Provider.GOOGLE then
+voice=Voice or MSRS.poptions.gcloud.voice
+end
+self.msrs:SetVoice(voice)
 self.msrs:SetCoordinate(self.airbase:GetCoordinate())
 self.msrsQ=MSRSQUEUE:New("ATIS")
 self.msrsQ:SetTransmitOnlyWithPlayers(self.TransmitOnlyWithPlayers)
 if self.dTQueueCheck<=10 then
 self:SetQueueUpdateTime(90)
 end
+return self
+end
+function ATIS:SetSRSProvider(Provider)
+self:T(self.lid.."SetSRSProvider")
+if self.msrs then
+self.msrs:SetProvider(Provider)
 else
-self:E(self.lid..string.format("ERROR: No SRS path specified!"))
+MESSAGE:New(self.lid.."Set up SRS first before trying to change the provider!",30,"ATIS"):ToAll():ToLog()
 end
 return self
 end
@@ -64628,7 +64924,7 @@ end
 function CTLD:_GenerateUHFrequencies()
 self:T(self.lid.." _GenerateUHFrequencies")
 self.FreeUHFFrequencies={}
-self.FreeUHFFrequencies=UTILS.GenerateUHFrequencies()
+self.FreeUHFFrequencies=UTILS.GenerateUHFrequencies(243,320)
 return self
 end
 function CTLD:_GenerateFMFrequencies()
@@ -68141,7 +68437,7 @@ CSAR.AircraftType["Bell-47"]=2
 CSAR.AircraftType["UH-60L"]=10
 CSAR.AircraftType["AH-64D_BLK_II"]=2
 CSAR.AircraftType["Bronco-OV-10A"]=2
-CSAR.version="1.0.18"
+CSAR.version="1.0.19"
 function CSAR:New(Coalition,Template,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Template,Alias})
@@ -68418,7 +68714,7 @@ end
 self:T({_spawnedGroup,_alias})
 local _GroupName=_spawnedGroup:GetName()or _alias
 self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet)
-self:_InitSARForPilot(_spawnedGroup,_unitName,_freq,noMessage)
+self:_InitSARForPilot(_spawnedGroup,_unitName,_freq,noMessage,_playerName)
 return self
 end
 function CSAR:_SpawnCsarAtZone(_zone,_coalition,_description,_randomPoint,_nomessage,unitname,typename,forcedesc)
@@ -68653,7 +68949,7 @@ end
 end
 return self
 end
-function CSAR:_InitSARForPilot(_downedGroup,_GroupName,_freq,_nomessage)
+function CSAR:_InitSARForPilot(_downedGroup,_GroupName,_freq,_nomessage,_playername)
 self:T(self.lid.." _InitSARForPilot")
 local _leader=_downedGroup:GetUnit(1)
 local _groupName=_GroupName
@@ -68672,7 +68968,7 @@ end
 for _,_heliName in pairs(self.csarUnits)do
 self:_CheckWoundedGroupStatus(_heliName,_groupName)
 end
-self:__PilotDown(2,_downedGroup,_freqk,_groupName,_coordinatesText)
+self:__PilotDown(2,_downedGroup,_freqk,_groupName,_coordinatesText,_playername)
 return self
 end
 function CSAR:_CheckNameInDownedPilots(name)
@@ -69145,7 +69441,7 @@ self:T(self.lid.." _DisplayToAllSAR")
 local messagetime=_messagetime or self.messageTime
 if self.msrs then
 local voice=self.CSARVoice or MSRS.Voices.Google.Standard.en_GB_Standard_F
-if self.msrs.google==nil then
+if self.msrs:GetProvider()==MSRS.Provider.WINDOWS then
 voice=self.CSARVoiceMS or MSRS.Voices.Microsoft.Hedda
 end
 self:I("Voice = "..voice)
@@ -69448,7 +69744,8 @@ self.msrs:SetCoalition(self.coalition)
 self.msrs:SetVoice(self.SRSVoice)
 self.msrs:SetGender(self.SRSGender)
 if self.SRSGPathToCredentials then
-self.msrs:SetGoogle(self.SRSGPathToCredentials)
+self.msrs:SetProviderOptionsGoogle(self.SRSGPathToCredentials,self.SRSGPathToCredentials)
+self.msrs:SetProvider(MSRS.Provider.GOOGLE)
 end
 self.msrs:SetVolume(self.SRSVolume)
 self.msrs:SetLabel("CSAR")
@@ -69599,8 +69896,8 @@ end
 end
 return self
 end
-function CSAR:onbeforePilotDown(From,Event,To,Group,Frequency,Leadername,CoordinatesText)
-self:T({From,Event,To,Group,Frequency,Leadername,CoordinatesText})
+function CSAR:onbeforePilotDown(From,Event,To,Group,Frequency,Leadername,CoordinatesText,Playername)
+self:T({From,Event,To,Group,Frequency,Leadername,CoordinatesText,tostring(Playername)})
 return self
 end
 function CSAR:onbeforeLanded(From,Event,To,HeliName,Airbase)
@@ -78649,8 +78946,10 @@ self.power=power or 100
 return self
 end
 function RADIOQUEUE:SetSRS(PathToSRS,Port)
-self.msrs=MSRS:New(PathToSRS,self.frequency/1000000,self.modulation)
-self.msrs:SetPort(Port)
+local path=PathToSRS or MSRS.path
+local port=Port or MSRS.port
+self.msrs=MSRS:New(path,self.frequency/1000000,self.modulation)
+self.msrs:SetPort(port)
 return self
 end
 function RADIOQUEUE:SetDigit(digit,filename,duration,path,subtitle,subduration)
@@ -79173,6 +79472,39 @@ Microsoft={
 ["David"]="Microsoft David Desktop",
 ["Zira"]="Microsoft Zira Desktop",
 ["Hortense"]="Microsoft Hortense Desktop",
+["de-DE-Hedda"]="Microsoft Hedda Desktop",
+["en-GB-Hazel"]="Microsoft Hazel Desktop",
+["en-US-David"]="Microsoft David Desktop",
+["en-US-Zira"]="Microsoft Zira Desktop",
+["fr-FR-Hortense"]="Microsoft Hortense Desktop",
+},
+MicrosoftGRPC={
+["Hazel"]="Hazel",
+["George"]="George",
+["Susan"]="Susan",
+["David"]="David",
+["Zira"]="Zira",
+["Mark"]="Mark",
+["James"]="James",
+["Catherine"]="Catherine",
+["Richard"]="Richard",
+["Linda"]="Linda",
+["Ravi"]="Ravi",
+["Heera"]="Heera",
+["Sean"]="Sean",
+["en_GB_Hazel"]="Hazel",
+["en_GB_George"]="George",
+["en_GB_Susan"]="Susan",
+["en_US_David"]="David",
+["en_US_Zira"]="Zira",
+["en_US_Mark"]="Mark",
+["en_AU_James"]="James",
+["en_AU_Catherine"]="Catherine",
+["en_CA_Richard"]="Richard",
+["en_CA_Linda"]="Linda",
+["en_IN_Ravi"]="Ravi",
+["en_IN_Heera"]="Heera",
+["en_IR_Sean"]="Sean",
 },
 Google={
 Standard={
@@ -79320,7 +79652,19 @@ return self
 end
 function MSRS:SetBackend(Backend)
 self:F({Backend=Backend})
-self.backend=Backend or MSRS.Backend.SRSEXE
+Backend=Backend or MSRS.Backend.SRSEXE
+local function Checker(back)
+local ok=false
+for _,_backend in pairs(MSRS.Backend)do
+if tostring(back)==_backend then ok=true end
+end
+return ok
+end
+if Checker(Backend)then
+self.backend=Backend
+else
+MESSAGE:New("ERROR: Backend "..tostring(Backend).." is not supported!",30,"MSRS",true):ToLog():ToAll()
+end
 return self
 end
 function MSRS:SetBackendGRPC()
@@ -79334,11 +79678,9 @@ 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()
@@ -79503,15 +79845,20 @@ end
 return self
 end
 function MSRS:SetProvider(Provider)
-self:F({Provider=Provider})
+BASE:F({Provider=Provider})
+if self then
 self.provider=Provider or MSRS.Provider.WINDOWS
 return self
+else
+MSRS.provider=Provider or MSRS.Provider.WINDOWS
+end
+return
 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})
+BASE:F({Provider,CredentialsFile,AccessKey,SecretKey,Region})
 local option=MSRS._CreateProviderOptions(Provider,CredentialsFile,AccessKey,SecretKey,Region)
 if self then
 self.poptions=self.poptions or{}
@@ -79523,7 +79870,7 @@ end
 return option
 end
 function MSRS._CreateProviderOptions(Provider,CredentialsFile,AccessKey,SecretKey,Region)
-self:F({Provider,CredentialsFile,AccessKey,SecretKey,Region})
+BASE:F({Provider,CredentialsFile,AccessKey,SecretKey,Region})
 local option={}
 option.provider=Provider
 option.credentials=CredentialsFile
@@ -79633,7 +79980,7 @@ 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})
+self:T({Text,Delay,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate})
 if Delay and Delay>0 then
 self:ScheduleOnce(Delay,MSRS.PlayTextExt,self,Text,0,Frequencies,Modulations,Gender,Culture,Voice,Volume,Label,Coordinate)
 else
@@ -79893,7 +80240,7 @@ self.lid=string.format("MSRSQUEUE %s | ",self.alias)
 return self
 end
 function MSRSQUEUE:Clear()
-self:I(self.lid.."Clearing MSRSQUEUE")
+self:T(self.lid.."Clearing MSRSQUEUE")
 self.queue={}
 return self
 end
@@ -79939,24 +80286,25 @@ transmission.msrs=msrs
 transmission.Tplay=tstart or timer.getAbsTime()
 transmission.subtitle=subtitle
 transmission.interval=interval or 0
-transmission.frequency=frequency
-transmission.modulation=modulation
+transmission.frequency=frequency or msrs.frequencies
+transmission.modulation=modulation or msrs.modulations
 transmission.subgroups=subgroups
 if transmission.subtitle then
 transmission.subduration=subduration or transmission.duration
 else
 transmission.subduration=0
 end
-transmission.gender=gender
-transmission.culture=culture
-transmission.voice=voice
-transmission.volume=volume
-transmission.label=label
-transmission.coordinate=coordinate
+transmission.gender=gender or msrs.gender
+transmission.culture=culture or msrs.culture
+transmission.voice=voice or msrs.voice
+transmission.volume=volume or msrs.volume
+transmission.label=label or msrs.Label
+transmission.coordinate=coordinate or msrs.coordinate
 self:AddTransmission(transmission)
 return transmission
 end
 function MSRSQUEUE:Broadcast(transmission)
+self:T(self.lid.."Broadcast")
 if transmission.frequency then
 transmission.msrs:PlayTextExt(transmission.text,nil,transmission.frequency,transmission.modulation,transmission.gender,transmission.culture,transmission.voice,transmission.volume,transmission.label,transmission.coordinate)
 else

package/lua/lib/funkman.lua

@@ -0,0 +1 @@
+FunkMan = SOCKET:New(10042, "127.0.0.1")

package/lua/src/130-airboss.lua

@@ -30,7 +30,7 @@ function detectShitHotBreak(objAirboss)
                     -- Requirements for Shit Hot break are velocity >475 knots and less than 700 feet
                     trigger.action.outText(player_name..' performing a Sierra Hotel Break around ' .. objAirboss.customconfig.alias .. ' !', 10)
                     local sh_message_to_discord = ('**'..player_name..' is performing a Sierra Hotel Break at '..UTILS.Round(player_velocity, 0)..' knots and '..player_alt_feet..' feet!**')
-                    GemMan:SendTable({
+                    FunkMan:SendTable({
                         command="moose_text",
                         text=sh_message_to_discord,
                         msg_type='lso'
@@ -200,7 +200,7 @@ for index, airbossconfig in ipairs(AirBossConfig) do
         objAirboss:SetMaxSectionSize(4)
         objAirboss:SetMaxMarshalStacks(airbossconfig.maxstacks)
         objAirboss:SetDefaultPlayerSkill(airbossconfig.difficulty) -- other options EASY / HARD
-        objAirboss:SetFunkManOn(10043, "127.0.0.1")
+        objAirboss:SetFunkManOn(10042, "127.0.0.1")
         if airbossconfig.wirecorrection then
             objAirboss:SetMPWireCorrection(airbossconfig.wirecorrection)
         else
@@ -350,16 +350,16 @@ for index, airbossconfig in ipairs(AirBossConfig) do
                     myGrade.points = myGrade.points + 1.00
                     client_performing_sh:Set(0)
                     self:SetTrapSheet(self.trappath, "SH_unicorn_AIRBOSS-trapsheet-"..player_name)
-                    timer.scheduleFunction(
-                            function()
-                                trigger.action.outSound("AIRBOSS/Airboss Soundfiles/sureshot.ogg")
-                            end,
-                            {},
-                            timer.getTime() + 5
-                    )
                 else
                     self:SetTrapSheet(self.trappath, "unicorn_AIRBOSS-trapsheet-"..player_name)
                 end
+                timer.scheduleFunction(
+                        function()
+                            trigger.action.outSound("AIRBOSS/Airboss Soundfiles/sureshot.ogg")
+                        end,
+                        {},
+                        timer.getTime() + 5
+                )
 
             elseif string_grade == "OK" and player_wire >1 then
                 if client_performing_sh:Get() == 1 then
@@ -401,7 +401,7 @@ for index, airbossconfig in ipairs(AirBossConfig) do
             if playerData.wire == 1 then
                 myGrade.points = myGrade.points -1.00
                 local onewire_to_discord = ('**'..player_name..' almost had a rampstrike with that 1-wire!**')
-                GemMan:SendTable({
+                FunkMan:SendTable({
                     command="moose_text",
                     text=onewire_to_discord,
                     msg_type='lso'

package/lua/src/193-training_ranges.lua

@@ -15,7 +15,7 @@ for index, traingingrangeconfig in ipairs(TrainingRangeConfig) do
         trainingRange:SetDefaultPlayerSmokeBomb(false)
         trainingRange:SetRangeRadius(0.2) -- bomb impact at more than 200m is out of range
         trainingRange:SetScoreBombDistance(100)-- bomb impact at more than 100m won't be taken into account
-        trainingRange:SetFunkManOn(10043,"127.0.0.1")
+        trainingRange:SetFunkManOn(10042,"127.0.0.1")
         trainingRange:SetAutosaveOn()
         trainingRange:SetTargetSheet(traingingrangeconfig.targetsheetpath)
         if ( type(traingingrangeconfig.srs) ~= nil ) then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.1.10",
+  "version": "3.2.0",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [

package/scripts/inject-scripts.js

@@ -213,7 +213,7 @@ async function doInject(ciObject, sourceMizFileName, workspacePath,destinationMi
     // insertion des Librairies JTFF dans la file d'attente
     settingsArray.push(
         {
-            file: "settings-gemman.lua",
+            file: "settings-funkman.lua",
         },
         {
             file: "settings-global.lua",
@@ -221,8 +221,8 @@ async function doInject(ciObject, sourceMizFileName, workspacePath,destinationMi
     );
     libsArray.push({
         folder: 'lib',
-        scriptTitle: 'GemMan',
-        scripts: ['gemman.lua'],
+        scriptTitle: 'FunkMan',
+        scripts: ['funkman.lua'],
         timing: 17,
         color: '0xffff00ff'
     });

package/lua/lib/gemman.lua

@@ -1 +0,0 @@
-GemMan = SOCKET:New(10043, "127.0.0.1")