pydcs update for DCS 2.7.1

2025-11-10 15:41:24 +00:00 · 2021-05-21 01:15:54 +02:00
parent 844dc48d65
commit 9243fd499b
80 changed files with 211 additions and 215 deletions
--- a/resources/factions/NATO_Desert_Storm.json
+++ b/resources/factions/NATO_Desert_Storm.json
@@ -40,7 +40,7 @@
    "IFV_M2A2_Bradley",
    "IFV_M1126_Stryker_ICV",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "APC_TPz_Fuchs",
    "IFV_Warrior",
--- a/resources/factions/allies_1940.json
+++ b/resources/factions/allies_1940.json
@@ -14,7 +14,7 @@
    "Car_Daimler_Armored",
    "LT_Mk_VII_Tetrarch",
    "AAA_QF_3_7",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
  ],
--- a/resources/factions/allies_1944.json
+++ b/resources/factions/allies_1944.json
@@ -16,7 +16,7 @@
  ],
  "frontline_units": [
    "MT_M4A4_Sherman_Firefly",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "APC_M2A1_Halftrack",
    "CT_Cromwell_IV",
    "CT_Centaur_IV",
@@ -26,7 +26,7 @@
    "Car_Daimler_Armored",
    "LT_Mk_VII_Tetrarch",
    "AAA_QF_3_7",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
    "SPG_M12_GMC_155mm"
--- a/resources/factions/allies_1944_free.json
+++ b/resources/factions/allies_1944_free.json
@@ -14,9 +14,9 @@
    "A_20G"
  ],
  "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "APC_M2A1_Halftrack",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
  ],
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -37,13 +37,13 @@
  ],
  "frontline_units": [
    "MBT_M1A2_Abrams",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A6M",
    "MBT_Merkava_IV",
    "ATGM_Stryker",
    "IFV_M2A2_Bradley",
    "IFV_Marder",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Linebacker___Bradley_M6",
    "SAM_Avenger__Stinger"
--- a/resources/factions/canada_2005.json
+++ b/resources/factions/canada_2005.json
@@ -17,7 +17,8 @@
  ],
  "frontline_units": [
    "MBT_Leopard_1A3",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
+    "MBT_Leopard_2A6M",
    "IFV_LAV_25",
    "APC_M113",
    "IFV_Warrior",
--- a/resources/factions/canada_2005_c130.json
+++ b/resources/factions/canada_2005_c130.json
@@ -18,7 +18,8 @@
  ],
  "frontline_units": [
    "MBT_Leopard_1A3",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
+    "MBT_Leopard_2A6M",
    "IFV_LAV_25",
    "APC_M113",
    "IFV_Warrior",
--- a/resources/factions/china_2010.json
+++ b/resources/factions/china_2010.json
@@ -28,7 +28,7 @@
  "artillery_units": [
    "MLRS_9A52_Smerch_HE_300mm",
    "PLZ_05",
-    "SPH_2S9_Nona_120mm_M"
+    "SPM_2S9_Nona_120mm_M"
  ],
  "logistics_units": [
    "Truck_Ural_375",
--- a/resources/factions/dprk_1950_fictional.json
+++ b/resources/factions/dprk_1950_fictional.json
@@ -15,7 +15,7 @@
  "tankers": [
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "Grad_MRL_FDDM__FC",
    "APC_MTLB",
    "MBT_T_55",
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -20,10 +20,10 @@
  "frontline_units": [
    "MBT_Leclerc",
    "APC_TPz_Fuchs",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
    "ATGM_Stryker",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Roland_ADS"
  ],
--- a/resources/factions/gdr_1985.json
+++ b/resources/factions/gdr_1985.json
@@ -17,7 +17,7 @@
  "frontline_units": [
    "IFV_BMP_1",
    "IFV_BMP_2",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "APC_MTLB",
    "MBT_T_55",
    "MBT_T_72B"
--- a/resources/factions/georgia_2008.json
+++ b/resources/factions/georgia_2008.json
@@ -13,7 +13,7 @@
  "frontline_units": [
    "APC_BTR_80",
    "APC_MTLB",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
    "IFV_BMP_1",
    "IFV_BMP_2",
    "MBT_T_72B",
--- a/resources/factions/germany_1940.json
+++ b/resources/factions/germany_1940.json
@@ -10,7 +10,7 @@
    "Ju_88A4"
  ],
  "frontline_units": [
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
    "APC_Sd_Kfz_251_Halftrack",
    "IFV_Sd_Kfz_234_2_Puma",
    "AAA_8_8cm_Flak_18"
--- a/resources/factions/germany_1942.json
+++ b/resources/factions/germany_1942.json
@@ -10,14 +10,14 @@
    "Ju_88A4"
  ],
  "frontline_units": [
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
    "APC_Sd_Kfz_251_Halftrack",
    "IFV_Sd_Kfz_234_2_Puma",
    "SPG_Jagdpanzer_IV",
-    "AAA_8_8cm_Flak_18"
+    "AAA_8_8cm_Flak_18",
+    "SPG_Sturmpanzer_IV_Brummbar"
  ],
  "artillery_units": [
-    "SPG_Sturmpanzer_IV_Brummbar"
  ],
  "logistics_units": [
    "Truck_Opel_Blitz",
--- a/resources/factions/germany_1944.json
+++ b/resources/factions/germany_1944.json
@@ -11,7 +11,7 @@
  ],
  "frontline_units": [
    "MT_Pz_Kpfw_V_Panther_Ausf_G",
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
    "HT_Pz_Kpfw_VI_Tiger_I",
    "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II",
    "APC_Sd_Kfz_251_Halftrack",
@@ -22,10 +22,10 @@
    "SPG_StuG_III_Ausf__G",
    "SPG_StuG_IV",
    "AAA_8_8cm_Flak_18",
-    "AAA_8_8cm_Flak_41"
+    "AAA_8_8cm_Flak_41",
+    "SPG_Sturmpanzer_IV_Brummbar"
  ],
  "artillery_units": [
-    "SPG_Sturmpanzer_IV_Brummbar"
  ],
  "logistics_units": [
    "Truck_Opel_Blitz",
--- a/resources/factions/germany_1944_free.json
+++ b/resources/factions/germany_1944_free.json
@@ -9,7 +9,7 @@
    "Bf_109K_4"
  ],
  "frontline_units": [
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
    "APC_Sd_Kfz_251_Halftrack",
    "AAA_8_8cm_Flak_18"
  ],
--- a/resources/factions/germany_1990.json
+++ b/resources/factions/germany_1990.json
@@ -21,7 +21,7 @@
  "frontline_units": [
    "APC_TPz_Fuchs",
    "MBT_Leopard_1A3",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
    "IFV_Marder",
    "SPAAA_Gepard"
  ],
--- a/resources/factions/greece_2005.json
+++ b/resources/factions/greece_2005.json
@@ -15,10 +15,10 @@
    "KC130"
  ],
  "frontline_units": [
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
    "MBT_Leopard_1A3",
    "MBT_M60A3_Patton",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "APC_M113",
    "IFV_BMP_1"
@@ -48,4 +48,4 @@
  ],
  "has_jtac": true,
  "jtac_unit": "MQ_9_Reaper"
-}
+}
--- a/resources/factions/india_2010.json
+++ b/resources/factions/india_2010.json
@@ -26,7 +26,7 @@
    "SAM_SA_19_Tunguska_Grison"
  ],
  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/insurgents.json
