Merge branch 'Issues-#137-Repack-Vehicles-In-Crates' of https://github.com/FullGas1/DCS-CTLD_FG into Issues-#137-Repack-Vehicles-In-Crates

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "Lua.diagnostics.globals": [
+        "ctld"
+    ]
+}

CTLD-i18n.lua

@@ -18,7 +18,7 @@ ctld.i18n = {}
 
 --========  FRENCH - FRANCAIS =====================================================================================
 ctld.i18n["fr"] = {}
-ctld.i18n["fr"].translation_version = "1.5" -- make sure that this translation is compatible with the current version of the english language texts (ctld.i18n["en"].translation_version)
+ctld.i18n["fr"].translation_version = "1.6" -- make sure that this translation is compatible with the current version of the english language texts (ctld.i18n["en"].translation_version)
 local lang="fr";env.info(string.format("I - CTLD.i18n_translate: Loading %s language version %s", lang, tostring(ctld.i18n[lang].translation_version)))
 
 --- groups names
@@ -158,8 +158,6 @@ ctld.i18n["fr"]["FOB Crate dropped back to base"] = "Caisse FOB ramenée à la b
 ctld.i18n["fr"]["FOB Crate Loaded"] = "Caisse FOB chargée"
 ctld.i18n["fr"]["%1 loaded a FOB Crate ready for delivery!"] = "%1 a chargé une caisse FOB prête à être livrée !"
 ctld.i18n["fr"]["There are no friendly logistic units nearby to load a FOB crate from!"] = "Il n'y a pas d'unités logistiques alliée à proximité pour charger une caisse FOB !"
-ctld.i18n["fr"]["You already have troops onboard."] = "Vous avez déjà des troupes à bord."
-ctld.i18n["fr"]["You already have vehicles onboard."] = "Vous avez déjà des véhicules à bord."
 ctld.i18n["fr"]["This area has no more reinforcements available!"] = "Cette zone n'a plus de renforts disponibles !"
 ctld.i18n["fr"]["You are not in a pickup zone and no one is nearby to extract"] = "Vous n'êtes pas dans une zone d'embarquement et personne n'est à proximité pour être extrait."
 ctld.i18n["fr"]["You are not in a pickup zone"] = "Vous n'êtes pas dans une zone d'embarquement"
@@ -167,6 +165,7 @@ ctld.i18n["fr"]["No one to unload"] = "Personne à débarquer"
 ctld.i18n["fr"]["Dropped troops back to base"] = "Troupes larguées à la base"
 ctld.i18n["fr"]["Dropped vehicles back to base"] = "Véhicules largués à la base"
 ctld.i18n["fr"]["You already have troops onboard."] = "Vous avez déjà des troupes à bord."
+ctld.i18n["fr"]["Count Infantries limit in the mission reached, you can't load more troops"] = "Nombre maximum de troupes sur mission atteint, vous ne pouvez pas charger plus de troupes"
 ctld.i18n["fr"]["You already have vehicles onboard."] = "Vous avez déjà des véhicules à bord."
 ctld.i18n["fr"]["Sorry - The group of %1 is too large to fit. \n\nLimit is %2 for %3"] = "Désolé - Le groupe de %1 est trop important. \n\nLa limite est de %2 pour %3"
 ctld.i18n["fr"]["%1 extracted troops in %2 from combat"] = "%1 troupes extraites du combat en %2"
@@ -302,7 +301,7 @@ ctld.i18n["fr"]["STOP autoRefresh targets in LOS"] = "Stopper suivi automatique
 
 --======  SPANISH : ESPAÑOL====================================================================================
 ctld.i18n["es"] = {}
-ctld.i18n["es"].translation_version = "1.5" -- make sure that this translation is compatible with the current version of the english language texts (ctld.i18n["en"].translation_version)
+ctld.i18n["es"].translation_version = "1.6" -- make sure that this translation is compatible with the current version of the english language texts (ctld.i18n["en"].translation_version)
 local lang="es";env.info(string.format("I - CTLD.i18n_translate: Loading %s language version %s", lang, tostring(ctld.i18n[lang].translation_version)))
 
 --- groups names
