@jtff/miztemplate-lib 3.10.14 → 4.0.0

package/lua/src/160-atis.lua

@@ -1,80 +1,144 @@
 -- *****************************************************************************
 --                     **                        ATIS                         **
 --                     *********************************************************
+
+-- region ATISFunctions
+
 --- Enable ATIS for a specific airbase.
 ---@param airbase string The name of the airbase for which to enable ATIS for. (MOOSE Enum)
 function EnableAtis(airbase)
-  for _, atis in ipairs(ATISArray) do
-      if atis.customconfig.airfield == airbase then
-          -- Enable ATIS
-          atis:Start()
-          jtff_log.info(string.format("ATIS at airfield %s enabled (usually by bot).", atis.customconfig.airfield),"ATIS")
-          atis.menu[coalition.side.BLUE]:Remove()
-          atis.menu[coalition.side.BLUE] = MENU_COALITION_COMMAND:New(
-            coalition.side.BLUE,
-            "Disable Auto Atis at " .. atis.customconfig.airfield,
-            MenuCoalitionAtis[coalition.side.BLUE],
-            DisableAtis,
-            atis.customconfig.airfield
-          )
-          atis.menu[coalition.side.RED]:Remove()
-          atis.menu[coalition.side.RED] = MENU_COALITION_COMMAND:New(
-            coalition.side.RED,
-            "Disable Auto Atis at " .. atis.customconfig.airfield,
-            MenuCoalitionAtis[coalition.side.RED],
-            DisableAtis,
-            atis.customconfig.airfield
-          )
-          return true
-      end
-  end
+    for _, atis in ipairs(ATISArray) do
+        if atis.customconfig.airfield == airbase then
+            -- Enable ATIS
+            atis:Start()
+            Jtff_log.info(
+                string.format(
+                    "ATIS at airfield %s enabled (usually by bot).",
+                    atis.customconfig.airfield
+                ),
+                "ATIS"
+            )
+            for _k, _coalition in pairs(coalition.side) do
+                atis.menu[_coalition]:Remove()
+                atis.menu[_coalition] = MENU_COALITION_COMMAND:New(
+                    _coalition,
+                    "Disable Auto Atis at " .. atis.customconfig.airfield,
+                    MenuCoalitionAtis[UTILS.GetCoalitionName(_coalition)],
+                    DisableAtis,
+                    atis.customconfig.airfield
+                )
+            end
+            return true
+        end
+    end
 end
 
 --- Disable ATIS for a specific airbase.
 ---@param airbase string The name of the airbase for which to disable ATIS for. (MOOSE Enum)
 function DisableAtis(airbase)
-  for _, atis in ipairs(ATISArray) do
-      if atis.customconfig.airfield == airbase then
-          -- Disable ATIS
-          atis:Stop()
-          jtff_log.info(string.format("ATIS at airfield %s disabled (usually by bot).", atis.customconfig.airfield),"ATIS")
-          atis.menu[coalition.side.BLUE]:Remove()
-          atis.menu[coalition.side.BLUE] = MENU_COALITION_COMMAND:New(
-            coalition.side.BLUE,
-            "Enable Auto Atis at " .. atis.customconfig.airfield,
-            MenuCoalitionAtis[coalition.side.BLUE],
-            EnableAtis,
-            atis.customconfig.airfield
-          )
-          atis.menu[coalition.side.RED]:Remove()
-          atis.menu[coalition.side.RED] = MENU_COALITION_COMMAND:New(
-            coalition.side.RED,
-            "Enable Auto Atis at " .. atis.customconfig.airfield,
-            MenuCoalitionAtis[coalition.side.RED],
-            EnableAtis,
-            atis.customconfig.airfield
-          )
-          return true
-      end
-  end
+    for _, atis in ipairs(ATISArray) do
+        if atis.customconfig.airfield == airbase then
+            -- Disable ATIS
+            atis:Stop()
+            Jtff_log.info(
+                string.format(
+                    "ATIS at airfield %s disabled (usually by bot).",
+                    atis.customconfig.airfield
+                ),
+                "ATIS"
+            )
+            for _k, _coalition in pairs(coalition.side) do
+                atis.menu[_coalition]:Remove()
+                atis.menu[_coalition] = MENU_COALITION_COMMAND:New(
+                    _coalition,
+                    "Enable Auto Atis at " .. atis.customconfig.airfield,
+                    MenuCoalitionAtis[UTILS.GetCoalitionName(_coalition)],
+                    EnableAtis,
+                    atis.customconfig.airfield
+                )
+            end
+            return true
+        end
+    end
 end
 