+++ b/resources/factions/insurgents.json
@@ -6,9 +6,9 @@
  "aircrafts": [
  ],
  "frontline_units": [
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
    "APC_MTLB",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375"
  ],
  "artillery_units": [
--- a/resources/factions/insurgents_hard.json
+++ b/resources/factions/insurgents_hard.json
@@ -7,8 +7,8 @@
  ],
  "frontline_units": [
    "ATGM_HMMWV",
-    "APC_HMMWV__Scout",
-    "IFV_BRDM_2",
+    "Scout_HMMWV",
+    "Scout_BRDM_2",
    "APC_BTR_80",
    "APC_BTR_RD",
    "IFV_BMP_1",
--- a/resources/factions/iraq_1991.json
+++ b/resources/factions/iraq_1991.json
@@ -30,7 +30,7 @@
    "MBT_T_55",
    "MBT_T_72B",
    "APC_BTR_80",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "SPH_2S1_Gvozdika_122mm",
    "SPAAA_ZSU_57_2",
    "SPAAA_ZSU_23_4_Shilka_Gun_Dish"
--- a/resources/factions/israel_1948.json
+++ b/resources/factions/israel_1948.json
@@ -14,9 +14,9 @@
  "frontline_units": [
    "MT_M4A4_Sherman_Firefly",
    "APC_M2A1_Halftrack",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "Car_M8_Greyhound_Armored",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
  ],
--- a/resources/factions/israel_1973.json
+++ b/resources/factions/israel_1973.json
@@ -16,7 +16,7 @@
    "KC130"
  ],
  "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "APC_M2A1_Halftrack",
    "MBT_M60A3_Patton",
    "APC_M113",