@@ -442,8 +441,6 @@ ctld.i18n["es"]["FOB Crate dropped back to base"] = "La caja FOB volvió a la ba
 ctld.i18n["es"]["FOB Crate Loaded"] = "Caja FOB cargada"
 ctld.i18n["es"]["%1 loaded a FOB Crate ready for delivery!"] = "%1 cargó una caja FOB lista para su entrega!"
 ctld.i18n["es"]["There are no friendly logistic units nearby to load a FOB crate from!"] = "¡No hay unidades logísticas amigas cerca para cargar una caja FOB!"
-ctld.i18n["es"]["You already have troops onboard."] = "Ya tienes tropas a bordo."
-ctld.i18n["es"]["You already have vehicles onboard."] = "Ya tiene vehículos a bordo."
 ctld.i18n["es"]["This area has no more reinforcements available!"] = "¡Esta área no tiene más refuerzos disponibles!"
 ctld.i18n["es"]["You are not in a pickup zone and no one is nearby to extract"] = "No estás en una zona de recogida y no hay nadie cerca para extraerlo"
 ctld.i18n["es"]["You are not in a pickup zone"] = "No estás en una zona de recogida"
@@ -451,6 +448,7 @@ ctld.i18n["es"]["No one to unload"] = "Nadie para descargar"
 ctld.i18n["es"]["Dropped troops back to base"] = "Tropas arrojadas a la base"
 ctld.i18n["es"]["Dropped vehicles back to base"] = "Vehículos arrojados a la base"
 ctld.i18n["es"]["You already have troops onboard."] = "Ya tienes tropas a bordo."
+ctld.i18n["es"]["Count Infantries limit in the mission reached, you can't load more troops"] = "Se alcanzó el límite de infantería en la misión, no puedes cargar más tropas"
 ctld.i18n["es"]["You already have vehicles onboard."] = "Ya tiene vehículos a bordo."
 ctld.i18n["es"]["Sorry - The group of %1 is too large to fit. \n\nLimit is %2 for %3"] = "Lo sentimos, el grupo de %1 es demasiado grande. \n \nEl límite es %2 para %3"
 ctld.i18n["es"]["%1 extracted troops in %2 from combat"] = "%1 tropas extraídas del combate en %2"

CTLD.lua

@@ -71,7 +71,7 @@ end
 -- If a string is not found in the current language then it will default to this language
 -- Note that no translation is provided for this language (obviously) but that we'll maintain this table to help the translators.
 ctld.i18n["en"] = {}
-ctld.i18n["en"].translation_version = "1.5"                                       -- make sure that all the translations are compatible with this version of the english language texts
+ctld.i18n["en"].translation_version = "1.6"            -- make sure that all the translations are compatible with this version of the english language texts
 local lang = "en"; env.info(string.format("I - CTLD.i18n_translate: Loading %s language version %s", lang,
     tostring(ctld.i18n[lang].translation_version)))
 
@@ -212,8 +212,6 @@ ctld.i18n["en"]["FOB Crate dropped back to base"] = ""
 ctld.i18n["en"]["FOB Crate Loaded"] = ""
 ctld.i18n["en"]["%1 loaded a FOB Crate ready for delivery!"] = ""
 ctld.i18n["en"]["There are no friendly logistic units nearby to load a FOB crate from!"] = ""
-ctld.i18n["en"]["You already have troops onboard."] = ""
-ctld.i18n["en"]["You already have vehicles onboard."] = ""
 ctld.i18n["en"]["This area has no more reinforcements available!"] = ""
 ctld.i18n["en"]["You are not in a pickup zone and no one is nearby to extract"] = ""
 ctld.i18n["en"]["You are not in a pickup zone"] = ""
@@ -221,6 +219,7 @@ ctld.i18n["en"]["No one to unload"] = ""
 ctld.i18n["en"]["Dropped troops back to base"] = ""
 ctld.i18n["en"]["Dropped vehicles back to base"] = ""
 ctld.i18n["en"]["You already have troops onboard."] = ""