+-- endregion ATISFunctions
+
+-- region ATISConfigFunctions
+-- @type ATISConfig
+-- @field #boolean enable Enable Atis creation.
+-- @field #string airfield Airfield name.
+-- @field #radioConfig radio configuration object.
+-- @field #string relayunit UNIT Name to emit radio On.
+-- @field #table active Active Runway config Object.
+-- @field #tacanConfig tacan TACAN configuration..
+-- @field #table ils ILS configuration.
+-- @field #boolean useSRS Use SRS for the ATIS.
+
+--- Parse ATIS config Object.
+-- @param #JsonObject config Config object to parse
+-- @return #ATISConfig atisConfigJson Parsed ATISConfig object
+function ParseAtisConfigJson(config)
+    local json = require('Scripts/json')
+    local parser_name = "ATIS"
+    -- **************************************************************************
+    --                             enable
+    -- **************************************************************************
+    local atisConfigJson = {
+        enable = config.enable or false,
+    }
+    if type(config) ~= 'table' then
+        Jtff_log.error(
+            string.format(
+                "no proper atisconfig defined, skipping Atis configuration"
+            ),
+            parser_name
+        )
+        atisConfigJson.enable = false
+        return atisConfigJson
+    end
+    atisConfigJson = config
+    Jtff_log.debug(
+        string.format(
+            "parsed ATIS config for %s ATIS, resulting config :\n%s",
+            config.airfield or "unknown Airbase",
+            json:encode(
+                atisConfigJson,
+                { indent = true }
+            )
+        ),
+        parser_name
+    )
+    return atisConfigJson
+end
+
+-- endregion ATISConfigFunctions
+
 ATISArray = {}
-compteur = 0
 MenuCoalitionAtis = {}
-MenuCoalitionAtis[coalition.side.BLUE] = MENU_COALITION:New(coalition.side.BLUE, "Atis", MenuCoalitionBlue)
-MenuCoalitionAtis[coalition.side.RED] = MENU_COALITION:New(coalition.side.RED, "Atis", MenuCoalitionRed)
-for index, atisconfig in ipairs(AtisConfig) do
+for _k, _coalition in pairs(coalition.side) do
+    MenuCoalitionAtis[UTILS.GetCoalitionName(_coalition)] = MENU_COALITION:New(_coalition, "Atis", MenuCoalition[UTILS.GetCoalitionName(_coalition)])
+end
+
+local compteur = #ATISArray
+for _index, _currentAtisConfigObject in ipairs(AtisConfig or {}) do
+    local atisconfig = ParseAtisConfigJson(_currentAtisConfigObject)
     if atisconfig.enable == true then
         compteur = compteur + 1
-        jtff_log.info(string.format("Creation ATIS at airfield %s", atisconfig.airfield),"ATIS")
+        Jtff_log.info(
+            string.format(
+                "Creation ATIS at airfield %s",
+                atisconfig.airfield
+            ),
+            "ATIS"
+        )
         local objAtis = ATIS:New(atisconfig.airfield, atisconfig.radio.freq, atisconfig.radio.modulation)
                             :SetImperialUnits()
-                            :SetSoundfilesPath(soundFilesPrefix .. 'ATIS/ATIS Soundfiles/')
+                            :SetSoundfilesPath(SoundFilesPrefix .. 'ATIS/ATIS Soundfiles/')
                             :SetSubtitleDuration(0)
                             :SetMapMarks(true)