--- a/resources/factions/israel_2000.json
+++ b/resources/factions/israel_2000.json
@@ -21,7 +21,7 @@
  ],
  "frontline_units": [
    "APC_M113",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "MBT_Merkava_IV",
    "SPAAA_Vulcan_M163"
--- a/resources/factions/japan_2005.json
+++ b/resources/factions/japan_2005.json
@@ -23,7 +23,7 @@
    "IFV_Marder",
    "APC_TPz_Fuchs",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "SPAAA_Gepard"
  ],
  "artillery_units": [
--- a/resources/factions/libya_2011.json
+++ b/resources/factions/libya_2011.json
@@ -18,7 +18,7 @@
  ],
  "frontline_units": [
    "IFV_BMP_1",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "MBT_T_72B",
    "MBT_T_55",
    "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
--- a/resources/factions/north_korea_2000.json
+++ b/resources/factions/north_korea_2000.json
@@ -19,7 +19,7 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "APC_BTR_80",
    "IFV_BMP_1",
    "MBT_T_55",
@@ -30,7 +30,7 @@
  ],
  "artillery_units": [
    "MLRS_BM_21_Grad_122mm",
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/pakistan_2015.json
+++ b/resources/factions/pakistan_2015.json
@@ -28,7 +28,7 @@
  ],
  "artillery_units": [
    "MLRS_9A52_Smerch_HE_300mm",
-    "SPH_2S9_Nona_120mm_M"
+    "SPM_2S9_Nona_120mm_M"
  ],
  "logistics_units": [
    "Truck_Ural_375",
--- a/resources/factions/pmc_russian.json
+++ b/resources/factions/pmc_russian.json
@@ -10,9 +10,9 @@
    "Ka_50"
  ],
  "frontline_units": [
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
    "APC_BTR_80",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "SAM_SA_13_Strela_10M3_Gopher_TEL"
  ],
  "artillery_units": [
--- a/resources/factions/pmc_us.json
+++ b/resources/factions/pmc_us.json
@@ -10,7 +10,7 @@
    "SA342M"
  ],
  "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "IFV_Warrior",
    "IFV_LAV_25",
    "SAM_Avenger__Stinger"
--- a/resources/factions/pmc_us_with_mb339.json
+++ b/resources/factions/pmc_us_with_mb339.json
@@ -11,7 +11,7 @@
    "SA342M"
  ],
  "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "IFV_Warrior",
    "IFV_LAV_25",
    "SAM_Avenger__Stinger"
