@jtff/miztemplate-lib 3.7.6 → 3.7.8

package/lua/src/020-mission_functions.lua

@@ -434,12 +434,24 @@ function deleteSubRangeUnits(param)
     local subRangeConfig = param[3]
     local radioCommandSubRange = param[4]
     local blnMute = param[5]
-    for i = 1, #groupsToSpawn do
-        destroyGroup(groupsToSpawn[i])
-    end
-
     local subRangeName = subRangeConfig.name
     local staticsToDelete = subRangeConfig.staticsToSpawn
+    if (subRangeConfig.groupsToSpawn ~= nil) then
+        for i = 1, #groupsToSpawn do
+            destroyGroup(groupsToSpawn[i])
+        end
+    else
+        jtff_log.warn(string.format("No Groups in %s", subRangeName), "RANGE")
+    end
+    if (subRangeConfig.randomGroupsToSpawn ~= nil) then
+        local groupsToDestroy = subRangeConfig.randomGroupsToSpawn
+        for i = 1, #groupsToDestroy do
+            destroyGroup(subRangeConfig.randomGroupsToSpawn[i])
+        end
+    else
+        jtff_log.warn(string.format("No random*W Groups in %s", subRangeName), "RANGE")
+    end
+
     if (staticsToDelete ~= nil)then
         destroyStatics(staticsToDelete, subRangeName)
     else
@@ -715,8 +727,8 @@ end
 function markGroupOnMap(param)
     local groupsToSpawn = param[1]
     local side = param[2]
-    for i = 2, #groupsToSpawn do
-        local group_name = string.format("%s", groupsToSpawn[i])
+    for index = 1, #groupsToSpawn do
+        local group_name = string.format("%s", groupsToSpawn[index])
         jtff_log.info(string.format("Mark on map all groups with name prefix %s", group_name),"MARK")
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
@@ -844,6 +856,8 @@ function SpawnRanges(param)
     local subRangeConfig = param[3]
     local subRangeName = subRangeConfig.name
     local groupsToSpawn = subRangeConfig.groupsToSpawn
+    local randomGroupsToSpawn = subRangeConfig.randomGroupsToSpawn
+    local nbRandomGroupsToSpawn = subRangeConfig.nbRandomGroupsToSpawn or 1
     local staticsToSpawn = subRangeConfig.staticsToSpawn
     local holdFire = subRangeConfig.holdFire
     local engageAirWeapons = subRangeConfig.engageAirWeapons
@@ -851,7 +865,7 @@ function SpawnRanges(param)
     local redAlert = subRangeConfig.redAlert
 
     jtff_log.info(string.format("SpawnRanges : Range %s - Targets %s", rangeName, subRangeName),"RANGE")
-    if (staticsToSpawn ~= nil)then
+    if (staticsToSpawn ~= nil) then
         for index, staticToSpawn in ipairs(staticsToSpawn) do
             local spawnStatic = nil
             if (staticToSpawn.name ~= nil) then
@@ -910,46 +924,107 @@ function SpawnRanges(param)
         jtff_log.warn(string.format("No static in %s", subRangeName),"RANGE")
     end
 
