@jtff/miztemplate-lib 3.1.8 → 3.1.9

package/lua/lib/skynet-iads-compiled.lua

@@ -1,7 +1,7 @@
-env.info("--- SKYNET VERSION: 3.1.0 | BUILD TIME: 09.02.2023 1925Z ---")
+env.info("--- SKYNET VERSION: 3.3.0 | BUILD TIME: 29.12.2023 2311Z ---")
 do
 --this file contains the required units per sam type
-samTypesDB = {
+samTypesDB = {	
 	['S-200'] = {
         ['type'] = 'complex',
         ['searchRadar'] = {
@@ -47,9 +47,16 @@ samTypesDB = {
 					['NATO'] = 'Big Bird',
 				},
 			},
+			['S-300PS 40B6MD sr_19J6'] = {
+				['name'] = {
+					['NATO'] = 'Tin Shield',
+				},
+			}
 		},
 		['trackingRadar'] = {
 			['S-300PS 40B6M tr'] = {
+			},	
+			['S-300PS 5H63C 30H6_tr'] = {
 			},
 		},
 		['launchers'] = {
@@ -212,16 +219,18 @@ samTypesDB = {
 
 	},	
 	['Roland ADS'] = {
-		['type'] = 'single',
+		['type'] = 'complex',
 		['searchRadar'] = {
-			['Roland ADS'] = {
+			['Roland Radar'] = {
+				['name'] = {
+					['NATO'] = 'Roland EWR',
+				},
 			},
 		},
 		['launchers'] = {
 			['Roland ADS'] = {
 			},
 		},
-
 		['name'] = {
 			['NATO'] = 'Roland ADS',
 		},
@@ -394,8 +403,23 @@ samTypesDB = {
 			['NATO'] = 'CSA-4',
 		},
 		['harm_detection_chance'] = 30
-	},
---- Start of EW radars:
+	},	
+	['Phalanx'] = {
+		['type'] = 'single',
+		['searchRadar'] = {
+			['HEMTT_C-RAM_Phalanx'] = {
+			},
+		},
+		['launchers'] = {
+			['HEMTT_C-RAM_Phalanx'] = {
+			},
+		},
+		['name'] = {
+			['NATO'] = 'Phalanx',
+		},
+		['harm_detection_chance'] = 10
+	},	
+-- Start of RED EW radars:	
 	['1L13 EWR'] = {
 		['type'] = 'ewr',
 		['searchRadar'] = {
@@ -429,18 +453,29 @@ samTypesDB = {
 		},
 		['harm_detection_chance'] = 20
 	},
-	['Roland Radar'] = {
+-- Start of BLUE EW radars:
+	['FPS-117 Dome'] = {
 		['type'] = 'ewr',
 		['searchRadar'] = {
-			['Roland Radar'] = {
+			['FPS-117 Dome'] = {
 				['name'] = {
-					['NATO'] = 'Roland EWR',
+					['NATO'] = 'FPS-117 Dome',
 				},
 			},
 		},
-
-		['harm_detection_chance'] = 60
-	},	
+		['harm_detection_chance'] = 80
+	},
+	['FPS-117'] = {
+		['type'] = 'ewr',
+		['searchRadar'] = {
+			['FPS-117'] = {
+				['name'] = {
+					['NATO'] = 'FPS-117',
+				},
+			},
+		},
+		['harm_detection_chance'] = 80
+	}
 }
 end
 do
@@ -745,17 +780,6 @@ samTypesDB['S-300PMU2'] = {
 		},
 		['S-300PMU1 40B6MD sr'] = s300PMU140B6MDsr,
 		['S-300PMU1 64N6E sr'] = s300PMU164N6Esr,
-		
-		['S-300PS 40B6MD sr'] = {
-			['name'] = {
-				['NATO'] = '',
-			},
-		},		
-		['S-300PS 64H6E sr'] = {
-			['name'] = {
-				['NATO'] = '',
-			},
-		},
 	},
 	['trackingRadar'] = {
 		['S-300PMU2 92H6E tr'] = {
@@ -1170,9 +1194,17 @@ function SkynetIADS:create(name)
 		iads.name = ""
 	end
 	iads.contactUpdateInterval = 5
+	world.addEventHandler(iads)
 	return iads
 end
 
+function SkynetIADS:onEvent(event)
+	if (event.id == world.event.S_EVENT_BIRTH ) then
+		env.info("New Object Spawned")
+	--	self:addSAMSite(event.initiator:getGroup():getName());
+	end
+end
+
 function SkynetIADS:setUpdateInterval(interval)
 	self.contactUpdateInterval = interval
 end
@@ -1305,7 +1337,7 @@ function SkynetIADS:addSAMSitesByPrefix(prefix)
 		if pos and pos == 1 then
 			--mist returns groups, units and, StaticObjects
 			local dcsObject = Group.getByName(groupName)
-			if dcsObject then
+			if dcsObject and dcsObject:getUnits()[1]:isActive() then
 				self:addSAMSite(groupName)
 			end
 		end
@@ -1876,7 +1908,10 @@ end
 function SkynetIADSAbstractDCSObjectWrapper:setDCSRepresentation(representation)
 	self.dcsRepresentation = representation
 	if self.dcsRepresentation then
-		self.dcsName = self:getDCSRepresentation():getName()
+		self.dcsName = self.dcsRepresentation:getName()
+		if (self.dcsName == nil or string.len(self.dcsName) == 0) and self.dcsRepresentation.id_ then
+			self.dcsName = self.dcsRepresentation.id_
+		end
 	end
 end
 
@@ -2633,6 +2668,7 @@ function SkynetIADSAbstractRadarElement:goLive()
 	then
 		if self:isDestroyed() == false then
 			local  cont = self:getController()
+			cont:setOnOff(true)
 			cont:setOption(AI.Option.Ground.id.ALARM_STATE, AI.Option.Ground.val.ALARM_STATE.RED)	
 			cont:setOption(AI.Option.Air.id.ROE, AI.Option.Air.val.ROE.WEAPON_FREE)
 			self:getDCSRepresentation():enableEmission(true)
@@ -2665,9 +2701,15 @@ function SkynetIADSAbstractRadarElement:goDark()
 		-- point defence will only go live if the Radar Emitting site it is protecting goes dark and this is due to a it defending against a HARM
 		if (self.harmSilenceID ~= nil) then
 			self:pointDefencesGoLive()
+			if self:isDestroyed() == false then
+				--if site goes dark due to HARM we turn off AI, this is due to a bug in DCS multiplayer where the harm will find its way to the radar emitter if just setEmissions is set to false
+				local controller = self:getController()
+				controller:setOnOff(false)
+			end
 		end
 		self.aiState = false
 		self:stopScanningForHARMs()
+		self.cachedTargets = {}
 		if self.iads:getDebugSettings().radarWentDark then
 			self.iads:printOutputToLog("GOING DARK: "..self:getDescription())
 		end
@@ -2910,22 +2952,24 @@ function SkynetIADSAbstractRadarElement:informOfHARM(harmContact)
 	local radars = self:getRadars()
 		for j = 1, #radars do
 			local radar = radars[j]
-			local distanceNM =  mist.utils.metersToNM(self:getDistanceInMetersToContact(radar, harmContact:getPosition().p))
-			local harmToSAMHeading = mist.utils.toDegree(mist.utils.getHeadingPoints(harmContact:getPosition().p, radar:getPosition().p))
-			local harmToSAMAspect = self:calculateAspectInDegrees(harmContact:getMagneticHeading(), harmToSAMHeading)
-			local speedKT = harmContact:getGroundSpeedInKnots(0)
-			local secondsToImpact = self:getSecondsToImpact(distanceNM, speedKT)
-			--TODO: use tti instead of distanceNM?
-			-- when iterating through the radars, store shortest tti and work with that value??
-			if ( harmToSAMAspect < SkynetIADSAbstractRadarElement.HARM_TO_SAM_ASPECT and distanceNM < SkynetIADSAbstractRadarElement.HARM_LOOKAHEAD_NM ) then
-				self:addObjectIdentifiedAsHARM(harmContact)
-				if ( #self:getPointDefences() > 0 and self:pointDefencesGoLive() == true and self.iads:getDebugSettings().harmDefence ) then
-						self.iads:printOutputToLog("POINT DEFENCES GOING LIVE FOR: "..self:getDCSName().." | TTI: "..secondsToImpact)
-				end
-				--self.iads:printOutputToLog("Ignore HARM shutdown: "..tostring(self:shallIgnoreHARMShutdown()))
-				if ( self:getIsAPointDefence() == false and ( self:isDefendingHARM() == false or ( self:getHARMShutdownTime() < secondsToImpact ) ) and self:shallIgnoreHARMShutdown() == false) then
-					self:goSilentToEvadeHARM(secondsToImpact)
-					break
+			if radar:isExist() then
+				local distanceNM =  mist.utils.metersToNM(self:getDistanceInMetersToContact(radar, harmContact:getPosition().p))
+				local harmToSAMHeading = mist.utils.toDegree(mist.utils.getHeadingPoints(harmContact:getPosition().p, radar:getPosition().p))
+				local harmToSAMAspect = self:calculateAspectInDegrees(harmContact:getMagneticHeading(), harmToSAMHeading)
+				local speedKT = harmContact:getGroundSpeedInKnots(0)
+				local secondsToImpact = self:getSecondsToImpact(distanceNM, speedKT)
+				--TODO: use tti instead of distanceNM?
+				-- when iterating through the radars, store shortest tti and work with that value??
+				if ( harmToSAMAspect < SkynetIADSAbstractRadarElement.HARM_TO_SAM_ASPECT and distanceNM < SkynetIADSAbstractRadarElement.HARM_LOOKAHEAD_NM ) then
+					self:addObjectIdentifiedAsHARM(harmContact)
+					if ( #self:getPointDefences() > 0 and self:pointDefencesGoLive() == true and self.iads:getDebugSettings().harmDefence ) then
+							self.iads:printOutputToLog("POINT DEFENCES GOING LIVE FOR: "..self:getDCSName().." | TTI: "..secondsToImpact)
+					end
+					--self.iads:printOutputToLog("Ignore HARM shutdown: "..tostring(self:shallIgnoreHARMShutdown()))
+					if ( self:getIsAPointDefence() == false and ( self:isDefendingHARM() == false or ( self:getHARMShutdownTime() < secondsToImpact ) ) and self:shallIgnoreHARMShutdown() == false) then
+						self:goSilentToEvadeHARM(secondsToImpact)
+						break
+					end
 				end
 			end
 		end
@@ -3131,9 +3175,11 @@ function SkynetIADSContact:getTypeName()
 	if self:isIdentifiedAsHARM() then
 		return SkynetIADSContact.HARM
 	end
-	local category = self:getDCSRepresentation():getCategory()
-	if category == Object.Category.UNIT then
-		return self.typeName
+	if self:getDCSRepresentation() ~= nil then
+		local category = self:getDCSRepresentation():getCategory()
+		if category == Object.Category.UNIT then
+			return self.typeName
+		end
 	end
 	return "UNKNOWN"
 end
@@ -3797,31 +3843,31 @@ function SkynetIADSHARMDetection:cleanAgedContacts()
 end
 
 function SkynetIADSHARMDetection:getNewRadarsThatHaveDetectedContact(contact)
-	local newRadars = contact:getAbstractRadarElementsDetected()
-	local radars = self.contactRadarsEvaluated[contact]
-	if radars then
-		newRadars = {}
-		local contactRadars = contact:getAbstractRadarElementsDetected()
-		for i = 1, #contactRadars do
-			local contactRadar = contactRadars[i]
-			local newRadar = self:isElementInTable(radars, contactRadar)
-			if newRadar ~= nil then
-				table.insert(newRadars, newRadar)
-			end
+	local radarsFromContact = contact:getAbstractRadarElementsDetected()
+	local evaluatedRadars = self.contactRadarsEvaluated[contact]
+	local newRadars = {}
+	if evaluatedRadars == nil then
+		evaluatedRadars = {}
+		self.contactRadarsEvaluated[contact] = evaluatedRadars
+	end
+	for i = 1, #radarsFromContact do
+		local contactRadar = radarsFromContact[i]
+		if self:isElementInTable(evaluatedRadars, contactRadar) == false then
+			table.insert(evaluatedRadars, contactRadar)
+			table.insert(newRadars, contactRadar)
 		end
 	end
-	self.contactRadarsEvaluated[contact] = contact:getAbstractRadarElementsDetected()
 	return newRadars
 end
 
 function SkynetIADSHARMDetection:isElementInTable(tbl, element)
 	for i = 1, #tbl do
-		tblElement = tbl[i]
+		local tblElement = tbl[i]
 		if tblElement == element then
-			return nil
+			return true
 		end
 	end
-	return element
+	return false
 end
 
 function SkynetIADSHARMDetection:informRadarsOfHARM(contact)

package/lua/src/020-mission_functions.lua

@@ -9,7 +9,7 @@
 env.info('JTFF-SHAREDLIB: shared library loading...')
 
 DEBUG_MSG = false
-DEBUG_SQ_MSG = false
+DEBUG_SC_MSG = false
 DEBUG_DETECT_MSG = false
 
 use_jtff_sound_mod = false
@@ -36,13 +36,13 @@ end
 
 function debug_detection_msg(message)
     if DEBUG_DETECT_MSG then
-        env.info(string.format("[DETECTION] %s", message))
+        env.info(string.format("[DEBUG DETECTION] %s", message))
     end
 end
 
-function debug_squeduler_msg(message)
-    if DEBUG_SQ_MSG then
-        env.info(string.format("[DEBUG SQ] %s", message))
+function debug_scheduler_msg(message)
+    if DEBUG_SC_MSG then
+        env.info(string.format("[DEBUG SCHEDULER] %s", message))
     end
 end
 

package/lua/src/130-airboss.lua

@@ -4,41 +4,32 @@
 function detectShitHotBreak(objAirboss)
     local clientData={}
     local player_name=""
-    --env.info('detectShitHotBreak : '.. objAirboss.customconfig.alias..' suspense ...')
-    objAirboss.CVNClients:ForEachClientInZone( objAirboss.CVN_GROUPZone,
+    debug_msg('detectShitHotBreak : '.. objAirboss.customconfig.alias .. ' has ' .. objAirboss.CVNClients:Count()..' clients in Set ...')
+    objAirboss.CVNClients:ForEachClientInZone( objAirboss.CVN_UNITZone,
             function( MooseClient )
 
-                local function resetFlag()
+                local function resetFlag(userflag)
                     --trigger.action.outText('RESET SH Pass FLAG)', 5 )
-                    client_in_zone_flag:Set(0)
+                    userflag:Set(0)
                 end
 
                 local player_velocity = MooseClient:GetVelocityKNOTS()
                 local player_name = MooseClient:GetPlayerName()
-                local player_alt = MooseClient:GetAltitude()
                 local player_type = MooseClient:GetTypeName()
-
-                local player_alt_feet = math.floor((player_alt * ( 3.28 / 10)))*10
-
-                local player_velocity_round = math.floor((player_velocity/10))*10
+                local player_fuel = MooseClient:GetFuel()
+                local player_alt_feet = UTILS.MetersToFeet(MooseClient:GetAltitude())
+                --trigger.action.outText('ForEachClientInZone: MooseClient name is '..player_name , 5)
 
                 local Play_SH_Sound = USERSOUND:New( soundFilesPrefix .. "AIRBOSS/Airboss Soundfiles/GreatBallsOfFire.ogg" )
-                --trigger.action.outText(player_name..' altitude is '..player_alt, 5)
+                --trigger.action.outText(player_name..' altitude is '..player_alt_feet..' feet', 5)
                 --trigger.action.outText(player_name..' speed is '..player_velocity, 5)
-                if client_in_zone_flag == nil then
-                    client_in_zone_flag = USERFLAG:New(MooseClient:GetClientGroupID() + 10000000)
-                else
-                end
+                local client_in_zone_flag = USERFLAG:New(MooseClient:GetUCID())
+                local client_performing_sh = USERFLAG:New(MooseClient:GetUCID()..'_sh')
 
-                if client_performing_sh == nil then
-                    client_performing_sh = USERFLAG:New(MooseClient:GetClientGroupID() + 100000000)
-                else
-                end
-
-                if client_in_zone_flag:Get() == 0 and player_velocity > 475 and player_alt < 213 then
-                    -- Requirements for Shit Hot break are velocity >475 knots and less than 213 meters (700')
-                    --trigger.action.outText(player_name..' performing a Sierra Hotel Break!', 10)
-                    local sh_message_to_discord = ('**'..player_name..' is performing a Sierra Hotel Break at '..player_velocity_round..' knots and '..player_alt_feet..' feet!**')
+                if client_in_zone_flag:Get() == 0 and player_velocity > 475 and player_alt_feet < 700 then
+                    -- 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({
                         command="moose_text",
                         text=sh_message_to_discord,
@@ -47,12 +38,12 @@ function detectShitHotBreak(objAirboss)
                     Play_SH_Sound:ToAll()
                     client_in_zone_flag:Set(1)
                     client_performing_sh:Set(1)
-                    timer.scheduleFunction(resetFlag, {}, timer.getTime() + 10)
+                    timer.scheduleFunction(resetFlag, {client_in_zone_flag}, timer.getTime() + 10)
                 else
                 end
 
-                --trigger.action.outText('ForEachClientInZone: Client name is '..clientData.clientName , 5)
-                --trigger.action.outText('ForEachClientInZone: Client fuel1 is '..clientData.clientFuel1 , 5)
+                --trigger.action.outText('ForEachClientInZone: Client name is '..player_name , 5)
+                --trigger.action.outText('ForEachClientInZone: Client fuel is '..player_fuel , 5)
 
             end
     )
@@ -68,7 +59,7 @@ function switchCarrierDefCon2(params)
     SCHEDULER:New(
             nil,
             function(carrierName)
-                debug_squeduler_msg(carrierName .. " switchback to DEFCON 4")
+                debug_scheduler_msg(carrierName .. " switchback to DEFCON 4")
                 debug_msg(string.format("CSG : %s DEFCON 4 -> ROE = %d", carrierName, ENUMS.ROE.ReturnFire))
                 UNIT:FindByName(carrierName):GetGroup():OptionROE(ENUMS.ROE.ReturnFire):OptionAlarmStateRed()
             end,
@@ -343,25 +334,25 @@ for index, airbossconfig in ipairs(AirBossConfig) do
             local player_wire = playerData.wire
 
             player_name = player_name:gsub('[%p]', '')
-            local client_performing_sh = USERFLAG:New(UNIT:FindByName(unit_name):GetClient():GetClientGroupID() + 100000000)
+            local client_performing_sh = USERFLAG:New(UNIT:FindByName(unit_name):GetClient():GetUCID()..'_sh')
             --local gradeForFile
             if  string_grade == "_OK_" then
                 --if  string_grade == "_OK_" and player_wire == "3" and player_Tgroove >=15 and player_Tgroove <19 then
                 timer.scheduleFunction(
                         function()
-                            trigger.action.outSound("Airboss Soundfiles/ffyrtp.ogg")
+                            trigger.action.outSound("AIRBOSS/Airboss Soundfiles/ffyrtp.ogg")
                         end,
                         {},
                         timer.getTime() + 5
                 )
                 if client_performing_sh:Get() == 1 then
                     myGrade.grade = "_OK_<SH>"
-                    myGrade.points = myGrade.points
+                    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 Soundfiles/sureshot.ogg")
+                                trigger.action.outSound("AIRBOSS/Airboss Soundfiles/sureshot.ogg")
                             end,
                             {},
                             timer.getTime() + 5
@@ -373,7 +364,7 @@ for index, airbossconfig in ipairs(AirBossConfig) do
             elseif string_grade == "OK" and player_wire >1 then
                 if client_performing_sh:Get() == 1 then
                     myGrade.grade = "OK<SH>"
-                    myGrade.points = myGrade.points + 0.5
+                    myGrade.points = myGrade.points + 1.00
                     client_performing_sh:Set(0)
                     self:SetTrapSheet(self.trappath, "SH_AIRBOSS-trapsheet-"..player_name)
                 else
@@ -415,6 +406,13 @@ for index, airbossconfig in ipairs(AirBossConfig) do
                     text=onewire_to_discord,
                     msg_type='lso'
                 })
+                timer.scheduleFunction(
+                        function()
+                            trigger.action.outSound("AIRBOSS/Airboss Soundfiles/GetYourButtsUptoVipersOffice.ogg")
+                        end,
+                        {},
+                        timer.getTime() + 5
+                )
             end
             self:_SaveTrapSheet(playerData, myGrade)
 
@@ -546,12 +544,13 @@ for index, airbossconfig in ipairs(AirBossConfig) do
 
         AIRBOSSArray[compteur] = objAirboss
         AIRBOSSArray[compteur]:Start()
-        AIRBOSSArray[compteur].CVN_GROUPZone = ZONE_GROUP:New(
-                'cvnGroupZone-'..AIRBOSSArray[compteur].customconfig.alias,
-                AIRBOSSArray[compteur].carrier:GetGroup(),
+        AIRBOSSArray[compteur].CVN_UNITZone = ZONE_UNIT:New(
+                'cvnUnitZone-'..AIRBOSSArray[compteur].customconfig.alias,
+                AIRBOSSArray[compteur].carrier,
                 1111)
         AIRBOSSArray[compteur].CVNClients = SET_CLIENT:New()
-                                                      :FilterCoalitions(UTILS.GetCoalitionName(AIRBOSSArray[compteur].customconfig.coalition))
+                                                      :FilterActive()
+                                                      :FilterCoalitions(string.lower(UTILS.GetCoalitionName(objAirboss.customconfig.coalition)))
                                                       :FilterStart()
         local myscheduler
         local myschedulerID

package/package.json

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

package/scripts/inject-scripts.js

@@ -408,8 +408,8 @@ async function doInject(ciObject, sourceMizFileName, workspacePath,destinationMi
     // injection des CTLD dans la file d'attente
     if ((/^y\b|o\b|yes\b|oui\b/i).test(promptResult.inject_Logistics)) {
         // injection des fichiers son CTLD
-        await ciObject.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'CTLD');
-        await ciObject.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'CTLD', true);
+        await ciObject.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'CTLD CSAR');
+        await ciObject.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'CTLD CSAR', true);
         settingsArray.push(
             {
                 file: "settings-logistics.lua",