npm - @jtff/miztemplate-lib - Versions diffs - 3.5.6 → 3.5.8 - Mend

@jtff/miztemplate-lib 3.5.6 → 3.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lua/src/020-mission_functions.lua +22 -7
package/lua/src/110-set_clients.lua +38 -12
package/package.json +1 -1

package/lua/src/020-mission_functions.lua CHANGED Viewed

@@ -66,6 +66,16 @@ AAMAxRange = {
     RANDOM_RANGE = 4,
 }
+if (pcall(
+        function ()
+            dofile(lfs.writedir() .. 'Scripts/net/DCSServerBot/DCSServerBot.lua')
+        end)) then
+    jtff_log.debug(string.format("DCSServerBot present on server ! Including NetLibrary..."), "Initialization")
+else
+    jtff_log.error(string.format("DCSServerBot NOT present on server ! Preventing use of it..."), "Initialization")
+    dcsbot = nil
+end
 function switchGroupImmortalStatus(group)
     status = not BASE:GetState(group, "isImmortal")
     jtff_log.info(string.format("switch group %s to immortal status %s", group:GetName(), tostring(status)), "GENERAL")
@@ -171,8 +181,7 @@ function tankerStatusMessage(tanker, PlayerUnit, PlayerGroup)
     MESSAGE:NewType(message, MESSAGE.Type.Overview):ToGroup(PlayerGroup)
 end
-function findNearestTanker(PlayerUnit, PlayerGroup, Radius)
+function getNearestTankerfromPlayerUnit(PlayerUnit, Radius)
     Radius=UTILS.NMToMeters(Radius or 50)
     local isrefuelable, playerrefuelsystem=PlayerUnit:IsRefuelable()
@@ -199,10 +208,16 @@ function findNearestTanker(PlayerUnit, PlayerGroup, Radius)
                 end
             end
         end
+        return tanker
+    end
+    return nil
+end
+function findNearestTanker(PlayerUnit, PlayerGroup, Radius)
+    local tanker = getNearestTankerfromPlayerUnit(PlayerUnit)
+    if (type(tanker) ~= "nil") then
         tankerStatusMessage(tanker, PlayerUnit, PlayerGroup)
     end
-    return nil
 end
 function findAllTanker(PlayerUnit, PlayerGroup, Radius)
@@ -726,11 +741,11 @@ function SpawnRangesDelay(param)
     local delay = param[4] or spawnStandardDelay
     local myfunc = param[5]
     local sound_warning = true
-    if (type(param[6]) ~= nil) then
+    if (type(param[6]) ~= "nil") then
         sound_warning = param[6]
     end
     local message_warning = true
-    if (type(param[7]) ~= nil) then
+    if (type(param[7]) ~= "nil") then
         message_warning = param[7]
     end
     if ( sound_warning ) then
@@ -755,11 +770,11 @@ function SpawnWholeRangesDelay(param)
     local delay = param[3] or spawnStandardDelay
     local myfunc = param[4]
     local sound_warning = true
-    if (type(param[5]) ~= nil) then
+    if (type(param[5]) ~= "nil") then
         sound_warning = param[5]
     end
     local message_warning = true
-    if (type(param[6]) ~= nil) then
+    if (type(param[6]) ~= "nil") then
         message_warning = param[6]
     end
     parentRangeMenu:RemoveSubMenus()

package/lua/src/110-set_clients.lua CHANGED Viewed

@@ -30,28 +30,54 @@ function Set_CLIENT:OnEventPlayerEnterAircraft(EventData)
             MENU_GROUP_COMMAND:New( EventData.IniGroup, "Nearest Tanker Info", MenuCoalitionTankerRed, NearestTankerInfo, { EventData.IniUnit, EventData.IniGroup}  )
             MENU_GROUP_COMMAND:New( EventData.IniGroup, "All Tankers Info", MenuCoalitionTankerRed, AllTankersInfo, {EventData.IniUnit,EventData.IniGroup} )
         end
-        local GroupMenu = MENU_GROUP:New( EventData.IniGroup, "My settings" )
+        local GroupMenu = MENU_GROUP:New( EventData.IniGroup, "My Group settings" )
         jtff_log.debug(string.format("Add Immortal Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName),"GENERAL")
         BASE:SetState( EventData.IniGroup, "isImmortal", false )
         MENU_GROUP_COMMAND:New( EventData.IniGroup, "Switch immortal status", GroupMenu, switchGroupImmortalStatus, EventData.IniGroup )
-        --if #AIRBOSSArray > 0 then
-        --    MENU_GROUP_COMMAND:New( EventData.IniGroup, "Switch Airboss subtitles", GroupMenu, switchGroupAirbossSubtitlesStatus, EventData.IniGroup )
-        --end
+        if #AIRBOSSArray > 0 then
+            MENU_GROUP_COMMAND:New( EventData.IniGroup, "Switch Airboss subtitles", GroupMenu, switchGroupAirbossSubtitlesStatus, EventData.IniGroup )
+        end
     end
 end
 function Set_CLIENT:OnEventRefueling(EventData)
-    if (EventData.IniGroup) then
-        local client = CLIENT:Find(EventData.IniDCSUnit)
-        local clientFuel = EventData.IniUnit:GetTemplateFuel()
-        jtff_log.trace(string.format("[%s] Start to refuel at the tanker %[s], current fuel : %.0f Kg",EventData.IniPlayerName , EventData.TgtUnitName, clientFuel),"TANKER")
+    if (EventData.initiator) then
+        local client = CLIENT:Find(EventData.initiator)
+        local clientUnit = UNIT:Find(EventData.initiator)
+        local clientFuel = clientUnit:GetFuel() * clientUnit:GetDesc().fuelMassMax
+        local tankerUnit = getNearestTankerfromPlayerUnit(clientUnit)
+        local tankerUnitName = 'unknown'
+        if (type(tankerUnit) ~= 'nil') then
+            tankerUnitName = tankerUnit:GetName()
+        end
+        jtff_log.trace(string.format("[%s] Start to refuel at the tanker [%s], current fuel : %.0f Lbs",client:GetPlayer() , tankerUnitName, UTILS.kg2lbs(clientFuel)),"TANKER")
         BASE:SetState( client, "Fuel", clientFuel )
     end
 end
 function Set_CLIENT:OnEventRefuelingStop(EventData)
-    if (EventData.IniGroup) then
-        local client = CLIENT:Find(EventData.IniDCSUnit)
-        local clientFuelTaken = EventData.IniUnit:GetTemplateFuel() - BASE:GetState(client,"Fuel")
-        jtff_log.trace(string.format("[%s] Stop to refuel at the tanker %[s], taken %.0f Kg",EventData.IniPlayerName , EventData.TgtUnitName, clientFuelTaken),"TANKER")
+    if (EventData.initiator) then
+        local client = CLIENT:Find(EventData.initiator)
+        local clientUnit = UNIT:Find(EventData.initiator)
+        local clientFuel = clientUnit:GetFuel() * clientUnit:GetDesc().fuelMassMax
+        local tankerUnit = getNearestTankerfromPlayerUnit(clientUnit)
+        local tankerUnitName = 'unknown'
+        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)
+        end
     end
 end

package/package.json CHANGED Viewed

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