-    for i = 1, #groupsToSpawn do
-        local groupNameToSpawn = string.format("%s", groupsToSpawn[i])
-        if (GROUP:FindByName(groupNameToSpawn) ~= nil) then
-            local spawnGroup = SPAWN:New(groupNameToSpawn)
-            jtff_log.info(string.format("SPAWN %s", groupNameToSpawn), "RANGE")
-            local groupSpawning
-            if (subRangeConfig.spawnZone) then
-                groupSpawning = spawnGroup:SpawnInZone(ZONE:New(subRangeConfig.spawnZone),true)
-            else
-                groupSpawning = spawnGroup:Spawn()
+    if (randomGroupsToSpawn ~= nil) then
+        local availableRandomGroupsList = randomGroupsToSpawn
+        nbRandomGroupsToSpawn = math.min(nbRandomGroupsToSpawn,#availableRandomGroupsList)
+        --math.randomseed(os.time())
+        for i = 1, nbRandomGroupsToSpawn do
+            local randomIndex = math.random(1, #availableRandomGroupsList)
+            local groupNameToSpawn = string.format("%s", availableRandomGroupsList[randomIndex])
+            local finalList = {}
+            for index, value in ipairs(availableRandomGroupsList) do
+                if index ~= randomIndex then
+                    table.insert(finalList, value)
+                end
             end
-            if (holdFire) then
-                groupSpawning:OptionROEHoldFire()
+            availableRandomGroupsList = finalList
+
+            if (GROUP:FindByName(groupNameToSpawn) ~= nil) then
+                local spawnGroup = SPAWN:New(groupNameToSpawn)
+                jtff_log.info(string.format("SPAWN %s", groupNameToSpawn), "RANGE")
+                local groupSpawning
+                if (subRangeConfig.spawnZone) then
+                    groupSpawning = spawnGroup:SpawnInZone(ZONE:New(subRangeConfig.spawnZone),true)
+                else
+                    groupSpawning = spawnGroup:Spawn()
+                end
+                markGroupOnMap({{groupNameToSpawn}, rangeConfig.benefit_coalition})
+                if (holdFire) then
+                    groupSpawning:OptionROEHoldFire()
+                else
+                    groupSpawning:OptionROEOpenFire()
+                end
+                if (engageAirWeapons) then
+                    groupSpawning:SetOption(AI.Option.Ground.id.ENGAGE_AIR_WEAPONS, true)
+                end
+                if (activateAI == true or activateAI == false) then
+                    groupSpawning:SetAIOnOff(activateAI)
+                end
+                if (redAlert == true or redAlert == false) then
+                    if (redAlert == true) then
+                        groupSpawning:OptionAlarmStateRed()
+                    else
+                        groupSpawning:OptionAlarmStateGreen()
+                    end
+                else
+                    groupSpawning:OptionAlarmStateAuto()
+                end
+                if (string.find(groupNameToSpawn, "SAM") ~= nil) then
+                    sead:UpdateSet(groupNameToSpawn)
+                    jtff_log.info(string.format("SEAD for %s", groupNameToSpawn),"RANGE")
+                end
             else
-                groupSpawning:OptionROEOpenFire()
+                jtff_log.error(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn),"RANGE")
             end
-            if (engageAirWeapons) then
-                groupSpawning:SetOption(AI.Option.Ground.id.ENGAGE_AIR_WEAPONS, true)
-            end
-            if (activateAI == true or activateAI == false) then
-                groupSpawning:SetAIOnOff(activateAI)
-            end
-            if (redAlert == true or redAlert == false) then
-                if (redAlert == true) then
-                    groupSpawning:OptionAlarmStateRed()
+        end
+    end
+
+    if (groupsToSpawn ~= nil) then
+        for i = 1, #groupsToSpawn do
+            local groupNameToSpawn = string.format("%s", groupsToSpawn[i])
+            if (GROUP:FindByName(groupNameToSpawn) ~= nil) then
+                local spawnGroup = SPAWN:New(groupNameToSpawn)
+                jtff_log.info(string.format("SPAWN %s", groupNameToSpawn), "RANGE")
+                local groupSpawning
+                if (subRangeConfig.spawnZone) then
+                    groupSpawning = spawnGroup:SpawnInZone(ZONE:New(subRangeConfig.spawnZone),true)
+                else
+                    groupSpawning = spawnGroup:Spawn()
+                end
+                if (holdFire) then
+                    groupSpawning:OptionROEHoldFire()
+                else
+                    groupSpawning:OptionROEOpenFire()
+                end
+                if (engageAirWeapons) then
+                    groupSpawning:SetOption(AI.Option.Ground.id.ENGAGE_AIR_WEAPONS, true)
+                end
+                if (activateAI == true or activateAI == false) then
+                    groupSpawning:SetAIOnOff(activateAI)
+                end
+                if (redAlert == true or redAlert == false) then
+                    if (redAlert == true) then
+                        groupSpawning:OptionAlarmStateRed()
+                    else
+                        groupSpawning:OptionAlarmStateGreen()
+                    end
                 else
-                    groupSpawning:OptionAlarmStateGreen()
+                    groupSpawning:OptionAlarmStateAuto()
+                end
+                if (string.find(groupNameToSpawn, "SAM") ~= nil) then
+                    sead:UpdateSet(groupNameToSpawn)
+                    jtff_log.info(string.format("SEAD for %s", groupNameToSpawn),"RANGE")
                 end
             else
-                groupSpawning:OptionAlarmStateAuto()
-            end
-            if (string.find(groupNameToSpawn, "SAM") ~= nil) then
-                sead:UpdateSet(groupNameToSpawn)
-                jtff_log.info(string.format("SEAD for %s", groupNameToSpawn),"RANGE")
+                jtff_log.error(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn),"RANGE")
             end
-        else
-            jtff_log.error(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn),"RANGE")
         end
+        markGroupOnMap({groupsToSpawn, rangeConfig.benefit_coalition})
+    else
+        jtff_log.warn(string.format("No GROUP to spawn in subRange %s settings !",subRangeName),"RANGE")
     end
 
