@jtff/miztemplate-lib 3.1.9 → 3.1.11

package/lua/src/020-mission_functions.lua

@@ -8,9 +8,19 @@
 --
 env.info('JTFF-SHAREDLIB: shared library loading...')
 
-DEBUG_MSG = false
-DEBUG_SC_MSG = false
-DEBUG_DETECT_MSG = false
+log_modes = {
+    { name = "trace", color = "\27[34m", },
+    { name = "debug", color = "\27[36m", },
+    { name = "info",  color = "\27[32m", },
+    { name = "warn",  color = "\27[33m", },
+    { name = "error", color = "\27[31m", },
+    { name = "fatal", color = "\27[35m", },
+}
+log_levels = {}
+for i, v in ipairs(log_modes) do
+    log_levels[v.name] = i
+end
+JTFF_LOGLEVEL = 'info'
 
 use_jtff_sound_mod = false
 
@@ -19,6 +29,9 @@ spawnStandardDelay = 15
 sead = SEAD:New({})
 map_marker = {}
 
+HoundBlue = HoundElint:create(coalition.side.BLUE)
+HoundRed = HoundElint:create(coalition.side.RED)
+
 AAMAxRange = {
     MAX_RANGE = 0,
     NEZ_RANGE = 1,
@@ -27,28 +40,21 @@ AAMAxRange = {
     RANDOM_RANGE = 4,
 }
 
-
-function debug_msg(message)
-    if DEBUG_MSG then
-        env.info(string.format("[DEBUG] %s", message))
-    end
-end
-
-function debug_detection_msg(message)
-    if DEBUG_DETECT_MSG then
-        env.info(string.format("[DEBUG DETECTION] %s", message))
-    end
-end
-
-function debug_scheduler_msg(message)
-    if DEBUG_SC_MSG then
-        env.info(string.format("[DEBUG SCHEDULER] %s", message))
+jtff_log = {}
+for index, mode in ipairs(log_modes) do
+    local nameupper = mode.name:upper()
+    jtff_log[mode.name] = function(message, category)
+        -- Return early if we're below the log level
+        if index < log_levels[JTFF_LOGLEVEL] then
+            return
+        end
+        env.info(string.format("[JTFF-%s]--%s-- %s", mode.name, category, message))
     end
 end
 
 function switchGroupImmortalStatus(group)
     status = not BASE:GetState(group, "isImmortal")
-    debug_msg(string.format("switch group %s to immortal status %s", group:GetName(), tostring(status)))
+    jtff_log.info(string.format("switch group %s to immortal status %s", group:GetName(), tostring(status)), "GENERAL")
     group:SetCommandImmortal(status)
     BASE:SetState(group, "isImmortal", status)
     MESSAGE:NewType("Immortal status of your group : " .. tostring(status) , MESSAGE.Type.Update):ToGroup(group)
@@ -114,33 +120,33 @@ function tankerStatusMessage(tanker, PlayerUnit, PlayerGroup)
     local timeLeftString = "Time left : "
     local groupName = tanker:GetName()
     for index, value in pairs(tankersArray) do
-        debug_msg(string.format("%s spawned at %i", value.tanker.GroupName, value.spawnAbsTime))
+        jtff_log.debug(string.format("%s spawned at %i", value.tanker.GroupName, value.spawnAbsTime),"TANKER")
         if (string.find(groupName, value.tanker.GroupName, 1, true) ~= nil) then
             timeInTheAir = timer.getAbsTime() - value.spawnAbsTime
             timeLeftInTheAir = value.customconfig.missionmaxduration * 60 - timeInTheAir
             if (UTILS.SecondsToClock(timeLeftInTheAir, true) ~= nil) then
                 timeLeftString = timeLeftString .. UTILS.SecondsToClock(timeLeftInTheAir, true)
             end
-            debug_msg(string.format("%s found in %s, time in the air : %i sec, time left %i sec",
-                    value.tanker.GroupName, groupName, timeInTheAir, timeLeftInTheAir))
+            jtff_log.debug(string.format("%s found in %s, time in the air : %i sec, time left %i sec",
+                    value.tanker.GroupName, groupName, timeInTheAir, timeLeftInTheAir), "TANKER")
         else
-            debug_msg(string.format("%s not found in %s", value.tanker.GroupName, groupName))
+            jtff_log.warn(string.format("%s not found in %s", value.tanker.GroupName, groupName),"TANKER")
         end
     end
 
     for index, value in pairs(tankersOnDemandArray) do
         if( value ~= nil) then
-            debug_msg(string.format("%s spawned in tankersOnDemandArray", value:GetName()))
+            jtff_log.info(string.format("%s spawned in tankersOnDemandArray", value:GetName()),"TANKER")
             if (string.find(groupName, value:GetName(), 1, true) ~= nil) then
                 timeInTheAir = timer.getAbsTime() - value.spawnAbsTime
                 timeLeftInTheAir = value.missionmaxduration * 60 - timeInTheAir
                 if (UTILS.SecondsToClock(timeLeftInTheAir, true) ~= nil) then
                     timeLeftString = timeLeftString .. UTILS.SecondsToClock(timeLeftInTheAir, true)
                 end
-                debug_msg(string.format("%s found in %s, time in the air : %i sec, time left %i sec",
-                        value:GetName(), groupName, timeInTheAir, timeLeftInTheAir))
+                jtff_log.debug(string.format("%s found in %s, time in the air : %i sec, time left %i sec",
+                        value:GetName(), groupName, timeInTheAir, timeLeftInTheAir),"TANKER")
             else
-                debug_msg(string.format("%s not found in %s", value:GetName(), groupName))
+                jtff_log.warn(string.format("%s not found in %s", value:GetName(), groupName),"TANKER")
             end
         end
     end
@@ -261,7 +267,7 @@ function taskTankerEscort(param)
                 )
             }
     )
