@jtff/miztemplate-lib 3.10.14 → 4.0.1

package/lua/src/120-tankers.lua

@@ -1,495 +1,626 @@
 -- *****************************************************************************
 --                     **                     Tankers                         **
 --                     *********************************************************
-tankersArray = {}
-compteur = 0
-MenuCoalitionTankerBlue = MENU_COALITION:New(coalition.side.BLUE, "Tankers", MenuCoalitionBlue)
-MenuCoalitionTankerRed = MENU_COALITION:New(coalition.side.RED, "Tankers", MenuCoalitionRed)
-for index, tankerconfig in ipairs(TankersConfig) do
-    if tankerconfig.enable == true then
-        compteur = compteur + 1
-        jtff_log.info('creation Tanker : '.. tankerconfig.groupName..'...',"TANKER")
-        local objTanker = RECOVERYTANKER:New(UNIT:FindByName(tankerconfig.patternUnit), tankerconfig.groupName)
-                                        :SetTakeoffCold()
-                                        :SetRespawnOnOff(tankerconfig.autorespawn)
-                                        :SetLowFuelThreshold(tankerconfig.fuelwarninglevel)
-                                        :SetAltitude(tankerconfig.altitude)
-                                        :SetSpeed(tankerconfig.speed)
-                                        :SetHomeBase(AIRBASE:FindByName(tankerconfig.baseUnit),tankerconfig.terminalType)
-                                        :SetCallsign(tankerconfig.callsign.name, tankerconfig.callsign.number)
-                                        :SetRecoveryAirboss(tankerconfig.airboss_recovery)
-                                        :SetRadio(tankerconfig.freq)
-                                        :SetModex(tankerconfig.modex)
-                                        :SetTACAN(tankerconfig.tacan.channel, tankerconfig.tacan.morse, tankerconfig.tacan.band)
-                                        :SetRacetrackDistances(tankerconfig.racetrack.front, tankerconfig.racetrack.back)
-        objTanker.customconfig = tankerconfig
-        function objTanker:OnAfterStart(from, event, to)
-            --self:SetTACAN(self.customconfig.tacan.channel, self.customconfig.tacan.morse, self.customconfig.tacan.band )
-            self.spawnAbsTime = timer.getAbsTime()
-            jtff_log.info('popup Tanker : '..self.tanker.GroupName..' at : '..self.spawnAbsTime,"TANKER")
-            if self.customconfig.escortgroupname then
-                self.escortSpawnObject = SPAWN:NewWithAlias(self.customconfig.escortgroupname,'escort-'.. self.customconfig.groupName)
-                                              :InitRepeatOnEngineShutDown()
-                                              :InitSkill("Excellent")
-                                              :OnSpawnGroup(function(SpawnGroup)
-                    taskTankerEscort({self, SpawnGroup})
-                end)
-                self.escortGroupObject = spawnRecoveryTankerEscort(self.escortSpawnObject,self.customconfig)
-                if self.customconfig.missionmaxduration then
-                    self.escortGroupObject:ScheduleOnce(self.customconfig.missionmaxduration*60,
-                        function(SpawnGroup, airBaseName)
-                            --trigger.action.outText('RTB schedule trigger Tanker-escort group : '..(SpawnGroup.GroupName)..' airbase'..(airBaseName)..'...', 45)
-                            SpawnGroup:RouteRTB(AIRBASE:FindByName(airBaseName))
-                        end,
-                        self.escortGroupObject,
-                        self.customconfig.baseUnit
-                    )
-                    --trigger.action.outText('Tanker-escort configured to RTB in  : '..(self.customconfig.missionmaxduration)..' minutes max...', 45)
-                end
+
+-- region TankerConfigFunctions
+
+-- @type TankerCallsignConfig
+-- @field #string alias Alias for the tanker.
+-- @field #number name CallSign name for the tanker.
+-- @field #number number CallSign number (1-7) for the tanker.
+
+--- Parse an Tanker Callsign config Object.
+-- @param #JsonObject config Config object to parse
+-- @param #string parser_name Parser name ("AIRBASE", "AIRBOSS", etc...).
+-- @return #TankerCallsignConfig tankerCallsignConfigJson Parsed CallSign object
+function ParseTankerCallsignConfigJson(config, parser_name)
+    local tankerCallsignConfigJson = {}
+    local default_number = 1
+    -- **************************************************************************
+    --                             name
+    -- **************************************************************************
+    if type(config.name) == "number" then
+        if table.count_value(CALLSIGN.Tanker, config.name) > 0 then
+            tankerCallsignConfigJson.name = config.name
+        else
+            Jtff_log.error("Tanker Callsign name is not a valid CallSign name, skipping tanker configuration",
+                parser_name)
+            return {}
+        end
+    else
+        Jtff_log.error("Tanker Callsign name is not valid, skipping tanker configuration", parser_name)
+        return {}
+    end
+    -- **************************************************************************
+    --                             alias
+    -- **************************************************************************
+    if type(config.alias) == "string" then
+        tankerCallsignConfigJson.alias = config.alias
+    else
+        Jtff_log.warn("Tanker Callsign alias is not a string, defaulting to Tanker name", parser_name)
+        tankerCallsignConfigJson.alias = tankerCallsignConfigJson.name
+    end
+    -- **************************************************************************
+    --                             number
+    -- **************************************************************************
+    if type(config.number) == "number" then
+        if config.number >= 1 and config.number <= 7 then
+            tankerCallsignConfigJson.number = config.number
+        else
+            Jtff_log.warn(
+            string.format("Tanker Callsign number is not a valid number (1-7), defaulting number to %d", default_number),
+                parser_name)
+            tankerCallsignConfigJson.number = default_number
+        end
+    else
+        Jtff_log.warn(string.format("Tanker Callsign number is not a number, defaulting number to %d", default_number),
+            parser_name)
+        tankerCallsignConfigJson.number = default_number
+    end
+    return tankerCallsignConfigJson
+end
+
+-- @type TankerConfig
+-- @field #boolean enable Enable tanker creation.
+-- @field #string type Tanker type.
+-- @field #string airbaseName Airbase name.
+-- @field #boolean autospawn Autospawn tanker.
+-- @field #RacetrackConfig racetrack Racetrack configuration.
+-- @field #number nbEscort Number of escort aircraft.
+-- @field #number missionmaxduration Maximum mission duration in minutes.
+-- @field #number refuelSystem Refueling system (0=boom, 1=probe).
+-- @field #tacanConfig tacan TACAN configuration.
+-- @field #radioConfig radio Radio configuration.
+-- @field #number fuelLowThreshold Fuel low threshold in %.
+-- @field #TankerCallsignConfig callsign Callsign configuration.
+-- @field #SquawkConfig squawk Squawk configuration.
+
+
+--- Parse Tanker config Object.
+-- @param #JsonObject config Config object to parse
+-- @return #TankerConfig tankerConfigJson Parsed TankerConfig object
+function ParseTankersConfigJson(config)
+    local json = require('Scripts/json')
+    local parser_name = "TANKER"
+    local default_autospawn = false
+    local default_nbEscort = 0
+    local default_missionmaxduration = 180
+    local default_fuelLowThreshold = 35
+    local default_refuelSystem = Unit.RefuelingSystem.PROBE_AND_DROGUE
+    -- **************************************************************************
+    --                             enable
+    -- **************************************************************************
+    local tankerConfigJson = {
+        enable = config.enable or false,
+    }
+    -- **************************************************************************
+    --                             type
+    -- **************************************************************************
+    if type(config.type) == "string" then
+        tankerConfigJson.type = config.type
+    else
+        Jtff_log.error("Tanker type is not a string, skipping tanker configuration", parser_name)
+        config.enable = false
+        return config
+    end
+    -- **************************************************************************
+    --                             airbaseName
+    -- **************************************************************************
+    if type(config.airbaseName) == "string" then
+        if type(AIRBASE:FindByName(config.airbaseName)) == 'nil' then
+            Jtff_log.error(
+                string.format(
+                    "Airbase %s not found, skipping tanker configuration",
+                    config.airbaseName
+                ),
+                parser_name
+            )
+            config.enable = false
+            return config
+        else
+            tankerConfigJson.airbaseName = config.airbaseName
+        end
+    else
+        Jtff_log.error("Airbase warehouse is not a string", parser_name)
+        config.enable = false
+        return config
+    end
+    -- **************************************************************************
+    --                             autospawn
+    -- **************************************************************************
+    if type(config.autospawn) == "boolean" then
+        tankerConfigJson.autospawn = config.autospawn
+    else
+        Jtff_log.warn("Tanker %s autospawn not defined : defaulting", parser_name)
+        tankerConfigJson.autospawn = default_autospawn
+    end
+    -- **************************************************************************
+    --                             racetrack
+    -- **************************************************************************
+    if type(config.racetrack) == "table" then
+        tankerConfigJson.racetrack = ParseRacetrackConfigJson(config.racetrack, parser_name)
+        if next(tankerConfigJson.racetrack) == nil then
+            Jtff_log.error("Tanker racetrack is not a valid Racetrack object, skipping tanker configuration", parser_name)
+            config.enable = false
+            return config
+        end
+    else
+        Jtff_log.error("Tanker racetrack is not a table, skipping tanker configuration", parser_name)
+        config.enable = false
+        return config
+    end
+    -- **************************************************************************
+    --                             nbEscort
+    -- **************************************************************************
+    if type(config.nbEscort) == "number" then
+        tankerConfigJson.nbEscort = config.nbEscort
+    else
+        Jtff_log.warn(string.format("Tanker nbEscort is not a number, defaulting to %d", default_nbEscort), parser_name)
+        tankerConfigJson.nbEscort = default_nbEscort
+    end
+    -- **************************************************************************
+    --                             missionmaxduration
+    -- **************************************************************************
+    if type(config.missionmaxduration) == "number" then
+        tankerConfigJson.missionmaxduration = config.missionmaxduration
+    else
+        Jtff_log.warn(
+        string.format("Tanker missionmaxduration is not a number, defaulting to %d", default_missionmaxduration),
+            parser_name)
+        tankerConfigJson.missionmaxduration = default_missionmaxduration
+    end
+    -- **************************************************************************
+    --                             refuelSystem
+    -- **************************************************************************
+    if type(config.refuelSystem) == "number" then
+        tankerConfigJson.refuelSystem = config.refuelSystem
+    else
+        Jtff_log.warn(string.format("Tanker refuelSystem is not a number, defaulting to %s", default_refuelSystem), parser_name)
+        tankerConfigJson.refuelSystem = default_refuelSystem
+    end
+    -- **************************************************************************
+    --                             tacan
+    -- **************************************************************************
+    if type(config.tacan) == "table" then
+        tankerConfigJson.tacan = ParseTacanConfigJson(config.tacan, parser_name)
+        if next(tankerConfigJson.tacan) == nil then
+            Jtff_log.error("Tanker tacan is not a valid TACAN object, skipping tanker configuration", parser_name)
+            config.enable = false
+            return config
+        end
+    else
+        Jtff_log.error("Tanker tacan is not a table, skipping tanker configuration", parser_name)
+        config.enable = false
+        return config
+    end
+    -- **************************************************************************
+    --                             radio
+    -- **************************************************************************
+    if type(config.radio) == "table" then
+        tankerConfigJson.radio = ParseRadioConfigJson(config.radio, parser_name)
+        if next(tankerConfigJson.radio) == nil then
+            Jtff_log.error("Tanker radio is not a valid Radio object, skipping tanker configuration", parser_name)
+            config.enable = false
+            return config
+        end
+    else
+        Jtff_log.error("Tanker radio is not a table, skipping tanker configuration", parser_name)
+        config.enable = false
+        return config
+    end
+    -- **************************************************************************
+    --                             fuelLowThreshold
+    -- **************************************************************************
+    if type(config.fuelLowThreshold) == "number" then
+        tankerConfigJson.fuelLowThreshold = config.fuelLowThreshold
+    else
+        Jtff_log.warn(
+        string.format("Tanker fuelLowThreshold is not a number, defaulting to %d %%", default_fuelLowThreshold),
+            parser_name)
+        tankerConfigJson.fuelLowThreshold = default_fuelLowThreshold
+    end
+    -- **************************************************************************
+    --                             callsign
+    -- **************************************************************************
+    if type(config.callsign) == "table" then
+        tankerConfigJson.callsign = ParseTankerCallsignConfigJson(config.callsign, parser_name)
+        if next(tankerConfigJson.callsign) == nil then
+            Jtff_log.error("Tanker callsign is not a valid Callsign object, skipping tanker configuration", parser_name)
+            config.enable = false
+            return config
+        end
+    else
+        Jtff_log.error("Tanker callsign is not a table, skipping tanker configuration", parser_name)
+        config.enable = false
+        return config
+    end
+    -- **************************************************************************
+    --                             squawk
+    -- **************************************************************************
+    if type(config.squawk) == "table" then
+        tankerConfigJson.squawk = ParseSquawkConfigJson(config.squawk, parser_name)
+    else
+        Jtff_log.warn("Tanker squawk is not a table, defaulting tanker squawk configuration", parser_name)
+        tankerConfigJson.squawk = ParseSquawkConfigJson({}, parser_name)
+    end
+    Jtff_log.debug(
+        string.format(
+            "parsed Tanker config for %s Tanker, resulting config :\n%s",
+            config.type or "",
+            json:encode(
+                tankerConfigJson,
+                { indent = true }
+            )
+        ),
+        parser_name
+    )
+    return tankerConfigJson
+end
+
+-- endregion TankerConfigFunctions
+
+-- region TankerFunctions
+
+--- Trigger a Tanker mission.
+-- @param #table objTanker Tanker object.
+function TriggerTankerMission(objTanker)
+    objTanker.airwing:AddMission(objTanker.mission)
+    Jtff_log.info(
+        string.format(
+            'Tanker %s triggered',
+            objTanker.customconfig.type
+        ),
+        "TANKER"
+    )
+end
+
+--- Generate a Tanker mission object.
+-- @param #TankerConfig tankerconfig Tanker configuration object.
+-- @param #boolean manageEscort Manage escort mission creation.
+-- @return #AUFTRAG tankermission Tanker mission object, #AIRWING airwing Airwing object.
+function GenerateTankerMission(tankerconfig, manageEscort)
+    local generateEscortMission = false
+    if manageEscort == true then
+        generateEscortMission = true
+    end
+    local airwing = FindAirwingByAirbaseName(tankerconfig.airbaseName)
+    local tankermission = nil
+    if airwing == nil then
+        Jtff_log.error(
+            string.format(
+                "Airwing not found for Airbase %s, skipping tanker mission generation",
+                tankerconfig.airbaseName
+            ),
+            "TANKER"
+        )
+        return nil,nil
+    else
+        local function isAnchorCoordValid(MGRSString, autospawn)
+            if autospawn == true then
+                return true
             end
