@jtff/miztemplate-lib 3.7.9 → 3.8.1

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/020-mission_functions.lua

@@ -186,14 +186,13 @@ function getNearestTankerfromPlayerUnit(PlayerUnit, Radius)
 
     local isrefuelable, playerrefuelsystem=PlayerUnit:IsRefuelable()
     if isrefuelable then
-        local coord=PlayerUnit:GetCoordinate()
-        local units=coord:ScanUnits(Radius)
+        local playerCoordinates=PlayerUnit:GetCoordinate()
+        local unitList=playerCoordinates:ScanUnits(Radius)
         local coalition=PlayerUnit:GetCoalition()
 
-        local dmin = math.huge
-        local tanker = nil --Wrapper.Unit#UNIT
-        for _,_unit in pairs(units.Set) do
-            local unit = _unit --Wrapper.Unit#UNIT
+        local minDistance = math.huge
+        local foundTanker = nil --Wrapper.Unit#UNIT
+        for index,unit in pairs(unitList.Set) do
             local istanker, tankerrefuelsystem=unit:IsTanker()
             if istanker and
                     playerrefuelsystem == tankerrefuelsystem and
@@ -201,14 +200,14 @@ function getNearestTankerfromPlayerUnit(PlayerUnit, Radius)
                     unit:IsAlive() then
 
                 -- Distance.
-                local d = unit:GetCoordinate():Get2DDistance(coord)
-                if d < dmin then
-                    d = dmin
-                    tanker=unit
+                local d = unit:GetCoordinate():Get2DDistance(playerCoordinates)
+                if d < minDistance then
+                    d = minDistance
+                    foundTanker=unit
                 end
             end
         end
-        return tanker
+        return foundTanker
     end
     return nil
 end

package/lua/src/110-set_clients.lua

@@ -51,49 +51,147 @@ function Set_CLIENT:OnEventPlayerEnterAircraft(EventData)
         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 )
+        BASE:SetState( EventData.IniUnit, "isRefueling", 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 )
+        if (type(AIRBOSSArray) == 'table') then
+            if #AIRBOSSArray > 0 then
+                MENU_GROUP_COMMAND:New( EventData.IniGroup, "Switch Airboss subtitles", GroupMenu, switchGroupAirbossSubtitlesStatus, EventData.IniGroup )
+            end
         end
     end
 end
 function Set_CLIENT:OnEventRefueling(EventData)
     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()