-        if (atisconfig.radio.relayunit) then
-            objAtis:SetRadioRelayUnitName(atisconfig.radio.relayunit)
+        if (atisconfig.relayunit) then
+            objAtis:SetRadioRelayUnitName(atisconfig.relayunit)
         else
             if (atisconfig.radio.power) then
                 objAtis:SetRadioPower(atisconfig.radio.power)
@@ -109,27 +173,26 @@ for index, atisconfig in ipairs(AtisConfig) do
         end
         objAtis.customconfig = atisconfig
         objAtis.menu = {}
-        objAtis.menu[coalition.side.BLUE] = MENU_COALITION_COMMAND:New(
-          coalition.side.BLUE,
-          "Disable Auto Atis at " .. atisconfig.airfield,
-          MenuCoalitionAtis[coalition.side.BLUE],
-          DisableAtis,
-          atisconfig.airfield
-        )
-        objAtis.menu[coalition.side.RED] = MENU_COALITION_COMMAND:New(
-          coalition.side.RED,
-          "Disable Auto Atis at " .. atisconfig.airfield,
-          MenuCoalitionAtis[coalition.side.RED],
-          DisableAtis,
-          atisconfig.airfield
-        )
+        for _k, _coalition in pairs(coalition.side) do
+            objAtis.menu[_coalition] = MENU_COALITION_COMMAND:New(
+                _coalition,
+                string.format(
+                    "Disable Auto Atis at %s",
+                    atisconfig.airfield
+                ),
+                MenuCoalitionAtis[UTILS.GetCoalitionName(_coalition)],
+                DisableAtis,
+                atisconfig.airfield
+            )
+        end        
         ATISArray[compteur] = objAtis
         ATISArray[compteur]:Start()
     end
 end
 
 if compteur == 0 then
-  MenuCoalitionAtis[coalition.side.BLUE]:Remove()
-  MenuCoalitionAtis[coalition.side.RED]:Remove()
-  MenuCoalitionAtis = {}
+    for _k, _coalition in pairs(coalition.side) do
+        MenuCoalitionAtis[UTILS.GetCoalitionName(_coalition)]:Remove()
+    end
+    MenuCoalitionAtis = {}
 end

package/lua/src/170-cap_zone_training.lua

@@ -2,92 +2,160 @@
 --                     **                CAPZone Training                     **
 --                     *********************************************************
 function wipeCapZone(objCAPZone)
