pydcs update for DCS 2.7.1

gen/ground_forces/ai_ground_planner_db.py

@@ -8,7 +8,10 @@ TYPE_TANKS = [
     Armor.MBT_T_72B3,
     Armor.MBT_T_80U,
     Armor.MBT_T_90,
-    Armor.MBT_Leopard_2,
+    Armor.MBT_Leopard_2A4,
+    Armor.MBT_Leopard_2A4_Trs,
+    Armor.MBT_Leopard_2A5,
+    Armor.MBT_Leopard_2A6M,
     Armor.MBT_Leopard_1A3,
     Armor.MBT_Leclerc,
     Armor.MBT_Challenger_II,
@@ -18,16 +21,17 @@ TYPE_TANKS = [
     Armor.ZTZ_96B,
     # WW2
     Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
-    Armor.MT_PzIV_H,
+    Armor.Tk_PzIV_H,
     Armor.HT_Pz_Kpfw_VI_Tiger_I,
     Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II,
-    Armor.MT_M4_Sherman,
+    Armor.Tk_M4_Sherman,
     Armor.MT_M4A4_Sherman_Firefly,
     Armor.SPG_StuG_IV,
     Armor.CT_Centaur_IV,
     Armor.CT_Cromwell_IV,
     Armor.HIT_Churchill_VII,
     Armor.LT_Mk_VII_Tetrarch,
+    Armor.SPG_Sturmpanzer_IV_Brummbar,
     # Mods
     frenchpack.DIM__TOYOTA_BLUE,
     frenchpack.DIM__TOYOTA_GREEN,
@@ -77,18 +81,18 @@ TYPE_IFV = [
 ]
 
 TYPE_APC = [
-    Armor.APC_HMMWV__Scout,
+    Armor.Scout_HMMWV,
     Armor.IFV_M1126_Stryker_ICV,
     Armor.APC_M113,
     Armor.APC_BTR_80,
-    Armor.APC_BTR_82A,
+    Armor.IFV_BTR_82A,
     Armor.APC_MTLB,
     Armor.APC_M2A1_Halftrack,
-    Armor.APC_Cobra__Scout,
+    Armor.Scout_Cobra,
     Armor.APC_Sd_Kfz_251_Halftrack,
     Armor.APC_AAV_7_Amphibious,
     Armor.APC_TPz_Fuchs,
-    Armor.IFV_BRDM_2,
+    Armor.Scout_BRDM_2,
     Armor.APC_BTR_RD,
     Artillery.Grad_MRL_FDDM__FC,
     # WW2
@@ -105,16 +109,15 @@ TYPE_ARTILLERY = [
     Artillery.SPH_2S1_Gvozdika_122mm,
     Artillery.SPH_2S3_Akatsia_152mm,
     Artillery.MLRS_BM_21_Grad_122mm,
-    Artillery.MLRS_BM_27_Uragan_220mm,
+    Artillery.MLRS_9K57_Uragan_BM_27_220mm,
     Artillery.SPH_M109_Paladin_155mm,
     Artillery.MLRS_M270_227mm,
-    Artillery.SPH_2S9_Nona_120mm_M,
+    Artillery.SPM_2S9_Nona_120mm_M,
     Artillery.SPH_Dana_vz77_152mm,
     Artillery.PLZ_05,
     Artillery.SPH_2S19_Msta_152mm,
     Artillery.MLRS_9A52_Smerch_CM_300mm,
     # WW2
-    Artillery.SPG_Sturmpanzer_IV_Brummbar,
     Artillery.SPG_M12_GMC_155mm,
 ]
 
@@ -175,7 +178,7 @@ TYPE_SHORAD = [
     AirDefence.AAA_8_8cm_Flak_36,
     AirDefence.AAA_8_8cm_Flak_37,
     AirDefence.AAA_8_8cm_Flak_41,
-    AirDefence.AAA_40mm_Bofors,
+    AirDefence.AAA_Bofors_40mm,
     AirDefence.AAA_S_60_57mm,
     AirDefence.AAA_M1_37mm,
     AirDefence.AAA_QF_3_7,

gen/sam/aaa_bofors.py

@@ -27,7 +27,7 @@ class BoforsGenerator(AirDefenseGroupGenerator):
             for j in range(grid_y):
                 index = index + 1
                 self.add_unit(
-                    AirDefence.AAA_40mm_Bofors,
+                    AirDefence.AAA_Bofors_40mm,
                     "AAA#" + str(index),
                     self.position.x + spacing * i,
                     self.position.y + spacing * j,

gen/sam/aaa_zu23_insurgent.py

@@ -27,7 +27,7 @@ class ZU23InsurgentGenerator(AirDefenseGroupGenerator):
             for j in range(grid_y):
                 index = index + 1
                 self.add_unit(
-                    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent,
+                    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement,
                     "AAA#" + str(index),
                     self.position.x + spacing * i,
                     self.position.y + spacing * j,

gen/sam/ewrs.py

@@ -87,7 +87,7 @@ class StraightFlushGenerator(EwrGenerator):
     This is the SA-6 search/track radar, but used as an early warning radar.
     """
 
-    unit_type = AirDefence.SAM_SA_6_Kub_Long_Track_STR
+    unit_type = AirDefence.SAM_SA_6_Kub_Straight_Flush_STR
 
 
 class HawkEwrGenerator(EwrGenerator):

gen/sam/sam_group_generator.py

@@ -105,13 +105,13 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = {
 
 
 SAM_PRICES = {
-    AirDefence.SAM_Hawk_Generator__PCP: 35,
+    AirDefence.SAM_Hawk_Platoon_Command_Post__PCP: 35,
     AirDefence.AAA_ZU_23_Emplacement: 10,
     AirDefence.AAA_ZU_23_Closed_Emplacement: 10,
     AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375: 10,
     AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375: 10,
-    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent: 10,
-    AirDefence.AAA_ZU_23_Insurgent: 10,
+    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement: 10,
+    AirDefence.AAA_ZU_23_Insurgent_Emplacement: 10,
     AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish: 10,
     AirDefence.SPAAA_Vulcan_M163: 15,
     AirDefence.SAM_Linebacker___Bradley_M6: 20,
@@ -122,7 +122,7 @@ SAM_PRICES = {
     AirDefence.SAM_Patriot_LN: 85,
     AirDefence.SAM_Patriot_EPP_III: 85,
     AirDefence.SAM_Chaparral_M48: 25,
-    AirDefence.AAA_40mm_Bofors: 15,
+    AirDefence.AAA_Bofors_40mm: 15,
     AirDefence.AAA_8_8cm_Flak_36: 15,
     AirDefence.SAM_SA_2_S_75_Guideline_LN: 30,
     AirDefence.SAM_SA_3_S_125_Goa_LN: 35,

gen/sam/sam_hawk.py

@@ -26,7 +26,7 @@ class HawkGenerator(AirDefenseGroupGenerator):
             self.heading,
         )
         self.add_unit(
-            AirDefence.SAM_Hawk_Generator__PCP,
+            AirDefence.SAM_Hawk_Platoon_Command_Post__PCP,
             "PCP",
             self.position.x,
             self.position.y,

gen/sam/sam_sa6.py

@@ -18,7 +18,7 @@ class SA6Generator(AirDefenseGroupGenerator):
 
     def generate(self):
         self.add_unit(
-            AirDefence.SAM_SA_6_Kub_Long_Track_STR,
+            AirDefence.SAM_SA_6_Kub_Straight_Flush_STR,
             "STR",
             self.position.x,
             self.position.y,