--- a/resources/factions/poland_2010.json
+++ b/resources/factions/poland_2010.json
@@ -13,13 +13,13 @@
    "KC130"
  ],
  "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "IFV_M1126_Stryker_ICV",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "IFV_BMP_1",
    "APC_MTLB",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A6M",
    "MBT_T_72B3"
  ],
  "artillery_units": [
--- a/resources/factions/redfor_china_2010.json
+++ b/resources/factions/redfor_china_2010.json
@@ -31,7 +31,7 @@
  ],
  "frontline_units": [
    "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
    "HQ_7_Self_Propelled_LN",
    "IFV_BMP_1",
    "IFV_BMP_2",
@@ -46,8 +46,8 @@
  ],
  "artillery_units": [
    "MLRS_9A52_Smerch_HE_300mm",
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
+    "MLRS_9K57_Uragan_BM_27_220mm",
+    "SPM_2S9_Nona_120mm_M",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/redfor_russia_2010.json
+++ b/resources/factions/redfor_russia_2010.json
@@ -31,7 +31,7 @@
  ],
  "frontline_units": [
    "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
    "HQ_7_Self_Propelled_LN",
    "IFV_BMP_1",
    "IFV_BMP_2",
@@ -46,8 +46,8 @@
  ],
  "artillery_units": [
    "MLRS_9A52_Smerch_HE_300mm",
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
+    "MLRS_9K57_Uragan_BM_27_220mm",
+    "SPM_2S9_Nona_120mm_M",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/russia_1955.json
+++ b/resources/factions/russia_1955.json
@@ -13,7 +13,7 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "Grad_MRL_FDDM__FC",
    "APC_MTLB",
    "MBT_T_55",
--- a/resources/factions/russia_1965.json
+++ b/resources/factions/russia_1965.json
@@ -17,7 +17,7 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "APC_BTR_80",
    "APC_BTR_RD",
    "IFV_BMD_1",
--- a/resources/factions/russia_1970_limited_air.json
+++ b/resources/factions/russia_1970_limited_air.json
@@ -10,7 +10,7 @@
    "Mi_24V"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "APC_BTR_80",
    "IFV_BMD_1",
    "IFV_BMP_1",
@@ -19,7 +19,7 @@
  ],
  "artillery_units": [
    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S9_Nona_120mm_M",
+    "SPM_2S9_Nona_120mm_M",
    "SPH_2S1_Gvozdika_122mm"
  ],
  "logistics_units": [
--- a/resources/factions/russia_1975.json
+++ b/resources/factions/russia_1975.json
@@ -23,7 +23,7 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "APC_BTR_80",
    "IFV_BMD_1",
    "IFV_BMP_1",
@@ -32,7 +32,7 @@
  ],
  "artillery_units": [
    "MLRS_BM_21_Grad_122mm",
-    "SPH_2S9_Nona_120mm_M",
+    "SPM_2S9_Nona_120mm_M",
    "SPH_2S1_Gvozdika_122mm"
  ],
  "logistics_units": [
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -35,7 +35,7 @@
    "SAM_SA_13_Strela_10M3_Gopher_TEL"
  ],
  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/russia_2010.json
+++ b/resources/factions/russia_2010.json
@@ -34,14 +34,14 @@
    "IFV_BMP_2",
    "IFV_BMP_3",
    "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
    "MBT_T_90",
    "MBT_T_80U",
    "MBT_T_72B3",
    "SAM_SA_19_Tunguska_Grison"
  ],
  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/russia_2010_hds.json
+++ b/resources/factions/russia_2010_hds.json
@@ -34,14 +34,14 @@
    "IFV_BMP_2",
    "IFV_BMP_3",
    "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
    "MBT_T_90",
    "MBT_T_80U",
    "MBT_T_72B3",
    "SAM_SA_19_Tunguska_Grison"
  ],
  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/russia_2020.json
+++ b/resources/factions/russia_2020.json
@@ -39,7 +39,7 @@
    "SAM_SA_19_Tunguska_Grison"
  ],
  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
    "SPH_2S19_Msta_152mm"
  ],
  "logistics_units": [
--- a/resources/factions/soviet_union_1943.json
+++ b/resources/factions/soviet_union_1943.json
@@ -8,11 +8,11 @@
    "I_16"
  ],
  "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "APC_M2A1_Halftrack",
    "Car_Daimler_Armored",
    "LT_Mk_VII_Tetrarch",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
    "MLRS_BM_21_Grad_122mm"