-    fctKillSpawnObject(objCAPZone.objSpawn)
+    while (#(objCAPZone.objFlightGroups) > 0) do
+        Jtff_log.debug(string.format("Wipe CAP Zone : %s, before wipe remaining flight groups: %d", objCAPZone.customconfig.name, #(objCAPZone.objFlightGroups)),"CAP_ZONE_TRAINING")
+        if objCAPZone.objFlightGroups[1].MissionPatrol then
+            objCAPZone.objFlightGroups[1].MissionPatrol.markerOn = false
+            if objCAPZone.objFlightGroups[1].MissionPatrol.marker then
+                objCAPZone.objFlightGroups[1].MissionPatrol.marker:Remove()
+            end
+        end
+        objCAPZone.objFlightGroups[1]:Destroy()
+        objCAPZone.objFlightGroups[1]:__Stop(10)
+        table.remove(objCAPZone.objFlightGroups, 1)
+        Jtff_log.debug(string.format("Wipe CAP Zone : %s, after wipe remaining flight groups: %d", objCAPZone.customconfig.name, #(objCAPZone.objFlightGroups)),"CAP_ZONE_TRAINING")
+    end
+    objCAPZone.objFlightGroups = {}
+    -- fctKillSpawnObject(objCAPZone.objSpawn)
     trigger.action.outText('CAP Training Zone '..(objCAPZone.customconfig.name)..' cleaned !!', 30)
+    Jtff_log.info(string.format("Wipe CAP Zone : %s", objCAPZone.customconfig.name),"CAP_ZONE_TRAINING")
 end
 
-function startCapZone(objCAPZone)
+function startCapZone(params)
+    local objCAPZone = params[1]
+    local effectiveForce = params[2] or 2
+    objCAPZone.objSpawn:InitGrouping(effectiveForce)
     local AICapGroup = objCAPZone.objSpawn:SpawnInZone(objCAPZone.objPatrolZone,
             true
     )
-    local objCAP = AI_CAP_ZONE:New(
-            objCAPZone.objPatrolZone,
-            UTILS.Round(objCAPZone.customconfig.capParameters.patrolFloor*0.3048,0),
-            UTILS.Round(objCAPZone.customconfig.capParameters.patrolCeiling*0.3048,0),
-            UTILS.Round(objCAPZone.customconfig.capParameters.minPatrolSpeed*1.852,0),
-            UTILS.Round(objCAPZone.customconfig.capParameters.maxPatrolSpeed*1.852,0),
-            AI.Task.AltitudeType.BARO
-    )
-    objCAP:SetControllable(AICapGroup)
-    objCAP:SetEngageZone(objCAPZone.objEngageZone)
-    objCAP:__Start(1)
-    --local objAiCapZone = AI_CAP_ZONE:New(
-    --        objCAPZone.objPatrolZone,
-    --        UTILS.Round(objCAPZone.customconfig.capParameters.patrolFloor*0.3048,0),
-    --        UTILS.Round(objCAPZone.customconfig.capParameters.patrolCeiling*0.3048,0),
-    --        UTILS.Round(objCAPZone.customconfig.capParameters.minPatrolSpeed*1.852,0),
-    --        UTILS.Round(objCAPZone.customconfig.capParameters.maxPatrolSpeed*1.852,0),
-    --        AI.Task.AltitudeType.BARO
-    --)
-    --function objAiCapZone:OnAfterStart(from, event, to)
-    --end
-
-    --objAiCapZone:SetControllable(
-    --        objCAPZone.objSpawn:SpawnInZone(objCAPZone.objPatrolZone,
-    --                true
-    --        )
-    --)
 end
 
 
 CAPZoneArray = {}
-compteur = 0
-MenuCoalitionCAPZoneBlue = MENU_COALITION:New(coalition.side.BLUE, "Hostile CAP Zones", MenuCoalitionBlue)
-MenuCoalitionCAPZoneRed = MENU_COALITION:New(coalition.side.RED, "Hostile CAP Zones", MenuCoalitionRed)
+MenuCoalitionCAPZoneBlue = MENU_COALITION:New(coalition.side.BLUE, "Hostile CAP Zones", MenuCoalition[coalition.side.BLUE])
+MenuCoalitionCAPZoneRed = MENU_COALITION:New(coalition.side.RED, "Hostile CAP Zones", MenuCoalition[coalition.side.RED])
+local compteur = #CAPZoneArray
 for index, capzoneconfig in ipairs(TrainingCAPConfig) do
     if capzoneconfig.enable == true then
         compteur = compteur + 1
-        env.info('creation CAP Zone : '.. capzoneconfig.name..'...')
+        Jtff_log.info(string.format("creation CAP Zone : %s", capzoneconfig.name),"CAP_ZONE_TRAINING")
         objCapZone = {}
+        objCapZone.objFlightGroups = {}
         objCapZone.objSpawn = SPAWN:New(capzoneconfig.CAPGoups[1])
                                    :InitSkill(capzoneconfig.skill)
                                    :InitRandomizeTemplate(capzoneconfig.CAPGoups)
-                                   :OnSpawnGroup(function(SpawnGroup)
-            SpawnGroup:OptionROE(ENUMS.ROE.OpenFireWeaponFree)
-            SpawnGroup:OptionROT(ENUMS.ROT.EvadeFire)
-            SpawnGroup:OptionRTBBingoFuel(false)
-            --if math.random(0,100) > 50 then
-            --    SpawnGroup:OptionAAAttackRange(AI.Option.Air.val.MISSILE_ATTACK.MAX_RANGE)
-            --else
-            --    SpawnGroup:OptionAAAttackRange(AI.Option.Air.val.MISSILE_ATTACK.HALF_WAY_RMAX_NEZ)
-            --end
-            SpawnGroup:OptionRestrictBurner(false)
-            SpawnGroup:OptionECM_OnlyLockByRadar()
-            SpawnGroup:EnableEmission(true)
-            SpawnGroup:OptionAlarmStateRed()
-        end)
+                                   :OnSpawnGroup(function(SpawnGroup, objCapZone)
+--                       ******************************************************
+--                       ** OnGroupSpawn : Setup FlightGroup and mission     **
+--                       ******************************************************
+            -- **********************Flight GroupSetup*************************
+            Jtff_log.info(string.format("Group spawned : %s - %s", SpawnGroup:GetName(), SpawnGroup:GetTypeName()),"CAP_ZONE_TRAINING")
+            local flightgroup = FLIGHTGROUP:New(SpawnGroup)
+            Jtff_log.debug(string.format("FlightGroup created from group %s", SpawnGroup:GetName()),"CAP_ZONE_TRAINING")
+            flightgroup:SetFuelCriticalThreshold(15)
+            flightgroup:SetFuelLowThreshold(25)
+            flightgroup:SetOutOfAAMRTB(true)
+            flightgroup:SetFuelCriticalRTB(true)
+            flightgroup:SetFuelLowRTB(true)
+            flightgroup:SetAllowAfterburner()
+            flightgroup:SetDetection(true)
+            Jtff_log.debug(string.format("FlightGroup %s goes nose hot !", SpawnGroup:GetName()),"CAP_ZONE_TRAINING")
+            flightgroup:SetVerbosity(JTFF_verbosity_levels[JTFF_LOGLEVEL])
+            function flightgroup:OnAfterDead(From, Event, To)
+                self:CancelAllMissions()
+                self.MissionPatrol.markerOn = false
+                if self.MissionPatrol.marker then
+                    self.MissionPatrol.marker:Remove()
+                end
+                self.MissionPatrol:Stop()
+                self.MissionPatrol = nil
+                Jtff_log.debug(string.format("Zone %s: FlightGroup %s Dead !", objCapZone.customconfig.name, SpawnGroup:GetName()),"CAP_ZONE_TRAINING")
+                self:__Stop(10)
+            end
+            function flightgroup:OnAfterRTB(From, Event, To, airbase)
+                Jtff_log.debug(string.format("Zone %s: FlightGroup %s is RTB to %s !", objCapZone.customconfig.name, SpawnGroup:GetName(), airbase:GetName()),"CAP_ZONE_TRAINING")
+                self:CancelAllMissions()
+                self.MissionPatrol.markerOn = false
+                if self.MissionPatrol.marker then
+                    self.MissionPatrol.marker:Remove()
+                end
+                self.MissionPatrol:Stop()
+                for index, curFlightGroup in ipairs(objCapZone.objFlightGroups) do
+                    if curFlightGroup:GetName() == self:GetName() then
+                        table.remove(objCapZone.objFlightGroups, index)
+                        break
+                    end
+                end
+            end
+            if objCapZone.customconfig.airBaseName and AIRBASE:FindByName(objCapZone.customconfig.airBaseName) then
+                flightgroup:SetHomebase(AIRBASE:FindByName(objCapZone.customconfig.airBaseName))
+            end
+            -- *********************Mission Setup******************************            
+            flightgroup.MissionPatrol = AUFTRAG:NewPATROL_RACETRACK(
+                objCapZone.objPatrolZone:GetRandomCoordinate(),
+                objCapZone.customconfig.capParameters.patrolAltitude,
+                objCapZone.customconfig.capParameters.patrolSpeed,
+                objCapZone.customconfig.capParameters.patrolHeading,
+                objCapZone.customconfig.capParameters.patrolLegLength,
+                ENUMS.Formation.FixedWing.LineAbreast.Group
+            )
+            flightgroup.MissionPatrol:SetName(
+                string.format('MISSION_CAP_PATROL_%s_%d', objCapZone.customconfig.name, #objCapZone.objFlightGroups + 1)
+            )
+            flightgroup.MissionPatrol:SetEngageDetected(
+                150,
+                {"All"},
+                objCapZone.objEngageZone
+            )
+            if objCapZone.customconfig.coalitionCAP == coalition.side.RED then
+                flightgroup.MissionPatrol:SetEnableMarkers(coalition.side.BLUE)
+            else
+                flightgroup.MissionPatrol:SetEnableMarkers(coalition.side.RED)
+            end
+            flightgroup.MissionPatrol.markerOn = (JTFF_verbosity_levels[JTFF_LOGLEVEL] >= 1)
+            flightgroup.MissionPatrol:UpdateMarker()
+            flightgroup.MissionPatrol:SetDuration((10*60*60))
+            flightgroup.MissionPatrol:SetVerbosity(JTFF_verbosity_levels[JTFF_LOGLEVEL])
+
+-- ****************************Mission Add to FlightGroup**********************
+            flightgroup:AddMission(flightgroup.MissionPatrol)
+            flightgroup:MissionStart(flightgroup.MissionPatrol)
+            table.insert(objCapZone.objFlightGroups, flightgroup)
+            Jtff_log.debug(string.format("FlightGroup %s is assigned mission %s", SpawnGroup:GetName(), flightgroup.MissionPatrol:GetName()),"CAP_ZONE_TRAINING")
+        end, objCapZone)
+
+--                                   ******************************************
+--                                   **         Set Patrol Zone              **
+--                                   ******************************************
         if capzoneconfig.patrolZoneGroupName then
             objCapZone.objPatrolZone = ZONE_POLYGON:New(
                     'CAP_PATROL_ZONE_'..capzoneconfig.name,
                     GROUP:FindByName(capzoneconfig.patrolZoneGroupName))
-            env.info('Training CAP : Patrol zone Polygon created : '.. objCapZone.objPatrolZone:GetName() ..'...')
+            Jtff_log.info(string.format("Patrol zone Polygon created : %s", objCapZone.objPatrolZone:GetName()),"CAP_ZONE_TRAINING")
         else
             if capzoneconfig.patrolZoneName then
                 objCapZone.objPatrolZone = ZONE:New(capzoneconfig.patrolZoneName)
             end
         end
+--                                   ******************************************
+--                                   **         Set Engage Zone              **
+--                                   ******************************************
         if capzoneconfig.engageZoneGroupName then
             objCapZone.objEngageZone = ZONE_POLYGON:New(
                     'CAP_ENGAGE_ZONE_'..capzoneconfig.name,
                     GROUP:FindByName(capzoneconfig.engageZoneGroupName))
-            env.info('Training CAP : Engage zone Polygon created : '.. objCapZone.objEngageZone:GetName() ..'...')
+            Jtff_log.info(string.format("Engage zone Polygon created : %s", objCapZone.objEngageZone:GetName()),"CAP_ZONE_TRAINING")
         else
             if capzoneconfig.engageZoneName then
                 objCapZone.objEngageZone = ZONE:New(capzoneconfig.engageZoneName)
             end
         end
+
+--                                   ******************************************
+--                                   **         Draw Engage Zone             **
+--                                   ******************************************
         if capzoneconfig.coalitionCAP == coalition.side.RED then
-            if ((capzoneconfig.drawzone == true) or false) then
+            if ((capzoneconfig.drawzone == true) or false or (JTFF_verbosity_levels[JTFF_LOGLEVEL] >= 5)) then
                 objCapZone.objEngageZone:DrawZone(
                         coalition.side.BLUE,
                         {1,0,0},
@@ -110,7 +178,7 @@ for index, capzoneconfig in ipairs(TrainingCAPConfig) do
                 )
             end
         else
-            if ((capzoneconfig.drawzone == true) or false) then
+            if ((capzoneconfig.drawzone == true) or false or (JTFF_verbosity_levels[JTFF_LOGLEVEL] >= 5)) then
                 objCapZone.objEngageZone:DrawZone(
                         coalition.side.RED,
                         {1,0,0},
@@ -133,42 +201,77 @@ for index, capzoneconfig in ipairs(TrainingCAPConfig) do
                 )
             end
         end
+--                                    *****************************************
+--                                    **         Set Custom Config           **
+--                                    *****************************************
         objCapZone.customconfig = capzoneconfig
         CAPZoneArray[compteur] = objCapZone
+--                                   ******************************************
+--                                   **         Set Menu Commands            **
+--                                   ******************************************
         if capzoneconfig.coalitionCAP == coalition.side.RED then
             MENU_COALITION_COMMAND:New(
-                    coalition.side.BLUE,
-                    "Zone "..capzoneconfig.name.." Start",
-                    MenuCoalitionCAPZoneBlue,
-                    startCapZone,
-                    CAPZoneArray[compteur])
+                coalition.side.BLUE,
+                string.format("Zone %s : Spawn %d Hostile(s)", capzoneconfig.name, 1),
+                MenuCoalitionCAPZoneBlue,
+                startCapZone,
+                {CAPZoneArray[compteur], 1}
+            )
+            MENU_COALITION_COMMAND:New(
+                coalition.side.BLUE,
+                string.format("Zone %s : Spawn %d Hostile(s)", capzoneconfig.name, 2),
+                MenuCoalitionCAPZoneBlue,
+                startCapZone,
+                {CAPZoneArray[compteur], 2}
+            )
+            MENU_COALITION_COMMAND:New(
+                coalition.side.BLUE,
+                string.format("Zone %s : Spawn %d Hostile(s)", capzoneconfig.name, 4),
+                MenuCoalitionCAPZoneBlue,
+                startCapZone,
+                {CAPZoneArray[compteur], 4}
+            )
             MENU_COALITION_COMMAND:New(
-                    coalition.side.BLUE,
-                    "Zone "..capzoneconfig.name.." Clean",
-                    MenuCoalitionCAPZoneBlue,
-                    wipeCapZone,
-                    CAPZoneArray[compteur]
+                coalition.side.BLUE,
+                string.format("Zone %s : Clean", capzoneconfig.name),
+                MenuCoalitionCAPZoneBlue,
+                wipeCapZone,
+                CAPZoneArray[compteur]
             )
         else
             MENU_COALITION_COMMAND:New(
-                    coalition.side.RED,
-                    "Zone "..capzoneconfig.name.." Start",
-                    MenuCoalitionCAPZoneRed,
-                    startCapZone,
-                    CAPZoneArray[compteur])
+                coalition.side.RED,
+                string.format("Zone %s : Spawn %d Hostile(s)", capzoneconfig.name, 1),
+                MenuCoalitionCAPZoneRed,
+                startCapZone,
+                {CAPZoneArray[compteur], 1}
+            )
+            MENU_COALITION_COMMAND:New(
+                coalition.side.RED,
+                string.format("Zone %s : Spawn %d Hostile(s)", capzoneconfig.name, 2),
+                MenuCoalitionCAPZoneRed,
+                startCapZone,
+                {CAPZoneArray[compteur], 2}
+            )
+            MENU_COALITION_COMMAND:New(
+                coalition.side.RED,
+                string.format("Zone %s : Spawn %d Hostile(s)", capzoneconfig.name, 4),
+                MenuCoalitionCAPZoneRed,
+                startCapZone,
+                {CAPZoneArray[compteur], 4}
+            )
             MENU_COALITION_COMMAND:New(
-                    coalition.side.RED,
-                    "Zone "..capzoneconfig.name.." Clean",
-                    MenuCoalitionCAPZoneRed,
-                    wipeCapZone,
-                    CAPZoneArray[compteur]
+                coalition.side.RED,
+                string.format("Zone %s : Clean", capzoneconfig.name),
+                MenuCoalitionCAPZoneRed,
+                wipeCapZone,
+                CAPZoneArray[compteur]
             )
         end
-        --CAPZoneArray[compteur]:Start()
     end
 end
 
-if compteur == 0 then
+if #CAPZoneArray == 0 then
     MenuCoalitionCAPZoneBlue:Remove()
     MenuCoalitionCAPZoneRed:Remove()
 end