-    env.info('Escort group spawned : '.. EscortGroup.GroupName..'. Escorting '..recoveryTankerObject.tanker.GroupName)
+    jtff_log.info('Escort group spawned : '.. EscortGroup.GroupName..'. Escorting '..recoveryTankerObject.tanker.GroupName,"TANKER")
 end
 
 function taskGroupEscort(param)
@@ -301,7 +307,7 @@ function taskGroupEscort(param)
                 )
             }
     )
-    env.info('Escort group spawned : '.. EscortingGroup.GroupName..'. Escorting '.. GroupToEscortObject.GroupName)
+    jtff_log.info('Escort group spawned : '.. EscortingGroup.GroupName..'. Escorting '.. GroupToEscortObject.GroupName,"GENERAL")
 end
 
 function spawnRecoveryTankerEscort(escortSpawnObject,customconfig)
@@ -342,7 +348,7 @@ function getMaxThreatUnit(setUnits)
     setUnits:ForEachUnitPerThreatLevel(10, 0, function(unit)
         setUnitsSorted:AddUnit(unit)
     end)
-    debug_msg(string.format("Max priority unit : %s", setUnitsSorted:GetFirst():GetName()))
+    jtff_log.debug(string.format("Max priority unit : %s", setUnitsSorted:GetFirst():GetName()), "GENERAL")
     return setUnitsSorted:GetFirst()
 end
 