--- a/resources/factions/spain_1990.json
+++ b/resources/factions/spain_1990.json
@@ -19,7 +19,7 @@
  ],
  "frontline_units": [
    "MBT_M60A3_Patton",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
    "APC_M113",
    "SAM_Avenger__Stinger"
  ],
--- a/resources/factions/sweden_1970.json
+++ b/resources/factions/sweden_1970.json
@@ -17,7 +17,7 @@
  ],
  "frontline_units": [
    "IFV_Warrior",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
    "IFV_M1126_Stryker_ICV",
    "SAM_Chaparral_M48"
  ],
--- a/resources/factions/sweden_1990.json
+++ b/resources/factions/sweden_1990.json
@@ -16,7 +16,7 @@
  ],
  "frontline_units": [
    "IFV_Warrior",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
    "IFV_M1126_Stryker_ICV",
    "SAM_Avenger__Stinger"
  ],
--- a/resources/factions/syria_1948.json
+++ b/resources/factions/syria_1948.json
@@ -10,9 +10,9 @@
  "frontline_units": [
    "IFV_Sd_Kfz_234_2_Puma",
    "APC_Sd_Kfz_251_Halftrack",
-    "MT_PzIV_H",
-    "MT_M4_Sherman",
-    "AAA_40mm_Bofors"
+    "Tk_PzIV_H",
+    "Tk_M4_Sherman",
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
  ],
--- a/resources/factions/syria_1967.json
+++ b/resources/factions/syria_1967.json
@@ -17,8 +17,8 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
-    "MT_PzIV_H",
+    "Scout_BRDM_2",
+    "Tk_PzIV_H",
    "MBT_T_55",
    "SPAAA_ZU_23_2_Mounted_Ural_375",
    "SPAAA_ZSU_57_2",
--- a/resources/factions/syria_1967_with_ww2_weapons.json
+++ b/resources/factions/syria_1967_with_ww2_weapons.json
@@ -18,9 +18,9 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "MBT_T_55",
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
    "SPG_StuG_III_Ausf__G",
    "SPG_Jagdpanzer_IV",
    "SPAAA_ZSU_57_2",
--- a/resources/factions/syria_2011.json
+++ b/resources/factions/syria_2011.json
@@ -26,17 +26,17 @@
    "IFV_BMP_1",
    "IFV_BMP_2",
    "APC_BTR_80",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
    "APC_MTLB",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
    "MBT_T_55",
    "MBT_T_72B",
    "MBT_T_90",
    "SPAAA_ZSU_57_2"
  ],
  "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
+    "MLRS_9K57_Uragan_BM_27_220mm",
+    "SPM_2S9_Nona_120mm_M",
    "MLRS_BM_21_Grad_122mm",
    "SPH_2S1_Gvozdika_122mm"
  ],
--- a/resources/factions/turkey_2005.json
+++ b/resources/factions/turkey_2005.json
@@ -17,10 +17,10 @@
    "KC130"
  ],
  "frontline_units": [
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4_Trs",
    "MBT_Leopard_1A3",
    "MBT_M60A3_Patton",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
    "APC_BTR_80",
    "SAM_Avenger__Stinger"
  ],
--- a/resources/factions/uk_1944.json
+++ b/resources/factions/uk_1944.json
@@ -16,14 +16,14 @@
  ],
  "frontline_units": [
    "MT_M4A4_Sherman_Firefly",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "APC_M2A1_Halftrack",
    "CT_Cromwell_IV",
    "CT_Centaur_IV",
    "HIT_Churchill_VII",
    "Car_Daimler_Armored",
    "LT_Mk_VII_Tetrarch",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
  ],
--- a/resources/factions/uk_1990.json
+++ b/resources/factions/uk_1990.json
@@ -20,7 +20,7 @@
  "frontline_units": [
    "MBT_Challenger_II",
    "IFV_Warrior",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Avenger__Stinger"
  ],
