From a3d61ea286ab71507066ddc2f352f701f57b0004 Mon Sep 17 00:00:00 2001 From: Khopa Date: Fri, 18 Jun 2021 01:06:09 +0200 Subject: [PATCH] Continue pydcs update --- game/data/aaa_db.py | 30 +- game/data/alic.py | 40 +- game/db.py | 444 +++++++++--------- game/version.py | 6 +- gen/coastal/silkworm.py | 4 +- gen/missiles/scud_site.py | 6 +- gen/sam/aaa_bofors.py | 2 +- gen/sam/aaa_flak.py | 8 +- gen/sam/aaa_flak18.py | 2 +- gen/sam/aaa_ww2_ally_flak.py | 6 +- gen/sam/aaa_zsu57.py | 2 +- gen/sam/aaa_zu23_insurgent.py | 2 +- gen/sam/cold_war_flak.py | 22 +- gen/sam/ewrs.py | 10 +- gen/sam/freya_ewr.py | 2 +- gen/sam/sam_avenger.py | 4 +- gen/sam/sam_chaparral.py | 4 +- gen/sam/sam_gepard.py | 6 +- gen/sam/sam_group_generator.py | 62 +-- gen/sam/sam_hawk.py | 10 +- gen/sam/sam_hq7.py | 8 +- gen/sam/sam_linebacker.py | 4 +- gen/sam/sam_patriot.py | 8 +- gen/sam/sam_rapier.py | 2 +- gen/sam/sam_roland.py | 4 +- gen/sam/sam_sa10.py | 20 +- gen/sam/sam_sa11.py | 2 +- gen/sam/sam_sa13.py | 4 +- gen/sam/sam_sa15.py | 4 +- gen/sam/sam_sa19.py | 4 +- gen/sam/sam_sa2.py | 4 +- gen/sam/sam_sa3.py | 6 +- gen/sam/sam_sa6.py | 4 +- gen/sam/sam_sa8.py | 4 +- gen/sam/sam_sa9.py | 4 +- gen/sam/sam_vulcan.py | 6 +- gen/sam/sam_zsu23.py | 2 +- gen/sam/sam_zu23.py | 2 +- gen/sam/sam_zu23_ural.py | 2 +- gen/sam/sam_zu23_ural_insurgent.py | 2 +- .../Israel-USN_2005_Allied_Sword.json | 20 +- resources/factions/NATO_Desert_Storm.json | 40 +- .../Syria-Lebanon_2005_Allied_Sword.json | 24 +- resources/factions/allies_1940.json | 12 +- resources/factions/allies_1944.json | 26 +- resources/factions/allies_1944_free.json | 6 +- resources/factions/australia_2005.json | 16 +- resources/factions/australia_2005_c130.json | 16 +- resources/factions/bluefor_coldwar.json | 16 +- resources/factions/bluefor_coldwar_a4.json | 16 +- .../factions/bluefor_coldwar_a4_mb339.json | 16 +- resources/factions/bluefor_modern.json | 36 +- resources/factions/canada_2005.json | 16 +- resources/factions/canada_2005_c130.json | 16 +- resources/factions/china_2010.json | 20 +- resources/factions/dprk_1950_fictional.json | 18 +- .../factions/france_1985_frenchpack.json | 14 +- resources/factions/france_1995.json | 22 +- .../factions/france_2005_frenchpack.json | 16 +- resources/factions/gdr_1985.json | 20 +- resources/factions/georgia_2008.json | 26 +- resources/factions/germany_1940.json | 8 +- resources/factions/germany_1942.json | 12 +- resources/factions/germany_1944.json | 28 +- resources/factions/germany_1944_free.json | 6 +- resources/factions/germany_1990.json | 12 +- resources/factions/greece_2005.json | 20 +- resources/factions/india_2010.json | 18 +- resources/factions/insurgents.json | 18 +- resources/factions/insurgents_hard.json | 28 +- resources/factions/insurgents_modded.json | 10 +- resources/factions/iran_1988.json | 24 +- resources/factions/iran_2015.json | 24 +- resources/factions/iraq_1991.json | 28 +- resources/factions/israel_1948.json | 12 +- resources/factions/israel_1973.json | 14 +- resources/factions/israel_1982.json | 12 +- resources/factions/israel_2000.json | 18 +- resources/factions/israel_2012.json | 18 +- resources/factions/italy_1990.json | 14 +- resources/factions/italy_1990_mb339.json | 14 +- resources/factions/japan_2005.json | 24 +- resources/factions/libya_2011.json | 20 +- resources/factions/netherlands_1990.json | 10 +- resources/factions/north_korea_2000.json | 28 +- resources/factions/pakistan_2015.json | 20 +- resources/factions/pmc_russian.json | 14 +- resources/factions/pmc_us.json | 12 +- resources/factions/pmc_us_with_mb339.json | 12 +- resources/factions/poland_2010.json | 26 +- resources/factions/redfor_china_2010.json | 38 +- resources/factions/redfor_russia_2010.json | 38 +- resources/factions/russia_1955.json | 22 +- resources/factions/russia_1965.json | 26 +- .../factions/russia_1970_limited_air.json | 24 +- resources/factions/russia_1975.json | 24 +- resources/factions/russia_1990.json | 20 +- resources/factions/russia_2010.json | 26 +- resources/factions/russia_2010_hds.json | 26 +- resources/factions/russia_2020.json | 20 +- resources/factions/soviet_union_1943.json | 12 +- resources/factions/spain_1990.json | 14 +- resources/factions/sweden_1970.json | 10 +- resources/factions/sweden_1990.json | 10 +- .../factions/sweden_2002_with_gripen.json | 10 +- resources/factions/syria_1948.json | 14 +- resources/factions/syria_1967.json | 20 +- .../factions/syria_1967_with_ww2_weapons.json | 22 +- resources/factions/syria_1973.json | 20 +- resources/factions/syria_1982.json | 22 +- resources/factions/syria_2011.json | 34 +- resources/factions/syria_2012.json | 34 +- resources/factions/turkey_2005.json | 22 +- resources/factions/uae_2005.json | 10 +- resources/factions/uae_2015.json | 10 +- resources/factions/uk_1944.json | 18 +- resources/factions/uk_1990.json | 24 +- resources/factions/ukraine_2010.json | 18 +- resources/factions/unc_1950_fictional.json | 16 +- resources/factions/us_aggressors.json | 20 +- resources/factions/usa_1944.json | 14 +- resources/factions/usa_1955.json | 14 +- resources/factions/usa_1960.json | 12 +- resources/factions/usa_1965.json | 14 +- resources/factions/usa_1975.json | 16 +- resources/factions/usa_1990.json | 28 +- resources/factions/usa_2005.json | 32 +- resources/factions/usa_2005_c130.json | 30 +- resources/factions/usa_2005_modded.json | 30 +- resources/factions/usn_1985.json | 20 +- tests/resources/invalid_faction_country.json | 26 +- tests/resources/valid_faction.json | 26 +- tests/test_factions.py | 30 +- 133 files changed, 1295 insertions(+), 1305 deletions(-) diff --git a/game/data/aaa_db.py b/game/data/aaa_db.py index 3008011e..4110d84d 100644 --- a/game/data/aaa_db.py +++ b/game/data/aaa_db.py @@ -1,22 +1,22 @@ from dcs.vehicles import AirDefence AAA_UNITS = [ - AirDefence.SPAAA_Gepard, - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, - AirDefence.SPAAA_Vulcan_M163, - AirDefence.AAA_ZU_23_Closed_Emplacement, - AirDefence.AAA_ZU_23_Emplacement, - AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, - AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement, - AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375, - AirDefence.AAA_ZU_23_Insurgent_Emplacement, - AirDefence.AAA_8_8cm_Flak_18, + AirDefence.Gepard, + AirDefence.ZSU_23_4_Shilka, + AirDefence.Vulcan, + AirDefence.ZU_23_Emplacement_Closed, + AirDefence.ZU_23_Emplacement, + AirDefence.Ural_375_ZU_23, + AirDefence.ZU_23_Closed_Insurgent, + AirDefence.Ural_375_ZU_23_Insurgent, + AirDefence.ZU_23_Insurgent, + AirDefence.Flak18, AirDefence.AAA_Flak_38_20mm, - AirDefence.AAA_8_8cm_Flak_36, - AirDefence.AAA_8_8cm_Flak_37, + AirDefence.Flak36, + AirDefence.Flak37, AirDefence.AAA_Flak_Vierling_38_Quad_20mm, AirDefence.AAA_SP_Kdo_G_40, - AirDefence.AAA_8_8cm_Flak_41, - AirDefence.AAA_Bofors_40mm, - AirDefence.AAA_S_60_57mm, + AirDefence.Flak41, + AirDefence.Bofors40, + AirDefence.S_60_Type59_Artillery, ] diff --git a/game/data/alic.py b/game/data/alic.py index 84436837..fbb10200 100644 --- a/game/data/alic.py +++ b/game/data/alic.py @@ -6,33 +6,33 @@ class AlicCodes: CODES = { AirDefence.EWR_1L13.id: 101, AirDefence.EWR_55G6.id: 102, - AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR.id: 103, - AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR.id: 104, + AirDefence.S_300PS_40B6MD_sr.id: 103, + AirDefence.S_300PS_64H6E_sr.id: 104, AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR.id: 107, - AirDefence.SAM_SA_6_Kub_Straight_Flush_STR.id: 108, + AirDefence.Kub_1S91_str.id: 108, AirDefence.MCC_SR_Sborka_Dog_Ear_SR.id: 109, - AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR.id: 110, - AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL.id: 115, - AirDefence.SAM_SA_8_Osa_Gecko_TEL.id: 117, - AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL.id: 118, - AirDefence.SAM_SA_15_Tor_Gauntlet.id: 119, - AirDefence.SAM_SA_19_Tunguska_Grison.id: 120, - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish.id: 121, - AirDefence.SAM_P19_Flat_Face_SR__SA_2_3.id: 122, - AirDefence.SAM_SA_3_S_125_Low_Blow_TR.id: 123, + AirDefence.S_300PS_40B6M_tr.id: 110, + AirDefence.SA_11_Buk_LN_9A310M1.id: 115, + AirDefence.Osa_9A33_ln.id: 117, + AirDefence.Strela_10M3.id: 118, + AirDefence.Tor_9A331.id: 119, + AirDefence._2S6_Tunguska.id: 120, + AirDefence.ZSU_23_4_Shilka.id: 121, + AirDefence.P_19_s_125_sr.id: 122, + AirDefence.Snr_s_125_tr.id: 123, AirDefence.SAM_Rapier_Blindfire_TR.id: 124, - AirDefence.SAM_Rapier_LN.id: 125, + AirDefence.Rapier_fsa_launcher.id: 125, AirDefence.SAM_SA_2_S_75_Fan_Song_TR.id: 126, - AirDefence.HQ_7_Self_Propelled_LN.id: 127, + AirDefence.HQ_7_LN_SP.id: 127, AirDefence.HQ_7_Self_Propelled_STR.id: 128, - AirDefence.SAM_Roland_ADS.id: 201, - AirDefence.SAM_Patriot_STR.id: 202, - AirDefence.SAM_Hawk_SR__AN_MPQ_50.id: 203, - AirDefence.SAM_Hawk_TR__AN_MPQ_46.id: 204, + AirDefence.Roland_ADS.id: 201, + AirDefence.Patriot_str.id: 202, + AirDefence.Hawk_sr.id: 203, + AirDefence.Hawk_tr.id: 204, AirDefence.SAM_Roland_EWR.id: 205, AirDefence.SAM_Hawk_CWAR_AN_MPQ_55.id: 206, - AirDefence.SPAAA_Gepard.id: 207, - AirDefence.SPAAA_Vulcan_M163.id: 208, + AirDefence.Gepard.id: 207, + AirDefence.Vulcan.id: 208, } @classmethod diff --git a/game/db.py b/game/db.py index 14f08e72..3310b03e 100644 --- a/game/db.py +++ b/game/db.py @@ -610,7 +610,6 @@ PRICES = { AirDefence.Tor_9A331: 40, AirDefence.Strela_10M3: 16, AirDefence.Strela_1_9P31: 12, - AirDefence.SA_8_Osa_LD_9T217: 22, AirDefence.Patriot_AMG: 35, AirDefence.Patriot_ECS: 30, AirDefence.Gepard: 24, @@ -881,187 +880,178 @@ UNIT_BY_TASK = { KJ_2000, ], PinpointStrike: [ - Armor.APC_MTLB, - Armor.APC_MTLB, - Armor.APC_MTLB, - Armor.APC_MTLB, - Armor.APC_MTLB, - Artillery.Grad_MRL_FDDM__FC, - Artillery.Grad_MRL_FDDM__FC, - Artillery.Grad_MRL_FDDM__FC, - Artillery.Grad_MRL_FDDM__FC, - Artillery.Grad_MRL_FDDM__FC, - Armor.Scout_BRDM_2, - Armor.Scout_BRDM_2, - Armor.Scout_BRDM_2, - Armor.APC_BTR_RD, - Armor.APC_BTR_RD, - Armor.APC_BTR_RD, - Armor.APC_BTR_RD, - Armor.APC_BTR_80, - Armor.APC_BTR_80, - Armor.APC_BTR_80, - Armor.APC_BTR_80, - Armor.APC_BTR_80, - Armor.IFV_BTR_82A, - Armor.IFV_BTR_82A, - Armor.IFV_BMP_1, - Armor.IFV_BMP_1, - Armor.IFV_BMP_1, - Armor.IFV_BMP_2, - Armor.IFV_BMP_2, - Armor.IFV_BMP_3, - Armor.IFV_BMP_3, - Armor.IFV_BMD_1, - Armor.LT_PT_76, - Armor.ZBD_04A, - Armor.ZBD_04A, - Armor.ZBD_04A, - Armor.MBT_T_55, - Armor.MBT_T_55, - 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, - Armor.ZTZ_96B, - Armor.Scout_Cobra, - Armor.Scout_Cobra, - Armor.Scout_Cobra, - Armor.Scout_Cobra, - Armor.APC_M113, - Armor.APC_M113, - Armor.APC_M113, - Armor.APC_M113, - Armor.APC_TPz_Fuchs, - Armor.APC_TPz_Fuchs, - Armor.APC_TPz_Fuchs, - Armor.APC_TPz_Fuchs, - Armor.ATGM_HMMWV, - Armor.ATGM_HMMWV, - Armor.ATGM_VAB_Mephisto, - Armor.ATGM_VAB_Mephisto, - Armor.Scout_HMMWV, - Armor.Scout_HMMWV, - Armor.IFV_M2A2_Bradley, - Armor.IFV_M2A2_Bradley, - Armor.ATGM_Stryker, - Armor.ATGM_Stryker, - Armor.IFV_M1126_Stryker_ICV, - Armor.IFV_M1126_Stryker_ICV, - Armor.IFV_M1126_Stryker_ICV, - Armor.SPG_Stryker_MGS, - Armor.IFV_Warrior, - Armor.IFV_Warrior, - Armor.IFV_Warrior, - Armor.IFV_LAV_25, - Armor.IFV_LAV_25, - Armor.IFV_Marder, - Armor.IFV_Marder, - Armor.IFV_Marder, - Armor.IFV_Marder, - Armor.MBT_M60A3_Patton, - Armor.MBT_M60A3_Patton, - Armor.MBT_M60A3_Patton, - Armor.MBT_Leopard_1A3, - Armor.MBT_Leopard_1A3, - Armor.MBT_M1A2_Abrams, - Armor.MBT_Leclerc, - Armor.MBT_Leopard_2A6M, - Armor.MBT_Challenger_II, - Armor.MBT_Chieftain_Mk_3, - Armor.MBT_Merkava_IV, - Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, - Armor.Tk_PzIV_H, - Armor.HT_Pz_Kpfw_VI_Tiger_I, - Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, - Armor.APC_Sd_Kfz_251_Halftrack, - Armor.APC_Sd_Kfz_251_Halftrack, - Armor.APC_Sd_Kfz_251_Halftrack, - Armor.APC_Sd_Kfz_251_Halftrack, - Armor.IFV_Sd_Kfz_234_2_Puma, - Armor.IFV_Sd_Kfz_234_2_Puma, - Armor.Tk_M4_Sherman, - Armor.MT_M4A4_Sherman_Firefly, - Armor.CT_Cromwell_IV, - Unarmed.Carrier_M30_Cargo, - Unarmed.Carrier_M30_Cargo, - Armor.APC_M2A1_Halftrack, - Armor.APC_M2A1_Halftrack, - Armor.APC_M2A1_Halftrack, - Armor.APC_M2A1_Halftrack, - Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, - Armor.Tk_PzIV_H, - Armor.HT_Pz_Kpfw_VI_Tiger_I, - Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, - Armor.SPG_Jagdpanther_G1, - Armor.SPG_Jagdpanzer_IV, - Armor.SPG_Sd_Kfz_184_Elefant, - Armor.APC_Sd_Kfz_251_Halftrack, - Armor.IFV_Sd_Kfz_234_2_Puma, - Armor.Tk_M4_Sherman, - Armor.MT_M4A4_Sherman_Firefly, - Armor.CT_Cromwell_IV, - Unarmed.Carrier_M30_Cargo, - Unarmed.Carrier_M30_Cargo, - Unarmed.Carrier_M30_Cargo, - Armor.APC_M2A1_Halftrack, - Armor.APC_M2A1_Halftrack, - Armor.CT_Centaur_IV, - Armor.CT_Centaur_IV, - Armor.HIT_Churchill_VII, - Armor.Car_M8_Greyhound_Armored, - Armor.Car_M8_Greyhound_Armored, - Armor.SPG_M10_GMC, - Armor.SPG_M10_GMC, - Armor.SPG_StuG_III_Ausf__G, - Armor.SPG_StuG_IV, - Artillery.SPG_M12_GMC_155mm, - Armor.SPG_Sturmpanzer_IV_Brummbar, - Armor.Car_Daimler_Armored, - Armor.LT_Mk_VII_Tetrarch, - Artillery.MLRS_M270_227mm, - Artillery.SPH_M109_Paladin_155mm, - Artillery.SPM_2S9_Nona_120mm_M, - Artillery.SPH_2S1_Gvozdika_122mm, - Artillery.SPH_2S3_Akatsia_152mm, - Artillery.SPH_2S19_Msta_152mm, - Artillery.MLRS_BM_21_Grad_122mm, - Artillery.MLRS_BM_21_Grad_122mm, - Artillery.MLRS_9K57_Uragan_BM_27_220mm, - Artillery.MLRS_9A52_Smerch_HE_300mm, - Artillery.SPH_Dana_vz77_152mm, - Artillery.SPH_T155_Firtina_155mm, - Artillery.PLZ_05, - Artillery.SPG_M12_GMC_155mm, - Armor.SPG_Sturmpanzer_IV_Brummbar, - AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, - AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375, - AirDefence.SPAAA_ZSU_57_2, - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, - AirDefence.SAM_SA_8_Osa_Gecko_TEL, - AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, - AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL, - AirDefence.SAM_SA_15_Tor_Gauntlet, - AirDefence.SAM_SA_19_Tunguska_Grison, - AirDefence.SPAAA_Gepard, - AirDefence.SPAAA_Vulcan_M163, - AirDefence.SAM_Linebacker___Bradley_M6, - AirDefence.SAM_Chaparral_M48, - AirDefence.SAM_Avenger__Stinger, - AirDefence.SAM_Roland_ADS, - AirDefence.HQ_7_Self_Propelled_LN, - AirDefence.AAA_8_8cm_Flak_18, - AirDefence.AAA_8_8cm_Flak_36, - AirDefence.AAA_8_8cm_Flak_37, - AirDefence.AAA_8_8cm_Flak_41, - AirDefence.AAA_Bofors_40mm, - AirDefence.AAA_S_60_57mm, - AirDefence.AAA_M1_37mm, - AirDefence.AAA_QF_3_7, + Armor.MTLB, + Armor.MTLB, + Armor.MTLB, + Armor.MTLB, + Armor.MTLB, + Artillery.Grad_FDDM, + Artillery.Grad_FDDM, + Artillery.Grad_FDDM, + Artillery.Grad_FDDM, + Artillery.Grad_FDDM, + Armor.BRDM_2, + Armor.BRDM_2, + Armor.BRDM_2, + Armor.BTR_D, + Armor.BTR_D, + Armor.BTR_D, + Armor.BTR_D, + Armor.BTR_80, + Armor.BTR_80, + Armor.BTR_80, + Armor.BTR_80, + Armor.BTR_80, + Armor.BTR_82A, + Armor.BTR_82A, + Armor.BMP_1, + Armor.BMP_1, + Armor.BMP_1, + Armor.BMP_2, + Armor.BMP_2, + Armor.BMP_3, + Armor.BMP_3, + Armor.BMD_1, + Armor.PT_76, + Armor.ZBD04A, + Armor.ZBD04A, + Armor.ZBD04A, + Armor.T_55, + Armor.T_55, + Armor.T_55, + Armor.T_72B, + Armor.T_72B, + Armor.T_72B3, + Armor.T_72B3, + Armor.T_80UD, + Armor.T_80UD, + Armor.T_90, + Armor.ZTZ96B, + Armor.Cobra, + Armor.Cobra, + Armor.Cobra, + Armor.Cobra, + Armor.M_113, + Armor.M_113, + Armor.M_113, + Armor.M_113, + Armor.TPZ, + Armor.TPZ, + Armor.TPZ, + Armor.TPZ, + Armor.M1045_HMMWV_TOW, + Armor.M1045_HMMWV_TOW, + Armor.VAB_Mephisto, + Armor.VAB_Mephisto, + Armor.M1043_HMMWV_Armament, + Armor.M1043_HMMWV_Armament, + Armor.M_2_Bradley, + Armor.M_2_Bradley, + Armor.M1134_Stryker_ATGM, + Armor.M1134_Stryker_ATGM, + Armor.M1126_Stryker_ICV, + Armor.M1126_Stryker_ICV, + Armor.M1126_Stryker_ICV, + Armor.M1128_Stryker_MGS, + Armor.MCV_80, + Armor.MCV_80, + Armor.MCV_80, + Armor.LAV_25, + Armor.LAV_25, + Armor.Marder, + Armor.Marder, + Armor.Marder, + Armor.Marder, + Armor.M_60, + Armor.M_60, + Armor.M_60, + Armor.Leopard1A3, + Armor.Leopard1A3, + Armor.M_1_Abrams, + Armor.Leclerc, + Armor.Leopard_2, + Armor.Challenger2, + Armor.Chieftain_mk3, + Armor.Merkava_Mk4, + Armor.Pz_V_Panther_G, + Armor.Pz_IV_H, + Armor.Tiger_I, + Armor.Tiger_II_H, + Armor.Sd_Kfz_251, + Armor.Sd_Kfz_251, + Armor.Sd_Kfz_251, + Armor.Sd_Kfz_251, + Armor.Sd_Kfz_234_2_Puma, + Armor.Sd_Kfz_234_2_Puma, + Armor.M4_Sherman, + Armor.M4A4_Sherman_FF, + Armor.Cromwell_IV, + Unarmed.M30_CC, + Unarmed.M30_CC, + Armor.M2A1_halftrack, + Armor.M2A1_halftrack, + Armor.M2A1_halftrack, + Armor.M2A1_halftrack, + Armor.Pz_V_Panther_G, + Armor.Pz_IV_H, + Armor.Tiger_I, + Armor.Tiger_II_H, + Armor.Jagdpanther_G1, + Armor.JagdPz_IV, + Armor.Elefant_SdKfz_184, + Armor.Centaur_IV, + Armor.Centaur_IV, + Armor.Churchill_VII, + Armor.M8_Greyhound, + Armor.M8_Greyhound, + Armor.M10_GMC, + Armor.M10_GMC, + Armor.Stug_III, + Armor.Stug_IV, + Artillery.M12_GMC, + Armor.SturmPzIV, + Armor.Daimler_AC, + Armor.Tetrarch, + Artillery.MLRS, + Artillery.M_109, + Artillery.SAU_2_C9, + Artillery.SAU_Gvozdika, + Artillery.SAU_Akatsia, + Artillery.SAU_Msta, + Artillery.Grad_URAL, + Artillery.Grad_URAL, + Artillery.Uragan_BM_27, + Artillery.Smerch_HE, + Artillery.Smerch, + Artillery.SpGH_Dana, + Artillery.T155_Firtina, + Artillery.PLZ05, + Artillery.M12_GMC, + Armor.SturmPzIV, + AirDefence.Ural_375_ZU_23, + AirDefence.Ural_375_ZU_23_Insurgent, + AirDefence.ZSU_57_2, + AirDefence.ZSU_23_4_Shilka, + AirDefence.Osa_9A33_ln, + AirDefence.Strela_1_9P31, + AirDefence.Strela_10M3, + AirDefence.Tor_9A331, + AirDefence._2S6_Tunguska, + AirDefence.Gepard, + AirDefence.Vulcan, + AirDefence.M6_Linebacker, + AirDefence.M48_Chaparral, + AirDefence.M1097_Avenger, + AirDefence.Roland_ADS, + AirDefence.HQ_7_LN_SP, + AirDefence.Flak18, + AirDefence.Flak36, + AirDefence.Flak37, + AirDefence.Flak41, + AirDefence.Bofors40, + AirDefence.S_60_Type59_Artillery, + AirDefence.M1_37mm, + AirDefence.QF_37_AA, frenchpack.DIM__TOYOTA_BLUE, frenchpack.DIM__TOYOTA_DESERT, frenchpack.DIM__TOYOTA_GREEN, @@ -1086,25 +1076,25 @@ UNIT_BY_TASK = { ], AirDefence: [], Reconnaissance: [ - Unarmed.Truck_M818_6x6, - Unarmed.Truck_Ural_375, - Unarmed.LUV_UAZ_469_Jeep, + Unarmed.M_818, + Unarmed.Ural_375, + Unarmed.UAZ_469, ], Nothing: [ - Infantry.Infantry_M4, - Infantry.Infantry_AK_74, + Infantry.Soldier_M4, + Infantry.Infantry_AK, ], Embarking: [], Carriage: [ - CVN_74_John_C__Stennis, - LHA_1_Tarawa, - CV_1143_5_Admiral_Kuznetsov, + Stennis, + LHA_Tarawa, + KUZNECOW, ], CargoTransportation: [ - Cargo_Ivanov, - Bulker_Yakushev, - Tanker_Elnya_160, - Boat_Armed_Hi_speed, + Dry_cargo_ship_2, + Dry_cargo_ship_1, + ELNYA, + Speedboat, ], } @@ -1112,41 +1102,41 @@ UNIT_BY_TASK = { Units from AirDefense category of UNIT_BY_TASK that will be removed from use if "No SAM" option is checked at the start of the game """ SAM_BAN = [ - AirDefence.SAM_Linebacker___Bradley_M6, - AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, - AirDefence.SAM_SA_8_Osa_Gecko_TEL, - AirDefence.SAM_SA_19_Tunguska_Grison, - AirDefence.SAM_SA_6_Kub_Gainful_TEL, - AirDefence.SAM_SA_8_Osa_Gecko_TEL, - AirDefence.SAM_SA_3_S_125_Goa_LN, - AirDefence.SAM_Hawk_Platoon_Command_Post__PCP, - AirDefence.SAM_SA_2_S_75_Guideline_LN, - AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL, + AirDefence.M6_Linebacker, + AirDefence.Strela_1_9P31, + AirDefence.Osa_9A33_ln, + AirDefence._2S6_Tunguska, + AirDefence.Kub_2P25_ln, + AirDefence.Osa_9A33_ln, + AirDefence._5p73_s_125_ln, + AirDefence.Hawk_pcp, + AirDefence.S_75M_Volhov, + AirDefence.SA_11_Buk_LN_9A310M1, ] """ Used to convert SAM site parts to the corresponding site """ SAM_CONVERT = { - AirDefence.SAM_P19_Flat_Face_SR__SA_2_3: AirDefence.SAM_SA_3_S_125_Goa_LN, - AirDefence.SAM_SA_3_S_125_Low_Blow_TR: AirDefence.SAM_SA_3_S_125_Goa_LN, - AirDefence.SAM_SA_3_S_125_Goa_LN: AirDefence.SAM_SA_3_S_125_Goa_LN, - AirDefence.SAM_SA_6_Kub_Gainful_TEL: AirDefence.SAM_SA_6_Kub_Gainful_TEL, - AirDefence.SAM_SA_6_Kub_Straight_Flush_STR: AirDefence.SAM_SA_6_Kub_Gainful_TEL, - AirDefence.SAM_SA_10_S_300_Grumble_TEL_C: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C, - AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C, - AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C, - AirDefence.SAM_SA_10_S_300_Grumble_C2: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C, - AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR: AirDefence.SAM_SA_10_S_300_Grumble_C2, - AirDefence.SAM_Hawk_TR__AN_MPQ_46: AirDefence.SAM_Hawk_Platoon_Command_Post__PCP, - AirDefence.SAM_Hawk_SR__AN_MPQ_50: AirDefence.SAM_Hawk_Platoon_Command_Post__PCP, - AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_Platoon_Command_Post__PCP, + AirDefence.P_19_s_125_sr: AirDefence._5p73_s_125_ln, + AirDefence.Snr_s_125_tr: AirDefence._5p73_s_125_ln, + AirDefence._5p73_s_125_ln: AirDefence._5p73_s_125_ln, + AirDefence.Kub_2P25_ln: AirDefence.Kub_2P25_ln, + AirDefence.Kub_1S91_str: AirDefence.Kub_2P25_ln, + AirDefence.S_300PS_5P85D_ln: AirDefence.S_300PS_5P85D_ln, + AirDefence.S_300PS_40B6MD_sr: AirDefence.S_300PS_5P85D_ln, + AirDefence.S_300PS_40B6M_tr: AirDefence.S_300PS_5P85D_ln, + AirDefence.S_300PS_54K6_cp: AirDefence.S_300PS_5P85D_ln, + AirDefence.S_300PS_64H6E_sr: AirDefence.S_300PS_54K6_cp, + AirDefence.Hawk_tr: AirDefence.Hawk_pcp, + AirDefence.Hawk_sr: AirDefence.Hawk_pcp, + AirDefence.Hawk_ln: AirDefence.Hawk_pcp, "except": { # this radar is shared between the two S300's. if we attempt to find a SAM site at a base and can't find one # model, we can safely assume the other was deployed # well, perhaps not safely, but we'll make the assumption anyway :p - AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR: AirDefence.SAM_SA_10_S_300_Grumble_C2, - AirDefence.SAM_P19_Flat_Face_SR__SA_2_3: AirDefence.SAM_SA_2_S_75_Guideline_LN, + AirDefence.S_300PS_40B6M_tr: AirDefence.S_300PS_54K6_cp, + AirDefence.P_19_s_125_sr: AirDefence.S_75M_Volhov, }, } @@ -1169,14 +1159,14 @@ country : DCS Country name FACTIONS = FactionLoader() CARRIER_TYPE_BY_PLANE = { - FA_18C_hornet: CVN_74_John_C__Stennis, - F_14A_135_GR: CVN_74_John_C__Stennis, - F_14B: CVN_74_John_C__Stennis, - Ka_50: LHA_1_Tarawa, - SA342M: LHA_1_Tarawa, - UH_1H: LHA_1_Tarawa, - Mi_8MT: LHA_1_Tarawa, - AV8BNA: LHA_1_Tarawa, + FA_18C_hornet: Stennis, + F_14A_135_GR: Stennis, + F_14B: Stennis, + Ka_50: LHA_Tarawa, + SA342M: LHA_Tarawa, + UH_1H: LHA_Tarawa, + Mi_8MT: LHA_Tarawa, + AV8BNA: LHA_Tarawa, } """ diff --git a/game/version.py b/game/version.py index 824c2292..7f9702e9 100644 --- a/game/version.py +++ b/game/version.py @@ -70,9 +70,9 @@ VERSION = _build_version_string() #: Version 4.2 #: * Adds support for AAA objectives. Place with any of the following units (either red #: or blue): -#: * AAA_8_8cm_Flak_18, -#: * SPAAA_Vulcan_M163, -#: * SPAAA_ZSU_23_4_Shilka_Gun_Dish, +#: * Flak18, +#: * Vulcan, +#: * ZSU_23_4_Shilka, #: #: Version 5.0 #: * Ammunition Depots objective locations are now predetermined using the "Ammunition diff --git a/gen/coastal/silkworm.py b/gen/coastal/silkworm.py index baa751ad..a52c33ac 100644 --- a/gen/coastal/silkworm.py +++ b/gen/coastal/silkworm.py @@ -41,7 +41,7 @@ class SilkwormGenerator(GroupGenerator): # Shorad self.add_unit( - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.ZSU_23_4_Shilka, "SHILKA#0", self.position.x - 55, self.position.y - 38, @@ -50,7 +50,7 @@ class SilkwormGenerator(GroupGenerator): # Shorad 2 self.add_unit( - AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, + AirDefence.Strela_1_9P31, "STRELA#0", self.position.x + 200, self.position.y + 15, diff --git a/gen/missiles/scud_site.py b/gen/missiles/scud_site.py index bf5be54b..9ab81210 100644 --- a/gen/missiles/scud_site.py +++ b/gen/missiles/scud_site.py @@ -37,7 +37,7 @@ class ScudGenerator(GroupGenerator): # Commander self.add_unit( - Unarmed.LUV_UAZ_469_Jeep, + Unarmed.UAZ_469, "Kubel#0", self.position.x - 35, self.position.y - 20, @@ -46,7 +46,7 @@ class ScudGenerator(GroupGenerator): # Shorad self.add_unit( - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.ZSU_23_4_Shilka, "SHILKA#0", self.position.x - 55, self.position.y - 38, @@ -54,7 +54,7 @@ class ScudGenerator(GroupGenerator): ) self.add_unit( - AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, + AirDefence.Strela_1_9P31, "STRELA#0", self.position.x + 200, self.position.y + 15, diff --git a/gen/sam/aaa_bofors.py b/gen/sam/aaa_bofors.py index 6af41922..8c76f7f4 100644 --- a/gen/sam/aaa_bofors.py +++ b/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_Bofors_40mm, + AirDefence.Bofors40, "AAA#" + str(index), self.position.x + spacing * i, self.position.y + spacing * j, diff --git a/gen/sam/aaa_flak.py b/gen/sam/aaa_flak.py index 25b9e274..1aefad6e 100644 --- a/gen/sam/aaa_flak.py +++ b/gen/sam/aaa_flak.py @@ -9,10 +9,10 @@ from gen.sam.airdefensegroupgenerator import ( GFLAK = [ AirDefence.AAA_Flak_Vierling_38_Quad_20mm, - AirDefence.AAA_8_8cm_Flak_18, - AirDefence.AAA_8_8cm_Flak_36, - AirDefence.AAA_8_8cm_Flak_37, - AirDefence.AAA_8_8cm_Flak_41, + AirDefence.Flak18, + AirDefence.Flak36, + AirDefence.Flak37, + AirDefence.Flak41, AirDefence.AAA_Flak_38_20mm, ] diff --git a/gen/sam/aaa_flak18.py b/gen/sam/aaa_flak18.py index 26b44f82..aac1c271 100644 --- a/gen/sam/aaa_flak18.py +++ b/gen/sam/aaa_flak18.py @@ -25,7 +25,7 @@ class Flak18Generator(AirDefenseGroupGenerator): for j in range(2): index = index + 1 self.add_unit( - AirDefence.AAA_8_8cm_Flak_18, + AirDefence.Flak18, "AAA#" + str(index), self.position.x + spacing * i + random.randint(1, 5), self.position.y + spacing * j + random.randint(1, 5), diff --git a/gen/sam/aaa_ww2_ally_flak.py b/gen/sam/aaa_ww2_ally_flak.py index c9ace380..4048a8fc 100644 --- a/gen/sam/aaa_ww2_ally_flak.py +++ b/gen/sam/aaa_ww2_ally_flak.py @@ -21,7 +21,7 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator): positions = self.get_circular_position(4, launcher_distance=30, coverage=360) for i, position in enumerate(positions): self.add_unit( - AirDefence.AAA_QF_3_7, + AirDefence.QF_37_AA, "AA#" + str(i), position[0], position[1], @@ -31,7 +31,7 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator): positions = self.get_circular_position(8, launcher_distance=60, coverage=360) for i, position in enumerate(positions): self.add_unit( - AirDefence.AAA_M1_37mm, + AirDefence.M1_37mm, "AA#" + str(4 + i), position[0], position[1], @@ -57,7 +57,7 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator): random.randint(0, 360), ) self.add_unit( - Unarmed.Carrier_M30_Cargo, + Unarmed.M30_CC, "LOG#1", self.position.x, self.position.y + 20, diff --git a/gen/sam/aaa_zsu57.py b/gen/sam/aaa_zsu57.py index c87bf63d..4648e90b 100644 --- a/gen/sam/aaa_zsu57.py +++ b/gen/sam/aaa_zsu57.py @@ -21,7 +21,7 @@ class ZSU57Generator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SPAAA_ZSU_57_2, + AirDefence.ZSU_57_2, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/aaa_zu23_insurgent.py b/gen/sam/aaa_zu23_insurgent.py index 96cd1d71..5ca97638 100644 --- a/gen/sam/aaa_zu23_insurgent.py +++ b/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_Insurgent_Closed_Emplacement, + AirDefence.ZU_23_Closed_Insurgent, "AAA#" + str(index), self.position.x + spacing * i, self.position.y + spacing * j, diff --git a/gen/sam/cold_war_flak.py b/gen/sam/cold_war_flak.py index 1ea3a724..d8dcd3c8 100644 --- a/gen/sam/cold_war_flak.py +++ b/gen/sam/cold_war_flak.py @@ -29,7 +29,7 @@ class EarlyColdWarFlakGenerator(AirDefenseGroupGenerator): for j in range(2): index = index + 1 self.add_unit( - AirDefence.AAA_8_8cm_Flak_18, + AirDefence.Flak18, "AAA#" + str(index), self.position.x + spacing * i + random.randint(1, 5), self.position.y + spacing * j + random.randint(1, 5), @@ -38,14 +38,14 @@ class EarlyColdWarFlakGenerator(AirDefenseGroupGenerator): # Medium range guns self.add_unit( - AirDefence.AAA_S_60_57mm, + AirDefence.S_60_Type59_Artillery, "SHO#1", self.position.x - 40, self.position.y - 40, self.heading + 180, ), self.add_unit( - AirDefence.AAA_S_60_57mm, + AirDefence.S_60_Type59_Artillery, "SHO#2", self.position.x + spacing * 2 + 40, self.position.y + spacing + 40, @@ -54,14 +54,14 @@ class EarlyColdWarFlakGenerator(AirDefenseGroupGenerator): # Short range guns self.add_unit( - AirDefence.AAA_ZU_23_Closed_Emplacement, + AirDefence.ZU_23_Emplacement_Closed, "SHO#3", self.position.x - 80, self.position.y - 40, self.heading + 180, ), self.add_unit( - AirDefence.AAA_ZU_23_Closed_Emplacement, + AirDefence.ZU_23_Emplacement_Closed, "SHO#4", self.position.x + spacing * 2 + 80, self.position.y + spacing + 40, @@ -102,7 +102,7 @@ class ColdWarFlakGenerator(AirDefenseGroupGenerator): for j in range(2): index = index + 1 self.add_unit( - AirDefence.AAA_8_8cm_Flak_18, + AirDefence.Flak18, "AAA#" + str(index), self.position.x + spacing * i + random.randint(1, 5), self.position.y + spacing * j + random.randint(1, 5), @@ -111,14 +111,14 @@ class ColdWarFlakGenerator(AirDefenseGroupGenerator): # Medium range guns self.add_unit( - AirDefence.AAA_S_60_57mm, + AirDefence.S_60_Type59_Artillery, "SHO#1", self.position.x - 40, self.position.y - 40, self.heading + 180, ), self.add_unit( - AirDefence.AAA_S_60_57mm, + AirDefence.S_60_Type59_Artillery, "SHO#2", self.position.x + spacing * 2 + 40, self.position.y + spacing + 40, @@ -127,14 +127,14 @@ class ColdWarFlakGenerator(AirDefenseGroupGenerator): # Short range guns self.add_unit( - AirDefence.AAA_ZU_23_Closed_Emplacement, + AirDefence.ZU_23_Emplacement_Closed, "SHO#3", self.position.x - 80, self.position.y - 40, self.heading + 180, ), self.add_unit( - AirDefence.AAA_ZU_23_Closed_Emplacement, + AirDefence.ZU_23_Emplacement_Closed, "SHO#4", self.position.x + spacing * 2 + 80, self.position.y + spacing + 40, @@ -143,7 +143,7 @@ class ColdWarFlakGenerator(AirDefenseGroupGenerator): # Add a P19 Radar for EWR self.add_unit( - AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, + AirDefence.P_19_s_125_sr, "SR#0", self.position.x - 60, self.position.y - 20, diff --git a/gen/sam/ewrs.py b/gen/sam/ewrs.py index 0c529cf8..88efec1d 100644 --- a/gen/sam/ewrs.py +++ b/gen/sam/ewrs.py @@ -58,7 +58,7 @@ class FlatFaceGenerator(EwrGenerator): This is the SA-3 search radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_P19_Flat_Face_SR__SA_2_3 + unit_type = AirDefence.P_19_s_125_sr class PatriotEwrGenerator(EwrGenerator): @@ -67,7 +67,7 @@ class PatriotEwrGenerator(EwrGenerator): This is the Patriot search/track radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_Patriot_STR + unit_type = AirDefence.Patriot_str class BigBirdGenerator(EwrGenerator): @@ -76,7 +76,7 @@ class BigBirdGenerator(EwrGenerator): This is the SA-10 track radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR + unit_type = AirDefence.S_300PS_64H6E_sr class SnowDriftGenerator(EwrGenerator): @@ -94,7 +94,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_Straight_Flush_STR + unit_type = AirDefence.Kub_1S91_str class HawkEwrGenerator(EwrGenerator): @@ -103,4 +103,4 @@ class HawkEwrGenerator(EwrGenerator): This is the Hawk search radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_Hawk_SR__AN_MPQ_50 + unit_type = AirDefence.Hawk_sr diff --git a/gen/sam/freya_ewr.py b/gen/sam/freya_ewr.py index 7e77bf1d..bfa1c7be 100644 --- a/gen/sam/freya_ewr.py +++ b/gen/sam/freya_ewr.py @@ -38,7 +38,7 @@ class FreyaGenerator(AirDefenseGroupGenerator): positions = self.get_circular_position(4, launcher_distance=100, coverage=360) for i, position in enumerate(positions): self.add_unit( - AirDefence.AAA_8_8cm_Flak_18, + AirDefence.Flak18, "AA#" + str(4 + i), position[0], position[1], diff --git a/gen/sam/sam_avenger.py b/gen/sam/sam_avenger.py index 45b07bc1..b778cc62 100644 --- a/gen/sam/sam_avenger.py +++ b/gen/sam/sam_avenger.py @@ -20,7 +20,7 @@ class AvengerGenerator(AirDefenseGroupGenerator): num_launchers = random.randint(2, 3) self.add_unit( - Unarmed.Truck_M818_6x6, + Unarmed.M_818, "TRUCK", self.position.x, self.position.y, @@ -31,7 +31,7 @@ class AvengerGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Avenger__Stinger, + AirDefence.M1097_Avenger, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_chaparral.py b/gen/sam/sam_chaparral.py index fb4d6fee..465ba0bd 100644 --- a/gen/sam/sam_chaparral.py +++ b/gen/sam/sam_chaparral.py @@ -20,7 +20,7 @@ class ChaparralGenerator(AirDefenseGroupGenerator): num_launchers = random.randint(2, 4) self.add_unit( - Unarmed.Truck_M818_6x6, + Unarmed.M_818, "TRUCK", self.position.x, self.position.y, @@ -31,7 +31,7 @@ class ChaparralGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Chaparral_M48, + AirDefence.M48_Chaparral, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_gepard.py b/gen/sam/sam_gepard.py index a8c6c861..669781df 100644 --- a/gen/sam/sam_gepard.py +++ b/gen/sam/sam_gepard.py @@ -18,7 +18,7 @@ class GepardGenerator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SPAAA_Gepard, + AirDefence.Gepard, "SPAAA", self.position.x, self.position.y, @@ -26,14 +26,14 @@ class GepardGenerator(AirDefenseGroupGenerator): ) if random.randint(0, 1) == 1: self.add_unit( - AirDefence.SPAAA_Gepard, + AirDefence.Gepard, "SPAAA2", self.position.x, self.position.y, self.heading, ) self.add_unit( - Unarmed.Truck_M818_6x6, + Unarmed.M_818, "TRUCK", self.position.x + 80, self.position.y, diff --git a/gen/sam/sam_group_generator.py b/gen/sam/sam_group_generator.py index a4968830..c8db8dce 100644 --- a/gen/sam/sam_group_generator.py +++ b/gen/sam/sam_group_generator.py @@ -105,37 +105,37 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = { SAM_PRICES = { - 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_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, - AirDefence.SAM_Rapier_LN: 20, - AirDefence.SAM_Avenger__Stinger: 22, - AirDefence.SPAAA_Gepard: 24, - AirDefence.SAM_Roland_ADS: 40, - AirDefence.SAM_Patriot_LN: 85, - AirDefence.SAM_Patriot_EPP_III: 85, - AirDefence.SAM_Chaparral_M48: 25, - 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, - AirDefence.SAM_SA_6_Kub_Gainful_TEL: 45, - AirDefence.SAM_SA_8_Osa_Gecko_TEL: 30, - AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL: 25, - AirDefence.SAM_SA_10_S_300_Grumble_TEL_C: 80, - AirDefence.SAM_SA_10_S_300_Grumble_C2: 80, - AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL: 60, - AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL: 30, - AirDefence.SAM_SA_15_Tor_Gauntlet: 40, - AirDefence.SAM_SA_19_Tunguska_Grison: 35, - AirDefence.HQ_7_Self_Propelled_LN: 35, + AirDefence.Hawk_pcp: 35, + AirDefence.ZU_23_Emplacement: 10, + AirDefence.ZU_23_Emplacement_Closed: 10, + AirDefence.Ural_375_ZU_23: 10, + AirDefence.Ural_375_ZU_23_Insurgent: 10, + AirDefence.ZU_23_Closed_Insurgent: 10, + AirDefence.ZU_23_Insurgent: 10, + AirDefence.ZSU_23_4_Shilka: 10, + AirDefence.Vulcan: 15, + AirDefence.M6_Linebacker: 20, + AirDefence.Rapier_fsa_launcher: 20, + AirDefence.M1097_Avenger: 22, + AirDefence.Gepard: 24, + AirDefence.Roland_ADS: 40, + AirDefence.Patriot_ln: 85, + AirDefence.Patriot_EPP: 85, + AirDefence.M48_Chaparral: 25, + AirDefence.Bofors40: 15, + AirDefence.Flak36: 15, + AirDefence.S_75M_Volhov: 30, + AirDefence._5p73_s_125_ln: 35, + AirDefence.Kub_2P25_ln: 45, + AirDefence.Osa_9A33_ln: 30, + AirDefence.Strela_1_9P31: 25, + AirDefence.S_300PS_5P85D_ln: 80, + AirDefence.S_300PS_54K6_cp: 80, + AirDefence.SA_11_Buk_LN_9A310M1: 60, + AirDefence.Strela_10M3: 30, + AirDefence.Tor_9A331: 40, + AirDefence._2S6_Tunguska: 35, + AirDefence.HQ_7_LN_SP: 35, } diff --git a/gen/sam/sam_hawk.py b/gen/sam/sam_hawk.py index f07f8872..01e463e1 100644 --- a/gen/sam/sam_hawk.py +++ b/gen/sam/sam_hawk.py @@ -19,21 +19,21 @@ class HawkGenerator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_Hawk_SR__AN_MPQ_50, + AirDefence.Hawk_sr, "SR", self.position.x + 20, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_Hawk_Platoon_Command_Post__PCP, + AirDefence.Hawk_pcp, "PCP", self.position.x, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_Hawk_TR__AN_MPQ_46, + AirDefence.Hawk_tr, "TR", self.position.x + 40, self.position.y, @@ -44,7 +44,7 @@ class HawkGenerator(AirDefenseGroupGenerator): aa_group = self.add_auxiliary_group("AA") self.add_unit_to_group( aa_group, - AirDefence.SPAAA_Vulcan_M163, + AirDefence.Vulcan, "AAA", self.position + Point(20, 30), self.heading, @@ -57,7 +57,7 @@ class HawkGenerator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Hawk_LN_M192, + AirDefence.Hawk_ln, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_hq7.py b/gen/sam/sam_hq7.py index bbe449a4..2f13b675 100644 --- a/gen/sam/sam_hq7.py +++ b/gen/sam/sam_hq7.py @@ -26,7 +26,7 @@ class HQ7Generator(AirDefenseGroupGenerator): self.heading, ) self.add_unit( - AirDefence.HQ_7_Self_Propelled_LN, + AirDefence.HQ_7_LN_SP, "LN", self.position.x + 20, self.position.y, @@ -37,14 +37,14 @@ class HQ7Generator(AirDefenseGroupGenerator): aa_group = self.add_auxiliary_group("AA") self.add_unit_to_group( aa_group, - AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, + AirDefence.Ural_375_ZU_23, "AAA1", self.position + Point(20, 30), self.heading, ) self.add_unit_to_group( aa_group, - AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, + AirDefence.Ural_375_ZU_23, "AAA2", self.position - Point(20, 30), self.heading, @@ -57,7 +57,7 @@ class HQ7Generator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.HQ_7_Self_Propelled_LN, + AirDefence.HQ_7_LN_SP, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_linebacker.py b/gen/sam/sam_linebacker.py index f0393712..b140b138 100644 --- a/gen/sam/sam_linebacker.py +++ b/gen/sam/sam_linebacker.py @@ -20,7 +20,7 @@ class LinebackerGenerator(AirDefenseGroupGenerator): num_launchers = random.randint(2, 4) self.add_unit( - Unarmed.Truck_M818_6x6, + Unarmed.M_818, "TRUCK", self.position.x, self.position.y, @@ -31,7 +31,7 @@ class LinebackerGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Linebacker___Bradley_M6, + AirDefence.M6_Linebacker, "M6#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_patriot.py b/gen/sam/sam_patriot.py index af17b712..5614caca 100644 --- a/gen/sam/sam_patriot.py +++ b/gen/sam/sam_patriot.py @@ -20,7 +20,7 @@ class PatriotGenerator(AirDefenseGroupGenerator): def generate(self): # Command Post self.add_unit( - AirDefence.SAM_Patriot_STR, + AirDefence.Patriot_str, "STR", self.position.x + 30, self.position.y + 30, @@ -48,7 +48,7 @@ class PatriotGenerator(AirDefenseGroupGenerator): self.heading, ) self.add_unit( - AirDefence.SAM_Patriot_EPP_III, + AirDefence.Patriot_EPP, "EPP", self.position.x, self.position.y + 30, @@ -61,7 +61,7 @@ class PatriotGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Patriot_LN, + AirDefence.Patriot_ln, "LN#" + str(i), position[0], position[1], @@ -77,7 +77,7 @@ class PatriotGenerator(AirDefenseGroupGenerator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( aa_group, - AirDefence.SPAAA_Vulcan_M163, + AirDefence.Vulcan, f"SPAAA#{i}", Point(x, y), heading, diff --git a/gen/sam/sam_rapier.py b/gen/sam/sam_rapier.py index f869b17e..60b4091a 100644 --- a/gen/sam/sam_rapier.py +++ b/gen/sam/sam_rapier.py @@ -39,7 +39,7 @@ class RapierGenerator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Rapier_LN, + AirDefence.Rapier_fsa_launcher, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_roland.py b/gen/sam/sam_roland.py index 8511e94a..e6decc63 100644 --- a/gen/sam/sam_roland.py +++ b/gen/sam/sam_roland.py @@ -23,14 +23,14 @@ class RolandGenerator(AirDefenseGroupGenerator): self.heading, ) self.add_unit( - AirDefence.SAM_Roland_ADS, + AirDefence.Roland_ADS, "ADS", self.position.x, self.position.y, self.heading, ) self.add_unit( - Unarmed.Truck_M818_6x6, + Unarmed.M_818, "TRUCK", self.position.x + 80, self.position.y, diff --git a/gen/sam/sam_sa10.py b/gen/sam/sam_sa10.py index a0873223..9c0f33e7 100644 --- a/gen/sam/sam_sa10.py +++ b/gen/sam/sam_sa10.py @@ -22,12 +22,12 @@ class SA10Generator(AirDefenseGroupGenerator): def __init__(self, game: Game, ground_object: SamGroundObject): super().__init__(game, ground_object) - self.sr1 = AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR - self.sr2 = AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR - self.cp = AirDefence.SAM_SA_10_S_300_Grumble_C2 - self.tr1 = AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR - self.tr2 = AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR - self.ln1 = AirDefence.SAM_SA_10_S_300_Grumble_TEL_C + self.sr1 = AirDefence.S_300PS_40B6MD_sr + self.sr2 = AirDefence.S_300PS_64H6E_sr + self.cp = AirDefence.S_300PS_54K6_cp + self.tr1 = AirDefence.S_300PS_40B6M_tr + self.tr2 = AirDefence.S_300PS_40B6M_tr + self.ln1 = AirDefence.S_300PS_5P85D_ln self.ln2 = AirDefence.SAM_SA_10_S_300_Grumble_TEL_D def generate(self): @@ -84,7 +84,7 @@ class SA10Generator(AirDefenseGroupGenerator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( aa_group, - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.ZSU_23_4_Shilka, f"AA#{i}", Point(x, y), heading, @@ -109,7 +109,7 @@ class Tier2SA10Generator(SA10Generator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( pd_group, - AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.Tor_9A331, f"PD#{i}", Point(x, y), heading, @@ -131,7 +131,7 @@ class Tier3SA10Generator(SA10Generator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( aa_group, - AirDefence.SAM_SA_19_Tunguska_Grison, + AirDefence._2S6_Tunguska, f"AA#{i}", Point(x, y), heading, @@ -146,7 +146,7 @@ class Tier3SA10Generator(SA10Generator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( pd_group, - AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.Tor_9A331, f"PD#{i}", Point(x, y), heading, diff --git a/gen/sam/sam_sa11.py b/gen/sam/sam_sa11.py index 6076d69a..c3012811 100644 --- a/gen/sam/sam_sa11.py +++ b/gen/sam/sam_sa11.py @@ -39,7 +39,7 @@ class SA11Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL, + AirDefence.SA_11_Buk_LN_9A310M1, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa13.py b/gen/sam/sam_sa13.py index 76fc081f..a3e779fb 100644 --- a/gen/sam/sam_sa13.py +++ b/gen/sam/sam_sa13.py @@ -18,7 +18,7 @@ class SA13Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - Unarmed.LUV_UAZ_469_Jeep, + Unarmed.UAZ_469, "UAZ", self.position.x, self.position.y, @@ -38,7 +38,7 @@ class SA13Generator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL, + AirDefence.Strela_10M3, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa15.py b/gen/sam/sam_sa15.py index 8eccbd58..fe295f1d 100644 --- a/gen/sam/sam_sa15.py +++ b/gen/sam/sam_sa15.py @@ -16,14 +16,14 @@ class SA15Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.Tor_9A331, "ADS", self.position.x, self.position.y, self.heading, ) self.add_unit( - Unarmed.LUV_UAZ_469_Jeep, + Unarmed.UAZ_469, "EWR", self.position.x + 40, self.position.y, diff --git a/gen/sam/sam_sa19.py b/gen/sam/sam_sa19.py index 8583f490..caac1f7c 100644 --- a/gen/sam/sam_sa19.py +++ b/gen/sam/sam_sa19.py @@ -21,7 +21,7 @@ class SA19Generator(AirDefenseGroupGenerator): if num_launchers == 1: self.add_unit( - AirDefence.SAM_SA_19_Tunguska_Grison, + AirDefence._2S6_Tunguska, "LN#0", self.position.x, self.position.y, @@ -33,7 +33,7 @@ class SA19Generator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_19_Tunguska_Grison, + AirDefence._2S6_Tunguska, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa2.py b/gen/sam/sam_sa2.py index c34e697f..0e973779 100644 --- a/gen/sam/sam_sa2.py +++ b/gen/sam/sam_sa2.py @@ -18,7 +18,7 @@ class SA2Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, + AirDefence.P_19_s_125_sr, "SR", self.position.x, self.position.y, @@ -39,7 +39,7 @@ class SA2Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_2_S_75_Guideline_LN, + AirDefence.S_75M_Volhov, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa3.py b/gen/sam/sam_sa3.py index 7de69c59..1a95de12 100644 --- a/gen/sam/sam_sa3.py +++ b/gen/sam/sam_sa3.py @@ -18,14 +18,14 @@ class SA3Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, + AirDefence.P_19_s_125_sr, "SR", self.position.x, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_SA_3_S_125_Low_Blow_TR, + AirDefence.Snr_s_125_tr, "TR", self.position.x + 20, self.position.y, @@ -39,7 +39,7 @@ class SA3Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_3_S_125_Goa_LN, + AirDefence._5p73_s_125_ln, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa6.py b/gen/sam/sam_sa6.py index 25746651..fa72b24a 100644 --- a/gen/sam/sam_sa6.py +++ b/gen/sam/sam_sa6.py @@ -18,7 +18,7 @@ class SA6Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SA_6_Kub_Straight_Flush_STR, + AirDefence.Kub_1S91_str, "STR", self.position.x, self.position.y, @@ -32,7 +32,7 @@ class SA6Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_6_Kub_Gainful_TEL, + AirDefence.Kub_2P25_ln, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa8.py b/gen/sam/sam_sa8.py index 0ded6973..e7e63c84 100644 --- a/gen/sam/sam_sa8.py +++ b/gen/sam/sam_sa8.py @@ -16,14 +16,14 @@ class SA8Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SA_8_Osa_Gecko_TEL, + AirDefence.Osa_9A33_ln, "OSA", self.position.x, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_SA_8_Osa_LD_9T217, + AirDefence.SAM_Osa_9A33_ln, "LD", self.position.x + 20, self.position.y, diff --git a/gen/sam/sam_sa9.py b/gen/sam/sam_sa9.py index 85edfb60..9d8811d0 100644 --- a/gen/sam/sam_sa9.py +++ b/gen/sam/sam_sa9.py @@ -18,7 +18,7 @@ class SA9Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - Unarmed.LUV_UAZ_469_Jeep, + Unarmed.UAZ_469, "UAZ", self.position.x, self.position.y, @@ -38,7 +38,7 @@ class SA9Generator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, + AirDefence.Strela_1_9P31, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_vulcan.py b/gen/sam/sam_vulcan.py index 24998c4f..2d057dc0 100644 --- a/gen/sam/sam_vulcan.py +++ b/gen/sam/sam_vulcan.py @@ -18,7 +18,7 @@ class VulcanGenerator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SPAAA_Vulcan_M163, + AirDefence.Vulcan, "SPAAA", self.position.x, self.position.y, @@ -26,14 +26,14 @@ class VulcanGenerator(AirDefenseGroupGenerator): ) if random.randint(0, 1) == 1: self.add_unit( - AirDefence.SPAAA_Vulcan_M163, + AirDefence.Vulcan, "SPAAA2", self.position.x, self.position.y, self.heading, ) self.add_unit( - Unarmed.Truck_M818_6x6, + Unarmed.M_818, "TRUCK", self.position.x + 80, self.position.y, diff --git a/gen/sam/sam_zsu23.py b/gen/sam/sam_zsu23.py index 5be3de8d..708ae5c6 100644 --- a/gen/sam/sam_zsu23.py +++ b/gen/sam/sam_zsu23.py @@ -24,7 +24,7 @@ class ZSU23Generator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.ZSU_23_4_Shilka, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_zu23.py b/gen/sam/sam_zu23.py index 9cb43ab2..6a1b41cb 100644 --- a/gen/sam/sam_zu23.py +++ b/gen/sam/sam_zu23.py @@ -27,7 +27,7 @@ class ZU23Generator(AirDefenseGroupGenerator): for j in range(grid_y): index = index + 1 self.add_unit( - AirDefence.AAA_ZU_23_Closed_Emplacement, + AirDefence.ZU_23_Emplacement_Closed, "AAA#" + str(index), self.position.x + spacing * i, self.position.y + spacing * j, diff --git a/gen/sam/sam_zu23_ural.py b/gen/sam/sam_zu23_ural.py index af5f85db..4f97d6f3 100644 --- a/gen/sam/sam_zu23_ural.py +++ b/gen/sam/sam_zu23_ural.py @@ -24,7 +24,7 @@ class ZU23UralGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, + AirDefence.Ural_375_ZU_23, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_zu23_ural_insurgent.py b/gen/sam/sam_zu23_ural_insurgent.py index 91ca4a66..d0ab8405 100644 --- a/gen/sam/sam_zu23_ural_insurgent.py +++ b/gen/sam/sam_zu23_ural_insurgent.py @@ -24,7 +24,7 @@ class ZU23UralInsurgentGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375, + AirDefence.Ural_375_ZU_23_Insurgent, "SPAA#" + str(i), position[0], position[1], diff --git a/resources/factions/Israel-USN_2005_Allied_Sword.json b/resources/factions/Israel-USN_2005_Allied_Sword.json index ee7d8b67..d9d591d2 100644 --- a/resources/factions/Israel-USN_2005_Allied_Sword.json +++ b/resources/factions/Israel-USN_2005_Allied_Sword.json @@ -26,21 +26,21 @@ "S_3B_Tanker" ], "frontline_units": [ - "APC_M113", + "M_113", "APC_HMMWV__Scout", - "ATGM_HMMWV", - "MBT_Merkava_IV", - "SPAAA_Vulcan_M163" + "M1045_HMMWV_TOW", + "Merkava_Mk4", + "Vulcan" ], "artillery_units": [ - "SPH_M109_Paladin_155mm", - "MLRS_M270_227mm" + "M_109", + "MLRS" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -54,10 +54,10 @@ "HawkEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json index 0c02a3d1..49c8de9b 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -35,30 +35,30 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M2A2_Bradley", - "IFV_M1126_Stryker_ICV", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV", - "APC_TPz_Fuchs", - "IFV_Warrior", - "MBT_Challenger_II", - "MBT_M60A3_Patton", - "SPG_Stryker_MGS", - "SAM_Avenger__Stinger", - "ATGM_VAB_Mephisto" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M_2_Bradley", + "M1126_Stryker_ICV", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "TPZ", + "MCV_80", + "Challenger2", + "M_60", + "M1128_Stryker_MGS", + "M1097_Avenger", + "VAB_Mephisto" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -75,10 +75,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry" diff --git a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json b/resources/factions/Syria-Lebanon_2005_Allied_Sword.json index 49c41677..10d6f6e0 100644 --- a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json +++ b/resources/factions/Syria-Lebanon_2005_Allied_Sword.json @@ -25,26 +25,26 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "IFV_BMP_2", - "APC_BTR_80", + "BMP_1", + "BMP_2", + "BTR_80", "IFV_BRDM_2", - "APC_MTLB", + "MTLB", "APC_Cobra__Scout", - "MBT_T_55", - "MBT_T_72B", - "MBT_T_90", - "SPAAA_ZSU_57_2" + "T_55", + "T_72B", + "T_90", + "ZSU_57_2" ], "artillery_units": [ "MLRS_BM_27_Uragan_220mm", "SPH_2S9_Nona_120mm_M", - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm" + "Grad_URAL", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/allies_1940.json b/resources/factions/allies_1940.json index 1d590b00..89aab89d 100644 --- a/resources/factions/allies_1940.json +++ b/resources/factions/allies_1940.json @@ -9,12 +9,12 @@ "A_20G" ], "frontline_units": [ - "APC_M2A1_Halftrack", - "HIT_Churchill_VII", - "Car_Daimler_Armored", - "LT_Mk_VII_Tetrarch", - "AAA_QF_3_7", - "AAA_Bofors_40mm" + "M2A1_halftrack", + "Churchill_VII", + "Daimler_AC", + "Tetrarch", + "QF_37_AA", + "Bofors40" ], "artillery_units": [ ], diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json index 98f2a5ec..a592d9ee 100644 --- a/resources/factions/allies_1944.json +++ b/resources/factions/allies_1944.json @@ -15,21 +15,21 @@ "B_17G" ], "frontline_units": [ - "MT_M4A4_Sherman_Firefly", - "Tk_M4_Sherman", - "APC_M2A1_Halftrack", - "CT_Cromwell_IV", - "CT_Centaur_IV", - "HIT_Churchill_VII", - "Car_M8_Greyhound_Armored", - "SPG_M10_GMC", - "Car_Daimler_Armored", - "LT_Mk_VII_Tetrarch", - "AAA_QF_3_7", - "AAA_Bofors_40mm" + "M4A4_Sherman_FF", + "M4_Sherman", + "M2A1_halftrack", + "Cromwell_IV", + "Centaur_IV", + "Churchill_VII", + "M8_Greyhound", + "M10_GMC", + "Daimler_AC", + "Tetrarch", + "QF_37_AA", + "Bofors40" ], "artillery_units": [ - "SPG_M12_GMC_155mm" + "M12_GMC" ], "logistics_units": [ "Truck_Bedford", diff --git a/resources/factions/allies_1944_free.json b/resources/factions/allies_1944_free.json index 7e4e7fc9..0b6a1ccd 100644 --- a/resources/factions/allies_1944_free.json +++ b/resources/factions/allies_1944_free.json @@ -14,9 +14,9 @@ "A_20G" ], "frontline_units": [ - "Tk_M4_Sherman", - "APC_M2A1_Halftrack", - "AAA_Bofors_40mm" + "M4_Sherman", + "M2A1_halftrack", + "Bofors40" ], "artillery_units": [ ], diff --git a/resources/factions/australia_2005.json b/resources/factions/australia_2005.json index efca64d4..c0e70a02 100644 --- a/resources/factions/australia_2005.json +++ b/resources/factions/australia_2005.json @@ -17,19 +17,19 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "MBT_Leopard_1A3", - "APC_M113", - "IFV_LAV_25", - "IFV_Warrior" + "M_1_Abrams", + "Leopard1A3", + "M_113", + "LAV_25", + "MCV_80" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -43,7 +43,7 @@ "aircraft_carrier": [ ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/australia_2005_c130.json b/resources/factions/australia_2005_c130.json index ae5ecb18..e93f4560 100644 --- a/resources/factions/australia_2005_c130.json +++ b/resources/factions/australia_2005_c130.json @@ -18,19 +18,19 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "MBT_Leopard_1A3", - "APC_M113", - "IFV_LAV_25", - "IFV_Warrior" + "M_1_Abrams", + "Leopard1A3", + "M_113", + "LAV_25", + "MCV_80" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -44,7 +44,7 @@ "aircraft_carrier": [ ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index bf5322a8..db54c2af 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -25,18 +25,18 @@ "KC130" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "SAM_Chaparral_M48" + "M_60", + "M_113", + "M48_Chaparral" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -49,10 +49,10 @@ "HawkEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/bluefor_coldwar_a4.json b/resources/factions/bluefor_coldwar_a4.json index 407a0acf..d55e03aa 100644 --- a/resources/factions/bluefor_coldwar_a4.json +++ b/resources/factions/bluefor_coldwar_a4.json @@ -26,18 +26,18 @@ "KC130" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "SAM_Chaparral_M48" + "M_60", + "M_113", + "M48_Chaparral" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -50,10 +50,10 @@ "HawkEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/bluefor_coldwar_a4_mb339.json b/resources/factions/bluefor_coldwar_a4_mb339.json index 1fdbdad8..e270d730 100644 --- a/resources/factions/bluefor_coldwar_a4_mb339.json +++ b/resources/factions/bluefor_coldwar_a4_mb339.json @@ -27,18 +27,18 @@ "KC130" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "SAM_Chaparral_M48" + "M_60", + "M_113", + "M48_Chaparral" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -51,10 +51,10 @@ "HawkEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json index a07ba747..59de528d 100644 --- a/resources/factions/bluefor_modern.json +++ b/resources/factions/bluefor_modern.json @@ -36,28 +36,28 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "MBT_Leopard_2A6M", - "MBT_Merkava_IV", - "ATGM_Stryker", - "IFV_M2A2_Bradley", - "IFV_Marder", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV", - "SAM_Linebacker___Bradley_M6", - "SAM_Avenger__Stinger", - "ATGM_VAB_Mephisto" + "M_1_Abrams", + "Leopard_2", + "Merkava_Mk4", + "M1134_Stryker_ATGM", + "M_2_Bradley", + "Marder", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M6_Linebacker", + "M1097_Avenger", + "VAB_Mephisto" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -70,10 +70,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/canada_2005.json b/resources/factions/canada_2005.json index 6ef74e66..82e984fb 100644 --- a/resources/factions/canada_2005.json +++ b/resources/factions/canada_2005.json @@ -17,21 +17,21 @@ "KC130" ], "frontline_units": [ - "MBT_Leopard_1A3", + "Leopard1A3", "MBT_Leopard_2A4", - "MBT_Leopard_2A6M", - "IFV_LAV_25", - "APC_M113", - "IFV_Warrior", - "SAM_Avenger__Stinger" + "Leopard_2", + "LAV_25", + "M_113", + "MCV_80", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/canada_2005_c130.json b/resources/factions/canada_2005_c130.json index 6f1b7657..f4bac1ee 100644 --- a/resources/factions/canada_2005_c130.json +++ b/resources/factions/canada_2005_c130.json @@ -18,21 +18,21 @@ "KC130" ], "frontline_units": [ - "MBT_Leopard_1A3", + "Leopard1A3", "MBT_Leopard_2A4", - "MBT_Leopard_2A6M", - "IFV_LAV_25", - "APC_M113", - "IFV_Warrior", - "SAM_Avenger__Stinger" + "Leopard_2", + "LAV_25", + "M_113", + "MCV_80", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json index 740b96d2..37ca9868 100644 --- a/resources/factions/china_2010.json +++ b/resources/factions/china_2010.json @@ -20,20 +20,20 @@ "IL_78M" ], "frontline_units": [ - "ZTZ_96B", - "MBT_T_55", - "ZBD_04A", - "IFV_BMP_1", - "HQ_7_Self_Propelled_LN" + "ZTZ96B", + "T_55", + "ZBD04A", + "BMP_1", + "HQ_7_LN_SP" ], "artillery_units": [ - "MLRS_9A52_Smerch_HE_300mm", - "PLZ_05", - "SPM_2S9_Nona_120mm_M" + "Smerch_HE", + "PLZ05", + "SAU_2_C9" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/dprk_1950_fictional.json b/resources/factions/dprk_1950_fictional.json index 428212d9..9c854e60 100644 --- a/resources/factions/dprk_1950_fictional.json +++ b/resources/factions/dprk_1950_fictional.json @@ -15,19 +15,19 @@ "tankers": [ ], "frontline_units": [ - "Scout_BRDM_2", - "Grad_MRL_FDDM__FC", - "APC_MTLB", - "MBT_T_55", - "SPAAA_ZU_23_2_Mounted_Ural_375", - "AAA_8_8cm_Flak_18" + "BRDM_2", + "Grad_FDDM", + "MTLB", + "T_55", + "Ural_375_ZU_23", + "Flak18" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_AK_74_Rus", diff --git a/resources/factions/france_1985_frenchpack.json b/resources/factions/france_1985_frenchpack.json index 3d30195d..61ee5106 100644 --- a/resources/factions/france_1985_frenchpack.json +++ b/resources/factions/france_1985_frenchpack.json @@ -24,22 +24,22 @@ "ERC_90", "TRM_2000_PAMELA", "VAB__50", - "ATGM_VAB_Mephisto", + "VAB_Mephisto", "VAB_T20_13", "VBL__50", "VBL_AANF1", "AMX_30B2", - "SAM_Roland_ADS" + "Roland_ADS" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -49,7 +49,7 @@ ], "aircraft_carrier": [], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json index 5278dd32..53edaf89 100644 --- a/resources/factions/france_1995.json +++ b/resources/factions/france_1995.json @@ -19,22 +19,22 @@ "KC130" ], "frontline_units": [ - "MBT_Leclerc", - "APC_TPz_Fuchs", - "Scout_Cobra", - "IFV_LAV_25", - "ATGM_VAB_Mephisto", - "SAM_Roland_ADS" + "Leclerc", + "TPZ", + "Cobra", + "LAV_25", + "VAB_Mephisto", + "Roland_ADS" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger", "Mortar_2B11_120mm" @@ -49,7 +49,7 @@ "aircraft_carrier": [ ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa", diff --git a/resources/factions/france_2005_frenchpack.json b/resources/factions/france_2005_frenchpack.json index 2cfcff15..6cc3e43c 100644 --- a/resources/factions/france_2005_frenchpack.json +++ b/resources/factions/france_2005_frenchpack.json @@ -33,18 +33,18 @@ "VBAE_CRAB_MMP", "AMX_30B2", "Leclerc_Serie_XXI", - "SAM_Roland_ADS", - "ATGM_VAB_Mephisto" + "Roland_ADS", + "VAB_Mephisto" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -53,10 +53,10 @@ "HawkGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/gdr_1985.json b/resources/factions/gdr_1985.json index e68897bd..62e47864 100644 --- a/resources/factions/gdr_1985.json +++ b/resources/factions/gdr_1985.json @@ -16,20 +16,20 @@ "awacs": [], "tankers": [], "frontline_units": [ - "IFV_BMP_1", - "IFV_BMP_2", - "Scout_BRDM_2", - "APC_MTLB", - "MBT_T_55", - "MBT_T_72B" + "BMP_1", + "BMP_2", + "BRDM_2", + "MTLB", + "T_55", + "T_72B" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm" + "Grad_URAL", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_AK_74_Rus", diff --git a/resources/factions/georgia_2008.json b/resources/factions/georgia_2008.json index f1937456..736a3743 100644 --- a/resources/factions/georgia_2008.json +++ b/resources/factions/georgia_2008.json @@ -11,23 +11,23 @@ "UH_1H" ], "frontline_units": [ - "APC_BTR_80", - "APC_MTLB", - "Scout_Cobra", - "IFV_BMP_1", - "IFV_BMP_2", - "MBT_T_72B", - "MBT_T_55", - "SAM_SA_13_Strela_10M3_Gopher_TEL" + "BTR_80", + "MTLB", + "Cobra", + "BMP_1", + "BMP_2", + "T_72B", + "T_55", + "Strela_10M3" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm", - "SPH_2S3_Akatsia_152mm" + "Grad_URAL", + "SAU_Gvozdika", + "SAU_Akatsia" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/germany_1940.json b/resources/factions/germany_1940.json index b18211c8..05a02dbd 100644 --- a/resources/factions/germany_1940.json +++ b/resources/factions/germany_1940.json @@ -11,10 +11,10 @@ "Ju_88A4" ], "frontline_units": [ - "Tk_PzIV_H", - "APC_Sd_Kfz_251_Halftrack", - "IFV_Sd_Kfz_234_2_Puma", - "AAA_8_8cm_Flak_18" + "Pz_IV_H", + "Sd_Kfz_251", + "Sd_Kfz_234_2_Puma", + "Flak18" ], "artillery_units": [ ], diff --git a/resources/factions/germany_1942.json b/resources/factions/germany_1942.json index ee8e1a03..a9ea64f3 100644 --- a/resources/factions/germany_1942.json +++ b/resources/factions/germany_1942.json @@ -11,12 +11,12 @@ "Ju_88A4" ], "frontline_units": [ - "Tk_PzIV_H", - "APC_Sd_Kfz_251_Halftrack", - "IFV_Sd_Kfz_234_2_Puma", - "SPG_Jagdpanzer_IV", - "AAA_8_8cm_Flak_18", - "SPG_Sturmpanzer_IV_Brummbar" + "Pz_IV_H", + "Sd_Kfz_251", + "Sd_Kfz_234_2_Puma", + "JagdPz_IV", + "Flak18", + "SturmPzIV" ], "artillery_units": [ ], diff --git a/resources/factions/germany_1944.json b/resources/factions/germany_1944.json index f9b68cc9..8e93d150 100644 --- a/resources/factions/germany_1944.json +++ b/resources/factions/germany_1944.json @@ -11,20 +11,20 @@ "Ju_88A4" ], "frontline_units": [ - "MT_Pz_Kpfw_V_Panther_Ausf_G", - "Tk_PzIV_H", - "HT_Pz_Kpfw_VI_Tiger_I", - "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II", - "APC_Sd_Kfz_251_Halftrack", - "IFV_Sd_Kfz_234_2_Puma", - "SPG_Sd_Kfz_184_Elefant", - "SPG_Jagdpanther_G1", - "SPG_Jagdpanzer_IV", - "SPG_StuG_III_Ausf__G", - "SPG_StuG_IV", - "AAA_8_8cm_Flak_18", - "AAA_8_8cm_Flak_41", - "SPG_Sturmpanzer_IV_Brummbar" + "Pz_V_Panther_G", + "Pz_IV_H", + "Tiger_I", + "Tiger_II_H", + "Sd_Kfz_251", + "Sd_Kfz_234_2_Puma", + "Elefant_SdKfz_184", + "Jagdpanther_G1", + "JagdPz_IV", + "Stug_III", + "Stug_IV", + "Flak18", + "Flak41", + "SturmPzIV" ], "artillery_units": [ ], diff --git a/resources/factions/germany_1944_free.json b/resources/factions/germany_1944_free.json index 676eae2f..ee921b70 100644 --- a/resources/factions/germany_1944_free.json +++ b/resources/factions/germany_1944_free.json @@ -10,9 +10,9 @@ "Bf_109K_4" ], "frontline_units": [ - "Tk_PzIV_H", - "APC_Sd_Kfz_251_Halftrack", - "AAA_8_8cm_Flak_18" + "Pz_IV_H", + "Sd_Kfz_251", + "Flak18" ], "artillery_units": [ ], diff --git a/resources/factions/germany_1990.json b/resources/factions/germany_1990.json index f1368613..f702a3f7 100644 --- a/resources/factions/germany_1990.json +++ b/resources/factions/germany_1990.json @@ -20,19 +20,19 @@ "KC130" ], "frontline_units": [ - "APC_TPz_Fuchs", - "MBT_Leopard_1A3", + "TPZ", + "Leopard1A3", "MBT_Leopard_2A4", - "IFV_Marder", - "SPAAA_Gepard" + "Marder", + "Gepard" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "Mortar_2B11_120mm", "MANPADS_Stinger" diff --git a/resources/factions/greece_2005.json b/resources/factions/greece_2005.json index c24e664d..8f8129a7 100644 --- a/resources/factions/greece_2005.json +++ b/resources/factions/greece_2005.json @@ -21,22 +21,22 @@ ], "frontline_units": [ "MBT_Leopard_2A4", - "MBT_Leopard_1A3", - "MBT_M60A3_Patton", - "Scout_HMMWV", - "ATGM_HMMWV", - "APC_M113", - "IFV_BMP_1" + "Leopard1A3", + "M_60", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M_113", + "BMP_1" ], "artillery_units": [ - "SPH_M109_Paladin_155mm", - "MLRS_M270_227mm" + "M_109", + "MLRS" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json index b91aab32..80bff378 100644 --- a/resources/factions/india_2010.json +++ b/resources/factions/india_2010.json @@ -21,21 +21,21 @@ "IL_78M" ], "frontline_units": [ - "MBT_T_90", - "MBT_T_72B", - "IFV_BMP_2", - "SAM_SA_19_Tunguska_Grison" + "T_90", + "T_72B", + "BMP_2", + "_2S6_Tunguska" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPH_2S19_Msta_152mm" + "Uragan_BM_27", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Paratrooper_RPG_16", "MANPADS_SA_18_Igla_S_Grouse" ], diff --git a/resources/factions/insurgents.json b/resources/factions/insurgents.json index cbf7b3b3..b095fc7c 100644 --- a/resources/factions/insurgents.json +++ b/resources/factions/insurgents.json @@ -6,19 +6,19 @@ "aircrafts": [ ], "frontline_units": [ - "Scout_Cobra", - "APC_MTLB", - "Scout_BRDM_2", - "LT_PT_76", - "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375" + "Cobra", + "MTLB", + "BRDM_2", + "PT_76", + "Ural_375_ZU_23_Insurgent" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S19_Msta_152mm" + "Grad_URAL", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Insurgent_AK_74", diff --git a/resources/factions/insurgents_hard.json b/resources/factions/insurgents_hard.json index 14825184..916a264b 100644 --- a/resources/factions/insurgents_hard.json +++ b/resources/factions/insurgents_hard.json @@ -6,24 +6,24 @@ "aircrafts": [ ], "frontline_units": [ - "ATGM_HMMWV", - "Scout_HMMWV", - "Scout_BRDM_2", - "APC_BTR_80", - "APC_BTR_RD", - "LT_PT_76", - "IFV_BMP_1", - "MBT_T_55", - "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375", - "SPAAA_ZSU_57_2" + "M1045_HMMWV_TOW", + "M1043_HMMWV_Armament", + "BRDM_2", + "BTR_80", + "BTR_D", + "PT_76", + "BMP_1", + "T_55", + "Ural_375_ZU_23_Insurgent", + "ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S19_Msta_152mm" + "Grad_URAL", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Insurgent_AK_74", diff --git a/resources/factions/insurgents_modded.json b/resources/factions/insurgents_modded.json index cca23cf7..76ded9a2 100644 --- a/resources/factions/insurgents_modded.json +++ b/resources/factions/insurgents_modded.json @@ -10,15 +10,15 @@ "DIM__TOYOTA_DESERT", "DIM__TOYOTA_GREEN", "DIM__KAMIKAZE", - "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375" + "Ural_375_ZU_23_Insurgent" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S19_Msta_152mm" + "Grad_URAL", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Insurgent_AK_74", diff --git a/resources/factions/iran_1988.json b/resources/factions/iran_1988.json index e21e1b61..2d73b3e8 100644 --- a/resources/factions/iran_1988.json +++ b/resources/factions/iran_1988.json @@ -18,22 +18,22 @@ "IL_78M" ], "frontline_units": [ - "APC_M113", - "APC_BTR_80", - "MBT_M60A3_Patton", - "MBT_Chieftain_Mk_3", - "IFV_BMP_1", - "SPAAA_ZSU_23_4_Shilka_Gun_Dish", - "SPAAA_ZSU_57_2", - "SPAAA_ZU_23_2_Mounted_Ural_375" + "M_113", + "BTR_80", + "M_60", + "Chieftain_mk3", + "BMP_1", + "ZSU_23_4_Shilka", + "ZSU_57_2", + "Ural_375_ZU_23" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm" + "Grad_URAL", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/iran_2015.json b/resources/factions/iran_2015.json index f6c8cdd7..3957ff88 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -24,22 +24,22 @@ "IL_78M" ], "frontline_units": [ - "APC_M113", - "APC_BTR_80", - "MBT_M60A3_Patton", - "MBT_Chieftain_Mk_3", - "IFV_BMP_1", - "MBT_T_72B", - "SPAAA_ZSU_23_4_Shilka_Gun_Dish", - "SPAAA_ZSU_57_2" + "M_113", + "BTR_80", + "M_60", + "Chieftain_mk3", + "BMP_1", + "T_72B", + "ZSU_23_4_Shilka", + "ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S19_Msta_152mm" + "Grad_URAL", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/iraq_1991.json b/resources/factions/iraq_1991.json index ecb9579d..d4ad6fca 100644 --- a/resources/factions/iraq_1991.json +++ b/resources/factions/iraq_1991.json @@ -25,24 +25,24 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "APC_MTLB", - "MBT_T_55", - "MBT_T_72B", - "MBT_Chieftain_Mk_3", - "APC_BTR_80", - "Scout_BRDM_2", - "LT_PT_76", - "SPH_2S1_Gvozdika_122mm", - "SPAAA_ZSU_57_2", - "SPAAA_ZSU_23_4_Shilka_Gun_Dish" + "BMP_1", + "MTLB", + "T_55", + "T_72B", + "Chieftain_mk3", + "BTR_80", + "BRDM_2", + "PT_76", + "SAU_Gvozdika", + "ZSU_57_2", + "ZSU_23_4_Shilka" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/israel_1948.json b/resources/factions/israel_1948.json index e6282682..0009a644 100644 --- a/resources/factions/israel_1948.json +++ b/resources/factions/israel_1948.json @@ -13,16 +13,16 @@ "B_17G" ], "frontline_units": [ - "MT_M4A4_Sherman_Firefly", - "APC_M2A1_Halftrack", - "Tk_M4_Sherman", - "Car_M8_Greyhound_Armored", - "AAA_Bofors_40mm" + "M4A4_Sherman_FF", + "M2A1_halftrack", + "M4_Sherman", + "M8_Greyhound", + "Bofors40" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" diff --git a/resources/factions/israel_1973.json b/resources/factions/israel_1973.json index 6b852dd9..9dedd02b 100644 --- a/resources/factions/israel_1973.json +++ b/resources/factions/israel_1973.json @@ -17,19 +17,19 @@ "KC130" ], "frontline_units": [ - "Tk_M4_Sherman", - "APC_M2A1_Halftrack", - "MBT_M60A3_Patton", - "APC_M113", - "SAM_Chaparral_M48" + "M4_Sherman", + "M2A1_halftrack", + "M_60", + "M_113", + "M48_Chaparral" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ diff --git a/resources/factions/israel_1982.json b/resources/factions/israel_1982.json index 2d8323d0..c18d8266 100644 --- a/resources/factions/israel_1982.json +++ b/resources/factions/israel_1982.json @@ -21,18 +21,18 @@ "KC130" ], "frontline_units": [ - "APC_M113", - "MBT_M60A3_Patton", - "MBT_Merkava_IV", - "SPAAA_Vulcan_M163" + "M_113", + "M_60", + "Merkava_Mk4", + "Vulcan" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json index 57d2c842..fc5a5557 100644 --- a/resources/factions/israel_2000.json +++ b/resources/factions/israel_2000.json @@ -21,21 +21,21 @@ "KC130" ], "frontline_units": [ - "APC_M113", - "Scout_HMMWV", - "ATGM_HMMWV", - "MBT_Merkava_IV", - "SPAAA_Vulcan_M163" + "M_113", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "Merkava_Mk4", + "Vulcan" ], "artillery_units": [ - "SPH_M109_Paladin_155mm", - "MLRS_M270_227mm" + "M_109", + "MLRS" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/israel_2012.json b/resources/factions/israel_2012.json index 19512551..2489baf3 100644 --- a/resources/factions/israel_2012.json +++ b/resources/factions/israel_2012.json @@ -22,21 +22,21 @@ "KC130" ], "frontline_units": [ - "APC_M113", - "Scout_HMMWV", - "ATGM_HMMWV", - "MBT_Merkava_IV", - "SPAAA_Vulcan_M163" + "M_113", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "Merkava_Mk4", + "Vulcan" ], "artillery_units": [ - "SPH_M109_Paladin_155mm", - "MLRS_M270_227mm" + "M_109", + "MLRS" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/italy_1990.json b/resources/factions/italy_1990.json index 20618885..fe2a3938 100644 --- a/resources/factions/italy_1990.json +++ b/resources/factions/italy_1990.json @@ -18,18 +18,18 @@ "KC130" ], "frontline_units": [ - "MBT_Leopard_1A3", - "APC_M113", - "SAM_Avenger__Stinger" + "Leopard1A3", + "M_113", + "M1097_Avenger" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -43,7 +43,7 @@ "aircraft_carrier": [ ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry" diff --git a/resources/factions/italy_1990_mb339.json b/resources/factions/italy_1990_mb339.json index 7700704e..5abd11e2 100644 --- a/resources/factions/italy_1990_mb339.json +++ b/resources/factions/italy_1990_mb339.json @@ -19,18 +19,18 @@ "KC130" ], "frontline_units": [ - "MBT_Leopard_1A3", - "APC_M113", - "SAM_Avenger__Stinger" + "Leopard1A3", + "M_113", + "M1097_Avenger" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], @@ -44,7 +44,7 @@ "aircraft_carrier": [ ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry" diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json index 7d860b05..04d634c3 100644 --- a/resources/factions/japan_2005.json +++ b/resources/factions/japan_2005.json @@ -19,24 +19,24 @@ "KC130" ], "frontline_units": [ - "MBT_Merkava_IV", - "MBT_M1A2_Abrams", - "IFV_Marder", - "APC_TPz_Fuchs", - "IFV_LAV_25", - "Scout_HMMWV", - "SPAAA_Gepard" + "Merkava_Mk4", + "M_1_Abrams", + "Marder", + "TPZ", + "LAV_25", + "M1043_HMMWV_Armament", + "Gepard" ], "artillery_units": [ - "SPH_M109_Paladin_155mm", - "MLRS_M270_227mm", + "M_109", + "MLRS", "MANPADS_Stinger" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -50,7 +50,7 @@ "aircraft_carrier": [ ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/libya_2011.json b/resources/factions/libya_2011.json index cf6b45cd..d8cf8f31 100644 --- a/resources/factions/libya_2011.json +++ b/resources/factions/libya_2011.json @@ -17,20 +17,20 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "Scout_BRDM_2", - "MBT_T_72B", - "MBT_T_55", - "LT_PT_76", - "SPAAA_ZSU_23_4_Shilka_Gun_Dish", - "SAM_SA_8_Osa_Gecko_TEL" + "BMP_1", + "BRDM_2", + "T_72B", + "T_55", + "PT_76", + "ZSU_23_4_Shilka", + "Osa_9A33_ln" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Insurgent_AK_74", diff --git a/resources/factions/netherlands_1990.json b/resources/factions/netherlands_1990.json index feb9d43e..22730c4b 100644 --- a/resources/factions/netherlands_1990.json +++ b/resources/factions/netherlands_1990.json @@ -17,17 +17,17 @@ "KC130" ], "frontline_units": [ - "APC_M113", - "MBT_Leopard_1A3", - "SAM_Avenger__Stinger" + "M_113", + "Leopard1A3", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/north_korea_2000.json b/resources/factions/north_korea_2000.json index ffd01032..71dad4ca 100644 --- a/resources/factions/north_korea_2000.json +++ b/resources/factions/north_korea_2000.json @@ -19,24 +19,24 @@ "IL_78M" ], "frontline_units": [ - "Scout_BRDM_2", - "APC_BTR_80", - "IFV_BMP_1", - "MBT_T_55", - "MBT_T_72B", - "MBT_T_80U", - "LT_PT_76", - "SPAAA_ZSU_57_2", - "SAM_SA_9_Strela_1_Gaskin_TEL" + "BRDM_2", + "BTR_80", + "BMP_1", + "T_55", + "T_72B", + "T_80UD", + "PT_76", + "ZSU_57_2", + "Strela_1_9P31" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "MLRS_9K57_Uragan_BM_27_220mm", - "SPH_2S19_Msta_152mm" + "Grad_URAL", + "Uragan_BM_27", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/pakistan_2015.json b/resources/factions/pakistan_2015.json index c8e2b4b3..f2faffe9 100644 --- a/resources/factions/pakistan_2015.json +++ b/resources/factions/pakistan_2015.json @@ -19,20 +19,20 @@ "IL_78M" ], "frontline_units": [ - "MBT_T_80U", - "MBT_T_55", - "ZBD_04A", - "APC_BTR_80", - "APC_M113", - "HQ_7_Self_Propelled_LN" + "T_80UD", + "T_55", + "ZBD04A", + "BTR_80", + "M_113", + "HQ_7_LN_SP" ], "artillery_units": [ - "MLRS_9A52_Smerch_HE_300mm", - "SPM_2S9_Nona_120mm_M" + "Smerch_HE", + "SAU_2_C9" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/pmc_russian.json b/resources/factions/pmc_russian.json index 14061dd4..b7375906 100644 --- a/resources/factions/pmc_russian.json +++ b/resources/factions/pmc_russian.json @@ -11,17 +11,17 @@ "Ka_50" ], "frontline_units": [ - "Scout_Cobra", - "APC_BTR_80", - "Scout_BRDM_2", - "SAM_SA_13_Strela_10M3_Gopher_TEL" + "Cobra", + "BTR_80", + "BRDM_2", + "Strela_10M3" ], "artillery_units": [ - "SPH_2S19_Msta_152mm" + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/pmc_us.json b/resources/factions/pmc_us.json index 8957f5db..e3ab3305 100644 --- a/resources/factions/pmc_us.json +++ b/resources/factions/pmc_us.json @@ -10,18 +10,18 @@ "SA342M" ], "frontline_units": [ - "Scout_HMMWV", - "IFV_Warrior", - "IFV_LAV_25", - "SAM_Avenger__Stinger" + "M1043_HMMWV_Armament", + "MCV_80", + "LAV_25", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/pmc_us_with_mb339.json b/resources/factions/pmc_us_with_mb339.json index 1e9867d5..3cace7f1 100644 --- a/resources/factions/pmc_us_with_mb339.json +++ b/resources/factions/pmc_us_with_mb339.json @@ -11,18 +11,18 @@ "SA342M" ], "frontline_units": [ - "Scout_HMMWV", - "IFV_Warrior", - "IFV_LAV_25", - "SAM_Avenger__Stinger" + "M1043_HMMWV_Armament", + "MCV_80", + "LAV_25", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/poland_2010.json b/resources/factions/poland_2010.json index d37e55dc..628cb688 100644 --- a/resources/factions/poland_2010.json +++ b/resources/factions/poland_2010.json @@ -14,23 +14,23 @@ "KC130" ], "frontline_units": [ - "Scout_HMMWV", - "ATGM_HMMWV", - "IFV_M1126_Stryker_ICV", - "Scout_BRDM_2", - "IFV_BMP_1", - "APC_MTLB", - "MBT_Leopard_2A6M", - "MBT_T_72B3" + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M1126_Stryker_ICV", + "BRDM_2", + "BMP_1", + "MTLB", + "Leopard_2", + "T_72B3" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm", - "SPH_Dana_vz77_152mm" + "Grad_URAL", + "SAU_Gvozdika", + "SpGH_Dana" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/redfor_china_2010.json b/resources/factions/redfor_china_2010.json index 9acd9203..b836e9ca 100644 --- a/resources/factions/redfor_china_2010.json +++ b/resources/factions/redfor_china_2010.json @@ -30,29 +30,29 @@ "IL_78M" ], "frontline_units": [ - "APC_BTR_80", - "IFV_BTR_82A", - "HQ_7_Self_Propelled_LN", - "IFV_BMP_1", - "IFV_BMP_2", - "IFV_BMP_3", - "MBT_T_55", - "MBT_T_72B3", - "MBT_T_80U", - "MBT_T_90", - "SAM_SA_19_Tunguska_Grison", - "ZBD_04A", - "ZTZ_96B" + "BTR_80", + "BTR_82A", + "HQ_7_LN_SP", + "BMP_1", + "BMP_2", + "BMP_3", + "T_55", + "T_72B3", + "T_80UD", + "T_90", + "_2S6_Tunguska", + "ZBD04A", + "ZTZ96B" ], "artillery_units": [ - "MLRS_9A52_Smerch_HE_300mm", - "MLRS_9K57_Uragan_BM_27_220mm", - "SPM_2S9_Nona_120mm_M", - "SPH_2S19_Msta_152mm" + "Smerch_HE", + "Uragan_BM_27", + "SAU_2_C9", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Mortar_2B11_120mm", diff --git a/resources/factions/redfor_russia_2010.json b/resources/factions/redfor_russia_2010.json index 1703388b..306086b7 100644 --- a/resources/factions/redfor_russia_2010.json +++ b/resources/factions/redfor_russia_2010.json @@ -31,29 +31,29 @@ "IL_78M" ], "frontline_units": [ - "APC_BTR_80", - "IFV_BTR_82A", - "HQ_7_Self_Propelled_LN", - "IFV_BMP_1", - "IFV_BMP_2", - "IFV_BMP_3", - "MBT_T_55", - "MBT_T_72B3", - "MBT_T_80U", - "MBT_T_90", - "SAM_SA_19_Tunguska_Grison", - "ZBD_04A", - "ZTZ_96B" + "BTR_80", + "BTR_82A", + "HQ_7_LN_SP", + "BMP_1", + "BMP_2", + "BMP_3", + "T_55", + "T_72B3", + "T_80UD", + "T_90", + "_2S6_Tunguska", + "ZBD04A", + "ZTZ96B" ], "artillery_units": [ - "MLRS_9A52_Smerch_HE_300mm", - "MLRS_9K57_Uragan_BM_27_220mm", - "SPM_2S9_Nona_120mm_M", - "SPH_2S19_Msta_152mm" + "Smerch_HE", + "Uragan_BM_27", + "SAU_2_C9", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Mortar_2B11_120mm", diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json index ec107246..39ec4347 100644 --- a/resources/factions/russia_1955.json +++ b/resources/factions/russia_1955.json @@ -14,21 +14,21 @@ "IL_78M" ], "frontline_units": [ - "Scout_BRDM_2", - "Grad_MRL_FDDM__FC", - "APC_MTLB", - "MBT_T_55", - "LT_PT_76", - "SPAAA_ZU_23_2_Mounted_Ural_375", - "AAA_8_8cm_Flak_18", - "AAA_S_60_57mm" + "BRDM_2", + "Grad_FDDM", + "MTLB", + "T_55", + "PT_76", + "Ural_375_ZU_23", + "Flak18", + "S_60_Type59_Artillery" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_AK_74_Rus", diff --git a/resources/factions/russia_1965.json b/resources/factions/russia_1965.json index cd506c36..4dad0344 100644 --- a/resources/factions/russia_1965.json +++ b/resources/factions/russia_1965.json @@ -18,23 +18,23 @@ "IL_78M" ], "frontline_units": [ - "Scout_BRDM_2", - "APC_BTR_80", - "APC_BTR_RD", - "IFV_BMD_1", - "IFV_BMP_1", - "LT_PT_76", - "MBT_T_55", - "SPAAA_ZU_23_2_Mounted_Ural_375", - "SPAAA_ZSU_57_2", - "AAA_S_60_57mm" + "BRDM_2", + "BTR_80", + "BTR_D", + "BMD_1", + "BMP_1", + "PT_76", + "T_55", + "Ural_375_ZU_23", + "ZSU_57_2", + "S_60_Type59_Artillery" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_AK_74_Rus", diff --git a/resources/factions/russia_1970_limited_air.json b/resources/factions/russia_1970_limited_air.json index 735c2a88..7641de5e 100644 --- a/resources/factions/russia_1970_limited_air.json +++ b/resources/factions/russia_1970_limited_air.json @@ -11,22 +11,22 @@ "Mi_24V" ], "frontline_units": [ - "Scout_BRDM_2", - "APC_BTR_80", - "IFV_BMD_1", - "IFV_BMP_1", - "LT_PT_76", - "MBT_T_55", - "SPAAA_ZSU_57_2" + "BRDM_2", + "BTR_80", + "BMD_1", + "BMP_1", + "PT_76", + "T_55", + "ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPM_2S9_Nona_120mm_M", - "SPH_2S1_Gvozdika_122mm" + "Grad_URAL", + "SAU_2_C9", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_AK_74_Rus", diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json index 387bebf2..3240efcf 100644 --- a/resources/factions/russia_1975.json +++ b/resources/factions/russia_1975.json @@ -24,22 +24,22 @@ "IL_78M" ], "frontline_units": [ - "Scout_BRDM_2", - "APC_BTR_80", - "IFV_BMD_1", - "IFV_BMP_1", - "LT_PT_76", - "MBT_T_55", - "SAM_SA_8_Osa_Gecko_TEL" + "BRDM_2", + "BTR_80", + "BMD_1", + "BMP_1", + "PT_76", + "T_55", + "Osa_9A33_ln" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm", - "SPM_2S9_Nona_120mm_M", - "SPH_2S1_Gvozdika_122mm" + "Grad_URAL", + "SAU_2_C9", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_AK_74_Rus", diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json index 7f0f561f..8cf10dbc 100644 --- a/resources/factions/russia_1990.json +++ b/resources/factions/russia_1990.json @@ -28,20 +28,20 @@ "IL_78M" ], "frontline_units": [ - "APC_BTR_80", - "IFV_BMP_1", - "IFV_BMP_2", - "MBT_T_72B", - "MBT_T_80U", - "SAM_SA_13_Strela_10M3_Gopher_TEL" + "BTR_80", + "BMP_1", + "BMP_2", + "T_72B", + "T_80UD", + "Strela_10M3" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPH_2S19_Msta_152mm" + "Uragan_BM_27", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json index 624ced64..1fb5053e 100644 --- a/resources/factions/russia_2010.json +++ b/resources/factions/russia_2010.json @@ -31,23 +31,23 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "IFV_BMP_2", - "IFV_BMP_3", - "APC_BTR_80", - "IFV_BTR_82A", - "MBT_T_90", - "MBT_T_80U", - "MBT_T_72B3", - "SAM_SA_19_Tunguska_Grison" + "BMP_1", + "BMP_2", + "BMP_3", + "BTR_80", + "BTR_82A", + "T_90", + "T_80UD", + "T_72B3", + "_2S6_Tunguska" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPH_2S19_Msta_152mm" + "Uragan_BM_27", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/russia_2010_hds.json b/resources/factions/russia_2010_hds.json index 62eb94bf..8714ec55 100644 --- a/resources/factions/russia_2010_hds.json +++ b/resources/factions/russia_2010_hds.json @@ -31,23 +31,23 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "IFV_BMP_2", - "IFV_BMP_3", - "APC_BTR_80", - "IFV_BTR_82A", - "MBT_T_90", - "MBT_T_80U", - "MBT_T_72B3", - "SAM_SA_19_Tunguska_Grison" + "BMP_1", + "BMP_2", + "BMP_3", + "BTR_80", + "BTR_82A", + "T_90", + "T_80UD", + "T_72B3", + "_2S6_Tunguska" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPH_2S19_Msta_152mm" + "Uragan_BM_27", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json index 8d437dbf..d127736b 100644 --- a/resources/factions/russia_2020.json +++ b/resources/factions/russia_2020.json @@ -32,20 +32,20 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_2", - "IFV_BMP_3", - "MBT_T_90", - "MBT_T_80U", - "MBT_T_72B", - "SAM_SA_19_Tunguska_Grison" + "BMP_2", + "BMP_3", + "T_90", + "T_80UD", + "T_72B", + "_2S6_Tunguska" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPH_2S19_Msta_152mm" + "Uragan_BM_27", + "SAU_Msta" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/soviet_union_1943.json b/resources/factions/soviet_union_1943.json index f47687b2..17a4279d 100644 --- a/resources/factions/soviet_union_1943.json +++ b/resources/factions/soviet_union_1943.json @@ -9,14 +9,14 @@ "I_16" ], "frontline_units": [ - "Tk_M4_Sherman", - "APC_M2A1_Halftrack", - "Car_Daimler_Armored", - "LT_Mk_VII_Tetrarch", - "AAA_Bofors_40mm" + "M4_Sherman", + "M2A1_halftrack", + "Daimler_AC", + "Tetrarch", + "Bofors40" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ "Truck_Bedford", diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json index 728f2384..6c1d8088 100644 --- a/resources/factions/spain_1990.json +++ b/resources/factions/spain_1990.json @@ -19,18 +19,18 @@ "KC130" ], "frontline_units": [ - "MBT_M60A3_Patton", + "M_60", "MBT_Leopard_2A4", - "APC_M113", - "SAM_Avenger__Stinger" + "M_113", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -43,10 +43,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry" diff --git a/resources/factions/sweden_1970.json b/resources/factions/sweden_1970.json index 18554128..1884f81f 100644 --- a/resources/factions/sweden_1970.json +++ b/resources/factions/sweden_1970.json @@ -17,18 +17,18 @@ "KC130" ], "frontline_units": [ - "IFV_Warrior", + "MCV_80", "MBT_Leopard_2A4", - "IFV_M1126_Stryker_ICV", - "SAM_Chaparral_M48" + "M1126_Stryker_ICV", + "M48_Chaparral" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ diff --git a/resources/factions/sweden_1990.json b/resources/factions/sweden_1990.json index 18da3260..36f26d9c 100644 --- a/resources/factions/sweden_1990.json +++ b/resources/factions/sweden_1990.json @@ -16,18 +16,18 @@ "KC130" ], "frontline_units": [ - "IFV_Warrior", + "MCV_80", "MBT_Leopard_2A4", - "IFV_M1126_Stryker_ICV", - "SAM_Avenger__Stinger" + "M1126_Stryker_ICV", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/sweden_2002_with_gripen.json b/resources/factions/sweden_2002_with_gripen.json index 25af4e24..3e492ae9 100644 --- a/resources/factions/sweden_2002_with_gripen.json +++ b/resources/factions/sweden_2002_with_gripen.json @@ -18,18 +18,18 @@ "KC130" ], "frontline_units": [ - "IFV_Warrior", + "MCV_80", "MBT_Leopard_2A4", - "IFV_M1126_Stryker_ICV", - "SAM_Avenger__Stinger" + "M1126_Stryker_ICV", + "M1097_Avenger" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger" ], diff --git a/resources/factions/syria_1948.json b/resources/factions/syria_1948.json index ad05776d..30c2522f 100644 --- a/resources/factions/syria_1948.json +++ b/resources/factions/syria_1948.json @@ -8,17 +8,17 @@ "SpitfireLFMkIXCW" ], "frontline_units": [ - "IFV_Sd_Kfz_234_2_Puma", - "APC_Sd_Kfz_251_Halftrack", - "Tk_PzIV_H", - "Tk_M4_Sherman", - "AAA_Bofors_40mm" + "Sd_Kfz_234_2_Puma", + "Sd_Kfz_251", + "Pz_IV_H", + "M4_Sherman", + "Bofors40" ], "artillery_units": [ ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" diff --git a/resources/factions/syria_1967.json b/resources/factions/syria_1967.json index cab0ceb8..0548bcbf 100644 --- a/resources/factions/syria_1967.json +++ b/resources/factions/syria_1967.json @@ -17,20 +17,20 @@ "IL_78M" ], "frontline_units": [ - "Scout_BRDM_2", - "Tk_PzIV_H", - "MBT_T_55", - "LT_PT_76", - "SPAAA_ZU_23_2_Mounted_Ural_375", - "SPAAA_ZSU_57_2", - "AAA_S_60_57mm" + "BRDM_2", + "Pz_IV_H", + "T_55", + "PT_76", + "Ural_375_ZU_23", + "ZSU_57_2", + "S_60_Type59_Artillery" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/syria_1967_with_ww2_weapons.json b/resources/factions/syria_1967_with_ww2_weapons.json index cda98f1d..daa33545 100644 --- a/resources/factions/syria_1967_with_ww2_weapons.json +++ b/resources/factions/syria_1967_with_ww2_weapons.json @@ -18,21 +18,21 @@ "IL_78M" ], "frontline_units": [ - "Scout_BRDM_2", - "MBT_T_55", - "LT_PT_76", - "Tk_PzIV_H", - "SPG_StuG_III_Ausf__G", - "SPG_Jagdpanzer_IV", - "SPAAA_ZSU_57_2", - "AAA_S_60_57mm" + "BRDM_2", + "T_55", + "PT_76", + "Pz_IV_H", + "Stug_III", + "JagdPz_IV", + "ZSU_57_2", + "S_60_Type59_Artillery" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/syria_1973.json b/resources/factions/syria_1973.json index f5467de4..75f55214 100644 --- a/resources/factions/syria_1973.json +++ b/resources/factions/syria_1973.json @@ -17,20 +17,20 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "APC_MTLB", - "MBT_T_55", - "LT_PT_76", - "SPAAA_ZU_23_2_Mounted_Ural_375", - "SPAAA_ZSU_57_2", - "AAA_S_60_57mm" + "BMP_1", + "MTLB", + "T_55", + "PT_76", + "Ural_375_ZU_23", + "ZSU_57_2", + "S_60_Type59_Artillery" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/syria_1982.json b/resources/factions/syria_1982.json index 022fe6ea..d6cc57c6 100644 --- a/resources/factions/syria_1982.json +++ b/resources/factions/syria_1982.json @@ -18,21 +18,21 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "APC_MTLB", - "MBT_T_55", - "LT_PT_76", - "MBT_T_72B", - "SPAAA_ZU_23_2_Mounted_Ural_375", - "SPAAA_ZSU_57_2", - "AAA_S_60_57mm" + "BMP_1", + "MTLB", + "T_55", + "PT_76", + "T_72B", + "Ural_375_ZU_23", + "ZSU_57_2", + "S_60_Type59_Artillery" ], "artillery_units": [ - "MLRS_BM_21_Grad_122mm" + "Grad_URAL" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json index c5a3e375..46c6926c 100644 --- a/resources/factions/syria_2011.json +++ b/resources/factions/syria_2011.json @@ -23,27 +23,27 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "IFV_BMP_2", - "APC_BTR_80", - "Scout_BRDM_2", - "LT_PT_76", - "APC_MTLB", - "Scout_Cobra", - "MBT_T_55", - "MBT_T_72B", - "MBT_T_90", - "SPAAA_ZSU_57_2" + "BMP_1", + "BMP_2", + "BTR_80", + "BRDM_2", + "PT_76", + "MTLB", + "Cobra", + "T_55", + "T_72B", + "T_90", + "ZSU_57_2" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPM_2S9_Nona_120mm_M", - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm" + "Uragan_BM_27", + "SAU_2_C9", + "Grad_URAL", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/syria_2012.json b/resources/factions/syria_2012.json index f5c5f3cb..0c7d231d 100644 --- a/resources/factions/syria_2012.json +++ b/resources/factions/syria_2012.json @@ -24,27 +24,27 @@ "IL_78M" ], "frontline_units": [ - "IFV_BMP_1", - "IFV_BMP_2", - "APC_BTR_80", - "Scout_BRDM_2", - "LT_PT_76", - "APC_MTLB", - "Scout_Cobra", - "MBT_T_55", - "MBT_T_72B", - "MBT_T_90", - "SPAAA_ZSU_57_2" + "BMP_1", + "BMP_2", + "BTR_80", + "BRDM_2", + "PT_76", + "MTLB", + "Cobra", + "T_55", + "T_72B", + "T_90", + "ZSU_57_2" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27_220mm", - "SPM_2S9_Nona_120mm_M", - "MLRS_BM_21_Grad_122mm", - "SPH_2S1_Gvozdika_122mm" + "Uragan_BM_27", + "SAU_2_C9", + "Grad_URAL", + "SAU_Gvozdika" ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/turkey_2005.json b/resources/factions/turkey_2005.json index b4bfbd0a..2d6be24d 100644 --- a/resources/factions/turkey_2005.json +++ b/resources/factions/turkey_2005.json @@ -22,23 +22,23 @@ ], "frontline_units": [ "MBT_Leopard_2A4_Trs", - "MBT_Leopard_1A3", - "MBT_M60A3_Patton", - "Scout_Cobra", - "APC_BTR_80", - "APC_M113", - "SAM_Avenger__Stinger" + "Leopard1A3", + "M_60", + "Cobra", + "BTR_80", + "M_113", + "M1097_Avenger" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm", - "SPH_T155_Firtina_155mm" + "MLRS", + "M_109", + "T155_Firtina" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "Paratrooper_AKS", "MANPADS_SA_18_Igla_S_Grouse" diff --git a/resources/factions/uae_2005.json b/resources/factions/uae_2005.json index 265e2dfb..679f6b09 100644 --- a/resources/factions/uae_2005.json +++ b/resources/factions/uae_2005.json @@ -17,17 +17,17 @@ "KC130" ], "frontline_units": [ - "MBT_Leclerc", - "APC_TPz_Fuchs", - "IFV_BMP_3" + "Leclerc", + "TPZ", + "BMP_3" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_SA_18_Igla_S_Grouse" ], diff --git a/resources/factions/uae_2015.json b/resources/factions/uae_2015.json index 10bc290c..47a65d8e 100644 --- a/resources/factions/uae_2015.json +++ b/resources/factions/uae_2015.json @@ -21,17 +21,17 @@ "KC130" ], "frontline_units": [ - "MBT_Leclerc", - "APC_TPz_Fuchs", - "IFV_BMP_3" + "Leclerc", + "TPZ", + "BMP_3" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_SA_18_Igla_S_Grouse" ], diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json index 2a1aa650..75eb9095 100644 --- a/resources/factions/uk_1944.json +++ b/resources/factions/uk_1944.json @@ -16,15 +16,15 @@ "B_17G" ], "frontline_units": [ - "MT_M4A4_Sherman_Firefly", - "Tk_M4_Sherman", - "APC_M2A1_Halftrack", - "CT_Cromwell_IV", - "CT_Centaur_IV", - "HIT_Churchill_VII", - "Car_Daimler_Armored", - "LT_Mk_VII_Tetrarch", - "AAA_Bofors_40mm" + "M4A4_Sherman_FF", + "M4_Sherman", + "M2A1_halftrack", + "Cromwell_IV", + "Centaur_IV", + "Churchill_VII", + "Daimler_AC", + "Tetrarch", + "Bofors40" ], "artillery_units": [ ], diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json index 92b386ca..0e4cacc5 100644 --- a/resources/factions/uk_1990.json +++ b/resources/factions/uk_1990.json @@ -19,22 +19,22 @@ "KC130" ], "frontline_units": [ - "MBT_Challenger_II", - "MBT_Chieftain_Mk_3", - "IFV_Warrior", - "Scout_HMMWV", - "ATGM_HMMWV", - "SAM_Avenger__Stinger" + "Challenger2", + "Chieftain_mk3", + "MCV_80", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M1097_Avenger" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "Mortar_2B11_120mm", "MANPADS_Stinger" @@ -48,10 +48,10 @@ "HawkEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry" diff --git a/resources/factions/ukraine_2010.json b/resources/factions/ukraine_2010.json index 644b9799..41e79352 100644 --- a/resources/factions/ukraine_2010.json +++ b/resources/factions/ukraine_2010.json @@ -20,19 +20,19 @@ "IL_78M" ], "frontline_units": [ - "Scout_HMMWV", - "IFV_BMP_3", - "IFV_BMP_2", - "APC_BTR_80", - "MBT_T_80U", - "MBT_T_72B", - "SAM_SA_13_Strela_10M3_Gopher_TEL" + "M1043_HMMWV_Armament", + "BMP_3", + "BMP_2", + "BTR_80", + "T_80UD", + "T_72B", + "Strela_10M3" ], "artillery_units": [ ], "logistics_units": [ - "Truck_Ural_375", - "LUV_UAZ_469_Jeep" + "Ural_375", + "UAZ_469" ], "infantry_units": [ "Paratrooper_AKS", diff --git a/resources/factions/unc_1950_fictional.json b/resources/factions/unc_1950_fictional.json index 7651897b..d6769a95 100644 --- a/resources/factions/unc_1950_fictional.json +++ b/resources/factions/unc_1950_fictional.json @@ -12,20 +12,20 @@ "P_47D_40" ], "frontline_units": [ - "Tk_M4_Sherman", - "MBT_M60A3_Patton", - "APC_M2A1_Halftrack", - "Car_M8_Greyhound_Armored", - "AAA_Bofors_40mm" + "M4_Sherman", + "M_60", + "M2A1_halftrack", + "M8_Greyhound", + "Bofors40" ], "artillery_units": [ - "SPG_M12_GMC_155mm" + "M12_GMC" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4" + "Soldier_M4" ], "air_defenses": [ "AllyWW2FlakGenerator", diff --git a/resources/factions/us_aggressors.json b/resources/factions/us_aggressors.json index 38bab3fe..d29a37f5 100644 --- a/resources/factions/us_aggressors.json +++ b/resources/factions/us_aggressors.json @@ -31,23 +31,23 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", + "M_1_Abrams", "MBT_Leopard_2A4", - "ATGM_Stryker", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "SAM_Avenger__Stinger" + "M1134_Stryker_ATGM", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1097_Avenger" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ diff --git a/resources/factions/usa_1944.json b/resources/factions/usa_1944.json index 107051dd..13bff018 100644 --- a/resources/factions/usa_1944.json +++ b/resources/factions/usa_1944.json @@ -15,15 +15,15 @@ "B_17G" ], "frontline_units": [ - "MT_M4A4_Sherman_Firefly", - "Tk_M4_Sherman", - "APC_M2A1_Halftrack", - "Car_M8_Greyhound_Armored", - "SPG_M10_GMC", - "AAA_QF_3_7" + "M4A4_Sherman_FF", + "M4_Sherman", + "M2A1_halftrack", + "M8_Greyhound", + "M10_GMC", + "QF_37_AA" ], "artillery_units": [ - "SPG_M12_GMC_155mm" + "M12_GMC" ], "logistics_units": [ "Truck_GMC_Jimmy_6x6_Truck" diff --git a/resources/factions/usa_1955.json b/resources/factions/usa_1955.json index cb767293..560db0ef 100644 --- a/resources/factions/usa_1955.json +++ b/resources/factions/usa_1955.json @@ -12,19 +12,19 @@ "P_51D_30_NA" ], "frontline_units": [ - "Tk_M4_Sherman", - "MBT_M60A3_Patton", - "APC_M2A1_Halftrack", - "AAA_Bofors_40mm" + "M4_Sherman", + "M_60", + "M2A1_halftrack", + "Bofors40" ], "artillery_units": [ - "SPG_M12_GMC_155mm" + "M12_GMC" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4" + "Soldier_M4" ], "air_defenses": [ "BoforsGenerator", diff --git a/resources/factions/usa_1960.json b/resources/factions/usa_1960.json index f15a8685..f0a86801 100644 --- a/resources/factions/usa_1960.json +++ b/resources/factions/usa_1960.json @@ -13,17 +13,17 @@ "UH_1H" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "SPAAA_Vulcan_M163" + "M_60", + "M_113", + "Vulcan" ], "artillery_units": [ ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4" + "Soldier_M4" ], "air_defenses": [ "EarlyColdWarFlakGenerator", @@ -31,4 +31,4 @@ ], "requirements": {}, "doctrine": "coldwar" -} \ No newline at end of file +} diff --git a/resources/factions/usa_1965.json b/resources/factions/usa_1965.json index b0f08587..49e41c51 100644 --- a/resources/factions/usa_1965.json +++ b/resources/factions/usa_1965.json @@ -16,18 +16,18 @@ "E_2C" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "SPAAA_Vulcan_M163" + "M_60", + "M_113", + "Vulcan" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -41,4 +41,4 @@ ], "requirements": {}, "doctrine": "coldwar" -} \ No newline at end of file +} diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index fc8f71cf..5891ae98 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -19,19 +19,19 @@ "E_2C" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "SAM_Chaparral_M48", - "SPAAA_Vulcan_M163" + "M_60", + "M_113", + "M48_Chaparral", + "Vulcan" ], "artillery_units": [ - "SPH_M109_Paladin_155mm" + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "air_defenses": [ @@ -48,4 +48,4 @@ ], "requirements": {}, "doctrine": "coldwar" -} \ No newline at end of file +} diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index 0a9d8913..e72c9994 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -35,24 +35,24 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M1126_Stryker_ICV", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV", - "SAM_Avenger__Stinger" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M1126_Stryker_ICV", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M1097_Avenger" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger", "Mortar_2B11_120mm" @@ -67,10 +67,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry", diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json index f516f47d..8ca4583a 100644 --- a/resources/factions/usa_2005.json +++ b/resources/factions/usa_2005.json @@ -35,26 +35,26 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M1126_Stryker_ICV", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV", - "SAM_Avenger__Stinger", - "SAM_Linebacker___Bradley_M6", - "SPG_Stryker_MGS" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M1126_Stryker_ICV", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M1097_Avenger", + "M6_Linebacker", + "M1128_Stryker_MGS" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger", "Mortar_2B11_120mm" @@ -68,10 +68,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/usa_2005_c130.json b/resources/factions/usa_2005_c130.json index 8cfbcbb5..bd50e115 100644 --- a/resources/factions/usa_2005_c130.json +++ b/resources/factions/usa_2005_c130.json @@ -36,25 +36,25 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M1126_Stryker_ICV", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV", - "SAM_Avenger__Stinger", - "SAM_Linebacker___Bradley_M6" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M1126_Stryker_ICV", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M1097_Avenger", + "M6_Linebacker" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger", "Mortar_2B11_120mm" @@ -68,10 +68,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/usa_2005_modded.json b/resources/factions/usa_2005_modded.json index b791d905..a3939666 100644 --- a/resources/factions/usa_2005_modded.json +++ b/resources/factions/usa_2005_modded.json @@ -31,25 +31,25 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M1126_Stryker_ICV", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV", - "SAM_Avenger__Stinger", - "SAM_Linebacker___Bradley_M6" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M1126_Stryker_ICV", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW", + "M1097_Avenger", + "M6_Linebacker" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "MANPADS_Stinger", "Mortar_2B11_120mm" @@ -64,10 +64,10 @@ "PatriotEwrGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "DDG_Arleigh_Burke_IIa" diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index ee7cb9f1..c84e612c 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -20,20 +20,20 @@ "S_3B_Tanker" ], "frontline_units": [ - "MBT_M60A3_Patton", - "APC_M113", - "Scout_HMMWV", - "SPAAA_Vulcan_M163" + "M_60", + "M_113", + "M1043_HMMWV_Armament", + "Vulcan" ], "artillery_units": [ - "SPH_M109_Paladin_155mm", - "MLRS_M270_227mm" + "M_109", + "MLRS" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249", "Mortar_2B11_120mm", "MANPADS_Stinger" @@ -44,10 +44,10 @@ "VulcanGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry" diff --git a/tests/resources/invalid_faction_country.json b/tests/resources/invalid_faction_country.json index 50f3fe11..4e4c86fa 100644 --- a/tests/resources/invalid_faction_country.json +++ b/tests/resources/invalid_faction_country.json @@ -25,23 +25,23 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M1126_Stryker_ICV", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M1126_Stryker_ICV", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "shorads": [ @@ -51,10 +51,10 @@ "HawkGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry", diff --git a/tests/resources/valid_faction.json b/tests/resources/valid_faction.json index 1ee00e13..00106d05 100644 --- a/tests/resources/valid_faction.json +++ b/tests/resources/valid_faction.json @@ -27,23 +27,23 @@ "KC130" ], "frontline_units": [ - "MBT_M1A2_Abrams", - "ATGM_Stryker", - "IFV_M1126_Stryker_ICV", - "IFV_M2A2_Bradley", - "IFV_LAV_25", - "Scout_HMMWV", - "ATGM_HMMWV" + "M_1_Abrams", + "M1134_Stryker_ATGM", + "M1126_Stryker_ICV", + "M_2_Bradley", + "LAV_25", + "M1043_HMMWV_Armament", + "M1045_HMMWV_TOW" ], "artillery_units": [ - "MLRS_M270_227mm", - "SPH_M109_Paladin_155mm" + "MLRS", + "M_109" ], "logistics_units": [ - "Truck_M818_6x6" + "M_818" ], "infantry_units": [ - "Infantry_M4", + "Soldier_M4", "Infantry_M249" ], "shorads": [ @@ -53,10 +53,10 @@ "HawkGenerator" ], "aircraft_carrier": [ - "CVN_74_John_C__Stennis" + "Stennis" ], "helicopter_carrier": [ - "LHA_1_Tarawa" + "LHA_Tarawa" ], "destroyers": [ "FFG_Oliver_Hazzard_Perry", diff --git a/tests/test_factions.py b/tests/test_factions.py index 232786d4..e3bbaa13 100644 --- a/tests/test_factions.py +++ b/tests/test_factions.py @@ -23,8 +23,8 @@ from dcs.planes import ( A_10C_2, ) from dcs.ships import ( - CVN_74_John_C__Stennis, - LHA_1_Tarawa, + Stennis, + LHA_Tarawa, FFG_Oliver_Hazzard_Perry, DDG_Arleigh_Burke_IIa, CG_Ticonderoga, @@ -77,28 +77,28 @@ class TestFactionLoader(unittest.TestCase): self.assertTrue(faction.has_jtac) self.assertEqual(faction.jtac_unit, MQ_9_Reaper) - self.assertIn(Armor.MBT_M1A2_Abrams, faction.frontline_units) - self.assertIn(Armor.ATGM_Stryker, faction.frontline_units) - self.assertIn(Armor.IFV_M1126_Stryker_ICV, faction.frontline_units) - self.assertIn(Armor.IFV_M2A2_Bradley, faction.frontline_units) - self.assertIn(Armor.IFV_LAV_25, faction.frontline_units) - self.assertIn(Armor.Scout_HMMWV, faction.frontline_units) - self.assertIn(Armor.ATGM_HMMWV, faction.frontline_units) + self.assertIn(Armor.M_1_Abrams, faction.frontline_units) + self.assertIn(Armor.M1134_Stryker_ATGM, faction.frontline_units) + self.assertIn(Armor.M1126_Stryker_ICV, faction.frontline_units) + self.assertIn(Armor.M_2_Bradley, faction.frontline_units) + self.assertIn(Armor.LAV_25, faction.frontline_units) + self.assertIn(Armor.M1043_HMMWV_Armament, faction.frontline_units) + self.assertIn(Armor.M1045_HMMWV_TOW, faction.frontline_units) - self.assertIn(Artillery.MLRS_M270_227mm, faction.artillery_units) - self.assertIn(Artillery.SPH_M109_Paladin_155mm, faction.artillery_units) + self.assertIn(Artillery.MLRS, faction.artillery_units) + self.assertIn(Artillery.M_109, faction.artillery_units) - self.assertIn(Unarmed.Truck_M818_6x6, faction.logistics_units) + self.assertIn(Unarmed.M_818, faction.logistics_units) - self.assertIn(Infantry.Infantry_M4, faction.infantry_units) + self.assertIn(Infantry.Soldier_M4, faction.infantry_units) self.assertIn(Infantry.Infantry_M249, faction.infantry_units) self.assertIn("AvengerGenerator", faction.air_defenses) self.assertIn("HawkGenerator", faction.air_defenses) - self.assertIn(CVN_74_John_C__Stennis, faction.aircraft_carrier) - self.assertIn(LHA_1_Tarawa, faction.helicopter_carrier) + self.assertIn(Stennis, faction.aircraft_carrier) + self.assertIn(LHA_Tarawa, faction.helicopter_carrier) self.assertIn(FFG_Oliver_Hazzard_Perry, faction.destroyers) self.assertIn(DDG_Arleigh_Burke_IIa, faction.destroyers) self.assertIn(CG_Ticonderoga, faction.cruisers)