@@ -350,7 +356,7 @@ function destroyGroup(group_name)
     local set_group_alive = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
     set_group_alive:ForEachGroupAlive(
             function(group_alive)
-                debug_msg(string.format("Group %s just removed", group_alive:GetName()))
+                jtff_log.info(string.format("Group %s just removed", group_alive:GetName()),"GENERAL")
                 if (map_marker[group_alive:GetName()]) then
                     COORDINATE:RemoveMark(map_marker[group_alive:GetName()])
                 end
@@ -366,18 +372,18 @@ function destroyStatic(staticToDelete, subRangeName, index)
         end
         local staticUnitToDelete = STATIC:FindByName(staticNameToDelete, false)
         if (staticUnitToDelete ~= nil) then
-            debug_msg(string.format("Delete static %s", staticUnitToDelete:GetDCSObject():getName()))
+            jtff_log.info(string.format("Delete static %s", staticUnitToDelete:GetDCSObject():getName()),"GENERAL")
             staticUnitToDelete:Destroy()
         end
     elseif (staticToDelete.type ~= nil and staticToDelete.category ~= nil and index ~= nil) then
         local staticNameToDelete = string.format("%s_%s_%i", subRangeName, staticToDelete.type, index)
         local staticUnitToDelete = STATIC:FindByName(staticNameToDelete, false)
         if (staticUnitToDelete ~= nil) then
-            debug_msg(string.format("Delete Static %s", staticUnitToDelete:GetDCSObject():getName()))
+            jtff_log.info(string.format("Delete Static %s", staticUnitToDelete:GetDCSObject():getName()),"GENERAL")
             staticUnitToDelete:Destroy()
         end
     else
-        debug_msg(string.format("Static to delete has no name or type!"))
+        jtff_log.error(string.format("Static to delete has no name or type!"), "GENERAL")
     end
 end
 
@@ -408,7 +414,7 @@ function deleteSubRangeUnits(param)
     if (staticsToDelete ~= nil)then
         destroyStatics(staticsToDelete, subRangeName)
     else
-        debug_msg(string.format("No static in %s", subRangeName))
+        jtff_log.warn(string.format("No static in %s", subRangeName), "RANGE")
     end
 
     MESSAGE:NewType(string.format("Remove the site : %s-%s", rangeConfig.name, subRangeConfig.name),
@@ -466,7 +472,7 @@ function setROE(param)
         local group_name = string.format("%s", groupsToSpawn[groupIndex])
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
-            debug_msg(string.format("SET ROE of group %s at %i", group_alive:GetName(), ROEvalue))
+            jtff_log.info(string.format("SET ROE of group %s at %i", group_alive:GetName(), ROEvalue), "GENERAL")
             if (ROEvalue ~= ENUMS.ROE.WeaponHold) then
                 group_alive:SetAIOn()
             end
@@ -484,13 +490,13 @@ function setAlarmState(param)
         dcs_groups:ForEachGroupAlive(function(group_alive)
             group_alive:SetAIOn()
             if AlarmStateValue == ENUMS.AlarmState.Auto then
-                debug_msg(string.format("SET Alarm State of group %s at AUTO", group_alive:GetName()))
+                jtff_log.info(string.format("SET Alarm State of group %s at AUTO", group_alive:GetName()),"GENERAL")
                 group_alive:OptionAlarmStateAuto()
             elseif AlarmStateValue == ENUMS.AlarmState.Green then
-                debug_msg(string.format("SET Alarm State of group %s at Green", group_alive:GetName()))
+                jtff_log.info(string.format("SET Alarm State of group %s at Green", group_alive:GetName()),"GENERAL")
                 group_alive:OptionAlarmStateGreen()
             elseif AlarmStateValue == ENUMS.AlarmState.Red then
-                debug_msg(string.format("SET Alarm State of group %s at Red", group_alive:GetName()))
+                jtff_log.info(string.format("SET Alarm State of group %s at Red", group_alive:GetName()),"GENERAL")
                 group_alive:OptionAlarmStateRed()
             end
         end)
@@ -504,7 +510,7 @@ function setEngageAirWeapons(param)
         local group_name = string.format("%s", groupsToSpawn[groupIndex])
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
-            debug_msg(string.format("SET Engage Air Weapons of group %s at %s", group_alive:GetName(), tostring(value)))
+            jtff_log.info(string.format("SET Engage Air Weapons of group %s at %s", group_alive:GetName(), tostring(value)),"GENERAL")
             if (value) then
                 group_alive:SetAIOn()
             end
@@ -520,7 +526,7 @@ function smokeOnSubRange(param)
         local group_name = string.format("%s", groupsToSpawn[groupIndex])
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
-            debug_msg(string.format("Smoke on group %s", group_alive:GetName()))
+            jtff_log.info(string.format("Smoke on group %s", group_alive:GetName()),"GENERAL")
             local list_units = group_alive:GetUnits()
             local set_units_red = SET_UNIT:New()
             local set_units_blue = SET_UNIT:New()
@@ -553,35 +559,35 @@ function giveToClientGroupCoordinates(param)
     local groupsToSpawn = param[1]
     for i = 1, #groupsToSpawn do
         local group_name = string.format("%s", groupsToSpawn[i])
-        debug_msg(string.format("Coordinates of all groups with name prefix %s", group_name))
+        jtff_log.debug(string.format("Coordinates of all groups with name prefix %s", group_name),"GENERAL")
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         Set_CLIENT:ForEachClient(function(client)
             if (client:IsActive()) then
-                debug_msg(string.format("For Client %s ", client:GetName()))
+                jtff_log.debug(string.format("For Client %s ", client:GetName()),"GENERAL")
                 local coordinate_txt = ""
                 dcs_groups:ForEachGroupAlive(function(group_alive)
-                    debug_msg(string.format("Coordinates of the group %s", group_alive:GetName()))
+                    jtff_log.debug(string.format("Coordinates of the group %s", group_alive:GetName()),"GENERAL")
                     local coordinate = group_alive:GetCoordinate()
                     local setting = _DATABASE:GetPlayerSettings(client:GetPlayerName())
                     local coordinate_string = ""
                     if (setting:IsA2G_LL_DDM()) then
                         coordinate_string = coordinate:ToStringLLDDM(setting)
-                        debug_msg(string.format("%s IsA2G_LL_DDM", client:GetName()))
+                        jtff_log.debug(string.format("%s IsA2G_LL_DDM", client:GetName()),"GENERAL")
                     elseif (setting:IsA2G_MGRS()) then
                         coordinate_string = coordinate:ToStringMGRS(setting)
-                        debug_msg(string.format("%s IsA2G_MGRS", client:GetName()))
+                        jtff_log.debug(string.format("%s IsA2G_MGRS", client:GetName()),"GENERAL")
                     elseif (setting:IsA2G_LL_DMS()) then
                         coordinate_string = coordinate:ToStringLLDMS(setting)
-                        debug_msg(string.format("%s IsA2G_LL_DMS", client:GetName()))
+                        jtff_log.debug(string.format("%s IsA2G_LL_DMS", client:GetName()),"GENERAL")
                     elseif (setting:IsA2G_BR()) then
                         coordinate_string = coordinate:ToStringBR(client:GetCoordinate(), setting)
-                        debug_msg(string.format("%s IsA2G_BR", client:GetName()))
+                        jtff_log.debug(string.format("%s IsA2G_BR", client:GetName()),"GENERAL")
                     end
-                    debug_msg(string.format("coordinate_txt [%s] : %s", group_alive:GetName(), coordinate_string))
+                    jtff_log.debug(string.format("coordinate_txt [%s] : %s", group_alive:GetName(), coordinate_string),"GENERAL")
                     coordinate_txt = string.format("%s[%s] : %s\n", coordinate_txt, group_alive:GetName(),
                             coordinate_string)
                 end)
-                debug_msg(string.format("Message to Client %s : %s", client:GetName(), coordinate_txt))
+                jtff_log.debug(string.format("Message to Client %s : %s", client:GetName(), coordinate_txt),"GENERAL")
                 MESSAGE:NewType(coordinate_txt, MESSAGE.Type.Detailed):ToClient(client)
             end
         end)
@@ -592,13 +598,13 @@ function giveListOfGroupsAliveInRange(param)
     local groupsToSpawn = param[1]
     local rangeConfig = param[2]
     local subRangeConfig = param[3]
-    debug_msg(string.format("List of groups in range %s-%s", rangeConfig.name, subRangeConfig.name))
+    jtff_log.debug(string.format("List of groups in range %s-%s", rangeConfig.name, subRangeConfig.name),"RANGE")
     local message = string.format("Targets groups in Range %s-%s :", rangeConfig.name, subRangeConfig.name)
     for i = 1, #groupsToSpawn do
         local group_name = string.format("%s", groupsToSpawn[i])
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
-            debug_msg(string.format("group %s", group_alive:GetName()))
+            jtff_log.debug(string.format("group %s", group_alive:GetName()),"RANGE")
             message = string.format("%s %s | ", message, group_alive:GetName());
         end)
     end
@@ -615,10 +621,10 @@ function giveListOfUnitsAliveInGroup(param)
     local number_to_display = param[3]
     for i = 1, #groupsToSpawn do
         local group_name = string.format("%s", groupsToSpawn[i])
-        debug_msg(string.format("List of units of all groups with name prefix %s", group_name))
+        jtff_log.debug(string.format("List of units of all groups with name prefix %s", group_name),"GENERAL")
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
-            debug_msg(string.format("List of units of the group %s", group_alive:GetName()))
+            jtff_log.debug(string.format("List of units of the group %s", group_alive:GetName()),"GENERAL")
             local info_unit_header = string.format("Units list of the group [%s]:", group_name)
             Set_CLIENT:ForEachClient(function(client)
                 if (client:IsActive()) then
@@ -631,7 +637,7 @@ function giveListOfUnitsAliveInGroup(param)
                 local unit_tmp = list_units[index]
                 if (unit_tmp:IsAlive() and unit_tmp:GetCoalition() ~= side) then
                     set_units:AddUnit(unit_tmp)
-                    debug_msg(string.format("Type : %s", unit_tmp:GetTypeName()))
+                    jtff_log.debug(string.format("Type : %s", unit_tmp:GetTypeName()),"GENERAL")
                 end
             end
             local increment = 0;
@@ -682,10 +688,10 @@ function markGroupOnMap(param)
     local side = param[2]
     for i = 2, #groupsToSpawn do
         local group_name = string.format("%s", groupsToSpawn[i])
-        debug_msg(string.format("Mark on map all groups with name prefix %s", group_name))
+        jtff_log.info(string.format("Mark on map all groups with name prefix %s", group_name),"MARK")
         local dcs_groups = SET_GROUP:New():FilterPrefixes(group_name):FilterOnce()
         dcs_groups:ForEachGroupAlive(function(group_alive)
-            debug_msg(string.format("Mark on map the group %s", group_alive:GetName()))
+            jtff_log.info(string.format("Mark on map the group %s", group_alive:GetName()),"MARK")
             local coordinate = group_alive:GetCoordinate()
             map_marker[group_alive:GetName()] = coordinate:MarkToCoalition(group_alive:GetName(), side)
         end)
@@ -815,7 +821,7 @@ function SpawnRanges(param)
     local activateAI = subRangeConfig.AI
     local redAlert = subRangeConfig.redAlert
 
-    debug_msg(string.format("SpawnRanges : Range %s - Targets %s", rangeName, subRangeName))
+    jtff_log.info(string.format("SpawnRanges : Range %s - Targets %s", rangeName, subRangeName),"RANGE")
     if (staticsToSpawn ~= nil)then
         for index, staticToSpawn in ipairs(staticsToSpawn) do
             local spawnStatic = nil
@@ -836,7 +842,7 @@ function SpawnRanges(param)
                 local heading = staticToSpawn.heading
                 local name = string.format("%s_%s_%i", subRangeName, staticNameToSpawn,index)
                 local static = spawnStatic:SpawnFromPointVec2( POINT_VEC2:New( x, y ), heading, name )
-                debug_msg(string.format("Static to spawn %s at %i,%i -> %s", static:GetDCSObject():getTypeName(), x, y, static:GetDCSObject():getName()))
+                jtff_log.info(string.format("Static to spawn %s at %i,%i -> %s", static:GetDCSObject():getTypeName(), x, y, static:GetDCSObject():getName()),"RANGE")
             elseif (staticToSpawn.type ~= nil and staticToSpawn.category ~= nil) then
                 local staticTypeToSpawn = string.format("%s", staticToSpawn.type)
                 local staticCategoryToSpawn = string.format("%s", staticToSpawn.category)
@@ -855,20 +861,20 @@ function SpawnRanges(param)
                 local heading = staticToSpawn.heading
                 local name = string.format("%s_%s_%i", subRangeName, staticTypeToSpawn, index)
                 local static = spawnStatic:SpawnFromPointVec2( POINT_VEC2:New( x, y ), heading, name )
-                debug_msg(string.format("Static type to spawn %s at %i,%i -> %s", static:GetDCSObject():getTypeName(), x, y, static:GetDCSObject():getName()))
+                jtff_log.info(string.format("Static type to spawn %s at %i,%i -> %s", static:GetDCSObject():getTypeName(), x, y, static:GetDCSObject():getName()),"RANGE")
             else
-                debug_msg(string.format("Static to spawn has no name or type!"))
+                jtff_log.warn(string.format("Static to spawn has no name or type!"),"RANGE")
             end
         end
     else
-        debug_msg(string.format("No static in %s", subRangeName))
+        jtff_log.warn(string.format("No static in %s", subRangeName),"RANGE")
     end
 
     for i = 1, #groupsToSpawn do
         local groupNameToSpawn = string.format("%s", groupsToSpawn[i])
         if (GROUP:FindByName(groupNameToSpawn) ~= nil) then
             local spawnGroup = SPAWN:New(groupNameToSpawn)
-            debug_msg(string.format("SPAWN %s", groupNameToSpawn))
+            jtff_log.info(string.format("SPAWN %s", groupNameToSpawn), "RANGE")
             local groupSpawning
             if (subRangeConfig.spawnZone) then
                 groupSpawning = spawnGroup:SpawnInZone(ZONE:New(subRangeConfig.spawnZone),true)
@@ -897,10 +903,10 @@ function SpawnRanges(param)
             end
             if (string.find(groupNameToSpawn, "SAM") ~= nil) then
                 sead:UpdateSet(groupNameToSpawn)
-                debug_msg(string.format("SEAD for %s", groupNameToSpawn))
+                jtff_log.info(string.format("SEAD for %s", groupNameToSpawn),"RANGE")
             end
         else
-            debug_msg(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn))
+            jtff_log.error(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn),"RANGE")
         end
     end
 