+
     radioCommandSubRange:RemoveSubMenus()
     local CommandZoneDetroy = MENU_COALITION_COMMAND:New(rangeConfig.benefit_coalition, "Delete", radioCommandSubRange,
             deleteSubRangeUnits, {groupsToSpawn, rangeConfig, subRangeConfig, radioCommandSubRange, true})
@@ -982,7 +1057,6 @@ function SpawnRanges(param)
             radioCommandSubRange, giveListOfUnitsAliveInGroup, {groupsToSpawn, rangeConfig.benefit_coalition, 5})
     MESSAGE:NewType(string.format("Units in range %s(%s) in place", rangeName, subRangeName), MESSAGE.Type.Information)
            :ToCoalition(rangeConfig.benefit_coalition)
-    markGroupOnMap({groupsToSpawn, rangeConfig.benefit_coalition})
 end
 
 function SpawnFacRangesDelay(param)

package/lua/src/130-airboss.lua

@@ -99,20 +99,27 @@ function getCaseTypeFromWeather(CVNCoordinates, recovery_start, recovery_stop)
     end
     local weather = env.mission.weather
     local clouds = weather.clouds
-    -- local static = weather.atmosphere_type == 0
+    local static = weather.atmosphere_type == 0
     local visibility = weather.visibility.distance
-    -- local turbulence = weather.groundTurbulence
+    local turbulence = weather.groundTurbulence
     local dust = nil
     if weather.enable_dust == true then
         dust = weather.dust_density
+    else
+        dust = 0
     end
     local fog = nil
     if weather.enable_fog == true then
         fog = weather.fog
+    else
+        fog = {
+            thickness = 0,
+            visibility = 0,
+        }
     end
 
-    -- jtff_log.trace(string.format("visibility : %i | cloud : base %i density %i | fog %i,%i | dust %i", visibility, clouds.base, clouds.density, fog.thickness, fog.visibility, dust),"AIRBOSS")
-    local minVisibility = visibility
+    jtff_log.info(string.format("visibility : %i | cloud : base %i density %i | fog %i,%i | dust %i | precpt: %i", visibility, clouds.base, clouds.density, fog.thickness, fog.visibility, dust, clouds.iprecptns),"AIRBOSS")
+    local minVisibility = (clouds.iprecptns >= 2) and math.floor(visibility/2) or visibility
     if (weather.enable_fog and fog.thickness > 0) then
         minVisibility = math.min(minVisibility,fog.visibility)
     end
@@ -137,23 +144,28 @@ function getCaseTypeFromWeather(CVNCoordinates, recovery_start, recovery_stop)
     end
 end
 
-function startRecoveryOnDemand(objAirboss)
-    local effectiveeventcase = getCaseTypeFromWeather(
-            objAirboss:GetCoordinate(),
-            UTILS.Round(timer.getAbsTime() + 5 *60,0),
-            UTILS.Round(timer.getAbsTime() + ((objAirboss.customconfig.recoveryops.ondemand.recovery_duration_minutes or 30) * 60),0)
-    )
-    if effectiveeventcase == 1 then
-        objAirboss:MessageToMarshal('Good visibility : Case I', objAirboss.customconfig.alias, "", 45, false, 0)
-        objAirboss:SetMaxSectionSize(4)
-    elseif effectiveeventcase == 2 then
-        objAirboss:MessageToMarshal('Bad visibility in altitude : Case II', objAirboss.customconfig.alias, "", 45, false, 0)
-        objAirboss:SetMaxSectionSize(2)
-    elseif effectiveeventcase == 3 then
-        objAirboss:MessageToMarshal('Bad visibility : Case III', objAirboss.customconfig.alias, "", 45, false, 0)
-        objAirboss:SetMaxSectionSize(1)
+function startRecoveryOnDemand(objAirboss, forced_eventcase)
+    local effectiveeventcase
+    if (forced_eventcase) then
+        effectiveeventcase = forced_eventcase
     else
