@jtff/miztemplate-lib 3.1.6 → 3.1.7

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-11-19T12:40:22+01:00-522eb8b256f9edfbcb2c8ecfe66861f659c6403c ***')
 env.info('*** MOOSE STATIC INCLUDE START *** ')
 ENUMS={}
 env.setErrorMessageBoxEnabled(false)
@@ -5888,6 +5888,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 +6209,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 +6580,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
@@ -6568,7 +6626,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
@@ -8368,7 +8426,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
@@ -9212,7 +9270,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
@@ -11691,6 +11749,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,7 +11983,13 @@ self:F({MaxThreatLevelA2G=MaxThreatLevelA2G,MaxThreatText=MaxThreatText})
 return MaxThreatLevelA2G,MaxThreatText
 end
 function SET_UNIT:GetCoordinate()
-local Coordinate=self:GetRandom():GetCoordinate()
+local Coordinate=nil
+local unit=self:GetRandom()
+if self:Count()==1 and unit then
+return unit:GetCoordinate()
+end
+if unit then
+local Coordinate=unit:GetCoordinate()
 local x1=Coordinate.x
 local x2=Coordinate.x
 local y1=Coordinate.y
@@ -11925,7 +11999,7 @@ local z2=Coordinate.z
 local MaxVelocity=0
 local AvgHeading=nil
 local MovingCount=0
-for UnitName,UnitData in pairs(self:GetSet())do
+for UnitName,UnitData in pairs(self:GetAliveSet())do
 local Unit=UnitData
 local Coordinate=Unit:GetCoordinate()
 x1=(Coordinate.x<x1)and Coordinate.x or x1
@@ -11949,6 +12023,7 @@ Coordinate.z=(z2-z1)/2+z1
 Coordinate:SetHeading(AvgHeading)
 Coordinate:SetVelocity(MaxVelocity)
 self:F({Coordinate=Coordinate})
+end
 return Coordinate
 end
 function SET_UNIT:GetVelocity()
@@ -12805,6 +12880,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 +14986,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
@@ -16736,29 +16836,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
@@ -19437,11 +19548,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 +19935,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 +19947,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 +19956,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={
@@ -27140,7 +27251,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
@@ -28445,7 +28556,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
@@ -29102,7 +29213,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 +32361,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))
@@ -39511,6 +39624,7 @@ soundpath="Range Soundfiles/",
 targetsheet=nil,
 targetpath=nil,
 targetprefix=nil,
+Coalition=nil,
 }
 RANGE.Defaults={
 goodhitrange=25,
@@ -39580,10 +39694,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)
@@ -40118,7 +40233,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
@@ -50089,7 +50210,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 +50360,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 +50391,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 +51097,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 +51205,9 @@ UseEmOnOff=true,
 shootandscoot=false,
 SkateNumber=3,
 SkateZones=nil,
+minscootdist=100,
+minscootdist=3000,
+scootrandomcoord=false,
 }
 do
 SHORAD.Harms={
@@ -51123,7 +51251,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 +51281,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 +51551,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 +51568,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 +51603,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
@@ -62457,7 +62591,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)
@@ -63192,7 +63326,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 +63343,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.42"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -63349,7 +63483,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
@@ -64825,8 +64959,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)
@@ -65402,7 +65542,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 +65556,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 +65569,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)
@@ -78272,7 +78417,7 @@ end
 if self.google then
 command=command..string.format(' --ssml -G "%s"',self.google)
 end
-self:T("MSRS command="..command)
+self:I("MSRS command="..command)
 return command
 end
 function MSRS:LoadConfigFile(Path,Filename,ConfigLoaded)
@@ -78294,7 +78439,7 @@ self.culture=MSRS_Config.Culture or"en-GB"
 self.gender=MSRS_Config.Gender or"male"
 self.google=MSRS_Config.Google
 self.Label=MSRS_Config.Label or"MSRS"
-self.voice=MSRS_Config.Voice 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
@@ -78318,7 +78463,7 @@ MSRS.culture=MSRS_Config.Culture or"en-GB"
 MSRS.gender=MSRS_Config.Gender or"male"
 MSRS.google=MSRS_Config.Google
 MSRS.Label=MSRS_Config.Label or"MSRS"
-MSRS.voice=MSRS_Config.Voice 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
@@ -78502,7 +78647,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 +78704,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)

package/package.json

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