@jtff/miztemplate-lib 3.5.5 → 3.5.6

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2024-12-03T18:07:38+01:00-a30079c45b24979a1cb0d9ba781e5c30af8f4018 ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2024-12-18T22:04:38+01:00-43ab4d5f386b782242c67aee74e198381ee9f16c ***')
 if not MOOSE_DEVELOPMENT_FOLDER then
 MOOSE_DEVELOPMENT_FOLDER='Scripts'
 end
@@ -1103,6 +1103,7 @@ Falklands="Falklands",
 Sinai="SinaiMap",
 Kola="Kola",
 Afghanistan="Afghanistan",
+Iraq="Iraq"
 }
 CALLSIGN={
 Aircraft={
@@ -2175,6 +2176,8 @@ elseif map==DCSMAP.Kola then
 declination=15
 elseif map==DCSMAP.Afghanistan then
 declination=3
+elseif map==DCSMAP.Iraq then
+declination=4.4
 else
 declination=0
 end
@@ -5102,10 +5105,6 @@ BASE.__={}
 BASE._={
 Schedules={},
 }
-FORMATION={
-Cone="Cone",
-Vee="Vee",
-}
 function BASE:New()
 local self=UTILS.DeepCopy(self)
 _ClassID=_ClassID+1
@@ -7564,14 +7563,15 @@ end
 end
 elseif Event.TgtObjectCategory==Object.Category.SCENERY then
 Event.TgtDCSUnit=Event.target
-Event.TgtDCSUnitName=Event.TgtDCSUnit:getName()
-if Event.TgtDCSUnitName==nil then return end
+Event.TgtDCSUnitName=Event.TgtDCSUnit.getName and Event.TgtDCSUnit.getName()or nil
+if Event.TgtDCSUnitName~=nil then
 Event.TgtUnitName=Event.TgtDCSUnitName
 Event.TgtUnit=SCENERY:Register(Event.TgtDCSUnitName,Event.target)
 Event.TgtCategory=Event.TgtDCSUnit:getDesc().category
 Event.TgtTypeName=Event.TgtDCSUnit:getTypeName()
 end
 end
+end
 if Event.weapon and type(Event.weapon)=="table"and Event.weapon.isExist and Event.weapon:isExist()then
 Event.Weapon=Event.weapon
 Event.WeaponName=Event.weapon:isExist()and Event.weapon:getTypeName()or"Unknown Weapon"
@@ -11108,9 +11108,8 @@ end
 function DATABASE:AddStatic(DCSStaticName)
 if not self.STATICS[DCSStaticName]then
 self.STATICS[DCSStaticName]=STATIC:Register(DCSStaticName)
-return self.STATICS[DCSStaticName]
 end
-return nil
+return self.STATICS[DCSStaticName]
 end
 function DATABASE:DeleteStatic(DCSStaticName)
 self.STATICS[DCSStaticName]=nil
@@ -11122,9 +11121,8 @@ end
 function DATABASE:AddDynamicCargo(Name)
 if not self.DYNAMICCARGO[Name]then
 self.DYNAMICCARGO[Name]=DYNAMICCARGO:Register(Name)
-return self.DYNAMICCARGO[Name]
 end
-return nil
+return self.DYNAMICCARGO[Name]
 end
 function DATABASE:FindDynamicCargo(DynamicCargoName)
 local StaticFound=self.DYNAMICCARGO[DynamicCargoName]
@@ -16016,9 +16014,15 @@ end
 function SET_OPSGROUP:_EventOnBirth(Event)
 if Event.IniDCSUnit and Event.IniDCSGroup then
 local DCSgroup=Event.IniDCSGroup
+local CountAliveActive=0
+for index,data in pairs(DCSgroup:getUnits())do
+if data:isExist()and data:isActive()then
+CountAliveActive=CountAliveActive+1
+end
+end
 if DCSgroup:getInitialSize()==DCSgroup:getSize()then
 local groupname,group=self:AddInDatabase(Event)
-if group and group:CountAliveUnits()==DCSgroup:getInitialSize()then
+if group and CountAliveActive==DCSgroup:getInitialSize()then
 if group and self:IsIncludeObject(group)then
 self:Add(groupname,group)
 end
@@ -21336,8 +21340,6 @@ Template.unitId=nil
 end
 self.SpawnIndex=self.SpawnIndex+1
 Template.name=self.InitStaticName or string.format("%s#%05d",self.SpawnTemplatePrefix,self.SpawnIndex)
-local mystatic=_DATABASE:AddStatic(Template.name)
-self:T(Template)
 local Static=nil
 if self.InitFarp then
 local TemplateGroup={}
@@ -21362,7 +21364,13 @@ else
 self:T("Spawning Static")
 self:T2({Template=Template})
 Static=coalition.addStaticObject(CountryID,Template)
+if Static then
+self:T(string.format("Succesfully spawned static object \"%s\" ID=%d",Static:getName(),Static:getID()))
+else
+self:E(string.format("ERROR: DCS static object \"%s\" is nil!",tostring(Template.name)))
+end
 end
+local mystatic=_DATABASE:AddStatic(Template.name)
 if self.SpawnFunctionHook then
 self:ScheduleOnce(0.3,self.SpawnFunctionHook,mystatic,unpack(self.SpawnFunctionArguments))
 end
@@ -27328,12 +27336,23 @@ h=-math.rad(360-course)
 end
 return h
 end
+local function TransFormRoute(Template,OldPos,NewPos)
+if Template.route and Template.route.points then
+for _,_point in ipairs(Template.route.points)do
+_point.x=_point.x-OldPos.x+NewPos.x
+_point.y=_point.y-OldPos.y+NewPos.y
+end
+end
+return Template
+end
 if self:IsAlive()then
+local OldPos=self:GetVec2()
 local Zone=self.InitRespawnZone
 local Vec3=Zone and Zone:GetVec3()or self:GetVec3()
 local From={x=Template.x,y=Template.y}
 Template.x=Vec3.x
 Template.y=Vec3.z
+local NewPos={x=Vec3.x,y=Vec3.z}
 if Reset==true then
 for UnitID,UnitData in pairs(self:GetUnits())do
 local GroupUnit=UnitData
@@ -27365,6 +27384,7 @@ Template.units[UnitID].heading=_Heading(self.InitRespawnHeading and self.InitRes
 Template.units[UnitID].psi=-Template.units[UnitID].heading
 end
 end
+Template=TransFormRoute(Template,OldPos,NewPos)
 elseif Reset==false then
 for UnitID,TemplateUnitData in pairs(Template.units)do
 local GroupUnitVec3={x=TemplateUnitData.x,y=TemplateUnitData.alt,z=TemplateUnitData.y}
@@ -27387,6 +27407,7 @@ Template.units[UnitID].x=(Template.units[UnitID].x-From.x)+GroupUnitVec3.x
 Template.units[UnitID].y=(Template.units[UnitID].y-From.y)+GroupUnitVec3.z
 Template.units[UnitID].heading=self.InitRespawnHeading and self.InitRespawnHeading or TemplateUnitData.heading
 end
+Template=TransFormRoute(Template,OldPos,NewPos)
 else
 local units=self:GetUnits()
 for UnitID,Unit in pairs(Template.units)do
@@ -27420,10 +27441,14 @@ if self.InitRespawnModu then
 Template.modulation=self.InitRespawnModu
 end
 self:Destroy(false)
-_DATABASE:Spawn(Template)
+self:ScheduleOnce(0.1,_DATABASE.Spawn,_DATABASE,Template)
 self:ResetEvents()
 return self
 end
+function GROUP:Teleport(Coordinate)
+self:InitZone(Coordinate)
+return self:Respawn(nil,false)
+end
 function GROUP:RespawnAtCurrentAirbase(SpawnTemplate,Takeoff,Uncontrolled)
 if self and self:IsAlive()then
 local airbase=self:GetCoordinate():GetClosestAirbase()
@@ -29051,6 +29076,8 @@ local DCSStatic=StaticObject.getByName(self.StaticName)
 if DCSStatic then
 local Life0=DCSStatic:getLife()or 1
 self.Life0=Life0
+else
+self:E(string.format("Static object %s does not exist!",tostring(self.StaticName)))
 end
 return self
 end
@@ -29562,6 +29589,21 @@ AIRBASE.Afghanistan={
 ["Shindand_Heliport"]="Shindand Heliport",
 ["Tarinkot"]="Tarinkot",
 }
+AIRBASE.Iraq={
+["Baghdad_International_Airport"]="Baghdad International Airport",
+["Sulaimaniyah_International_Airport"]="Sulaimaniyah International Airport",
+["Al_Sahra_Airport"]="Al-Sahra Airport",
+["Erbil_International_Airport"]="Erbil International Airport",
+["Al_Taji_Airport"]="Al-Taji Airport",
+["Al_Asad_Airbase"]="Al-Asad Airbase",
+["Al_Salam_Airbase"]="Al-Salam Airbase",
+["Balad_Airbase"]="Balad Airbase",
+["Kirkuk_International_Airport"]="Kirkuk International Airport",
+["Bashur_Airport"]="Bashur Airport",
+["Al_Taquddum_Airport"]="Al-Taquddum Airport",
+["Qayyarah_Airfield_West"]="Qayyarah Airfield West",
+["K1_Base"]="K1 Base",
+}
 AIRBASE.TerminalType={
 Runway=16,
 HelicopterOnly=40,
@@ -29586,7 +29628,7 @@ self.descriptors=self:GetDesc()
 self.category=self.descriptors and self.descriptors.category or Airbase.Category.AIRDROME
 if self.category==Airbase.Category.AIRDROME then
 self.isAirdrome=true
-elseif self.category==Airbase.Category.HELIPAD then
+elseif self.category==Airbase.Category.HELIPAD or self.descriptors.typeName=="FARP_SINGLE_01"then
 self.isHelipad=true
 elseif self.category==Airbase.Category.SHIP then
 self.isShip=true
@@ -30990,7 +31032,8 @@ local object=self.weapon:getTarget()
 if object then
 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 name then
+self:T(self.lid..string.format("Got Target Object %s, category=%d",name,category))
 if category==Object.Category.UNIT then
 target=UNIT:FindByName(name)
 elseif category==Object.Category.STATIC then
@@ -31002,6 +31045,7 @@ self:E(self.lid..string.format("ERROR: Object category=%d is not implemented yet
 end
 end
 end
+end
 return target
 end
 function WEAPON:GetTargetDistance(ConversionFunction)
@@ -43803,7 +43847,7 @@ local ca2g=coord:ToStringA2G(_unit,_settings)
 _text=_text..string.format("\n- %s:\n%s @ %s",bombtarget.name or"unknown",ca2g,eltxt)
 end
 end
-self:_DisplayMessageToGroup(_unit,_text,120,true,true,_multiplayer)
+self:_DisplayMessageToGroup(_unit,_text,150,true,true,_multiplayer)
 end
 end
 function RANGE:_DisplayStrafePits(_unitname)
@@ -44063,10 +44107,10 @@ end
 _rootMenu=RANGE.MenuF10[_gid]or MENU_GROUP:New(group,"On the Range")
 end
 local _rangePath=MENU_GROUP:New(group,self.rangename,_rootMenu)
-local _statsPath=MENU_GROUP:New(group,"Statistics",_rangePath)
+local _infoPath=MENU_GROUP:New(group,"Range Info",_rangePath)
 local _markPath=MENU_GROUP:New(group,"Mark Targets",_rangePath)
+local _statsPath=MENU_GROUP:New(group,"Statistics",_rangePath)
 local _settingsPath=MENU_GROUP:New(group,"My Settings",_rangePath)
-local _infoPath=MENU_GROUP:New(group,"Range Info",_rangePath)
 local _mysmokePath=MENU_GROUP:New(group,"Smoke Color",_settingsPath)
 local _myflarePath=MENU_GROUP:New(group,"Flare Color",_settingsPath)
 local _MoMap=MENU_GROUP_COMMAND:New(group,"Mark On Map",_markPath,self._MarkTargetsOnMap,self,_unitName)
@@ -51866,7 +51910,6 @@ end
 end
 end
 function WAREHOUSE:_DeleteQueueItem(qitem,queue)
-self:F({qitem=qitem,queue=queue})
 for i=1,#queue do
 local _item=queue[i]
 if _item.uid==qitem.uid then
@@ -53176,24 +53219,47 @@ MANTIS.SamDataSMA={
 ["Lvkv9040M SMA"]={Range=4,Blindspot=0,Height=2.5,Type="Short",Radar="LvKv9040"},
 }
 MANTIS.SamDataCH={
-["2S38 CH"]={Range=8,Blindspot=0.5,Height=6,Type="Short",Radar="2S38"},
-["PantsirS1 CH"]={Range=20,Blindspot=1.2,Height=15,Type="Short",Radar="PantsirS1"},
-["PantsirS2 CH"]={Range=30,Blindspot=1.2,Height=18,Type="Medium",Radar="PantsirS2"},
-["PGL-625 CH"]={Range=10,Blindspot=0.5,Height=5,Type="Short",Radar="PGL_625"},
-["HQ-17A CH"]={Range=20,Blindspot=1.5,Height=10,Type="Short",Radar="HQ17A"},
-["M903PAC2 CH"]={Range=160,Blindspot=3,Height=24.5,Type="Long",Radar="MIM104_M903_PAC2"},
-["M903PAC3 CH"]={Range=120,Blindspot=1,Height=40,Type="Long",Radar="MIM104_M903_PAC3"},
-["TorM2 CH"]={Range=12,Blindspot=1,Height=10,Type="Short",Radar="TorM2"},
-["TorM2K CH"]={Range=12,Blindspot=1,Height=10,Type="Short",Radar="TorM2K"},
-["TorM2M CH"]={Range=16,Blindspot=1,Height=10,Type="Short",Radar="TorM2M"},
-["NASAMS3-AMRAAMER CH"]={Range=50,Blindspot=2,Height=35.7,Type="Medium",Radar="CH_NASAMS3_LN_AMRAAM_ER"},
-["NASAMS3-AIM9X2 CH"]={Range=20,Blindspot=0.2,Height=18,Type="Short",Radar="CH_NASAMS3_LN_AIM9X2"},
-["C-RAM CH"]={Range=2,Blindspot=0,Height=2,Type="Short",Radar="CH_Centurion_C_RAM"},
-["PGZ-09 CH"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="CH_PGZ09"},
-["S350-9M100 CH"]={Range=15,Blindspot=1.5,Height=8,Type="Short",Radar="CH_S350_50P6_9M100"},
-["S350-9M96D CH"]={Range=150,Blindspot=2.5,Height=30,Type="Long",Radar="CH_S350_50P6_9M96D"},
-["LAV-AD CH"]={Range=8,Blindspot=0.2,Height=4.8,Type="Short",Radar="CH_LAVAD"},
-["HQ-22 CH"]={Range=170,Blindspot=5,Height=27,Type="Long",Radar="CH_HQ22_LN"},
+["2S38 CHM"]={Range=8,Blindspot=0.5,Height=6,Type="Short",Radar="2S38"},
+["PantsirS1 CHM"]={Range=20,Blindspot=1.2,Height=15,Type="Short",Radar="PantsirS1"},
+["PantsirS2 CHM"]={Range=30,Blindspot=1.2,Height=18,Type="Medium",Radar="PantsirS2"},
+["PGL-625 CHM"]={Range=10,Blindspot=0.5,Height=5,Type="Short",Radar="PGL_625"},
+["HQ-17A CHM"]={Range=20,Blindspot=1.5,Height=10,Type="Short",Radar="HQ17A"},
+["M903PAC2 CHM"]={Range=160,Blindspot=3,Height=24.5,Type="Long",Radar="MIM104_M903_PAC2"},
+["M903PAC3 CHM"]={Range=120,Blindspot=1,Height=40,Type="Long",Radar="MIM104_M903_PAC3"},
+["TorM2 CHM"]={Range=12,Blindspot=1,Height=10,Type="Short",Radar="TorM2"},
+["TorM2K CHM"]={Range=12,Blindspot=1,Height=10,Type="Short",Radar="TorM2K"},
+["TorM2M CHM"]={Range=16,Blindspot=1,Height=10,Type="Short",Radar="TorM2M"},
+["NASAMS3-AMRAAMER CHM"]={Range=50,Blindspot=2,Height=35.7,Type="Medium",Radar="CH_NASAMS3_LN_AMRAAM_ER"},
+["NASAMS3-AIM9X2 CHM"]={Range=20,Blindspot=0.2,Height=18,Type="Short",Radar="CH_NASAMS3_LN_AIM9X2"},
+["C-RAM CHM"]={Range=2,Blindspot=0,Height=2,Type="Short",Radar="CH_Centurion_C_RAM"},
+["PGZ-09 CHM"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="CH_PGZ09"},
+["S350-9M100 CHM"]={Range=15,Blindspot=1.5,Height=8,Type="Short",Radar="CH_S350_50P6_9M100"},
+["S350-9M96D CHM"]={Range=150,Blindspot=2.5,Height=30,Type="Long",Radar="CH_S350_50P6_9M96D"},
+["LAV-AD CHM"]={Range=8,Blindspot=0.2,Height=4.8,Type="Short",Radar="CH_LAVAD"},
+["HQ-22 CHM"]={Range=170,Blindspot=5,Height=27,Type="Long",Radar="CH_HQ22_LN"},
+["PGZ-95 CHM"]={Range=2,Blindspot=0,Height=2,Type="Short",Radar="CH_PGZ95"},
+["LD-3000 CHM"]={Range=3,Blindspot=0,Height=3,Type="Short",Radar="CH_LD3000_stationary"},
+["LD-3000M CHM"]={Range=3,Blindspot=0,Height=3,Type="Short",Radar="CH_LD3000"},
+["FlaRakRad CHM"]={Range=8,Blindspot=1.5,Height=6,Type="Short",Radar="HQ17A"},
+["IRIS-T SLM CHM"]={Range=40,Blindspot=0.5,Height=20,Type="Medium",Radar="CH_IRIST_SLM"},
+["M903PAC2KAT1 CHM"]={Range=160,Blindspot=3,Height=24.5,Type="Long",Radar="CH_MIM104_M903_PAC2_KAT1"},
+["Skynex CHM"]={Range=3.5,Blindspot=0,Height=3.5,Type="Short",Radar="CH_SkynexHX"},
+["Skyshield CHM"]={Range=3.5,Blindspot=0,Height=3.5,Type="Short",Radar="CH_Skyshield_Gun"},
+["WieselOzelot CHM"]={Range=8,Blindspot=0.2,Height=4.8,Type="Short",Radar="CH_Wiesel2Ozelot"},
+["BukM3-9M317M CHM"]={Range=70,Blindspot=0.25,Height=35,Type="Medium",Radar="CH_BukM3_9A317M"},
+["BukM3-9M317MA CHM"]={Range=70,Blindspot=0.25,Height=35,Type="Medium",Radar="CH_BukM3_9A317MA"},
+["SkySabre CHM"]={Range=30,Blindspot=0.5,Height=10,Type="Medium",Radar="CH_SkySabreLN"},
+["Stormer CHM"]={Range=7.5,Blindspot=0.3,Height=7,Type="Short",Radar="CH_StormerHVM"},
+["THAAD CHM"]={Range=200,Blindspot=40,Height=150,Type="Long",Radar="CH_THAAD_M1120"},
+["USInfantryFIM92K CHM"]={Range=8,Blindspot=0.2,Height=4.8,Type="Short",Radar="CH_USInfantry_FIM92"},
+["RBS98M CHM"]={Range=20,Blindspot=0,Height=8,Type="Short",Radar="RBS-98"},
+["RBS70 CHM"]={Range=8,Blindspot=0,Height=5.5,Type="Short",Radar="RBS-70"},
+["RBS90 CHM"]={Range=8,Blindspot=0,Height=5.5,Type="Short",Radar="RBS-90"},
+["RBS103A CHM"]={Range=150,Blindspot=3,Height=24.5,Type="Long",Radar="LvS-103_Lavett103_Rb103A"},
+["RBS103B CHM"]={Range=35,Blindspot=0,Height=36,Type="Medium",Radar="LvS-103_Lavett103_Rb103B"},
+["RBS103AM CHM"]={Range=150,Blindspot=3,Height=24.5,Type="Long",Radar="LvS-103_Lavett103_HX_Rb103A"},
+["RBS103BM CHM"]={Range=35,Blindspot=0,Height=36,Type="Medium",Radar="LvS-103_Lavett103_HX_Rb103B"},
+["Lvkv9040M CHM"]={Range=4,Blindspot=0,Height=2.5,Type="Short",Radar="LvKv9040"},
 }
 do
 function MANTIS:New(name,samprefix,ewrprefix,hq,coalition,dynamic,awacs,EmOnOff,Padding,Zones)
@@ -53299,7 +53365,7 @@ end
 if self.HQ_Template_CC then
 self.HQ_CC=GROUP:FindByName(self.HQ_Template_CC)
 end
-self.version="0.8.18"
+self.version="0.8.20"
 self:I(string.format("***** Starting MANTIS Version %s *****",self.version))
 self:SetStartState("Stopped")
 self:AddTransition("Stopped","Start","Running")
@@ -53792,6 +53858,9 @@ range,height,type=self:_GetSAMDataFromUnits(grpname,HDSmod,SMAMod,CHMod)
 elseif not found then
 self:E(self.lid..string.format("*****Could not match radar data for %s! Will default to midrange values!",grpname))
 end
+if string.find(grpname,"SHORAD",1,true)then
+type=MANTIS.SamType.SHORT
+end
 return range,height,type,blind
 end
 function MANTIS:SetSAMStartState()
@@ -53909,6 +53978,10 @@ end
 function MANTIS:_CheckLoop(samset,detset,dlink,limit)
 self:T(self.lid.."CheckLoop "..#detset.." Coordinates")
 local switchedon=0
+local statusreport=REPORT:New("\nMANTIS Status")
+local instatusred=0
+local instatusgreen=0
+local SEADactive=0
 for _,_data in pairs(samset)do
 local samcoordinate=_data[2]
 local name=_data[1]
@@ -53944,7 +54017,6 @@ self:__ShoradActivated(1,name,radius,ontime)
 end
 if(self.debug or self.verbose)and switch then
 local text=string.format("SAM %s in alarm state RED!",name)
-local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
 if self.verbose then self:I(self.lid..text)end
 end
 end
@@ -53961,12 +54033,25 @@ self.SamStateTracker[name]="GREEN"
 end
 if self.debug or self.verbose then
 local text=string.format("SAM %s in alarm state GREEN!",name)
-local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
 if self.verbose then self:I(self.lid..text)end
 end
 end
 end
 end
+if self.debug then
+for _,_status in pairs(self.SamStateTracker)do
+if _status=="GREEN"then
+instatusgreen=instatusgreen+1
+elseif _status=="RED"then
+instatusred=instatusred+1
+end
+end
+statusreport:Add("+-----------------------------+")
+statusreport:Add(string.format("+ SAM in RED State: %2d",instatusred))
+statusreport:Add(string.format("+ SAM in GREEN State: %2d",instatusgreen))
+statusreport:Add("+-----------------------------+")
+MESSAGE:New(statusreport:Text(),10,nil,true):ToAll():ToLog()
+end
 return self
 end
 function MANTIS:_Check(detection,dlink)
@@ -54041,7 +54126,7 @@ else
 self.Detection=self:StartIntelDetection()
 end
 if self.autoshorad then
-self.Shorad=SHORAD:New(self.name.."-SHORAD",self.name.."-SHORAD",self.SAM_Group,self.ShoradActDistance,self.ShoradTime,self.coalition,self.UseEmOnOff)
+self.Shorad=SHORAD:New(self.name.."-SHORAD","SHORAD",self.SAM_Group,self.ShoradActDistance,self.ShoradTime,self.coalition,self.UseEmOnOff)
 self.Shorad:SetDefenseLimits(80,95)
 self.ShoradLink=true
 self.Shorad.Groupset=self.ShoradGroupSet
@@ -64824,6 +64909,9 @@ Syria=5,
 MarianaIslands=2,
 Falklands=12,
 SinaiMap=5,
+Kola=15,
+Afghanistan=3,
+Iraq=4.4
 }
 ATIS.ICAOPhraseology={
 Caucasus=true,
@@ -64835,85 +64923,88 @@ Syria=true,
 MarianaIslands=true,
 Falklands=true,
 SinaiMap=true,
+Kola=true,
+Afghanistan=true,
+Iraq=true,
 }
 ATIS.Sound={
-ActiveRunway={filename="ActiveRunway.ogg",duration=0.99},
-ActiveRunwayDeparture={filename="ActiveRunwayDeparture.ogg",duration=0.99},
-ActiveRunwayArrival={filename="ActiveRunwayArrival.ogg",duration=0.99},
-AdviceOnInitial={filename="AdviceOnInitial.ogg",duration=3.00},
-Airport={filename="Airport.ogg",duration=0.66},
-Altimeter={filename="Altimeter.ogg",duration=0.68},
-At={filename="At.ogg",duration=0.41},
-CloudBase={filename="CloudBase.ogg",duration=0.82},
-CloudCeiling={filename="CloudCeiling.ogg",duration=0.61},
-CloudsBroken={filename="CloudsBroken.ogg",duration=1.07},
-CloudsFew={filename="CloudsFew.ogg",duration=0.99},
-CloudsNo={filename="CloudsNo.ogg",duration=1.01},
-CloudsNotAvailable={filename="CloudsNotAvailable.ogg",duration=2.35},
-CloudsOvercast={filename="CloudsOvercast.ogg",duration=0.83},
-CloudsScattered={filename="CloudsScattered.ogg",duration=1.18},
-Decimal={filename="Decimal.ogg",duration=0.54},
-DegreesCelsius={filename="DegreesCelsius.ogg",duration=1.27},
-DegreesFahrenheit={filename="DegreesFahrenheit.ogg",duration=1.23},
-DewPoint={filename="DewPoint.ogg",duration=0.65},
-Dust={filename="Dust.ogg",duration=0.54},
-Elevation={filename="Elevation.ogg",duration=0.78},
-EndOfInformation={filename="EndOfInformation.ogg",duration=1.15},
-Feet={filename="Feet.ogg",duration=0.45},
-Fog={filename="Fog.ogg",duration=0.47},
-Gusting={filename="Gusting.ogg",duration=0.55},
-HectoPascal={filename="HectoPascal.ogg",duration=1.15},
-Hundred={filename="Hundred.ogg",duration=0.47},
-InchesOfMercury={filename="InchesOfMercury.ogg",duration=1.16},
-Information={filename="Information.ogg",duration=0.85},
-Kilometers={filename="Kilometers.ogg",duration=0.78},
-Knots={filename="Knots.ogg",duration=0.59},
-Left={filename="Left.ogg",duration=0.54},
-MegaHertz={filename="MegaHertz.ogg",duration=0.87},
-Meters={filename="Meters.ogg",duration=0.59},
-MetersPerSecond={filename="MetersPerSecond.ogg",duration=1.14},
-Miles={filename="Miles.ogg",duration=0.60},
-MillimetersOfMercury={filename="MillimetersOfMercury.ogg",duration=1.53},
-Minus={filename="Minus.ogg",duration=0.64},
-N0={filename="N-0.ogg",duration=0.55},
-N1={filename="N-1.ogg",duration=0.41},
-N2={filename="N-2.ogg",duration=0.37},
-N3={filename="N-3.ogg",duration=0.41},
-N4={filename="N-4.ogg",duration=0.37},
-N5={filename="N-5.ogg",duration=0.43},
-N6={filename="N-6.ogg",duration=0.55},
-N7={filename="N-7.ogg",duration=0.43},
-N8={filename="N-8.ogg",duration=0.38},
-N9={filename="N-9.ogg",duration=0.55},
-NauticalMiles={filename="NauticalMiles.ogg",duration=1.04},
-None={filename="None.ogg",duration=0.43},
-QFE={filename="QFE.ogg",duration=0.63},
-QNH={filename="QNH.ogg",duration=0.71},
-Rain={filename="Rain.ogg",duration=0.41},
-Right={filename="Right.ogg",duration=0.44},
-Snow={filename="Snow.ogg",duration=0.48},
-SnowStorm={filename="SnowStorm.ogg",duration=0.82},
-StatuteMiles={filename="StatuteMiles.ogg",duration=1.15},
-SunriseAt={filename="SunriseAt.ogg",duration=0.92},
-SunsetAt={filename="SunsetAt.ogg",duration=0.95},
-Temperature={filename="Temperature.ogg",duration=0.64},
-Thousand={filename="Thousand.ogg",duration=0.55},
-ThunderStorm={filename="ThunderStorm.ogg",duration=0.81},
-TimeLocal={filename="TimeLocal.ogg",duration=0.90},
-TimeZulu={filename="TimeZulu.ogg",duration=0.86},
-TowerFrequency={filename="TowerFrequency.ogg",duration=1.19},
-Visibilty={filename="Visibility.ogg",duration=0.79},
-WeatherPhenomena={filename="WeatherPhenomena.ogg",duration=1.07},
-WindFrom={filename="WindFrom.ogg",duration=0.60},
+ActiveRunway={filename="ActiveRunway.ogg",duration=0.85},
+ActiveRunwayDeparture={filename="ActiveRunwayDeparture.ogg",duration=1.50},
+ActiveRunwayArrival={filename="ActiveRunwayArrival.ogg",duration=1.38},
+AdviceOnInitial={filename="AdviceOnInitial.ogg",duration=2.98},
+Airport={filename="Airport.ogg",duration=0.55},
+Altimeter={filename="Altimeter.ogg",duration=0.91},
+At={filename="At.ogg",duration=0.32},
+CloudBase={filename="CloudBase.ogg",duration=0.69},
+CloudCeiling={filename="CloudCeiling.ogg",duration=0.53},
+CloudsBroken={filename="CloudsBroken.ogg",duration=0.81},
+CloudsFew={filename="CloudsFew.ogg",duration=0.74},
+CloudsNo={filename="CloudsNo.ogg",duration=0.69},
+CloudsNotAvailable={filename="CloudsNotAvailable.ogg",duration=2.64},
+CloudsOvercast={filename="CloudsOvercast.ogg",duration=0.82},
+CloudsScattered={filename="CloudsScattered.ogg",duration=0.89},
+Decimal={filename="Decimal.ogg",duration=0.71},
+DegreesCelsius={filename="DegreesCelsius.ogg",duration=1.08},
+DegreesFahrenheit={filename="DegreesFahrenheit.ogg",duration=1.07},
+DewPoint={filename="DewPoint.ogg",duration=0.59},
+Dust={filename="Dust.ogg",duration=0.37},
+Elevation={filename="Elevation.ogg",duration=0.92},
+EndOfInformation={filename="EndOfInformation.ogg",duration=1.24},
+Feet={filename="Feet.ogg",duration=0.34},
+Fog={filename="Fog.ogg",duration=0.41},
+Gusting={filename="Gusting.ogg",duration=0.58},
+HectoPascal={filename="HectoPascal.ogg",duration=0.92},
+Hundred={filename="Hundred.ogg",duration=0.53},
 ILSFrequency={filename="ILSFrequency.ogg",duration=1.30},
-InnerNDBFrequency={filename="InnerNDBFrequency.ogg",duration=1.56},
-OuterNDBFrequency={filename="OuterNDBFrequency.ogg",duration=1.59},
-RunwayLength={filename="RunwayLength.ogg",duration=0.91},
-VORFrequency={filename="VORFrequency.ogg",duration=1.38},
-TACANChannel={filename="TACANChannel.ogg",duration=0.88},
-PRMGChannel={filename="PRMGChannel.ogg",duration=1.18},
-RSBNChannel={filename="RSBNChannel.ogg",duration=1.14},
-Zulu={filename="Zulu.ogg",duration=0.62},
+InchesOfMercury={filename="InchesOfMercury.ogg",duration=1.26},
+Information={filename="Information.ogg",duration=0.99},
+InnerNDBFrequency={filename="InnerNDBFrequency.ogg",duration=1.69},
+Kilometers={filename="Kilometers.ogg",duration=0.93},
+Knots={filename="Knots.ogg",duration=0.46},
+Left={filename="Left.ogg",duration=0.41},
+MegaHertz={filename="MegaHertz.ogg",duration=0.83},
+Meters={filename="Meters.ogg",duration=0.55},
+MetersPerSecond={filename="MetersPerSecond.ogg",duration=1.03},
+Miles={filename="Miles.ogg",duration=0.44},
+MillimetersOfMercury={filename="MillimetersOfMercury.ogg",duration=1.59},
+Minus={filename="Minus.ogg",duration=0.55},
+N0={filename="N-0.ogg",duration=0.52},
+N1={filename="N-1.ogg",duration=0.35},
+N2={filename="N-2.ogg",duration=0.41},
+N3={filename="N-3.ogg",duration=0.34},
+N4={filename="N-4.ogg",duration=0.37},
+N5={filename="N-5.ogg",duration=0.40},
+N6={filename="N-6.ogg",duration=0.46},
+N7={filename="N-7.ogg",duration=0.52},
+N8={filename="N-8.ogg",duration=0.36},
+N9={filename="N-9.ogg",duration=0.51},
+NauticalMiles={filename="NauticalMiles.ogg",duration=0.93},
+None={filename="None.ogg",duration=0.33},
+OuterNDBFrequency={filename="OuterNDBFrequency.ogg",duration=1.70},
+PRMGChannel={filename="PRMGChannel.ogg",duration=1.27},
+QFE={filename="QFE.ogg",duration=0.90},
+QNH={filename="QNH.ogg",duration=0.94},
+Rain={filename="Rain.ogg",duration=0.35},
+Right={filename="Right.ogg",duration=0.31},
+RSBNChannel={filename="RSBNChannel.ogg",duration=1.26},
+RunwayLength={filename="RunwayLength.ogg",duration=0.81},
+Snow={filename="Snow.ogg",duration=0.40},
+SnowStorm={filename="SnowStorm.ogg",duration=0.73},
+StatuteMiles={filename="StatuteMiles.ogg",duration=0.90},
+SunriseAt={filename="SunriseAt.ogg",duration=0.82},
+SunsetAt={filename="SunsetAt.ogg",duration=0.87},
+TACANChannel={filename="TACANChannel.ogg",duration=0.81},
+Temperature={filename="Temperature.ogg",duration=0.70},
+Thousand={filename="Thousand.ogg",duration=0.58},
+ThunderStorm={filename="ThunderStorm.ogg",duration=0.79},
+TimeLocal={filename="TimeLocal.ogg",duration=0.83},
+TimeZulu={filename="TimeZulu.ogg",duration=0.83},
+TowerFrequency={filename="TowerFrequency.ogg",duration=1.05},
+Visibilty={filename="Visibility.ogg",duration=1.16},
+VORFrequency={filename="VORFrequency.ogg",duration=1.28},
+WeatherPhenomena={filename="WeatherPhenomena.ogg",duration=1.09},
+WindFrom={filename="WindFrom.ogg",duration=0.63},
+Zulu={filename="Zulu.ogg",duration=0.51},
 }
 ATIS.Messages={
 EN=
@@ -65158,7 +65249,7 @@ DELIMITER="Décimal",
 }
 ATIS.locale="en"
 _ATIS={}
-ATIS.version="1.0.0"
+ATIS.version="1.0.1"
 function ATIS:New(AirbaseName,Frequency,Modulation)
 local self=BASE:Inherit(self,FSM:New())
 self.airbasename=AirbaseName
@@ -65713,33 +65804,31 @@ dewpoint=UTILS.CelsiusToFahrenheit(dewpoint)
 end
 local TEMPERATURE=string.format("%d",math.abs(temperature))
 local DEWPOINT=string.format("%d",math.abs(dewpoint))
-local clouds,visibility,turbulence,fog,dust,static=self:GetMissionWeather()
-if fog and fog.thickness<height+25 then
-fog=nil
-end
-if dust and height+25>UTILS.FeetToMeters(1500)then
-dust=nil
-end
-local visibilitymin=visibility
-if fog then
-if fog.visibility<visibilitymin then
-visibilitymin=fog.visibility
+local clouds,visibility,turbulence,dustdens,static=self:GetMissionWeather()
+local dust=false
+local fog=false
+if dustdens then
+if UTILS.FeetToMeters(1500)>height+25 then
+dust=true
+visibility=math.min(visibility,dustdens)
 end
-end
-if dust then
-if dust<visibilitymin then
-visibilitymin=dust
+else
+local fvis=world.weather.getFogVisibilityDistance()
+local fheight=world.weather.getFogThickness()
+if fvis>0 and fheight>height+25 then
+fog=true
+visibility=math.min(visibility,fvis)
 end
 end
 local VISIBILITY=""
 if self.metric then
-local reportedviz=UTILS.Round(visibilitymin/1000)
+local reportedviz=UTILS.Round(visibility/1000)
 if reportedviz>10 then
 reportedviz=10
 end
 VISIBILITY=string.format("%d",reportedviz)
 else
-local reportedviz=UTILS.Round(UTILS.MetersToSM(visibilitymin))
+local reportedviz=UTILS.Round(UTILS.MetersToSM(visibility))
 if reportedviz>10 then
 reportedviz=10
 end
@@ -66599,18 +66688,13 @@ local dust=nil
 if weather.enable_dust==true then
 dust=weather.dust_density
 end
-local fog=nil
-if weather.enable_fog==true then
-fog=weather.fog
-end
 self:T("FF weather:")
 self:T({clouds=clouds})
 self:T({visibility=visibility})
 self:T({turbulence=turbulence})
-self:T({fog=fog})
 self:T({dust=dust})
 self:T({static=static})
-return clouds,visibility,turbulence,fog,dust,static
+return clouds,visibility,turbulence,dust,static
 end
 function ATIS:_GetThousandsAndHundreds(n)
 local N=UTILS.Round(n/1000,1)
@@ -66999,6 +67083,7 @@ ChinookTroopCircleRadius=5,
 TroopUnloadDistGround=5,
 TroopUnloadDistGroundHerc=25,
 TroopUnloadDistGroundHook=15,
+TroopUnloadDistHoverHook=5,
 TroopUnloadDistHover=1.5,
 UserSetGroup=nil,
 }
@@ -67035,7 +67120,7 @@ CTLD.UnitTypeCapabilities={
 ["OH58D"]={type="OH58D",crates=false,troops=false,cratelimit=0,trooplimit=0,length=14,cargoweightlimit=400},
 ["CH-47Fbl1"]={type="CH-47Fbl1",crates=true,troops=true,cratelimit=4,trooplimit=31,length=20,cargoweightlimit=10800},
 }
-CTLD.version="1.1.18"
+CTLD.version="1.1.20"
 function CTLD:New(Coalition,Prefixes,Alias)
 local self=BASE:Inherit(self,FSM:New())
 BASE:T({Coalition,Prefixes,Alias})
@@ -68450,7 +68535,12 @@ local Angle=(heading+270)%360
 if IsHerc or IsHook then Angle=(heading+180)%360 end
 local offset=hoverunload and self.TroopUnloadDistHover or self.TroopUnloadDistGround
 if IsHerc then offset=self.TroopUnloadDistGroundHerc or 25 end
-if IsHook then offset=self.TroopUnloadDistGroundHook or 15 end
+if IsHook then
+offset=self.TroopUnloadDistGroundHook or 15
+if self.TroopUnloadDistHoverHook then
+offset=self.TroopUnloadDistHoverHook or 5
+end
+end
 randomcoord:Translate(offset,Angle,nil,true)
 end
 local tempcount=0
@@ -69849,6 +69939,20 @@ table.insert(Stock,_troop.Name,_troop.Stock or-1)
 end
 return Stock
 end
+function CTLD:GetLoadedCargo(Unit)
+local Troops=0
+local Crates=0
+local Cargo={}
+if Unit and Unit:IsAlive()then
+local name=Unit:GetName()
+if self.Loaded_Cargo[name]then
+Troops=self.Loaded_Cargo[name].Troopsloaded or 0
+Crates=self.Loaded_Cargo[name].Cratesloaded or 0
+Cargo=self.Loaded_Cargo[name].Cargo or{}
+end
+end
+return Troops,Crates,Cargo
+end
 function CTLD:GetStockStatics()
 local Stock={}
 local gentroops=self.Cargo_Statics

package/package.json

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