@@ -956,12 +962,12 @@ function SpawnFacRanges(param)
     local groupsToSpawn = facSubRangeConfig.groupsToSpawn
     local staticsToSpawn = facSubRangeConfig.staticsToSpawn
 
-    debug_msg(string.format("SpawnFacRanges : %s-%s", facRangeName, facSubRangeName))
+    jtff_log.info(string.format("SpawnFacRanges : %s-%s", facRangeName, facSubRangeName),"RANGE")
     for i = 1, #groupsToSpawn do
         local groupNameToSpawn = string.format("%s", groupsToSpawn[i])
         if (GROUP:FindByName(groupNameToSpawn) ~= nil) then
             local spawnGroup = SPAWN:New(groupNameToSpawn)
-            debug_msg(string.format("SPAWN %s", groupNameToSpawn))
+            jtff_log.info(string.format("SPAWN %s", groupNameToSpawn),"RANGE")
             local groupSpawning
             if (facSubRangeConfig.spawnZone) then
                 groupSpawning = spawnGroup:SpawnInZone(ZONE:New(facSubRangeConfig.spawnZone),true)
@@ -970,7 +976,7 @@ function SpawnFacRanges(param)
             end
             groupSpawning:SetCommandInvisible(true)
         else
-            debug_msg(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn))
+            jtff_log.warn(string.format("GROUP to spawn %s not found in mission", groupNameToSpawn),"RANGE")
         end
     end
 

