Merge branch 'develop_2_3_x' into develop

changelog.md

@@ -1,6 +1,12 @@
 # 2.3.2
 
+## Features/Improvements
+* **[Units]** Support for newly added BTR-82A, T-72B3
+* **[Units]** Added ZSU-57 AAA sites
+
 ## Fixes:
+* **[Mission Generator]** Fix mission generation error when there are too many radio frequency to setup for the Mig-21
+* **[Mission Generator]** Fix ground units not moving forward
 * **[Flight Planner]** Fix creation of custom waypoints.
 
 # 2.3.1
@@ -21,7 +27,7 @@
 * **[Campaign Map]** Possible to add FOB as control points
 * **[Campaign Map]** Added off-map spawn locations
 * **[Campaign AI]** Overhauled AI recruiting behaviour
-* **[Campaign AI]** Added AI proucurement for Blue
+* **[Campaign AI]** Added AI procurement for Blue
 * **[Campaign]** New Campaign: "Black Sea"
 * **[Mission Planner]** Possible to move carrier and tarawa on the campaign map
 * **[Mission Generator]** Infantry squads on frontline can have manpads

game/db.py

@@ -366,12 +366,14 @@ PRICES = {
 
     # armor
     Armor.APC_MTLB: 4,
-    Armor.FDDM_Grad: 5,
+    Armor.FDDM_Grad: 4,
     Armor.ARV_BRDM_2: 6,
-    Armor.ARV_BTR_RD: 8,
+    Armor.ARV_BTR_RD: 6,
     Armor.APC_BTR_80: 8,
+    Armor.APC_BTR_82A: 10,
     Armor.MBT_T_55: 18,
-    Armor.MBT_T_72B: 22,
+    Armor.MBT_T_72B: 20,
+    Armor.MBT_T_72B3: 25,
     Armor.MBT_T_80U: 25,
     Armor.MBT_T_90: 30,
     Armor.IFV_BMD_1: 8,
@@ -485,11 +487,12 @@ PRICES = {
     AirDefence.SAM_Stinger_comm_dsr: 4,
     AirDefence.SAM_Stinger_comm: 4,
     AirDefence.SPAAA_ZSU_23_4_Shilka: 10,
+    AirDefence.AAA_ZSU_57_2: 12,
     AirDefence.AAA_ZU_23_Closed: 6,
     AirDefence.AAA_ZU_23_Emplacement: 6,
-    AirDefence.AAA_ZU_23_on_Ural_375: 8,
+    AirDefence.AAA_ZU_23_on_Ural_375: 7,
     AirDefence.AAA_ZU_23_Insurgent_Closed: 6,
-    AirDefence.AAA_ZU_23_Insurgent_on_Ural_375: 8,
+    AirDefence.AAA_ZU_23_Insurgent_on_Ural_375: 7,
     AirDefence.AAA_ZU_23_Insurgent: 6,
     AirDefence.SAM_SA_18_Igla_MANPADS: 10,
     AirDefence.SAM_SA_18_Igla_comm: 8,
@@ -714,6 +717,8 @@ UNIT_BY_TASK = {
         Armor.APC_BTR_80,
         Armor.APC_BTR_80,
         Armor.APC_BTR_80,
+        Armor.APC_BTR_82A,
+        Armor.APC_BTR_82A,
         Armor.IFV_BMP_1,
         Armor.IFV_BMP_1,
         Armor.IFV_BMP_1,
@@ -730,6 +735,8 @@ UNIT_BY_TASK = {
         Armor.MBT_T_55,
         Armor.MBT_T_72B,
         Armor.MBT_T_72B,
+        Armor.MBT_T_72B3,
+        Armor.MBT_T_72B3,
         Armor.MBT_T_80U,
         Armor.MBT_T_80U,
         Armor.MBT_T_90,

game/version.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 
 def _build_version_string() -> str:
-    components = ["2.3.1"]
+    components = ["2.3.2"]
     build_number_path = Path("resources/buildnumber")
     if build_number_path.exists():
         with build_number_path.open("r") as build_number_file:

gen/ground_forces/ai_ground_planner.py

@@ -12,6 +12,7 @@ from gen.ground_forces.combat_stance import CombatStance
 TYPE_TANKS = [
     Armor.MBT_T_55,
     Armor.MBT_T_72B,
+    Armor.MBT_T_72B3,
     Armor.MBT_T_80U,
     Armor.MBT_T_90,
     Armor.MBT_Leopard_2,
@@ -96,6 +97,7 @@ TYPE_APC = [
     Armor.APC_M1126_Stryker_ICV,
     Armor.APC_M113,
     Armor.APC_BTR_80,
+    Armor.APC_BTR_82A,
     Armor.APC_MTLB,
     Armor.APC_M2A1,
     Armor.APC_Cobra,

gen/sam/aaa_zsu57.py

@@ -0,0 +1,25 @@
+from dcs.vehicles import AirDefence
+
+from gen.sam.airdefensegroupgenerator import (
+    AirDefenseRange,
+    AirDefenseGroupGenerator,
+)
+
+
+class ZSU57Generator(AirDefenseGroupGenerator):
+    """
+    This generate a Zsu 57 group
+    """
+
+    name = "ZSU-57-2 Group"
+    price = 60
+
+    def generate(self):
+        num_launchers = 5
+        positions = self.get_circular_position(num_launchers, launcher_distance=110, coverage=360)
+        for i, position in enumerate(positions):
+            self.add_unit(AirDefence.AAA_ZSU_57_2, "SPAA#" + str(i), position[0], position[1], position[2])
+
+    @classmethod
+    def range(cls) -> AirDefenseRange:
+        return AirDefenseRange.Short

gen/sam/sam_group_generator.py

@@ -12,6 +12,7 @@ from gen.sam.aaa_bofors import BoforsGenerator
 from gen.sam.aaa_flak import FlakGenerator
 from gen.sam.aaa_flak18 import Flak18Generator
 from gen.sam.aaa_ww2_ally_flak import AllyWW2FlakGenerator
+from gen.sam.aaa_zsu57 import ZSU57Generator
 from gen.sam.aaa_zu23_insurgent import ZU23InsurgentGenerator
 from gen.sam.airdefensegroupgenerator import (
     AirDefenseGroupGenerator,
@@ -98,7 +99,8 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = {
     "ColdWarFlakGenerator": ColdWarFlakGenerator,
     "EarlyColdWarFlakGenerator": EarlyColdWarFlakGenerator,
     "FreyaGenerator": FreyaGenerator,
-    "AllyWW2FlakGenerator": AllyWW2FlakGenerator
+    "AllyWW2FlakGenerator": AllyWW2FlakGenerator,
+    "ZSU57Generator": ZSU57Generator
 }
 
 

pydcs

@@ -1 +1 @@
-Subproject commit c9751f54e01de18f0ff3bb84c2793f6f95c95345
+Subproject commit edc87fab1d65d4e4153c84006f537e6ae6b0671a

resources/factions/china_2010.json

@@ -48,6 +48,7 @@
     "SA13Generator",
     "Tier2SA10Generator",
     "ZSU23Generator",
+    "ZSU57Generator",
     "ZU23Generator",
     "ZU23UralGenerator"
   ],

resources/factions/north_korea_2000.json

@@ -48,7 +48,8 @@
     "SA9Generator",
     "SA13Generator",
     "ZU23Generator",
-    "ZSU23Generator"
+    "ZSU23Generator",
+    "ZSU57Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator",

resources/factions/russia_1965.json

@@ -39,6 +39,7 @@
     "SA2Generator",
     "SA3Generator",
     "ZSU23Generator",
+    "ZSU57Generator",
     "ZU23Generator",
     "ZU23UralGenerator"
   ],

resources/factions/russia_1970_limited_air.json

@@ -38,6 +38,7 @@
     "SA11Generator",
     "ColdWarFlakGenerator",
     "ZSU23Generator",
+    "ZSU57Generator",
     "ZU23Generator",
     "ZU23UralGenerator"
   ],

resources/factions/russia_1975.json

@@ -49,6 +49,7 @@
     "SA9Generator",
     "SA13Generator",
     "ZSU23Generator",
+    "ZSU57Generator",
     "ZU23Generator",
     "ZU23UralGenerator"
   ],

resources/factions/russia_2010.json

@@ -31,9 +31,10 @@
     "IFV_BMP_2",
     "IFV_BMP_3",
     "APC_BTR_80",
+    "APC_BTR_82A",
     "MBT_T_90",
     "MBT_T_80U",
-    "MBT_T_72B"
+    "MBT_T_72B3"
   ],
   "artillery_units": [
     "MLRS_9K57_Uragan_BM_27",

resources/factions/syria_1967.json

@@ -38,7 +38,8 @@
     "SA3Generator",
     "ZSU23Generator",
     "ZU23Generator",
-    "ZU23UralGenerator"
+    "ZU23UralGenerator",
+    "ZSU57Generator"
   ],
   "ewrs": [
     "FlatFaceGenerator"

resources/factions/syria_1967_with_ww2_weapons.json

@@ -42,6 +42,7 @@
     "SA3Generator",
     "ZSU23Generator",
     "ZU23Generator",
+    "ZSU57Generator",
     "ZU23UralGenerator"
   ],
   "ewrs": [

resources/factions/syria_1973.json

@@ -42,6 +42,7 @@
     "SA9Generator",
     "ZSU23Generator",
     "ZU23Generator",
+    "ZSU57Generator",
     "ZU23UralGenerator"
   ],
   "ewrs": [

resources/factions/syria_1982.json

@@ -46,7 +46,8 @@
     "SA13Generator",
     "ZSU23Generator",
     "ZU23Generator",
-    "ZU23UralGenerator"
+    "ZU23UralGenerator",
+    "ZSU57Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator"