Merge branch 'develop_2_3_x' into develop

# Conflicts:
#	changelog.md
#	game/procurement.py
#	resources/factions/iraq_1991.json

game/db.py

@@ -389,6 +389,7 @@ PRICES = {
     Armor.ATGM_M1045_HMMWV_TOW: 8,
     Armor.IFV_M2A2_Bradley: 12,
     Armor.APC_M1126_Stryker_ICV: 10,
+    Armor.SPG_M1128_Stryker_MGS: 14,
     Armor.ATGM_M1134_Stryker: 12,
     Armor.MBT_M60A3_Patton: 16,
     Armor.MBT_M1A2_Abrams: 25,
@@ -765,6 +766,7 @@ UNIT_BY_TASK = {
         Armor.APC_M1126_Stryker_ICV,
         Armor.APC_M1126_Stryker_ICV,
         Armor.APC_M1126_Stryker_ICV,
+        Armor.SPG_M1128_Stryker_MGS,
         Armor.IFV_MCV_80,
         Armor.IFV_MCV_80,
         Armor.IFV_MCV_80,
@@ -847,6 +849,23 @@ UNIT_BY_TASK = {
         Artillery.M12_GMC,
         Artillery.Sturmpanzer_IV_Brummbär,
 
+        AirDefence.AAA_ZU_23_on_Ural_375,
+        AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
+        AirDefence.AAA_ZSU_57_2,
+        AirDefence.SPAAA_ZSU_23_4_Shilka,
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.SAM_SA_9_Strela_1_9P31,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.SAM_SA_15_Tor_9A331,
+        AirDefence.SAM_SA_19_Tunguska_2S6,
+        AirDefence.SPAAA_Gepard,
+        AirDefence.AAA_Vulcan_M163,
+        AirDefence.SAM_Linebacker_M6,
+        AirDefence.SAM_Chaparral_M48,
+        AirDefence.SAM_Avenger_M1097,
+        AirDefence.SAM_Roland_ADS,
+        AirDefence.HQ_7_Self_Propelled_LN,
+
         frenchpack.DIM__TOYOTA_BLUE,
         frenchpack.DIM__TOYOTA_DESERT,
         frenchpack.DIM__TOYOTA_GREEN,
@@ -872,23 +891,6 @@ UNIT_BY_TASK = {
 
     ],
     AirDefence: [
-
-        # those are listed multiple times here to balance prioritization more into lower tier AAs
-        AirDefence.AAA_Vulcan_M163,
-        AirDefence.AAA_Vulcan_M163,
-        AirDefence.AAA_Vulcan_M163,
-        AirDefence.SAM_Linebacker_M6,
-
-        AirDefence.SPAAA_ZSU_23_4_Shilka,
-        AirDefence.AAA_ZU_23_Closed,
-        AirDefence.SAM_SA_9_Strela_1_9P31,
-        AirDefence.SAM_SA_8_Osa_9A33,
-        AirDefence.SAM_SA_19_Tunguska_2S6,
-        AirDefence.SAM_SA_6_Kub_LN_2P25,
-        AirDefence.SAM_SA_3_S_125_LN_5P73,
-        AirDefence.SAM_Hawk_PCP,
-        AirDefence.SAM_SA_2_LN_SM_90,
-        AirDefence.SAM_SA_11_Buk_LN_9A310M1,
     ],
     Reconnaissance: [Unarmed.Transport_M818, Unarmed.Transport_Ural_375, Unarmed.Transport_UAZ_469],
     Nothing: [Infantry.Infantry_M4, Infantry.Soldier_AK, ],

game/procurement.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
 import math
 import random
+from dataclasses import dataclass
 from typing import Iterator, List, Optional, TYPE_CHECKING, Type
 
 from dcs.task import CAP, CAS
@@ -75,15 +75,25 @@ class ProcurementAi:
         return budget
 
     def random_affordable_ground_unit(
-            self, budget: int) -> Optional[Type[VehicleType]]:
-        affordable_units = [u for u in self.faction.frontline_units if
+            self, budget: int, cp: ControlPoint) -> Optional[Type[VehicleType]]:
+        affordable_units = [u for u in self.faction.frontline_units + self.faction.artillery_units if
                             db.PRICES[u] <= budget]
+
+        total_number_aa = cp.base.total_frontline_aa + cp.pending_frontline_aa_deliveries_count
+        total_non_aa = cp.base.total_armor + cp.pending_deliveries_count - total_number_aa
+        max_aa = math.ceil(total_non_aa/8)
+
+        # Limit the number of AA units the AI will buy
+        if not total_number_aa < max_aa:
+            for unit in [u for u in affordable_units if u in TYPE_SHORAD]:
+                affordable_units.remove(unit)
+
         if not affordable_units:
             return None
         return random.choice(affordable_units)
 
     def reinforce_front_line(self, budget: int) -> int:
-        if not self.faction.frontline_units:
+        if not self.faction.frontline_units and not self.faction.artillery_units:
             return budget
 
         while budget > 0:
@@ -92,7 +102,7 @@ class ProcurementAi:
                 break
 
             cp = random.choice(candidates)
-            unit = self.random_affordable_ground_unit(budget)
+            unit = self.random_affordable_ground_unit(budget, cp)
             if unit is None:
                 # Can't afford any more units.
                 break

game/theater/base.py

@@ -9,6 +9,7 @@ from dcs.unittype import FlyingType, UnitType, VehicleType
 from dcs.vehicles import AirDefence, Armor
 
 from game import db
+from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
 
 STRENGTH_AA_ASSEMBLE_MIN = 0.2
 PLANES_SCRAMBLE_MIN_BASE = 2
@@ -36,6 +37,10 @@ class Base:
     def total_armor(self) -> int:
         return sum(self.armor.values())
 
+    @property
+    def total_frontline_aa(self) -> int:
+        return sum([v for k, v in self.armor.items() if k in TYPE_SHORAD])
+
     @property
     def total_aa(self) -> int:
         return sum(self.aa.values())

game/theater/controlpoint.py

@@ -20,6 +20,7 @@ from dcs.terrain.terrain import Airport, ParkingSlot
 from dcs.unittype import FlyingType
 
 from game import db
+from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
 from gen.runways import RunwayAssigner, RunwayData
 from gen.ground_forces.combat_stance import CombatStance
 from .base import Base
@@ -457,6 +458,26 @@ class ControlPoint(MissionTarget, ABC):
                             u.position.x = u.position.x + delta.x
                             u.position.y = u.position.y + delta.y
 
+    @property
+    def pending_frontline_aa_deliveries_count(self):
+        """
+        Get number of pending frontline aa units
+        """
+        if self.pending_unit_deliveries:
+            return sum([v for k,v in self.pending_unit_deliveries.units.items() if k in TYPE_SHORAD])
+        else:
+            return 0
+
+    @property
+    def pending_deliveries_count(self):
+        """
+        Get number of pending units
+        """
+        if self.pending_unit_deliveries:
+            return sum([v for k, v in self.pending_unit_deliveries.units.items()])
+        else:
+            return 0
+
 
 class Airfield(ControlPoint):