package/lua/src/110-set_clients.lua

@@ -11,7 +11,7 @@ function Set_CLIENT:OnEventPlayerEnterAircraft(EventData)
         clientSetting:SetImperial()
         clientSetting:SetA2G_MGRS()
         clientSetting:SetMenutextShort(true)
-        debug_msg(string.format("Add Tanker Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName))
+        jtff_log.debug(string.format("Add Tanker Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName),"TANKER")
         if type(InterceptArray) == 'table' then
             for index, objIntercept in ipairs(InterceptArray) do
                 if (objIntercept.menus[EventData.IniUnit:GetCoalition()]) then
@@ -31,7 +31,7 @@ function Set_CLIENT:OnEventPlayerEnterAircraft(EventData)
             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" )
-        debug_msg(string.format("Add Immortal Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName))
+        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
@@ -43,7 +43,7 @@ function Set_CLIENT:OnEventRefueling(EventData)
     if (EventData.IniGroup) then
         local client = CLIENT:Find(EventData.IniDCSUnit)
         local clientFuel = EventData.IniUnit:GetTemplateFuel()
-        debug_msg(string.format("[%s] Start to refuel at the tanker %[s], current fuel : %.0f Kg",EventData.IniPlayerName , EventData.TgtUnitName, clientFuel))
+        jtff_log.trace(string.format("[%s] Start to refuel at the tanker %[s], current fuel : %.0f Kg",EventData.IniPlayerName , EventData.TgtUnitName, clientFuel),"TANKER")
         BASE:SetState( client, "Fuel", clientFuel )
     end
 end
@@ -51,11 +51,11 @@ function Set_CLIENT:OnEventRefuelingStop(EventData)
     if (EventData.IniGroup) then
         local client = CLIENT:Find(EventData.IniDCSUnit)
         local clientFuelTaken = EventData.IniUnit:GetTemplateFuel() - BASE:GetState(client,"Fuel")
-        debug_msg(string.format("[%s] Stop to refuel at the tanker %[s], taken %.0f Kg",EventData.IniPlayerName , EventData.TgtUnitName, clientFuelTaken))
+        jtff_log.trace(string.format("[%s] Stop to refuel at the tanker %[s], taken %.0f Kg",EventData.IniPlayerName , EventData.TgtUnitName, clientFuelTaken),"TANKER")
     end
 end
 
 Set_CLIENT_Bleu = SET_CLIENT:New():FilterCoalitions(coalition.side.BLUE):FilterOnce()
-debug_msg(string.format("Nbre Blue Client : %i", Set_CLIENT_Bleu:Count()))
+jtff_log.debug(string.format("Nbre Blue Client : %i", Set_CLIENT_Bleu:Count()),"GENERAL")
 Set_CLIENT_Red = SET_CLIENT:New():FilterCoalitions(coalition.side.RED):FilterOnce()
-debug_msg(string.format("Nbre Red Client : %i", Set_CLIENT_Red:Count()))
+jtff_log.debug(string.format("Nbre Red Client : %i", Set_CLIENT_Red:Count()),"GENERAL")

package/lua/src/120-tankers.lua

@@ -8,7 +8,7 @@ MenuCoalitionTankerRed = MENU_COALITION:New(coalition.side.RED, "Tankers", MenuC
 for index, tankerconfig in ipairs(TankersConfig) do
     if tankerconfig.enable == true then
         compteur = compteur + 1
-        env.info('creation Tanker : '.. tankerconfig.groupName..'...')
+        jtff_log.info('creation Tanker : '.. tankerconfig.groupName..'...',"TANKER")
         local objTanker = RECOVERYTANKER:New(UNIT:FindByName(tankerconfig.patternUnit), tankerconfig.groupName)
                                         :SetTakeoffCold()
                                         :SetRespawnOnOff(tankerconfig.autorespawn)
@@ -26,7 +26,7 @@ for index, tankerconfig in ipairs(TankersConfig) do
         function objTanker:OnAfterStart(from, event, to)
             --self:SetTACAN(self.customconfig.tacan.channel, self.customconfig.tacan.morse, self.customconfig.tacan.band )
             self.spawnAbsTime = timer.getAbsTime()
-            env.info('popup Tanker : '..self.tanker.GroupName..' at : '..self.spawnAbsTime)
+            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()
@@ -77,9 +77,9 @@ for index, tankerconfig in ipairs(TankersConfig) do
         end
         function objTanker:OnAfterRTB(from, event, to, airbase)
             if self.customconfig.escortgroupname then
-                env.info('Tanker RTB: '..self.tanker.GroupName..'...')
+                jtff_log.info('RTB: '..self.tanker.GroupName..'...',"TANKER")
                 if self.escortGroupObject:IsAirborne(false) == true then
-                    env.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.tanker.GroupName..'...')
+                    jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.tanker.GroupName..'...',"TANKER")
                     self.escortGroupObject:RouteRTB(airbase)
                 else
                     --self.escortGroupObject:Destroy(nil, 5)
@@ -89,7 +89,7 @@ for index, tankerconfig in ipairs(TankersConfig) do
         end
         function objTanker:OnEventKill(event)
             if self.customconfig.escortgroupname then
-                env.info(event.target' Killed !! Sending escort Home')
+                jtff_log.info(event.target' Killed !! Sending escort Home',"TANKER")
                 self.escortGroupObject:RouteRTB(AIRBASE:FindByName(self.customconfig.baseUnit))
             end
         end
@@ -97,7 +97,7 @@ for index, tankerconfig in ipairs(TankersConfig) do
             self.tanker:OptionRestrictBurner(true)
             if ((self.customconfig.escortgroupname) and (self.escortGroupObject)) then
                 if not(GROUP:FindByName(self.escortGroupObject.GroupName)) then
-                    env.info('Respawning escort Group '..self.escortGroupObject.GroupName)
+                    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)
                 end
@@ -116,7 +116,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
     if (OnDemandTankersConfig) then
         for index, OnDemandTanker in ipairs(OnDemandTankersConfig) do
             if ((OnDemandTanker.type == type) and (OnDemandTanker.enable)) then
-                debug_msg(string.format('OnDemandTanker : Found type %s Tanker : %s Group!', type, OnDemandTanker.groupName))
+                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
                 end
@@ -173,14 +173,14 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                     end
                 end
                 local set_group_tanker = SET_GROUP:New()
-                        :FilterActive()
-                        :FilterPrefixes(OnDemandTanker.groupName)
-                        :FilterCategories("plane")
-                        :FilterOnce()
+                                                  :FilterActive()
+                                                  :FilterPrefixes(OnDemandTanker.groupName)
+                                                  :FilterCategories("plane")
+                                                  :FilterOnce()
                 local aliveTankersGroupList = set_group_tanker:GetSetObjects()
 
                 local is_tanker_spawned = false
-                debug_msg(string.format('OnDemandTanker : Looking for a Group corresponding to template %s', string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)))
+                jtff_log.debug(string.format('Looking for a Group corresponding to template %s', string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)),"TANKER")
                 for index, current_group in ipairs(aliveTankersGroupList) do
                     if (
                             (not(is_tanker_spawned)) and
@@ -191,7 +191,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                                             true
                                     ) ~= nil)
                     ) then