+        if NET:GetMyPlayerID() == 1 then
+            --trigger.action.outText("Vous êtes en mode multijoueur.", 90)
+            local tankerUnit = UNIT:Find(EventData.initiator)
+            local refuelingUnitsSearchRadiusMeters = 150
+            local tankerUnitName = 'unknown'
+            local client = nil
+            local clientUnit = nil
+            local clientFuel = 0
+            local clientName = 'unknown'
+            if (type(tankerUnit) ~= 'nil') then
+                local clientRefuelableSet = SET_CLIENT:New()
+                --trigger.action.outText(string.format("clientRefuelableSet init count = %d",clientRefuelableSet:Count()), 90)
+                --trigger.action.outText(string.format("tankerUnit = %s",tankerUnit:GetName()), 90)
+                tankerUnitName = tankerUnit:GetName()
+                local isTanker, tankerRefuelSystem = tankerUnit:IsTanker()
+                local refuelingUnitsSet = tankerUnit
+                        :GetCoordinate()
+                        :ScanUnits(refuelingUnitsSearchRadiusMeters)
+                        :FilterCoalitions(tankerUnit:GetCoalitionName())
+                        :FilterActive(true)
+                        :FilterAlive()
+                        :FilterFunction(
+                        function(unit)
+                            local isRefuelable, unitrefuelsystem = unit:IsRefuelable()
+                            return isRefuelable and unitrefuelsystem == tankerRefuelSystem
+                        end)
+                        :ForEachUnit(
+                        function(unit)
+                            local clientRefueling = CLIENT:Find(unit:GetDCSObject(), true)
+                            --trigger.action.outText(string.format("testing unit %s for clientRefuelableSet",unit:GetName()), 90)
+                            if type(clientRefueling) ~= 'nil' then
+                                clientRefuelableSet:AddObject(clientRefueling)
+                                jtff_log.trace(string.format("adding %s to clientRefuelableSet (refuelable aicrafts near tanker)",clientRefueling:GetPlayer()),"TANKER")
+                            end
+                        end
+                )
+                jtff_log.trace(string.format("refuelingUnitSet (refuelable aicrafts near tanker) : count = %d",refuelingUnitsSet:Count()),"TANKER")
+                jtff_log.trace(string.format("clientRefuelableSet (client refuelable aircrafts near tanker): count = %d",clientRefuelableSet:Count()),"TANKER")
+                if clientRefuelableSet:Count() >= 1 then
+                    if clientRefuelableSet:Count() >= 2 then
+                        clientRefuelableSet:ForEachClient(
+                                function(client)
+                                    local clientUnit = client:GetClientGroupUnit()
+                                    local clientFuel = clientUnit:GetFuel() * clientUnit:GetDesc().fuelMassMax
+                                    if not(BASE:GetState(clientUnit, "isRefueling")) then
+                                        local mytimer=TIMER:New(
+                                                function(unit, clientObject, initialFuelState, tankerName)
+                                                    if (unit:GetFuel() * unit:GetDesc().fuelMassMax-initialFuelState >= 0) then
+                                                        local clientName = clientObject:GetPlayer() or unit:GetName()
+                                                        BASE:SetState( unit, "isRefueling", true )
+                                                        BASE:SetState( unit, "FuelState", initialFuelState )
+                                                        jtff_log.info(
+                                                                string.format(
+                                                                        "[%s] Start refueling at the tanker [%s], current fuel : %.0f Lbs",
+                                                                        clientName,
+                                                                        tankerName,
+                                                                        UTILS.kg2lbs(initialFuelState)
+                                                                ),
+                                                                "TANKER"
+                                                        )
+                                                    end
+                                                end,
+                                                clientUnit,
+                                                client,
+                                                clientFuel,
+                                                tankerUnitName
+                                        )
+                                        mytimer:Start(2)
+                                    end
+                                end
+                        )
+                    else
+                        client = clientRefuelableSet:GetFirst()
+                        clientUnit = client:GetClientGroupUnit()
+                        clientFuel = clientUnit:GetFuel() * clientUnit:GetDesc().fuelMassMax
+                        clientName = client:GetPlayer() or clientUnit:GetName()
+                        BASE:SetState( clientUnit, "FuelState", clientFuel )
+                        BASE:SetState( clientUnit, "isRefueling", true )
+                        jtff_log.info(string.format("[%s] Start refueling at the tanker [%s], current fuel : %.0f Lbs", clientName, tankerUnitName, UTILS.kg2lbs(clientFuel)),"TANKER")
+                    end
+                end
+            else
+                jtff_log.error("tanker not found !!!","TANKER")
+            end
+        else
+            --trigger.action.outText("Vous êtes en mode solo.", 90)
+            local client = CLIENT:Find(EventData.initiator, true)
+            if (type(client) ~= 'nil') then
+                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 clientName = clientUnit:GetName()
+                clientName = client:GetPlayer()
+                BASE:SetState( clientUnit, "FuelState", clientFuel )
+                BASE:SetState( clientUnit, "isRefueling", true )
+                jtff_log.info(string.format("[%s] Start refueling at the tanker [%s], current fuel : %.0f Lbs", clientName, tankerUnitName, UTILS.kg2lbs(clientFuel)),"TANKER")
+            end
         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.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 = 0
+        local client = CLIENT:Find(EventData.initiator, true)
         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")
+            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
+            if not(BASE:GetState(clientUnit,"isRefueling")) then
+                jtff_log.error(string.format("impossible to determine accurately fuel taken by [%s] : trying anyway...",client:GetPlayer()),"TANKER")
+            end
+            local clientFuelTaken = clientFuel - BASE:GetState(clientUnit,"FuelState")
+            BASE:SetState( clientUnit, "FuelState", clientFuel )
+            BASE:SetState( clientUnit, "isRefueling", false )
+            jtff_log.info(string.format("[%s] just finsihed refueling 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 description = string.format("[%s] just finsihed refueling 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)
+                    ['RefuelQty'] = string.format("%.0f Lbs", UTILS.kg2lbs(clientFuelTaken))
                 }
                 local footer = 'Sorry, tomcats took it all again...'
                 dcsbot.sendEmbed(title, description, img, fields, footer)

package/lua/src/120-tankers.lua

@@ -448,7 +448,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 TankerGroup:HandleEvent(EVENTS.Dead)
                 function TankerGroup:OnEventLand(EventData)
                     COORDINATE:RemoveMark(map_marker[self:GetName()])
-                    if self.custommconfig.escortgroupname then
+                    if self.customconfig.escortgroupname then
                         jtff_log.info('RTB: '..self.GroupName..'...',"TANKER")
                         if self.escortGroupObject:IsAirborne(false) == true then
                             jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...',"TANKER")
@@ -460,7 +460,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 end
                 function TankerGroup:OnEventCrash(EventData)
                     COORDINATE:RemoveMark(map_marker[self:GetName()])
-                    if self.custommconfig.escortgroupname then
+                    if self.customconfig.escortgroupname then
                         jtff_log.info('RTB: '..self.GroupName..'...',"TANKER")
                         if self.escortGroupObject:IsAirborne(false) == true then
                             jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...',"TANKER")
@@ -472,7 +472,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 end
                 function TankerGroup:OnEventDead(EventData)
                     COORDINATE:RemoveMark(map_marker[self:GetName()])
-                    if self.custommconfig.escortgroupname then
+                    if self.customconfig.escortgroupname then
                         jtff_log.info('RTB: '..self.GroupName..'...',"TANKER")
                         if self.escortGroupObject:IsAirborne(false) == true then
                             jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...',"TANKER")