@jtff/miztemplate-lib 3.7.7 → 3.7.9

package/lua/settings/settings-qra.lua

@@ -1,25 +1,25 @@
-QRAConfig = {
-    {
-        enable = false,
-        name = "QRA Training AutoSpawn",
-        type = JTFF_QRA.Type.TangoAuto,
-        benefit_coalition = coalition.side.BLUE,
-        templates = {
-            'qra_armed',
-            'qra_safe',
-        },
-        skill = 'Excellent'
-    },
-    {
-        enable = false,
-        name = "QRA Training ManualSpawn",
-        type = JTFF_QRA.Type.TangoManual,
-        benefit_coalition = coalition.side.BLUE,
-    },
-    {
-        enable = false,
-        name = "QRA Alpha",
-        type = JTFF_QRA.Type.Alpha,
-        benefit_coalition = coalition.side.BLUE,
-    },
+QRAConfig = {
+    {
+        enable = false,
+        name = "QRA Training AutoSpawn",
+        type = JTFF_QRA.Type.TangoAuto,
+        benefit_coalition = coalition.side.BLUE,
+        templates = {
+            'qra_armed',
+            'qra_safe',
+        },
+        skill = 'Excellent'
+    },
+    {
+        enable = false,
+        name = "QRA Training ManualSpawn",
+        type = JTFF_QRA.Type.TangoManual,
+        benefit_coalition = coalition.side.BLUE,
+    },
+    {
+        enable = false,
+        name = "QRA Alpha",
+        type = JTFF_QRA.Type.Alpha,
+        benefit_coalition = coalition.side.BLUE,
+    },
 }

package/lua/src/110-set_clients.lua

@@ -81,20 +81,23 @@ function Set_CLIENT:OnEventRefuelingStop(EventData)
         if (type(tankerUnit) ~= 'nil') then
             tankerUnitName = tankerUnit:GetName()
         end
-        local clientFuelTaken = clientFuel - BASE:GetState(client,"Fuel")
-        BASE:SetState( client, "Fuel", clientFuel )
-        jtff_log.trace(string.format("[%s] Stop to refuel at the tanker [%s], taken %.0f Lbs",client:GetPlayer() , tankerUnitName, UTILS.kg2lbs(clientFuelTaken)),"TANKER")
-        if (type(dcsbot) ~= 'nil') then
-            local title = string.format('End of Air refuel !')
-            local description = string.format("[%s] Stop to refuel at the tanker [%s], taken %.0f Lbs",client:GetPlayer() , tankerUnitName, UTILS.kg2lbs(clientFuelTaken))
-            local img = 'https://cdn10.picryl.com/photo/2004/10/03/a-us-navy-usn-f-14b-tomcat-aircraft-assigned-to-fighter-squadron-one-zero-three-f5f749-1024.jpg'
-            local fields = {
-                ['Pilot'] = client:GetPlayer(),
-                ['Tanker'] = tankerUnitName,
-                ['RefuelQty'] = UTILS.kg2lbs(clientFuelTaken)
-            }
-            local footer = 'Sorry, tomcats took it all again...'
-            dcsbot.sendEmbed(title, description, img, fields, footer)
+        local clientFuelTaken = 0
+        if (type(client) ~= 'nil') then
+            clientFuelTaken = clientFuel - BASE:GetState(client,"Fuel")
+            BASE:SetState( client, "Fuel", clientFuel )
+            jtff_log.trace(string.format("[%s] Stop to refuel at the tanker [%s], taken %.0f Lbs",client:GetPlayer() , tankerUnitName, UTILS.kg2lbs(clientFuelTaken)),"TANKER")
+            if (type(dcsbot) ~= 'nil') then
+                local title = string.format('End of Air refuel !')
+                local description = string.format("[%s] Stop to refuel at the tanker [%s], taken %.0f Lbs",client:GetPlayer() , tankerUnitName, UTILS.kg2lbs(clientFuelTaken))
+                local img = 'https://cdn10.picryl.com/photo/2004/10/03/a-us-navy-usn-f-14b-tomcat-aircraft-assigned-to-fighter-squadron-one-zero-three-f5f749-1024.jpg'
+                local fields = {
+                    ['Pilot'] = client:GetPlayer(),
+                    ['Tanker'] = tankerUnitName,
+                    ['RefuelQty'] = UTILS.kg2lbs(clientFuelTaken)
+                }
+                local footer = 'Sorry, tomcats took it all again...'
+                dcsbot.sendEmbed(title, description, img, fields, footer)
+            end
         end
     end
 end

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