+ctld.i18n["en"]["Count Infantries limit in the mission reached, you can't load more troops"] = ""
 ctld.i18n["en"]["You already have vehicles onboard."] = ""
 ctld.i18n["en"]["Sorry - The group of %1 is too large to fit. \n\nLimit is %2 for %3"] = ""
 ctld.i18n["en"]["%1 extracted troops in %2 from combat"] = ""
@@ -460,6 +459,9 @@ ctld.radioSoundFC3 =
 ctld.deployedBeaconBattery = 30         -- the battery on deployed beacons will last for this number minutes before needing to be re-deployed
 ctld.enabledRadioBeaconDrop = true      -- if its set to false then beacons cannot be dropped by units
 ctld.allowRandomAiTeamPickups = false   -- Allows the AI to randomize the loading of infantry teams (specified below) at pickup zones
+-- Limit the dropping of infantry teams -- this limit control is inactive if ctld.nbLimitSpwanedTroops = {0, 0} ----
+ctld.nbLimitSpwanedTroops = {0, 0}      -- {redLimitInfantryCount, blueLimitInfantryCount} when this cumulative number of troops is reached, no more troops can be loaded onboard
+ctld.InfantryInGameCount  = {0, 0}      -- {redCoaInfantryCount, blueCoaInfantryCount}
 
 -- Simulated Sling load configuration
 ctld.minimumHoverHeight = 7.5   -- Lowest allowable height for crate hover
@@ -3134,6 +3136,21 @@ function ctld.loadUnloadFOBCrate(_args)
     end
 end
 
+function ctld.updateTroopsInGame(params, t)		-- return count of troops in game by Coalition
+ 	if t == nil then t = timer.getTime() + 1; end
+    ctld.InfantryInGameCount  = {0, 0}
+    for coalitionId=1, 2 do				-- for each CoaId
+        for k,v in ipairs(coalition.getGroups(coalitionId, Group.Category.GROUND)) do   -- for each GROUND type group
+			for index, unitObj in pairs(v:getUnits()) do		-- for each unit in group
+                if unitObj:getDesc().attributes.Infantry then
+                    ctld.InfantryInGameCount[coalitionId] = ctld.InfantryInGameCount[coalitionId] + 1
+                end 
+            end
+        end
+    end
+    return 5		-- reschedule each 5"
+end
+
 function ctld.loadTroopsFromZone(_args)
     local _heli = ctld.getTransportUnit(_args[1])
     local _troops = _args[2]
@@ -3152,7 +3169,6 @@ function ctld.loadTroopsFromZone(_args)
         else
             ctld.displayMessageToGroup(_heli, ctld.i18n_translate("You already have vehicles onboard."), 10)
         end
-
         return false
     end
 
@@ -3167,6 +3183,7 @@ function ctld.loadTroopsFromZone(_args)
                 _extract = ctld.findNearestGroup(_heli, ctld.droppedTroopsBLUE)
             end
         else
+
             if _heli:getCoalition() == 1 then
                 _extract = ctld.findNearestGroup(_heli, ctld.droppedVehiclesRED)
             else
@@ -3177,24 +3194,32 @@ function ctld.loadTroopsFromZone(_args)
 
     if _extract ~= nil then
         -- search for nearest troops to pickup
-        return ctld.extractTroops({ _heli:getName(), _troops })
+        return ctld.extractTroops({_heli:getName(), _troops})
     elseif _zone.inZone == true then