-                        debug_msg(string.format('OnDemandTanker Found %s corresponding to template %s', current_group.GroupName, string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)))
+                        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
@@ -205,7 +205,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                     RTBAirbase = askedAnchorCoord:GetClosestAirbase2(Airbase.Category.AIRDROME, OnDemandTanker.benefit_coalition)
                 end
                 if (is_tanker_spawned) then
-                    debug_msg(string.format('OnDemandTanker already in air : rerouting %s', OnDemandTanker.groupName))
+                    jtff_log.debug(string.format('OnDemandTanker already in air : rerouting %s', OnDemandTanker.groupName),"TANKER")
                     TankerGroup:ClearTasks()
                     table.insert(
                             TankerRoute,
@@ -269,7 +269,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                             )
                     )
                 else
-                    debug_msg(string.format('OnDemandTanker Spawning %s', OnDemandTanker.groupName))
+                    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)
@@ -381,9 +381,9 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 end
                 if OnDemandTanker.escortgroupname then
                     TankerGroup.escortSpawnObject = SPAWN:NewWithAlias(OnDemandTanker.escortgroupname,'escort-'.. OnDemandTanker.groupName)
-                                                        :InitRepeatOnEngineShutDown()
-                                                        :InitSkill("Excellent")
-                                                        :OnSpawnGroup(function(SpawnGroup)
+                                                         :InitRepeatOnEngineShutDown()
+                                                         :InitSkill("Excellent")
+                                                         :OnSpawnGroup(function(SpawnGroup)
                         taskGroupEscort({TankerGroup, SpawnGroup})
                     end)
                     TankerGroup.escortGroupObject = spawnRecoveryTankerEscort(TankerGroup.escortSpawnObject,OnDemandTanker)
@@ -442,9 +442,9 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 function TankerGroup:OnEventLand(EventData)
                     COORDINATE:RemoveMark(map_marker[self:GetName()])
                     if self.custommconfig.escortgroupname then
-                        env.info('Tanker RTB: '..self.GroupName..'...')
+                        jtff_log.info('RTB: '..self.GroupName..'...',"TANKER")
                         if self.escortGroupObject:IsAirborne(false) == true then
-                            env.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...')
+                            jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...',"TANKER")
                             self.escortGroupObject:RouteRTB()
                         else
                             --self.escortGroupObject:Destroy(nil, 5)
@@ -454,9 +454,9 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 function TankerGroup:OnEventCrash(EventData)
                     COORDINATE:RemoveMark(map_marker[self:GetName()])
                     if self.custommconfig.escortgroupname then
-                        env.info('Tanker RTB: '..self.GroupName..'...')
+                        jtff_log.info('RTB: '..self.GroupName..'...',"TANKER")
                         if self.escortGroupObject:IsAirborne(false) == true then
-                            env.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...')
+                            jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...',"TANKER")
                             self.escortGroupObject:RouteRTB()
                         else
                             --self.escortGroupObject:Destroy(nil, 5)
@@ -466,9 +466,9 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
                 function TankerGroup:OnEventDead(EventData)
                     COORDINATE:RemoveMark(map_marker[self:GetName()])
                     if self.custommconfig.escortgroupname then
-                        env.info('Tanker RTB: '..self.GroupName..'...')
+                        jtff_log.info('RTB: '..self.GroupName..'...',"TANKER")
                         if self.escortGroupObject:IsAirborne(false) == true then
-                            env.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...')
+                            jtff_log.info('escort RTB : '.. self.escortGroupObject.GroupName..' Tanker : '..self.GroupName..'...',"TANKER")
                             self.escortGroupObject:RouteRTB()
                         else
                             --self.escortGroupObject:Destroy(nil, 5)
@@ -556,7 +556,7 @@ function TankerMarkHandler:onEvent(event)
         else
             cmd = full
         end
-        if DEBUG_MSG == true 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
@@ -568,7 +568,7 @@ function TankerMarkHandler:onEvent(event)
         end
 
         if string.find(cmd, "tanker") then
-            if DEBUG_MSG == true then
+            if log_levels[JTFF_LOGLEVEL] <= log_levels['debug'] then
                 trigger.action.outText("DEBUG: On Demand Tanker Started!", 10)
             end
             tankersOnDemandArray[#tankersOnDemandArray+1] = triggerOnDemandTanker(