@@ -71,4 +71,4 @@
  ],
  "has_jtac": true,
  "jtac_unit": "MQ_9_Reaper"
-}
+}
--- a/resources/factions/ukraine_2010.json
+++ b/resources/factions/ukraine_2010.json
@@ -20,7 +20,7 @@
    "IL_78M"
  ],
  "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "IFV_BMP_3",
    "IFV_BMP_2",
    "APC_BTR_80",
--- a/resources/factions/unc_1950_fictional.json
+++ b/resources/factions/unc_1950_fictional.json
@@ -12,11 +12,11 @@
    "P_47D_40"
  ],
  "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "MBT_M60A3_Patton",
    "APC_M2A1_Halftrack",
    "Car_M8_Greyhound_Armored",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
    "SPG_M12_GMC_155mm"
@@ -38,4 +38,4 @@
  "requirements": {
      "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
  }
-}
+}
--- a/resources/factions/us_aggressors.json
+++ b/resources/factions/us_aggressors.json
@@ -31,11 +31,11 @@
  ],
  "frontline_units": [
    "MBT_M1A2_Abrams",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
    "ATGM_Stryker",
    "IFV_M2A2_Bradley",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "SAM_Avenger__Stinger"
  ],
  "artillery_units": [
@@ -82,4 +82,4 @@
      "vf-74 adversary"
    ]
  }
-}
+}
--- a/resources/factions/usa_1944.json
+++ b/resources/factions/usa_1944.json
@@ -15,7 +15,7 @@
  ],
  "frontline_units": [
    "MT_M4A4_Sherman_Firefly",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "APC_M2A1_Halftrack",
    "Car_M8_Greyhound_Armored",
    "SPG_M10_GMC",
--- a/resources/factions/usa_1955.json
+++ b/resources/factions/usa_1955.json
@@ -11,10 +11,10 @@
    "P_51D_30_NA"
  ],
  "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
    "MBT_M60A3_Patton",
    "APC_M2A1_Halftrack",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
  ],
  "artillery_units": [
    "SPG_M12_GMC_155mm"
@@ -34,4 +34,4 @@
  "requirements": {
      "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
  }
-}
+}
--- a/resources/factions/usa_1990.json
+++ b/resources/factions/usa_1990.json
@@ -39,7 +39,7 @@
    "IFV_M1126_Stryker_ICV",
    "IFV_M2A2_Bradley",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Avenger__Stinger"
  ],
@@ -119,4 +119,4 @@
      "VMFA-323"
    ]
  }
-}
+}
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -39,7 +39,7 @@
    "IFV_M1126_Stryker_ICV",
    "IFV_M2A2_Bradley",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Avenger__Stinger",
    "SAM_Linebacker___Bradley_M6",
@@ -119,4 +119,4 @@
      "VMFA-323"
    ]
  }
-}
+}
--- a/resources/factions/usa_2005_c130.json
+++ b/resources/factions/usa_2005_c130.json
@@ -40,7 +40,7 @@
    "IFV_M1126_Stryker_ICV",
    "IFV_M2A2_Bradley",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Avenger__Stinger",
    "SAM_Linebacker___Bradley_M6"
@@ -121,4 +121,4 @@
      "VMFA-323"
    ]
  }
-}
+}
--- a/resources/factions/usa_2005_modded.json
+++ b/resources/factions/usa_2005_modded.json
@@ -35,7 +35,7 @@
    "IFV_M1126_Stryker_ICV",
    "IFV_M2A2_Bradley",
    "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "ATGM_HMMWV",
    "SAM_Avenger__Stinger",
    "SAM_Linebacker___Bradley_M6"
@@ -116,4 +116,4 @@
      "VMFA-323"
    ]
  }
-}
+}
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -21,7 +21,7 @@
  "frontline_units": [
    "MBT_M60A3_Patton",
    "APC_M113",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
    "SPAAA_Vulcan_M163"
  ],
  "artillery_units": [
@@ -87,4 +87,4 @@
      "VFA-97"
    ]
  }
-}
+}