+        local heloCoa = _heli:getCoalition()
+        ctld.logTrace("FG_ heloCoa =  %s", ctld.p(heloCoa))
+        ctld.logTrace("FG_ (ctld.nbLimitSpwanedTroops[1]~=0 or ctld.nbLimitSpwanedTroops[2]~=0) =  %s", ctld.p(ctld.nbLimitSpwanedTroops[1]~=0 or ctld.nbLimitSpwanedTroops[2]~=0))
+        ctld.logTrace("FG_ ctld.InfantryInGameCount[heloCoa] =  %s", ctld.p(ctld.InfantryInGameCount[heloCoa]))
+        ctld.logTrace("FG_ _groupTemplate.total =  %s", ctld.p(_groupTemplate.total))
+        ctld.logTrace("FG_ ctld.nbLimitSpwanedTroops[%s].total =  %s", ctld.p(heloCoa), ctld.p(ctld.nbLimitSpwanedTroops[heloCoa]))
+        
+        local limitReached = true
+        if (ctld.nbLimitSpwanedTroops[1]~=0 or ctld.nbLimitSpwanedTroops[2]~=0) and (ctld.InfantryInGameCount[heloCoa] + _groupTemplate.total > ctld.nbLimitSpwanedTroops[heloCoa]) then  -- load troops only if Coa limit not reached
+            ctld.displayMessageToGroup(_heli, ctld.i18n_translate("Count Infantries limit in the mission reached, you can't load more troops"), 10)
+            return false
+        end
         if _zone.limit - 1 >= 0 then
             -- decrease zone counter by 1
             ctld.updateZoneCounter(_zone.index, -1)
-
-            ctld.loadTroops(_heli, _troops, _groupTemplate)
-
+            ctld.loadTroops(_heli, _troops,_groupTemplate)
             return true
         else
             ctld.displayMessageToGroup(_heli, ctld.i18n_translate("This area has no more reinforcements available!"), 20)
-
             return false
         end
     else
         if _allowExtract then
-            ctld.displayMessageToGroup(_heli,
-                ctld.i18n_translate("You are not in a pickup zone and no one is nearby to extract"), 10)
+            ctld.displayMessageToGroup(_heli, ctld.i18n_translate("You are not in a pickup zone and no one is nearby to extract"), 10)
         else
             ctld.displayMessageToGroup(_heli, ctld.i18n_translate("You are not in a pickup zone"), 10)
         end
@@ -3902,7 +3927,6 @@ function ctld.getCrateObject(_name)
 end
 
 function ctld.unpackCrates(_arguments)
-    ctld.logTrace("FG_ _arguments =  %s", ctld.p(_arguments))
     local _status, _err = pcall(function(_args)
         local _heli = ctld.getTransportUnit(_args[1])
 
@@ -8317,6 +8341,9 @@ function ctld.initialize()
         if ctld.enableAutoOrbitingFlyingJtacOnTarget then
             timer.scheduleFunction(ctld.TreatOrbitJTAC, {}, timer.getTime()+3)
         end
+        if ctld.nbLimitSpwanedTroops[1]~=0 or ctld.nbLimitSpwanedTroops[2]~=0 then
+            timer.scheduleFunction(ctld.updateTroopsInGame, {}, timer.getTime()+1)
+        end
     end, nil, timer.getTime() + 1)
 
     --event handler for deaths

README.md

@@ -47,6 +47,7 @@ This script is a rewrite of some of the functionality of the original Complete C
     * [JTAC Automatic Orbiting Over Lased Target](#jtac-automatic-orbiting-over-lased-target)
 * [In Game](#in-game)
 * [Troop Loading and Unloading](#troop-loading-and-unloading)
+* [Limit troop Loading](#limit-troop-loading)
 * [Cargo Spawning and Sling Loading](#cargo-spawning-and-sling-loading)
   * [Simulated Sling Loading](#simulated-sling-loading)
   * [Real Sling Loading](#real-sling-loading)
@@ -924,7 +925,14 @@ ctld.MG_WEIGHT = 10 -- kg
 ctld.MORTAR_WEIGHT = 26 -- kg
 ctld.JTAC_WEIGHT = 15 -- kg
 ```
+## Limit troop Loading
+The number of Infantries units in mission can be limited by setting the table below :
+ctld.nbLimitSpwanedTroops = {0, 0}      -- {redLimitInfantryCount, blueLimitInfantryCount} 
 
+When this cumulative number of troops is reached for a coalition, no more troops can be loaded onboard, and a message is sent to player.
+
+If ctld.nbLimitSpwanedTroops = {0, 0} (both values at 0) the limit control is disabled.
+If either value is non-zero, limit control becomes active for both coalitions.
 
 ## Cargo Spawning and Sling Loading