-            if self.customconfig.missionmaxduration then
-                (self.tanker):ScheduleOnce(self.customconfig.missionmaxduration*60,
-                    function(tankerObject, airBaseName)
-                        --trigger.action.outText('RTB schedule trigger Tanker group : '..(tankerObject.tanker.GroupName)..' airbase'..(tankerObject.customconfig.baseUnit)..'...', 45)
-                        tankerObject:RTB(AIRBASE:FindByName(tankerObject.customconfig.baseUnit))
-                    end,
-                    self
-                )
-                --trigger.action.outText('Tanker configured to RTB in  : '..(self.customconfig.missionmaxduration)..' minutes max...', 45)
+            if #(UTILS.Split(MGRSString," ")) ~= 5 then
+                return false
             end
-            if (self.customconfig.benefit_coalition == coalition.side.RED) then
-                self.menureset = MENU_COALITION_COMMAND:New(
-                    coalition.side.RED,
-                    "Reset Tanker "..self.customconfig.callsign.alias..'-'..self.customconfig.callsign.number..'-1',
-                    MenuCoalitionTankerRed,
-                    resetRecoveryTanker,
-                    self
+            return true
+        end
+        local orbitCoord = {x=0, y=0, z=0}
+        if (isAnchorCoordValid(tankerconfig.racetrack.coordinate, tankerconfig.autospawn) == true) then
+            orbitCoord = COORDINATE:NewFromMGRSString(tankerconfig.racetrack.coordinate)
+        else
+            orbitCoord = AIRBASE:FindByName(tankerconfig.airbaseName):GetCoordinate()
+        end
+        tankermission = AUFTRAG:NewTANKER(
+            orbitCoord,
+            tankerconfig.racetrack.fl * 100,
+            tankerconfig.racetrack.speed,
+            tankerconfig.racetrack.heading,
+            tankerconfig.racetrack.leg,
+            tankerconfig.refuelSystem
+        )
+        tankermission:SetDuration(tankerconfig.missionmaxduration*60)
+        tankermission:SetReturnToLegion(true)
+        tankermission:SetRequiredAssets(1)
+        tankermission:SetName(
+            string.format(
+                "Tanker-%s",
+                tankerconfig.type
+            )
+        )
+        tankermission:SetRadio(
+            tankerconfig.radio.freq,
+            tankerconfig.radio.modulation
+        )
+        tankermission:SetTACAN(
+            tankerconfig.tacan.channel,
+            tankerconfig.tacan.morse,
+            nil,
+            tankerconfig.tacan.band
+        )
+        tankermission:SetEPLRS(true)
+        tankermission:SetEmission(false)
+        tankermission:SetVerbosity(JTFF_verbosity_levels[JTFF_LOGLEVEL])
+        tankermission.additionalData = {
+            minEscort = tankerconfig.nbEscort,
+            maxEscort = tankerconfig.nbEscort,
+            tankerType = tankerconfig.type,
+            tankerDuration = tankerconfig.missionmaxduration,
+            callsign = tankerconfig.callsign,
+            tankerTacan = tankerconfig.tacan,
+            tankerRadio = tankerconfig.radio,
+            tankerRacetrack = tankerconfig.racetrack,
+            tankerFuelLowThreshold = tankerconfig.fuelLowThreshold,
+        }
+        function tankermission:OnAfterScheduled(From, Event, To)
+            local tankerToEscort = self:GetOpsGroups()[1]
+            local airwing = tankerToEscort:GetAirwing()
+            tankerToEscort:SwitchCallsign(
+                self.additionalData.callsign.name,
+                self.additionalData.callsign.number
+            )
+            tankerToEscort:SetFuelLowThreshold(self.additionalData.tankerFuelLowThreshold)
+            tankerToEscort:SetFuelCriticalThreshold(self.additionalData.tankerFuelLowThreshold-10)
+            tankerToEscort:SetFuelLowRefuel(true)
+            tankerToEscort:SetFuelLowRTB(false)
+            tankerToEscort:SetFuelCriticalRTB(true)
+            if (Jtff_map_marker[tankerToEscort:GetName()]) then
+                COORDINATE:RemoveMark(Jtff_map_marker[tankerToEscort:GetName()])
+            end
+            if(self.additionalData.tankerTacan) then
+                Jtff_map_marker[tankerToEscort:GetName()] = COORDINATE:NewFromMGRSString(self.additionalData.tankerRacetrack.coordinate):MarkToCoalition(
+                    string.format(
+                        'OnDemand Tanker %s - TCN %i\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
+                        self.additionalData.tankerType,
+                        self.additionalData.tankerTacan.channel,
+                        UTILS.Round(self.additionalData.tankerRacetrack.fl , 0),
+                        self.additionalData.tankerRacetrack.speed,
+                        self.additionalData.tankerRadio.freq,
+                        self.additionalData.tankerDuration,
+                        self.additionalData.tankerRacetrack.heading,
+                        self.additionalData.tankerRacetrack.leg
+                    ),
+                    tankerToEscort:GetCoalition(),
+                    true,
+                    'OnDemand Tanker %s is Activated'
                 )
             else
-                self.menureset = MENU_COALITION_COMMAND:New(
-                    coalition.side.BLUE,
-                    "Reset Tanker "..self.customconfig.callsign.alias..'-'..self.customconfig.callsign.number..'-1',
-                    MenuCoalitionTankerBlue,
-                    resetRecoveryTanker,
-                    self
+                Jtff_map_marker[tankerToEscort:GetName()] = COORDINATE:NewFromMGRSString(self.additionalData.tankerRacetrack.coordinate):MarkToCoalition(
+                    string.format(
+                        'OnDemand Tanker %s\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
+                        self.additionalData.tankerType,
+                        UTILS.Round(self.additionalData.tankerRacetrack.fl , 0),
+                        self.additionalData.tankerRacetrack.speed,
+                        self.additionalData.tankerRadio.freq,
+                        self.additionalData.tankerDuration,
+                        self.additionalData.tankerRacetrack.heading,
+                        self.additionalData.tankerRacetrack.leg
+                    ),
+                    tankerToEscort:GetCoalition(),
+                    true,
+                    'OnDemand Tanker %s is Activated'
                 )
             end
-        end
-        function objTanker:OnAfterRTB(from, event, to, airbase)
-            if self.customconfig.escortgroupname then
-                jtff_log.info('RTB: '..self.tanker.GroupName..'...',"TANKER")
-                if self.escortGroupObject:IsAirborne(false) == true then
-                    jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.tanker.GroupName..'...',"TANKER")
-                    self.escortGroupObject:RouteRTB(airbase)
-                else
-                    --self.escortGroupObject:Destroy(nil, 5)
-                end
+            function tankerToEscort:OnBeforeRTB(From, Event, To, Airbase, speed, holdspeed)
+                COORDINATE:RemoveMark(Jtff_map_marker[self:GetName()])
             end
-            --trigger.action.outText('Tanker is RTB : '..(self.customconfig.groupName)..'...', 45)
-        end
-        function objTanker:OnEventKill(event)
-            if self.customconfig.escortgroupname then
-                jtff_log.info(event.target' Killed !! Sending escort Home',"TANKER")
-                self.escortGroupObject:RouteRTB(AIRBASE:FindByName(self.customconfig.baseUnit))
+            function tankerToEscort:OnAfterDead(From, Event, To)
+                COORDINATE:RemoveMark(Jtff_map_marker[self:GetName()])
             end
-        end
-        function objTanker:OnAfterStatus(from, event, to)
-            self.tanker:OptionRestrictBurner(true)
-            if ((self.customconfig.escortgroupname) and (self.escortGroupObject)) then
-                if not(GROUP:FindByName(self.escortGroupObject.GroupName)) then
-                    jtff_log.info('Respawning escort Group '..self.escortGroupObject.GroupName,"TANKER")
-                    self.escortGroupObject = self.escortSpawnObject
-                                                 :SpawnAtAirbase(
-                        AIRBASE:FindByName(self.customconfig.baseUnit),
-                        SPAWN.Takeoff.Cold,
-                        self.customconfig.altitude,
-                        nil,
-                        true
-                    )
+            function tankerToEscort:OnAfterElementDestroyed(From, Event, To, Element)
+                COORDINATE:RemoveMark(Jtff_map_marker[self:GetName()])
+            end
+            if self.additionalData.maxEscort > 0 and generateEscortMission == true then
+                local escortMission = AUFTRAG:NewESCORT(
+                    tankerToEscort,
+                    {x=250, y=100, z=400},
+                    35,
+                    {'Air'}
+                )
+                escortMission:SetReturnToLegion(true)
+                escortMission:SetRequiredAssets(self.additionalData.minEscort, self.additionalData.maxEscort)
+                escortMission:SetReinforce(3)
+                escortMission:SetName(string.format("Escort-Tanker-%s", self.additionalData.tankerType))
+                escortMission:SetEPLRS(true)
+                escortMission:SetEmission(true)
+                escortMission:SetVerbosity(JTFF_verbosity_levels[JTFF_LOGLEVEL])
+                escortMission:SetFormation(ENUMS.Formation.FixedWing.EchelonRight.Close)
+                escortMission:SetMissionAltitude(20000)
+                escortMission:SetMissionWaypointRandomization(UTILS.NMToMeters(20))
+                escortMission:SetProhibitAfterburnerExecutePhase()
+                escortMission:SetTime(
+                    300,
+                    ( self.additionalData.tankerDuration * 60 ) + 1200
+                )
+                function escortMission:OnAfterScheduled(From, Event, To)
+                    for _, opsGroup in ipairs(self:GetOpsGroups()) do
+                        opsGroup:SetFuelLowThreshold(30)
+                        opsGroup:SetFuelCriticalThreshold(20)
+                        opsGroup:SetFuelLowRefuel(true)
+                        opsGroup:SetFuelLowRTB(false)
+                        opsGroup:SetFuelCriticalRTB(true)
+                        opsGroup:SetJettisonEmptyTanks(false)
+                        opsGroup:SetJettisonWeapons(false)
+                    end
                 end
+                airwing:AddMission(escortMission)
+            end
+        end
+        return tankermission,airwing
+    end
+end
+
+-- endregion TankerFunctions
+
+TankersArray = {}
+MenuCoalitionTankers = {}
+for _k, _coalition in pairs(coalition.side) do
+    MenuCoalitionTankers[UTILS.GetCoalitionName(_coalition)] = MENU_COALITION:New(_coalition, "Tankers", MenuCoalition[UTILS.GetCoalitionName(_coalition)])
+end
+local compteur = #TankersArray
+for _index, _currentTankerConfigObject in ipairs(TankersConfig) do
+    local tankerconfig = ParseTankersConfigJson(_currentTankerConfigObject)
+    if tankerconfig.enable == true then
+        compteur = compteur + 1
+        Jtff_log.info(
+            string.format(
+                'configuration Tanker %s: ',
+                tankerconfig.type
+            ),
+            "TANKER"
+        )
+        -- local templateGroup = UTILS.DeepCopy(GROUP:FindByName(tankerconfig.templateGroup))
+        -- templateGroup.name = string.format("Tanker-%s %s", tankerconfig.type, CreateSquawkString(tankerconfig.squawk))
+        -- FindAirwingByAirbaseName(tankerconfig.airbaseName):AddAsset(templateGroup,2)
+        local tankermission, airwing = GenerateTankerMission(tankerconfig, true)
+        if tankermission == nil or airwing == nil then
+            Jtff_log.error(
+                string.format(
+                    "Airwing not found for Airbase %s, skipping tanker Registration",
+                    tankerconfig.airbaseName
+                ),
+                "TANKER"
+            )
+        else
+            TankersArray[compteur] = {
+                customconfig = tankerconfig,
+                mission = tankermission,
+                airwing = airwing,
+            }
+            if tankerconfig.autospawn == true then
+                Jtff_log.info(
+                    string.format(
+                        'autospawn Tanker %s',
+                        tankerconfig.type
+                    ),
+                    "TANKER"
+                )
+                TriggerTankerMission(TankersArray[compteur])
+                -- TankersArray[compteur].airwing:AddMission(TankersArray[compteur].mission)
+            else
+                Jtff_log.info(
+                    string.format(
+                        'OnDemand Tanker %s Registering',
+                        tankerconfig.type
+                    ),
+                    "TANKER"
+                )
             end
         end
-        tankersArray[compteur] = objTanker
-        tankersArray[compteur]:Start()
     end
 end
 
+
 -- *****************************************************************************
 --                     **                OnDemand Tankers                     **
 --                     *********************************************************
-function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAnchorCoord, askedOrbitHeading, askedOrbitLeg)
-    local TankerGroup
-    if (OnDemandTankersConfig) then
-        for index, OnDemandTanker in ipairs(OnDemandTankersConfig) do
-            if ((OnDemandTanker.type == type) and (OnDemandTanker.enable)) then
-                jtff_log.debug(string.format('OnDemandTanker : Found type %s Tanker : %s Group!', type, OnDemandTanker.groupName),"TANKER")
-                if (askedSpeed and askedSpeed > 0) then
-                    OnDemandTanker.speed = askedSpeed
+function TriggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAnchorCoord, askedOrbitHeading,
+                               askedOrbitLeg)
+    if (TankersConfig) then
+        for index, objTanker in ipairs(TankersArray) do
+            if (objTanker.customconfig.type == type) then
+                Jtff_log.debug(
+                    string.format(
+                        'OnDemandTanker : Found type %s Tanker !',
+                        type
+                    ),
+                    "TANKER"
+                )
+                if (askedAnchorCoord) then
+                    objTanker.customconfig.racetrack.coordinate = askedAnchorCoord:ToStringMGRS()
                 end
                 if (askedFL and askedFL > 0) then