-        objAirboss:SetMaxSectionSize(1)
+        effectiveeventcase = getCaseTypeFromWeather(
+                objAirboss:GetCoordinate(),
+                UTILS.Round(timer.getAbsTime() + 5 *60,0),
+                UTILS.Round(timer.getAbsTime() + ((objAirboss.customconfig.recoveryops.ondemand.recovery_duration_minutes or 30) * 60),0)
+        )
+        if effectiveeventcase == 1 then
+            objAirboss:MessageToMarshal('Good visibility : Case I', objAirboss.customconfig.alias, "", 45, false, 0)
+            objAirboss:SetMaxSectionSize(4)
+        elseif effectiveeventcase == 2 then
+            objAirboss:MessageToMarshal('Bad visibility in altitude : Case II', objAirboss.customconfig.alias, "", 45, false, 0)
+            objAirboss:SetMaxSectionSize(2)
+        elseif effectiveeventcase == 3 then
+            objAirboss:MessageToMarshal('Bad visibility : Case III', objAirboss.customconfig.alias, "", 45, false, 0)
+            objAirboss:SetMaxSectionSize(1)
+        else
+            objAirboss:SetMaxSectionSize(1)
+        end
     end
     objAirboss:AddRecoveryWindow(
             UTILS.SecondsToClock(timer.getAbsTime() + 10 * 60, false, false),
@@ -481,7 +493,7 @@ function flexDeck3SpawnLayout(objAirboss)
             ["type"] = "EA_6B",
         },
         {
-            ["livery_id"] = "vfa-87",
+            ["livery_id"] = "JTFF VFA-83 Line",
             ["category"] = "Planes",
             ["offsets"] =
             {
@@ -613,7 +625,7 @@ function flexDeck7SpawnLayout(objAirboss)
     spawnDeckLayout_Zone(objAirboss, "Point", pointLayout)
     local cat1Layout = {
         {
-            ["livery_id"] = "VFA-87",
+            ["livery_id"] = "JTFF VFA-83 Line",
             ["category"] = "Planes",
             ["offsets"] =
             {
@@ -624,7 +636,7 @@ function flexDeck7SpawnLayout(objAirboss)
             ["type"] = "FA-18C_hornet",
         },
         {
-            ["livery_id"] = "VFA-87",
+            ["livery_id"] = "JTFF VFA-83 Line",
             ["category"] = "Planes",
             ["offsets"] =
             {
@@ -635,7 +647,7 @@ function flexDeck7SpawnLayout(objAirboss)
             ["type"] = "FA-18C_hornet",
         },
         {
-            ["livery_id"] = "VFA-87",
+            ["livery_id"] = "JTFF VFA-83 Line",
             ["category"] = "Planes",
             ["offsets"] =
             {
@@ -740,7 +752,7 @@ function flexDeck7SpawnLayout(objAirboss)
             ["type"] = "FA-18C_hornet",
         },
         {
-            ["livery_id"] = "VFA-87",
+            ["livery_id"] = "JTFF VFA-83 Line",
             ["category"] = "Planes",
             ["offsets"] =
             {
@@ -1014,6 +1026,13 @@ function launchDeck1SpawnLayout(objAirboss)
     spawnDeckLayout_Zone(objAirboss, "Stern", sternLayout)
 end
 
+function resetAirbossDeck(objAirboss, delay)
+    local delay_second = delay or 5
+    jtff_log.info(string.format("reset all Deck Operations, closing the Deck on %s in %i seconds",objAirboss.customconfig.alias, delay_second),"AIRBOSS")
+    objAirboss:CloseCurrentRecoveryWindow(delay_second)
+    objAirboss:DeleteAllRecoveryWindows(delay_second+1)
+end
+
 AIRBOSSArray = {}
 compteur = 0
 MenuCoalitionCSGCommandsBlue = MENU_COALITION:New(coalition.side.BLUE, "CSG Commands", MenuCoalitionBlue)
@@ -1126,7 +1145,38 @@ for index, airbossconfig in ipairs(AirBossConfig) do
                     startRecoveryOnDemand,
                     objAirboss
             )
+            MENU_COALITION_COMMAND:New(
+                    airbossconfig.coalition,
+                    "OnDemand Recovery Forced Case 1: will start turning in 5 minutes",
+                    objAirboss.menuObject,
+                    startRecoveryOnDemand,
+                    objAirboss,
+                    1
+            )
+            MENU_COALITION_COMMAND:New(
+                    airbossconfig.coalition,
+                    "OnDemand Recovery Forced Case 2: will start turning in 5 minutes",
+                    objAirboss.menuObject,
+                    startRecoveryOnDemand,
+                    objAirboss,
+                    2
+            )
+            MENU_COALITION_COMMAND:New(
+                    airbossconfig.coalition,
+                    "OnDemand Recovery Forced Case 3: will start turning in 5 minutes",
+                    objAirboss.menuObject,
+                    startRecoveryOnDemand,
+                    objAirboss,
+                    3
+            )
         end
+        MENU_COALITION_COMMAND:New(
+                airbossconfig.coalition,
+                "Recovery : close the deck and reset Airboss",
+                objAirboss.menuObject,
+                resetAirbossDeck,
+                objAirboss
+        )
         objAirboss:SetTACAN(airbossconfig.tacan.channel, airbossconfig.tacan.mode, airbossconfig.tacan.morse)
         objAirboss:SetICLS(airbossconfig.icls.channel, airbossconfig.icls.morse)
         if (airbossconfig.infinitepatrol) then

package/package.json

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