-                    OnDemandTanker.altitude = askedFL * 100
+                    objTanker.customconfig.racetrack.fl = askedFL
                 end
-                if ( askedDuration == nil or askedDuration == 0 ) then
-                    askedDuration = 480
+                if (askedSpeed and askedSpeed > 0) then
+                    objTanker.customconfig.racetrack.speed = askedSpeed
+                end
+                if (askedDuration ~= nil and askedDuration ~= 0) then
+                    objTanker.customconfig.missionmaxduration = askedDuration
                 end
                 if (askedOrbitHeading) then
-                    if (askedOrbitLeg and askedOrbitLeg > 10) then
+                    if (askedOrbitLeg) then
                         --heading et Leg demandés
-                        OnDemandTanker.orbit = {
-                            heading = askedOrbitHeading % 360,
-                            length = askedOrbitLeg,
-                        }
+                        objTanker.customconfig.racetrack.heading = askedOrbitHeading % 360
+                        objTanker.customconfig.racetrack.leg = math.max(10, askedOrbitLeg)
                     else
                         --heading demandé et leg non demandé
-                        if (OnDemandTanker.orbit ) then
-                            if (not(OnDemandTanker.orbit.length)) then
-                                OnDemandTanker.orbit = {
-                                    heading = askedOrbitHeading % 360,
-                                    length = 30,
-                                }
-                            else
-                                OnDemandTanker.orbit = {
-                                    heading = askedOrbitHeading % 360,
-                                    length = math.max(10, OnDemandTanker.orbit.length),
-                                }
-                            end
-                        else
-                            OnDemandTanker.orbit = {
-                                heading = askedOrbitHeading % 360,
-                                length = 30,
-                            }
-                        end
-                    end
-                else
-                    --pas de heading demandé
-                    if (OnDemandTanker.orbit ) then
-                        if (not(OnDemandTanker.orbit.heading)) then
-                            OnDemandTanker.orbit.heading = 90
-                        end
-                        if (not(OnDemandTanker.orbit.length)) then
-                            OnDemandTanker.orbit.length = 30
-                        else
-                            OnDemandTanker.orbit.length = math.max(10, OnDemandTanker.orbit.length)
-                        end
-                    else
-                        OnDemandTanker.orbit = {
-                            heading = 90,
-                            length = 30,
-                        }
+                        objTanker.customconfig.racetrack.heading = askedOrbitHeading % 360
+                        objTanker.customconfig.racetrack.leg = 30
                     end
                 end
-                local set_group_tanker = SET_GROUP:New()
-                                                  :FilterActive()
-                                                  :FilterPrefixes(OnDemandTanker.groupName)
-                                                  :FilterCategories("plane")
-                                                  :FilterOnce()
-                local aliveTankersGroupList = set_group_tanker:GetSetObjects()
-
-                local is_tanker_spawned = false
-                jtff_log.debug(string.format('Looking for a Group corresponding to template %s', string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)),"TANKER")
-                for currrent_index, current_group in ipairs(aliveTankersGroupList) do
-                    if (
-                        (not(is_tanker_spawned)) and
-                            (string.find(
-                                current_group.GroupName,
-                                string.format("%s-%s",OnDemandTanker.groupName, OnDemandTanker.type),
-                                1,
-                                true
-                            ) ~= nil)
-                    ) then
-                        jtff_log.debug(string.format('Found %s corresponding to template %s', current_group.GroupName, string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)),"TANKER")
-                        is_tanker_spawned = true
-                        TankerGroup = current_group
-                    end
-                end
-
-                local RTBAirbase
-                local TankerRoute = {}
-                if (OnDemandTanker.baseUnit) then
-                    RTBAirbase = AIRBASE:FindByName(OnDemandTanker.baseUnit)
-                else
-                    RTBAirbase = askedAnchorCoord:GetClosestAirbase2(Airbase.Category.AIRDROME, OnDemandTanker.benefit_coalition)
-                end
-                if (is_tanker_spawned) then
-                    jtff_log.debug(string.format('OnDemandTanker already in air : rerouting %s', OnDemandTanker.groupName),"TANKER")
-                    TankerGroup:ClearTasks()
-                    table.insert(
-                        TankerRoute,
-                        askedAnchorCoord
-                            :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
-                            :WaypointAirTurningPoint(
-                            nil,
-                            UTILS.KnotsToKmph(OnDemandTanker.speed),
-                            {
-                                {
-                                    id = 'Tanker',
-                                    params = {
-                                    }
-                                },
-                                {
-                                    id = 'ControlledTask',
-                                    params = {
-                                        task =
-                                        {
-                                            id = 'Orbit',
-                                            params = {
-                                                pattern = AI.Task.OrbitPattern.RACE_TRACK,
-                                                speed = UTILS.KnotsToMps(OnDemandTanker.speed),
-                                                altitude = UTILS.FeetToMeters(OnDemandTanker.altitude)
-                                            }
-                                        },
-                                        stopCondition = {
-                                            duration = askedDuration * 60
-                                        }
-                                    },
-                                },
-                            },
-                            "Refuel Start"
-                        )
-                    )
-                    table.insert(
-                        TankerRoute,
-                        askedAnchorCoord
-                            :Translate(UTILS.NMToMeters(OnDemandTanker.orbit.length), OnDemandTanker.orbit.heading, true, false)
-                            :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
-                            :WaypointAirTurningPoint(
-                            nil,
-                            UTILS.KnotsToKmph(OnDemandTanker.speed),
-                            {
-                                {
-                                    id = 'Tanker',
-                                    params = {
-                                    }
-                                },
-                            },
-                            "Orbit End"
-                        )
-                    )
-                    table.insert(
-                        TankerRoute,
-                        RTBAirbase
-                            :GetCoordinate()
-                            :WaypointAirLanding(
-                            UTILS.KnotsToKmph(OnDemandTanker.speed),
-                            RTBAirbase
-                        )
-                    )
-                else
-                    jtff_log.info(string.format('OnDemandTanker Spawning %s', OnDemandTanker.groupName),"TANKER")
-                    local SpawnTanker = SPAWN:NewWithAlias(
-                        OnDemandTanker.groupName,
-                        string.format("%s-%s",OnDemandTanker.groupName,OnDemandTanker.type)
+                local oldMission = objTanker.airwing:GetMissionByID(objTanker.mission.auftragsnummer)
+                if oldMission then
+                    Jtff_log.info(
+                        string.format(
+                            'Mission %s already registered to Airwing %s, rerouting now',
+                            objTanker.mission:GetName(),
+                            objTanker.airwing:GetName()
+                        ),
+                        "TANKER"
                     )
-                    if (OnDemandTanker.freq) then
-                        SpawnTanker:InitRadioFrequency(OnDemandTanker.freq)
-                        SpawnTanker:InitRadioModulation("AM")
-                    end
-                    if (OnDemandTanker.modex) then
-                        SpawnTanker:InitModex(OnDemandTanker.modex)
-                    end
-                    if (OnDemandTanker.baseUnit) then
-                        TankerGroup = SpawnTanker:SpawnAtAirbase(
-                            AIRBASE:FindByName(OnDemandTanker.baseUnit),
-                            SPAWN.Takeoff.Hot,
-                            nil,
-                            OnDemandTanker.terminalType,
-                            true
-                        )
-                        table.insert(TankerRoute,
-                            AIRBASE
-                                :FindByName(OnDemandTanker.baseUnit)
-                                :GetCoordinate()
-                                :WaypointAirTakeOffParkingHot()
-                        )
-                    else
-                        TankerGroup = SpawnTanker:SpawnFromCoordinate(
-                            askedAnchorCoord
-                                :GetRandomCoordinateInRadius(
-                                UTILS.NMToMeters(30),
-                                UTILS.NMToMeters(20)
-                            )
-                                :SetAltitude(
-                                UTILS.FeetToMeters(OnDemandTanker.altitude)
-                            )
-                        )
-                    end
-                    TankerGroup.customconfig = OnDemandTanker
-                    TankerGroup.spawnAbsTime = timer.getAbsTime()
-                    TankerGroup.missionmaxduration = askedDuration
-                    table.insert(TankerRoute,
-                        askedAnchorCoord
-                            :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
-                            :WaypointAirTurningPoint(
-                            nil,
-                            UTILS.KnotsToKmph(OnDemandTanker.speed),
-                            {
-                                {
-                                    id = 'Tanker',
-                                    params = {
-                                    }
-                                },
-                                {
-                                    id = 'ControlledTask',
-                                    params = {
-                                        task =
-                                        {
-                                            id = 'Orbit',
-                                            params = {
-                                                pattern = AI.Task.OrbitPattern.RACE_TRACK,
-                                                speed = UTILS.KnotsToMps(OnDemandTanker.speed),
-                                                altitude = UTILS.FeetToMeters(OnDemandTanker.altitude)
-                                            }
-                                        },
-                                        stopCondition = {
-                                            duration = askedDuration * 60
-                                        }
-                                    },
-                                },
-                            },
-                            "Refuel Start"
-                        )
+                    local objOpsGroup = objTanker.mission:GetOpsGroups()[1]
+                    Jtff_log.debug(
+                        string.format(
+                            'OpsGroup executing previous mission %s ID=%d is %s',
+                            oldMission:GetName(),
+                            oldMission.auftragsnummer,
+                            objOpsGroup:GetName()
+                        ),
+                        "TANKER"
                     )
-                    table.insert(TankerRoute,
-                        askedAnchorCoord
-                            :Translate(UTILS.NMToMeters(OnDemandTanker.orbit.length), OnDemandTanker.orbit.heading, true, false)
-                            :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
-                            :WaypointAirTurningPoint(
-                            nil,
-                            UTILS.KnotsToKmph(OnDemandTanker.speed),
-                            {
-                                {
-                                    id = 'Tanker',
-                                    params = {
-                                    }
-                                }
-                            },
-                            "Orbit End"
-                        )
+                    objTanker.mission, objTanker.airwing = GenerateTankerMission(objTanker.customconfig, false)
+                    Jtff_log.debug(
+                        string.format(
+                            'Next Mission generated %s ID=%d for airwing %s',
+                            objTanker.mission:GetName(),
+                            objTanker.mission.auftragsnummer,
+                            objTanker.airwing:GetName()
+                        ),
+                        "TANKER"
                     )
-                    table.insert(TankerRoute,
-                        RTBAirbase
-                            :GetCoordinate()
-                            :WaypointAirLanding(
-                            UTILS.KnotsToKmph(OnDemandTanker.speed),
-                            RTBAirbase,
-                            {},
-                            'RTB'
-                        )
+                    objOpsGroup:AddMission(objTanker.mission)
+                    Jtff_log.debug(
+                        string.format(
+                            'Added next Mission %s generated ID=%d to group %s : %d mission(s) active(s)',
+                            objTanker.mission:GetName(),
+                            objTanker.mission.auftragsnummer,
+                            objOpsGroup:GetName(),
+                            #(objOpsGroup.missionqueue)
+                        ),
+                        "TANKER"
                     )
-                end
-                TankerGroup:Route(TankerRoute)
-                TankerGroup:CommandEPLRS(true, 4)
-                if (OnDemandTanker.tacan) then
-                    TankerGroup.beacon=BEACON:New(TankerGroup:GetUnit(1))
-                    TankerGroup.beacon:ActivateTACAN(OnDemandTanker.tacan.channel, "Y", OnDemandTanker.tacan.morse, true)
-                end
-                if (OnDemandTanker.callsign) then
-                    TankerGroup:CommandSetCallsign(OnDemandTanker.callsign.name, OnDemandTanker.callsign.number, 2)
-                end
-                if OnDemandTanker.escortgroupname then
-                    TankerGroup.escortSpawnObject = SPAWN:NewWithAlias(OnDemandTanker.escortgroupname,'escort-'.. OnDemandTanker.groupName)
-                                                         :InitRepeatOnEngineShutDown()
-                                                         :InitSkill("Excellent")
-                                                         :OnSpawnGroup(function(SpawnGroup)
-                        taskGroupEscort({TankerGroup, SpawnGroup})
-                    end)
-                    TankerGroup.escortGroupObject = spawnRecoveryTankerEscort(TankerGroup.escortSpawnObject,OnDemandTanker)
-                    if OnDemandTanker.missionmaxduration then
-                        TankerGroup.escortGroupObject:ScheduleOnce(OnDemandTanker.missionmaxduration*60,
-                            function(SpawnGroup, airBaseName)
-                                --trigger.action.outText('RTB schedule trigger Tanker-escort group : '..(SpawnGroup.GroupName)..' airbase'..(airBaseName)..'...', 45)
-                                SpawnGroup:RouteRTB(AIRBASE:FindByName(airBaseName))
-                            end,
-                            TankerGroup.escortGroupObject,
-                            OnDemandTanker.baseUnit
-                        )
-                        --trigger.action.outText('Tanker-escort configured to RTB in  : '..(OnDemandTanker.missionmaxduration)..' minutes max...', 45)
-                    end
-                end
-                if (map_marker[TankerGroup:GetName()]) then
-                    COORDINATE:RemoveMark(map_marker[TankerGroup:GetName()])
-                end
-                if(OnDemandTanker.tacan) then
-                    map_marker[TankerGroup:GetName()] = askedAnchorCoord:MarkToCoalition(
+                    -- objTanker.airwing:AddMission(objTanker.mission)
+                    objTanker.mission:AssignLegion(objTanker.airwing)
+                    table.insert(objTanker.airwing.missionqueue, objTanker.mission)
+                    oldMission:SetTime(nil, 5)
+                    Jtff_log.debug(
                         string.format(
-                            'OnDemand Tanker %s - TCN %i\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
-                            OnDemandTanker.type,
-                            OnDemandTanker.tacan.channel,
-                            UTILS.Round(OnDemandTanker.altitude / 100 , 0),
-                            OnDemandTanker.speed,
-                            OnDemandTanker.freq,
-                            askedDuration,
-                            OnDemandTanker.orbit.heading,
-                            OnDemandTanker.orbit.length
+                            'Stopped old Mission %s (ID=%d) from group %s : %d mission(s) active(s)',
+                            oldMission:GetName(),
+                            oldMission.auftragsnummer,
+                            objOpsGroup:GetName() or "unknown",
+                            #(objOpsGroup.missionqueue or {})
                         ),
-                        OnDemandTanker.benefit_coalition,
-                        true,
-                        'OnDemand Tanker %s is Activated'
+                        "TANKER"
                     )
                 else
-                    map_marker[TankerGroup:GetName()] = askedAnchorCoord:MarkToCoalition(
+                    Jtff_log.info(
                         string.format(
-                            'OnDemand Tanker %s\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
-                            OnDemandTanker.type,
-                            UTILS.Round(OnDemandTanker.altitude / 100 , 0),
-                            OnDemandTanker.speed,
-                            OnDemandTanker.freq,
-                            askedDuration,
-                            OnDemandTanker.orbit.heading,
-                            OnDemandTanker.orbit.length
+                            'Mission %s not registered to Airwing %s, spawning now',
+                            objTanker.mission:GetName(),
+                            objTanker.airwing:GetName()
                         ),
-                        OnDemandTanker.benefit_coalition,
-                        true,
-                        'OnDemand Tanker %s is Activated'
+                        "TANKER"
                     )
-                end
-                TankerGroup:HandleEvent(EVENTS.Land)
-                TankerGroup:HandleEvent(EVENTS.Crash)
-                TankerGroup:HandleEvent(EVENTS.Dead)
-                function TankerGroup:OnEventLand(EventData)
-                    COORDINATE:RemoveMark(map_marker[self:GetName()])
-                    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")
-                            self.escortGroupObject:RouteRTB()
-                        else
-                            --self.escortGroupObject:Destroy(nil, 5)
-                        end
-                    end
-                end
-                function TankerGroup:OnEventCrash(EventData)
-                    COORDINATE:RemoveMark(map_marker[self:GetName()])
-                    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")
-                            self.escortGroupObject:RouteRTB()
-                        else
-                            --self.escortGroupObject:Destroy(nil, 5)
-                        end
-                    end
-                end
-                function TankerGroup:OnEventDead(EventData)
-                    COORDINATE:RemoveMark(map_marker[self:GetName()])
-                    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")
-                            self.escortGroupObject:RouteRTB()
-                        else
-                            --self.escortGroupObject:Destroy(nil, 5)
-                        end
-                    end
+                    objTanker.mission, objTanker.airwing = GenerateTankerMission(objTanker.customconfig, true)
+                    objTanker.airwing:AddMission(objTanker.mission)
                 end
             end
         end
     end
-    return TankerGroup;
 end
 
 --local RestrToCoal = nil
-tankersOnDemandArray = {}
 local TankerMarkHandler = {}
 
 function TankerMarkHandler:onEvent(event)
@@ -520,30 +651,30 @@ function TankerMarkHandler:onEvent(event)
 
         if (string.find(full, CmdSymbol)) then
             param1Start = string.find(full, CmdSymbol)
-            cmd = string.sub(full, 0, param1Start-1)
-            remString = string.sub(full, param1Start+1)
+            cmd = string.sub(full, 0, param1Start - 1)
+            remString = string.sub(full, param1Start + 1)
             if (string.find(remString, CmdSymbol)) then
                 param2Start = string.find(remString, CmdSymbol)
-                param1 = string.sub(remString, 0, param2Start-1)
-                remString = string.sub(remString, param2Start+1)
+                param1 = string.sub(remString, 0, param2Start - 1)
+                remString = string.sub(remString, param2Start + 1)
                 if string.find(remString, CmdSymbol) then
                     param3Start = string.find(remString, CmdSymbol)
-                    param2 = string.sub(remString, 0, param3Start-1)
-                    remString = string.sub(remString, param3Start+1)
+                    param2 = string.sub(remString, 0, param3Start - 1)
+                    remString = string.sub(remString, param3Start + 1)
                     if string.find(remString, CmdSymbol) then
                         param4Start = string.find(remString, CmdSymbol)
-                        param3 = string.sub(remString, 0, param4Start-1)
-                        remString = string.sub(remString, param4Start+1)
+                        param3 = string.sub(remString, 0, param4Start - 1)
+                        remString = string.sub(remString, param4Start + 1)
 
                         if string.find(remString, CmdSymbol) then
                             param5Start = string.find(remString, CmdSymbol)
-                            param4 = string.sub(remString, 0, param5Start-1)
-                            remString = string.sub(remString, param5Start+1)
+                            param4 = string.sub(remString, 0, param5Start - 1)
+                            remString = string.sub(remString, param5Start + 1)
 
                             if string.find(remString, CmdSymbol) then
                                 param6Start = string.find(remString, CmdSymbol)
-                                param5 = string.sub(remString, 0, param6Start-1)
-                                param6 = string.sub(remString, param6Start+1)
+                                param5 = string.sub(remString, 0, param6Start - 1)
+                                param6 = string.sub(remString, param6Start + 1)
                             else
                                 param5 = remString
                             end
@@ -562,7 +693,7 @@ function TankerMarkHandler:onEvent(event)
         else
             cmd = full
         end
-        if log_levels[JTFF_LOGLEVEL] <= log_levels['debug'] then
+        if Log_levels[JTFF_LOGLEVEL] <= Log_levels['debug'] then
             trigger.action.outText("Full Text = " .. full, 10)
             trigger.action.outText("Command = " .. cmd, 10)
             if param1 ~= nil then trigger.action.outText("type = " .. param1, 10) end
@@ -574,10 +705,10 @@ function TankerMarkHandler:onEvent(event)
         end
 
         if string.find(cmd, "tanker") then
-            if log_levels[JTFF_LOGLEVEL] <= log_levels['debug'] then
+            if Log_levels[JTFF_LOGLEVEL] <= Log_levels['debug'] then
                 trigger.action.outText("DEBUG: On Demand Tanker Started!", 10)
             end
-            tankersOnDemandArray[#tankersOnDemandArray+1] = triggerOnDemandTanker(
+            TriggerOnDemandTanker(
                 param1,
                 tonumber(param2),
                 tonumber(param3),
@@ -587,9 +718,7 @@ function TankerMarkHandler:onEvent(event)
                 tonumber(param6)
             )
         end
-        --end
     end
-
 end
 
 world.addEventHandler(TankerMarkHandler)