From 15d2a5bb2bae146aae4bc4ae93998bdb543c84b4 Mon Sep 17 00:00:00 2001 From: Khopa Date: Fri, 16 Apr 2021 23:33:22 +0200 Subject: [PATCH] Updated units name in liberation --- game/data/aaa_db.py | 20 +- game/data/radar_db.py | 36 +- game/data/weapons.py | 4 +- game/db.py | 514 +++++++++--------- game/theater/conflicttheater.py | 16 +- gen/coastal/silkworm.py | 4 +- gen/ground_forces/ai_ground_planner_db.py | 120 ++-- gen/missiles/scud_site.py | 6 +- gen/missiles/v1_group.py | 2 +- gen/sam/aaa_bofors.py | 2 +- gen/sam/aaa_flak.py | 10 +- gen/sam/aaa_ww2_ally_flak.py | 8 +- gen/sam/aaa_zsu57.py | 2 +- gen/sam/aaa_zu23_insurgent.py | 2 +- gen/sam/cold_war_flak.py | 10 +- gen/sam/ewrs.py | 14 +- gen/sam/freya_ewr.py | 8 +- gen/sam/sam_avenger.py | 4 +- gen/sam/sam_chaparral.py | 2 +- gen/sam/sam_gepard.py | 2 +- gen/sam/sam_group_generator.py | 46 +- gen/sam/sam_hawk.py | 8 +- gen/sam/sam_hq7.py | 4 +- gen/sam/sam_linebacker.py | 4 +- gen/sam/sam_patriot.py | 12 +- gen/sam/sam_rapier.py | 6 +- gen/sam/sam_roland.py | 2 +- gen/sam/sam_sa10.py | 22 +- gen/sam/sam_sa11.py | 6 +- gen/sam/sam_sa13.py | 4 +- gen/sam/sam_sa15.py | 4 +- gen/sam/sam_sa17.py | 4 +- gen/sam/sam_sa19.py | 4 +- gen/sam/sam_sa2.py | 6 +- gen/sam/sam_sa3.py | 6 +- gen/sam/sam_sa6.py | 4 +- gen/sam/sam_sa8.py | 2 +- 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 +- pydcs_extensions/a4ec/a4ec.py | 12 +- resources/factions/NATO_Desert_Storm.json | 26 +- resources/factions/allies_1944.json | 14 +- resources/factions/allies_1944_free.json | 4 +- resources/factions/australia_2005.json | 8 +- resources/factions/bluefor_coldwar.json | 6 +- resources/factions/bluefor_coldwar_a4.json | 6 +- .../factions/bluefor_coldwar_a4_mb339.json | 6 +- resources/factions/bluefor_modern.json | 22 +- resources/factions/canada_2005.json | 10 +- resources/factions/china_2010.json | 12 +- resources/factions/dprk_1950_fictional.json | 16 +- .../factions/france_1985_frenchpack.json | 10 +- resources/factions/france_1995.json | 22 +- .../factions/france_2005_frenchpack.json | 10 +- resources/factions/france_2005_modded.json | 10 +- resources/factions/gdr_1985.json | 16 +- resources/factions/georgia_2008.json | 16 +- resources/factions/germany_1942.json | 10 +- resources/factions/germany_1944.json | 18 +- resources/factions/germany_1944_free.json | 6 +- resources/factions/germany_1990.json | 10 +- resources/factions/greece_2005.json | 14 +- resources/factions/india_2010.json | 12 +- resources/factions/insurgents.json | 22 +- resources/factions/insurgents_hard.json | 28 +- resources/factions/insurgents_modded.json | 16 +- resources/factions/iran_1988.json | 18 +- resources/factions/iran_2015.json | 16 +- resources/factions/iraq_1991.json | 18 +- resources/factions/israel_1948.json | 8 +- resources/factions/israel_1973.json | 6 +- resources/factions/israel_1982.json | 8 +- resources/factions/israel_2000.json | 18 +- resources/factions/italy_1990.json | 10 +- resources/factions/italy_1990_mb339.json | 10 +- resources/factions/japan_2005.json | 16 +- resources/factions/libya_2011.json | 16 +- resources/factions/netherlands_1990.json | 8 +- resources/factions/north_korea_2000.json | 20 +- resources/factions/pakistan_2015.json | 12 +- 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 | 24 +- resources/factions/redfor_china_2010.json | 20 +- resources/factions/redfor_russia_2010.json | 20 +- resources/factions/russia_1955.json | 16 +- resources/factions/russia_1965.json | 18 +- .../factions/russia_1970_limited_air.json | 18 +- resources/factions/russia_1975.json | 20 +- resources/factions/russia_1990.json | 16 +- resources/factions/russia_2010.json | 16 +- resources/factions/russia_2010_hds.json | 16 +- resources/factions/russia_2020.json | 14 +- resources/factions/soviet_union_1943.json | 8 +- resources/factions/spain_1990.json | 6 +- resources/factions/sweden_1970.json | 8 +- resources/factions/sweden_1990.json | 12 +- resources/factions/syria_1948.json | 12 +- resources/factions/syria_1967.json | 18 +- .../factions/syria_1967_with_ww2_weapons.json | 20 +- resources/factions/syria_1973.json | 14 +- resources/factions/syria_1982.json | 12 +- resources/factions/syria_2011.json | 22 +- resources/factions/turkey_2005.json | 12 +- resources/factions/uae_2005.json | 8 +- resources/factions/uk_1944.json | 6 +- resources/factions/uk_1990.json | 20 +- resources/factions/ukraine_2010.json | 12 +- resources/factions/unc_1950_fictional.json | 10 +- resources/factions/us_aggressors.json | 14 +- resources/factions/usa_1944.json | 10 +- resources/factions/usa_1955.json | 8 +- resources/factions/usa_1960.json | 4 +- resources/factions/usa_1965.json | 8 +- resources/factions/usa_1975.json | 8 +- resources/factions/usa_1990.json | 22 +- resources/factions/usa_2005.json | 26 +- resources/factions/usa_2005_c130.json | 24 +- resources/factions/usa_2005_modded.json | 24 +- resources/factions/usn_1985.json | 14 +- tests/resources/invalid_faction_country.json | 16 +- tests/resources/valid_faction.json | 16 +- tests/test_factions.py | 16 +- 128 files changed, 1068 insertions(+), 1072 deletions(-) diff --git a/game/data/aaa_db.py b/game/data/aaa_db.py index d7e7d101..3175f7b4 100644 --- a/game/data/aaa_db.py +++ b/game/data/aaa_db.py @@ -2,20 +2,20 @@ from dcs.vehicles import AirDefence AAA_UNITS = [ AirDefence.SPAAA_Gepard, - AirDefence.SPAAA_ZSU_23_4_Shilka, - AirDefence.AAA_Vulcan_M163, - AirDefence.AAA_ZU_23_Closed, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.SPAAA_Vulcan_M163, + AirDefence.AAA_ZU_23_Closed_Emplacement, AirDefence.AAA_ZU_23_Emplacement, - AirDefence.AAA_ZU_23_on_Ural_375, - AirDefence.AAA_ZU_23_Insurgent_Closed, - AirDefence.AAA_ZU_23_Insurgent_on_Ural_375, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, + AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent, + AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375, AirDefence.AAA_ZU_23_Insurgent, AirDefence.AAA_8_8cm_Flak_18, - AirDefence.AAA_Flak_38, + AirDefence.AAA_Flak_38_20mm, AirDefence.AAA_8_8cm_Flak_36, AirDefence.AAA_8_8cm_Flak_37, - AirDefence.AAA_Flak_Vierling_38, - AirDefence.AAA_Kdo_G_40, + 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_40mm_Bofors, ] diff --git a/game/data/radar_db.py b/game/data/radar_db.py index 10e38f42..e4de3efe 100644 --- a/game/data/radar_db.py +++ b/game/data/radar_db.py @@ -24,29 +24,29 @@ from dcs.vehicles import AirDefence UNITS_WITH_RADAR = [ # Radars - AirDefence.SAM_SA_15_Tor_9A331, - AirDefence.SAM_SA_11_Buk_CC_9S470M1, - AirDefence.SAM_Patriot_AMG_AN_MRC_137, - AirDefence.SAM_Patriot_ECS_AN_MSQ_104, + AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.SAM_SA_11_Buk_Gadfly_C2, + AirDefence.SAM_Patriot_CR__AMG_AN_MRC_137, + AirDefence.SAM_Patriot_ECS, AirDefence.SPAAA_Gepard, - AirDefence.AAA_Vulcan_M163, - AirDefence.SPAAA_ZSU_23_4_Shilka, + AirDefence.SPAAA_Vulcan_M163, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, AirDefence.EWR_1L13, - AirDefence.SAM_SA_6_Kub_STR_9S91, - AirDefence.SAM_SA_10_S_300PS_TR_30N6, - AirDefence.SAM_SA_10_S_300PS_SR_5N66M, + AirDefence.SAM_SA_6_Kub_Long_Track_STR, + AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR, + AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR, AirDefence.EWR_55G6, - AirDefence.SAM_SA_10_S_300PS_SR_64H6E, - AirDefence.SAM_SA_11_Buk_SR_9S18M1, - AirDefence.CP_9S80M1_Sborka, - AirDefence.SAM_Hawk_TR_AN_MPQ_46, - AirDefence.SAM_Hawk_SR_AN_MPQ_50, - AirDefence.SAM_Patriot_STR_AN_MPQ_53, + AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR, + AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR, + AirDefence.MCC_SR_Sborka_Dog_Ear_SR, + AirDefence.SAM_Hawk_TR__AN_MPQ_46, + AirDefence.SAM_Hawk_SR__AN_MPQ_50, + AirDefence.SAM_Patriot_STR, AirDefence.SAM_Hawk_CWAR_AN_MPQ_55, - AirDefence.SAM_SR_P_19, + AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, AirDefence.SAM_Roland_EWR, - AirDefence.SAM_SA_3_S_125_TR_SNR, - AirDefence.SAM_SA_2_TR_SNR_75_Fan_Song, + AirDefence.SAM_SA_3_S_125_Low_Blow_TR, + AirDefence.SAM_SA_2_S_75_Fan_Song_TR, AirDefence.HQ_7_Self_Propelled_STR, # Ships CVN_70_Carl_Vinson, diff --git a/game/data/weapons.py b/game/data/weapons.py index 09fc7ef7..b97b945b 100644 --- a/game/data/weapons.py +++ b/game/data/weapons.py @@ -119,8 +119,8 @@ _WEAPON_FALLBACKS = [ # ADM-141 TALD (Weapons.ADM_141A, None), (Weapons.ADM_141A_, None), - (Weapons.ADM_141A__, None), - (Weapons.ADM_141B, None), + (Weapons.ADM_141A_TALD, None), + (Weapons.ADM_141B_TALD, None), # AGM-114K Hellfire (Weapons.AGM114x2_OH_58, Weapons.M260_HYDRA), # assuming OH-58 and not MQ-9 (Weapons.AGM_114K, None), # Only for RQ-1 diff --git a/game/db.py b/game/db.py index 3f79b222..2185fef3 100644 --- a/game/db.py +++ b/game/db.py @@ -51,7 +51,6 @@ from dcs.planes import ( F_117A, F_14A_135_GR, F_14B, - F_111F, F_15C, F_15E, F_16A, @@ -116,8 +115,8 @@ from dcs.planes import ( I_16, ) from dcs.ships import ( - Armed_speedboat, - Bulk_cargo_ship_Yakushev, + Boat_Armed_Hi_speed, + Bulker_Yakushev, CVN_71_Theodore_Roosevelt, CVN_72_Abraham_Lincoln, CVN_73_George_Washington, @@ -125,7 +124,7 @@ from dcs.ships import ( CVN_75_Harry_S__Truman, CV_1143_5_Admiral_Kuznetsov, CV_1143_5_Admiral_Kuznetsov_2017, - Dry_cargo_ship_Ivanov, + Cargo_Ivanov, LHA_1_Tarawa, Tanker_Elnya_160, ship_map, @@ -360,7 +359,7 @@ x_map = { } from this example `Identifier` should be used (which may or may not include category of the unit and dot + underscore characters). -For example, player accessible Hornet is called `FA_18C_hornet`, and MANPAD Igla is called `AirDefence.SAM_SA_18_Igla_S_MANPADS` +For example, player accessible Hornet is called `FA_18C_hornet`, and MANPAD Igla is called `AirDefence.MANPADS_SA_18_Igla_S_Grouse` """ # This should probably be much higher, but the AI doesn't rollover their budget @@ -453,7 +452,6 @@ PRICES = { Tu_160: 50, Tu_22M3: 40, Tu_95MS: 35, - F_111F: 21, # special IL_76MD: 30, An_26B: 25, @@ -487,9 +485,9 @@ PRICES = { Rafale_B: 26, # armor Armor.APC_MTLB: 4, - Armor.FDDM_Grad: 4, - Armor.ARV_BRDM_2: 6, - Armor.ARV_BTR_RD: 6, + Artillery.Grad_MRL_FDDM__FC: 4, + Armor.IFV_BRDM_2: 6, + Armor.APC_BTR_RD: 6, Armor.APC_BTR_80: 8, Armor.APC_BTR_82A: 10, Armor.MBT_T_55: 18, @@ -503,147 +501,147 @@ PRICES = { Armor.IFV_BMP_3: 18, Armor.ZBD_04A: 12, Armor.ZTZ_96B: 30, - Armor.APC_Cobra: 4, + Armor.APC_Cobra__Scout: 4, Armor.APC_M113: 6, - Armor.APC_M1043_HMMWV_Armament: 2, - Armor.ATGM_M1045_HMMWV_TOW: 8, + Armor.APC_HMMWV__Scout: 2, + Armor.ATGM_HMMWV: 8, Armor.IFV_M2A2_Bradley: 12, - Armor.APC_M1126_Stryker_ICV: 10, - Armor.SPG_M1128_Stryker_MGS: 14, - Armor.ATGM_M1134_Stryker: 12, + Armor.IFV_M1126_Stryker_ICV: 10, + Armor.SPG_Stryker_MGS: 14, + Armor.ATGM_Stryker: 12, Armor.MBT_M60A3_Patton: 16, Armor.MBT_M1A2_Abrams: 25, Armor.MBT_Leclerc: 25, Armor.MBT_Leopard_1A3: 20, Armor.MBT_Leopard_2: 25, - Armor.MBT_Merkava_Mk__4: 25, - Armor.TPz_Fuchs: 5, + Armor.MBT_Merkava_IV: 25, + Armor.APC_TPz_Fuchs: 5, Armor.MBT_Challenger_II: 25, Armor.IFV_Marder: 10, - Armor.IFV_MCV_80: 10, + Armor.IFV_Warrior: 10, Armor.IFV_LAV_25: 7, - Artillery.MLRS_M270: 55, - Artillery.SPH_M109_Paladin: 25, - Artillery.SPH_2S9_Nona: 12, - Artillery.SPH_2S1_Gvozdika: 18, - Artillery.SPH_2S3_Akatsia: 24, - Artillery.SPH_2S19_Msta: 30, - Artillery.MLRS_BM_21_Grad: 15, - Artillery.MLRS_9K57_Uragan_BM_27: 50, - Artillery.MLRS_9A52_Smerch: 40, - Artillery._2B11_mortar: 4, - Artillery.SpGH_Dana: 26, - Unarmed.Transport_UAZ_469: 3, - Unarmed.Transport_Ural_375: 3, + Artillery.MLRS_M270_227mm: 55, + Artillery.SPH_M109_Paladin_155mm: 25, + Artillery.SPH_2S9_Nona_120mm_M: 12, + Artillery.SPH_2S1_Gvozdika_122mm: 18, + Artillery.SPH_2S3_Akatsia_152mm: 24, + Artillery.SPH_2S19_Msta_152mm: 30, + Artillery.MLRS_BM_21_Grad_122mm: 15, + Artillery.MLRS_BM_27_Uragan_220mm: 50, + Artillery.MLRS_9A52_Smerch_HE_300mm: 40, + Artillery.Mortar_2B11_120mm: 4, + Artillery.SPH_Dana_vz77_152mm: 26, + Unarmed.LUV_UAZ_469_Jeep: 3, + Unarmed.Truck_Ural_375: 3, Infantry.Infantry_M4: 1, - Infantry.Soldier_AK: 1, - Unarmed.Transport_M818: 3, + Infantry.Infantry_AK_74: 1, + Unarmed.Truck_M818_6x6: 3, # WW2 Armor.MT_Pz_Kpfw_V_Panther_Ausf_G: 24, - Armor.MT_Pz_Kpfw_IV_Ausf_H: 16, + Armor.MT_PzIV_H: 16, Armor.HT_Pz_Kpfw_VI_Tiger_I: 24, Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II: 26, - Armor.TD_Jagdpanther_G1: 18, - Armor.TD_Jagdpanzer_IV: 11, - Armor.Sd_Kfz_184_Elefant: 18, - Armor.APC_Sd_Kfz_251: 4, - Armor.AC_Sd_Kfz_234_2_Puma: 8, + Armor.SPG_Jagdpanther_G1: 18, + Armor.SPG_Jagdpanzer_IV: 11, + Armor.SPG_Sd_Kfz_184_Elefant: 18, + Armor.APC_Sd_Kfz_251_Halftrack: 4, + Armor.IFV_Sd_Kfz_234_2_Puma: 8, Armor.MT_M4_Sherman: 12, Armor.MT_M4A4_Sherman_Firefly: 16, Armor.CT_Cromwell_IV: 12, - Armor.M30_Cargo_Carrier: 2, - Armor.APC_M2A1: 4, + Unarmed.Carrier_M30_Cargo: 2, + Armor.APC_M2A1_Halftrack: 4, Armor.CT_Centaur_IV: 10, Armor.HIT_Churchill_VII: 16, - Armor.LAC_M8_Greyhound: 8, - Armor.TD_M10_GMC: 14, - Armor.StuG_III_Ausf__G: 12, - Armor.StuG_IV: 14, - Artillery.M12_GMC: 10, - Artillery.Sturmpanzer_IV_Brummbär: 10, - Armor.Daimler_Armoured_Car: 8, + Armor.Car_M8_Greyhound_Armored: 8, + Armor.SPG_M10_GMC: 14, + Armor.SPG_StuG_III_Ausf__G: 12, + Armor.SPG_StuG_IV: 14, + Artillery.SPG_M12_GMC_155mm: 10, + Artillery.SPG_Sturmpanzer_IV_Brummbar: 10, + Armor.Car_Daimler_Armored: 8, Armor.LT_Mk_VII_Tetrarch: 8, - Armor.M4_Tractor: 2, + Unarmed.Tractor_M4_Hi_Speed: 2, # ship CV_1143_5_Admiral_Kuznetsov: 100, CVN_74_John_C__Stennis: 100, LHA_1_Tarawa: 50, - Bulk_cargo_ship_Yakushev: 10, - Armed_speedboat: 10, - Dry_cargo_ship_Ivanov: 10, + Bulker_Yakushev: 10, + Boat_Armed_Hi_speed: 10, + Cargo_Ivanov: 10, Tanker_Elnya_160: 10, # Air Defence units - AirDefence.SAM_SA_19_Tunguska_2S6: 30, - AirDefence.SAM_SA_6_Kub_LN_2P25: 20, - AirDefence.SAM_SA_3_S_125_LN_5P73: 6, - AirDefence.SAM_SA_11_Buk_LN_9A310M1: 30, - AirDefence.SAM_SA_11_Buk_CC_9S470M1: 25, - AirDefence.SAM_SA_11_Buk_SR_9S18M1: 28, - AirDefence.SAM_SA_8_Osa_9A33: 28, - AirDefence.SAM_SA_15_Tor_9A331: 40, - AirDefence.SAM_SA_13_Strela_10M3_9A35M3: 16, - AirDefence.SAM_SA_9_Strela_1_9P31: 12, + AirDefence.SAM_SA_19_Tunguska_Grison: 30, + AirDefence.SAM_SA_6_Kub_Gainful_TEL: 20, + AirDefence.SAM_SA_3_S_125_Goa_LN: 6, + AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL: 30, + AirDefence.SAM_SA_11_Buk_Gadfly_C2: 25, + AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR: 28, + AirDefence.SAM_SA_8_Osa_Gecko_TEL: 28, + AirDefence.SAM_SA_15_Tor_Gauntlet: 40, + AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL: 16, + AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL: 12, AirDefence.SAM_SA_8_Osa_LD_9T217: 22, - AirDefence.SAM_Patriot_AMG_AN_MRC_137: 35, - AirDefence.SAM_Patriot_ECS_AN_MSQ_104: 30, + AirDefence.SAM_Patriot_CR__AMG_AN_MRC_137: 35, + AirDefence.SAM_Patriot_ECS: 30, AirDefence.SPAAA_Gepard: 24, - AirDefence.SAM_Hawk_PCP: 14, - AirDefence.AAA_Vulcan_M163: 10, + AirDefence.SAM_Hawk_Generator__PCP: 14, + AirDefence.SPAAA_Vulcan_M163: 10, AirDefence.SAM_Hawk_LN_M192: 8, AirDefence.SAM_Chaparral_M48: 16, - AirDefence.SAM_Linebacker_M6: 18, - AirDefence.SAM_Patriot_LN_M901: 15, - AirDefence.SAM_Avenger_M1097: 20, + AirDefence.SAM_Linebacker___Bradley_M6: 18, + AirDefence.SAM_Patriot_LN: 15, + AirDefence.SAM_Avenger__Stinger: 20, AirDefence.SAM_Patriot_EPP_III: 15, - AirDefence.SAM_Patriot_ICC: 18, + AirDefence.SAM_Patriot_C2_ICC: 18, AirDefence.SAM_Roland_ADS: 12, - AirDefence.Stinger_MANPADS: 6, - AirDefence.SAM_Stinger_comm_dsr: 4, - AirDefence.SAM_Stinger_comm: 4, - AirDefence.SPAAA_ZSU_23_4_Shilka: 10, - AirDefence.AAA_ZSU_57_2: 12, - AirDefence.AAA_ZU_23_Closed: 6, + AirDefence.MANPADS_Stinger: 6, + AirDefence.MANPADS_Stinger_C2_Desert: 4, + AirDefence.MANPADS_Stinger_C2: 4, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish: 10, + AirDefence.SPAAA_ZSU_57_2: 12, + AirDefence.AAA_ZU_23_Closed_Emplacement: 6, AirDefence.AAA_ZU_23_Emplacement: 6, - AirDefence.AAA_ZU_23_on_Ural_375: 7, - AirDefence.AAA_ZU_23_Insurgent_Closed: 6, - AirDefence.AAA_ZU_23_Insurgent_on_Ural_375: 7, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375: 7, + AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent: 6, + AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375: 7, AirDefence.AAA_ZU_23_Insurgent: 6, - AirDefence.SAM_SA_18_Igla_MANPADS: 10, - AirDefence.SAM_SA_18_Igla_comm: 8, - AirDefence.SAM_SA_18_Igla_S_MANPADS: 12, - AirDefence.SAM_SA_18_Igla_S_comm: 8, + AirDefence.MANPADS_SA_18_Igla_Grouse: 10, + AirDefence.MANPADS_SA_18_Igla_Grouse_C2: 8, + AirDefence.MANPADS_SA_18_Igla_S_Grouse: 12, + AirDefence.MANPADS_SA_18_Igla_S_Grouse_C2: 8, AirDefence.EWR_1L13: 30, - AirDefence.SAM_SA_6_Kub_STR_9S91: 22, + AirDefence.SAM_SA_6_Kub_Long_Track_STR: 22, AirDefence.EWR_55G6: 30, - AirDefence.CP_9S80M1_Sborka: 10, - AirDefence.SAM_Hawk_TR_AN_MPQ_46: 14, - AirDefence.SAM_Hawk_SR_AN_MPQ_50: 18, - AirDefence.SAM_Patriot_STR_AN_MPQ_53: 22, + AirDefence.MCC_SR_Sborka_Dog_Ear_SR: 10, + AirDefence.SAM_Hawk_TR__AN_MPQ_46: 14, + AirDefence.SAM_Hawk_SR__AN_MPQ_50: 18, + AirDefence.SAM_Patriot_STR: 22, AirDefence.SAM_Hawk_CWAR_AN_MPQ_55: 20, - AirDefence.SAM_SR_P_19: 14, + AirDefence.SAM_P19_Flat_Face_SR__SA_2_3: 14, AirDefence.SAM_Roland_EWR: 16, - AirDefence.SAM_SA_3_S_125_TR_SNR: 14, - AirDefence.SAM_SA_2_LN_SM_90: 8, - AirDefence.SAM_SA_2_TR_SNR_75_Fan_Song: 12, - AirDefence.Rapier_FSA_Launcher: 6, - AirDefence.Rapier_FSA_Optical_Tracker: 6, - AirDefence.Rapier_FSA_Blindfire_Tracker: 8, + AirDefence.SAM_SA_3_S_125_Low_Blow_TR: 14, + AirDefence.SAM_SA_2_S_75_Guideline_LN: 8, + AirDefence.SAM_SA_2_S_75_Fan_Song_TR: 12, + AirDefence.SAM_Rapier_LN: 6, + AirDefence.SAM_Rapier_Tracker: 6, + AirDefence.SAM_Rapier_Blindfire_TR: 8, AirDefence.HQ_7_Self_Propelled_LN: 20, AirDefence.HQ_7_Self_Propelled_STR: 24, AirDefence.AAA_8_8cm_Flak_18: 6, - AirDefence.AAA_Flak_38: 6, + AirDefence.AAA_Flak_38_20mm: 6, AirDefence.AAA_8_8cm_Flak_36: 8, AirDefence.AAA_8_8cm_Flak_37: 9, - AirDefence.AAA_Flak_Vierling_38: 5, - AirDefence.AAA_Kdo_G_40: 8, - AirDefence.Flak_Searchlight_37: 4, - AirDefence.Maschinensatz_33: 10, + AirDefence.AAA_Flak_Vierling_38_Quad_20mm: 5, + AirDefence.AAA_SP_Kdo_G_40: 8, + AirDefence.SL_Flakscheinwerfer_37: 4, + AirDefence.PU_Maschinensatz_33: 10, AirDefence.AAA_8_8cm_Flak_41: 10, AirDefence.EWR_FuMG_401_Freya_LZ: 25, - AirDefence.AAA_Bofors_40mm: 8, + AirDefence.AAA_40mm_Bofors: 8, AirDefence.AAA_M1_37mm: 7, - AirDefence.AAA_M45_Quadmount: 4, - AirDefence.AA_gun_QF_3_7: 10, + AirDefence.AAA_M45_Quadmount_HB_12_7mm: 4, + AirDefence.AAA_QF_3_7: 10, # FRENCH PACK MOD frenchpack.AMX_10RCR: 10, frenchpack.AMX_10RCR_SEPAR: 12, @@ -674,12 +672,12 @@ PRICES = { frenchpack.DIM__TOYOTA_DESERT: 2, frenchpack.DIM__KAMIKAZE: 6, # SA-10 - AirDefence.SAM_SA_10_S_300PS_CP_54K6: 18, - AirDefence.SAM_SA_10_S_300PS_TR_30N6: 24, - AirDefence.SAM_SA_10_S_300PS_SR_5N66M: 30, - AirDefence.SAM_SA_10_S_300PS_SR_64H6E: 30, - AirDefence.SAM_SA_10_S_300PS_LN_5P85C: 22, - AirDefence.SAM_SA_10_S_300PS_LN_5P85D: 22, + AirDefence.SAM_SA_10_S_300_Grumble_C2: 18, + AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR: 24, + AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR: 30, + AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR: 30, + AirDefence.SAM_SA_10_S_300_Grumble_TEL_C: 22, + AirDefence.SAM_SA_10_S_300_Grumble_TEL_D: 22, # High digit sams mod highdigitsams.AAA_SON_9_Fire_Can: 8, highdigitsams.AAA_100mm_KS_19: 10, @@ -786,7 +784,6 @@ UNIT_BY_TASK = { A_10C_2, A_20G, B_17G, - F_111F, B_1B, B_52H, F_117A, @@ -844,18 +841,18 @@ UNIT_BY_TASK = { Armor.APC_MTLB, Armor.APC_MTLB, Armor.APC_MTLB, - Armor.FDDM_Grad, - Armor.FDDM_Grad, - Armor.FDDM_Grad, - Armor.FDDM_Grad, - Armor.FDDM_Grad, - Armor.ARV_BRDM_2, - Armor.ARV_BRDM_2, - Armor.ARV_BRDM_2, - Armor.ARV_BTR_RD, - Armor.ARV_BTR_RD, - Armor.ARV_BTR_RD, - Armor.ARV_BTR_RD, + 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.IFV_BRDM_2, + Armor.IFV_BRDM_2, + Armor.IFV_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, @@ -885,33 +882,33 @@ UNIT_BY_TASK = { Armor.MBT_T_80U, Armor.MBT_T_90, Armor.ZTZ_96B, - Armor.APC_Cobra, - Armor.APC_Cobra, - Armor.APC_Cobra, - Armor.APC_Cobra, + Armor.APC_Cobra__Scout, + Armor.APC_Cobra__Scout, + Armor.APC_Cobra__Scout, + Armor.APC_Cobra__Scout, Armor.APC_M113, Armor.APC_M113, Armor.APC_M113, Armor.APC_M113, - Armor.TPz_Fuchs, - Armor.TPz_Fuchs, - Armor.TPz_Fuchs, - Armor.TPz_Fuchs, - Armor.ATGM_M1045_HMMWV_TOW, - Armor.ATGM_M1045_HMMWV_TOW, - Armor.APC_M1043_HMMWV_Armament, - Armor.APC_M1043_HMMWV_Armament, + Armor.APC_TPz_Fuchs, + Armor.APC_TPz_Fuchs, + Armor.APC_TPz_Fuchs, + Armor.APC_TPz_Fuchs, + Armor.ATGM_HMMWV, + Armor.ATGM_HMMWV, + Armor.APC_HMMWV__Scout, + Armor.APC_HMMWV__Scout, Armor.IFV_M2A2_Bradley, Armor.IFV_M2A2_Bradley, - Armor.ATGM_M1134_Stryker, - Armor.ATGM_M1134_Stryker, - Armor.APC_M1126_Stryker_ICV, - Armor.APC_M1126_Stryker_ICV, - Armor.APC_M1126_Stryker_ICV, - Armor.SPG_M1128_Stryker_MGS, - Armor.IFV_MCV_80, - Armor.IFV_MCV_80, - Armor.IFV_MCV_80, + 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, @@ -927,92 +924,92 @@ UNIT_BY_TASK = { Armor.MBT_Leclerc, Armor.MBT_Leopard_2, Armor.MBT_Challenger_II, - Armor.MBT_Merkava_Mk__4, + Armor.MBT_Merkava_IV, Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, - Armor.MT_Pz_Kpfw_IV_Ausf_H, + Armor.MT_PzIV_H, Armor.HT_Pz_Kpfw_VI_Tiger_I, Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, - Armor.APC_Sd_Kfz_251, - Armor.APC_Sd_Kfz_251, - Armor.APC_Sd_Kfz_251, - Armor.APC_Sd_Kfz_251, - Armor.AC_Sd_Kfz_234_2_Puma, - Armor.AC_Sd_Kfz_234_2_Puma, + 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.MT_M4_Sherman, Armor.MT_M4A4_Sherman_Firefly, Armor.CT_Cromwell_IV, - Armor.M30_Cargo_Carrier, - Armor.M30_Cargo_Carrier, - Armor.APC_M2A1, - Armor.APC_M2A1, - Armor.APC_M2A1, - Armor.APC_M2A1, + 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.MT_Pz_Kpfw_IV_Ausf_H, + Armor.MT_PzIV_H, Armor.HT_Pz_Kpfw_VI_Tiger_I, Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, - Armor.TD_Jagdpanther_G1, - Armor.TD_Jagdpanzer_IV, - Armor.Sd_Kfz_184_Elefant, - Armor.APC_Sd_Kfz_251, - Armor.AC_Sd_Kfz_234_2_Puma, + 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.MT_M4_Sherman, Armor.MT_M4A4_Sherman_Firefly, Armor.CT_Cromwell_IV, - Armor.M30_Cargo_Carrier, - Armor.M30_Cargo_Carrier, - Armor.M30_Cargo_Carrier, - Armor.APC_M2A1, - Armor.APC_M2A1, + 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.LAC_M8_Greyhound, - Armor.LAC_M8_Greyhound, - Armor.TD_M10_GMC, - Armor.TD_M10_GMC, - Armor.StuG_III_Ausf__G, - Armor.StuG_IV, - Artillery.M12_GMC, - Artillery.Sturmpanzer_IV_Brummbär, - Armor.Daimler_Armoured_Car, + 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, + Artillery.SPG_Sturmpanzer_IV_Brummbar, + Armor.Car_Daimler_Armored, Armor.LT_Mk_VII_Tetrarch, - Artillery.MLRS_M270, - Artillery.SPH_M109_Paladin, - Artillery.SPH_2S9_Nona, - Artillery.SPH_2S1_Gvozdika, - Artillery.SPH_2S3_Akatsia, - Artillery.SPH_2S19_Msta, - Artillery.MLRS_BM_21_Grad, - Artillery.MLRS_BM_21_Grad, - Artillery.MLRS_9K57_Uragan_BM_27, - Artillery.MLRS_9A52_Smerch, - Artillery.SpGH_Dana, - Artillery.M12_GMC, - Artillery.Sturmpanzer_IV_Brummbär, - AirDefence.AAA_ZU_23_on_Ural_375, - AirDefence.AAA_ZU_23_Insurgent_on_Ural_375, - AirDefence.AAA_ZSU_57_2, - AirDefence.SPAAA_ZSU_23_4_Shilka, - AirDefence.SAM_SA_8_Osa_9A33, - AirDefence.SAM_SA_9_Strela_1_9P31, - AirDefence.SAM_SA_13_Strela_10M3_9A35M3, - AirDefence.SAM_SA_15_Tor_9A331, - AirDefence.SAM_SA_19_Tunguska_2S6, + Artillery.MLRS_M270_227mm, + Artillery.SPH_M109_Paladin_155mm, + Artillery.SPH_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_BM_27_Uragan_220mm, + Artillery.MLRS_9A52_Smerch_HE_300mm, + Artillery.SPH_Dana_vz77_152mm, + Artillery.SPG_M12_GMC_155mm, + Artillery.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.AAA_Vulcan_M163, - AirDefence.SAM_Linebacker_M6, + AirDefence.SPAAA_Vulcan_M163, + AirDefence.SAM_Linebacker___Bradley_M6, AirDefence.SAM_Chaparral_M48, - AirDefence.SAM_Avenger_M1097, + 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_40mm_Bofors, AirDefence.AAA_M1_37mm, - AirDefence.AA_gun_QF_3_7, + AirDefence.AAA_QF_3_7, frenchpack.DIM__TOYOTA_BLUE, frenchpack.DIM__TOYOTA_DESERT, frenchpack.DIM__TOYOTA_GREEN, @@ -1037,13 +1034,13 @@ UNIT_BY_TASK = { ], AirDefence: [], Reconnaissance: [ - Unarmed.Transport_M818, - Unarmed.Transport_Ural_375, - Unarmed.Transport_UAZ_469, + Unarmed.Truck_M818_6x6, + Unarmed.Truck_Ural_375, + Unarmed.LUV_UAZ_469_Jeep, ], Nothing: [ Infantry.Infantry_M4, - Infantry.Soldier_AK, + Infantry.Infantry_AK_74, ], Embarking: [], Carriage: [ @@ -1052,10 +1049,10 @@ UNIT_BY_TASK = { CV_1143_5_Admiral_Kuznetsov, ], CargoTransportation: [ - Dry_cargo_ship_Ivanov, - Bulk_cargo_ship_Yakushev, + Cargo_Ivanov, + Bulker_Yakushev, Tanker_Elnya_160, - Armed_speedboat, + Boat_Armed_Hi_speed, ], } @@ -1063,41 +1060,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_M6, - AirDefence.SAM_SA_9_Strela_1_9P31, - AirDefence.SAM_SA_8_Osa_9A33, - AirDefence.SAM_SA_19_Tunguska_2S6, - AirDefence.SAM_SA_6_Kub_LN_2P25, - AirDefence.SAM_SA_8_Osa_9A33, - AirDefence.SAM_SA_3_S_125_LN_5P73, - AirDefence.SAM_Hawk_PCP, - AirDefence.SAM_SA_2_LN_SM_90, - AirDefence.SAM_SA_11_Buk_LN_9A310M1, + 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_Generator__PCP, + AirDefence.SAM_SA_2_S_75_Guideline_LN, + AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL, ] """ Used to convert SAM site parts to the corresponding site """ SAM_CONVERT = { - AirDefence.SAM_SR_P_19: AirDefence.SAM_SA_3_S_125_LN_5P73, - AirDefence.SAM_SA_3_S_125_TR_SNR: AirDefence.SAM_SA_3_S_125_LN_5P73, - AirDefence.SAM_SA_3_S_125_LN_5P73: AirDefence.SAM_SA_3_S_125_LN_5P73, - AirDefence.SAM_SA_6_Kub_LN_2P25: AirDefence.SAM_SA_6_Kub_LN_2P25, - AirDefence.SAM_SA_6_Kub_STR_9S91: AirDefence.SAM_SA_6_Kub_LN_2P25, - AirDefence.SAM_SA_10_S_300PS_LN_5P85C: AirDefence.SAM_SA_10_S_300PS_LN_5P85C, - AirDefence.SAM_SA_10_S_300PS_SR_5N66M: AirDefence.SAM_SA_10_S_300PS_LN_5P85C, - AirDefence.SAM_SA_10_S_300PS_TR_30N6: AirDefence.SAM_SA_10_S_300PS_LN_5P85C, - AirDefence.SAM_SA_10_S_300PS_CP_54K6: AirDefence.SAM_SA_10_S_300PS_LN_5P85C, - AirDefence.SAM_SA_10_S_300PS_SR_64H6E: AirDefence.SAM_SA_10_S_300PS_CP_54K6, - AirDefence.SAM_Hawk_TR_AN_MPQ_46: AirDefence.SAM_Hawk_PCP, - AirDefence.SAM_Hawk_SR_AN_MPQ_50: AirDefence.SAM_Hawk_PCP, - AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_PCP, + 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_Long_Track_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_Generator__PCP, + AirDefence.SAM_Hawk_SR__AN_MPQ_50: AirDefence.SAM_Hawk_Generator__PCP, + AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_Generator__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_300PS_TR_30N6: AirDefence.SAM_SA_10_S_300PS_CP_54K6, - AirDefence.SAM_SR_P_19: AirDefence.SAM_SA_2_LN_SM_90, + 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, }, } @@ -1227,7 +1224,6 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { F_14A_135_GR: COMMON_OVERRIDE, F_14B: COMMON_OVERRIDE, F_15C: COMMON_OVERRIDE, - F_111F: COMMON_OVERRIDE, F_22A: COMMON_OVERRIDE, F_16C_50: COMMON_OVERRIDE, JF_17: COMMON_OVERRIDE, @@ -1462,9 +1458,9 @@ def find_unittype(for_task: Task, country_name: str) -> List[Type[UnitType]]: MANPADS: List[VehicleType] = [ - AirDefence.SAM_SA_18_Igla_MANPADS, - AirDefence.SAM_SA_18_Igla_S_MANPADS, - AirDefence.Stinger_MANPADS, + AirDefence.MANPADS_SA_18_Igla_Grouse, + AirDefence.MANPADS_SA_18_Igla_S_Grouse, + AirDefence.MANPADS_Stinger, ] INFANTRY: List[VehicleType] = [ @@ -1473,28 +1469,28 @@ INFANTRY: List[VehicleType] = [ Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, - Infantry.Soldier_RPG, + Infantry.Infantry_RPG, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Infantry_M4, - Infantry.Soldier_M249, - Artillery._2B11_mortar, - Infantry.Soldier_AK, - Infantry.Soldier_AK, - Infantry.Soldier_AK, - Infantry.Soldier_AK, - Infantry.Soldier_AK, + Infantry.Infantry_M249, + Artillery.Mortar_2B11_120mm, + Infantry.Infantry_AK_74, + Infantry.Infantry_AK_74, + Infantry.Infantry_AK_74, + Infantry.Infantry_AK_74, + Infantry.Infantry_AK_74, Infantry.Paratrooper_RPG_16, - Infantry.Georgian_soldier_with_M4, - Infantry.Georgian_soldier_with_M4, - Infantry.Georgian_soldier_with_M4, - Infantry.Georgian_soldier_with_M4, - Infantry.Infantry_Soldier_Rus, - Infantry.Infantry_Soldier_Rus, - Infantry.Infantry_Soldier_Rus, - Infantry.Infantry_Soldier_Rus, + Infantry.Infantry_M4_Georgia, + Infantry.Infantry_M4_Georgia, + Infantry.Infantry_M4_Georgia, + Infantry.Infantry_M4_Georgia, + Infantry.Infantry_AK_74_Rus, + Infantry.Infantry_AK_74_Rus, + Infantry.Infantry_AK_74_Rus, + Infantry.Infantry_AK_74_Rus, Infantry.Infantry_SMLE_No_4_Mk_1, Infantry.Infantry_SMLE_No_4_Mk_1, Infantry.Infantry_SMLE_No_4_Mk_1, @@ -1505,9 +1501,9 @@ INFANTRY: List[VehicleType] = [ Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand, - Infantry.Infantry_Soldier_Insurgents, - Infantry.Infantry_Soldier_Insurgents, - Infantry.Infantry_Soldier_Insurgents, + Infantry.Insurgent_AK_74, + Infantry.Insurgent_AK_74, + Infantry.Insurgent_AK_74, ] diff --git a/game/theater/conflicttheater.py b/game/theater/conflicttheater.py index 32f8c300..a7e49223 100644 --- a/game/theater/conflicttheater.py +++ b/game/theater/conflicttheater.py @@ -97,8 +97,8 @@ class MizCampaignLoader: FARP_HELIPAD = "SINGLE_HELIPAD" EWR_UNIT_TYPE = AirDefence.EWR_55G6.id - SAM_UNIT_TYPE = AirDefence.SAM_SA_10_S_300PS_SR_64H6E.id - GARRISON_UNIT_TYPE = AirDefence.SAM_SA_19_Tunguska_2S6.id + SAM_UNIT_TYPE = AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR.id + GARRISON_UNIT_TYPE = AirDefence.SAM_SA_19_Tunguska_Grison.id OFFSHORE_STRIKE_TARGET_UNIT_TYPE = Fortification.Oil_platform.id SHIP_UNIT_TYPE = USS_Arleigh_Burke_IIa.id MISSILE_SITE_UNIT_TYPE = MissilesSS.SRBM_SS_1C_Scud_B_9K72_LN_9P117M.id @@ -107,15 +107,15 @@ class MizCampaignLoader: # Multiple options for the required SAMs so campaign designers can more # accurately see the coverage of their IADS for the expected type. REQUIRED_LONG_RANGE_SAM_UNIT_TYPES = { - AirDefence.SAM_Patriot_LN_M901.id, - AirDefence.SAM_SA_10_S_300PS_LN_5P85C.id, - AirDefence.SAM_SA_10_S_300PS_LN_5P85D.id, + AirDefence.SAM_Patriot_LN.id, + AirDefence.SAM_SA_10_S_300_Grumble_TEL_C.id, + AirDefence.SAM_SA_10_S_300_Grumble_TEL_D.id, } REQUIRED_MEDIUM_RANGE_SAM_UNIT_TYPES = { AirDefence.SAM_Hawk_LN_M192.id, - AirDefence.SAM_SA_2_LN_SM_90.id, - AirDefence.SAM_SA_3_S_125_LN_5P73.id, + AirDefence.SAM_SA_2_S_75_Guideline_LN.id, + AirDefence.SAM_SA_3_S_125_Goa_LN.id, } BASE_DEFENSE_RADIUS = nautical_miles(2) @@ -278,7 +278,7 @@ class MizCampaignLoader: control_point.captured_invert = group.late_activation control_points[control_point.id] = control_point for group in self.lhas(blue): - # TODO: Name the LHA. + # TODO: Name the LHA.db control_point = Lha("lha", group.position, next(self.control_point_id)) control_point.captured = blue control_point.captured_invert = group.late_activation diff --git a/gen/coastal/silkworm.py b/gen/coastal/silkworm.py index 8ccd7637..77324072 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, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, "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_9P31, + AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, "STRELA#0", self.position.x + 200, self.position.y + 15, diff --git a/gen/ground_forces/ai_ground_planner_db.py b/gen/ground_forces/ai_ground_planner_db.py index b34b055b..49575f89 100644 --- a/gen/ground_forces/ai_ground_planner_db.py +++ b/gen/ground_forces/ai_ground_planner_db.py @@ -14,16 +14,16 @@ TYPE_TANKS = [ Armor.MBT_Challenger_II, Armor.MBT_M1A2_Abrams, Armor.MBT_M60A3_Patton, - Armor.MBT_Merkava_Mk__4, + Armor.MBT_Merkava_IV, Armor.ZTZ_96B, # WW2 Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, - Armor.MT_Pz_Kpfw_IV_Ausf_H, + Armor.MT_PzIV_H, Armor.HT_Pz_Kpfw_VI_Tiger_I, Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, Armor.MT_M4_Sherman, Armor.MT_M4A4_Sherman_Firefly, - Armor.StuG_IV, + Armor.SPG_StuG_IV, Armor.CT_Centaur_IV, Armor.CT_Cromwell_IV, Armor.HIT_Churchill_VII, @@ -40,14 +40,14 @@ TYPE_TANKS = [ ] TYPE_ATGM = [ - Armor.ATGM_M1045_HMMWV_TOW, - Armor.ATGM_M1134_Stryker, + Armor.ATGM_HMMWV, + Armor.ATGM_Stryker, Armor.IFV_BMP_2, # WW2 (Tank Destroyers) - Armor.M30_Cargo_Carrier, - Armor.TD_Jagdpanzer_IV, - Armor.TD_Jagdpanther_G1, - Armor.TD_M10_GMC, + Unarmed.Carrier_M30_Cargo, + Armor.SPG_Jagdpanzer_IV, + Armor.SPG_Jagdpanther_G1, + Armor.SPG_M10_GMC, # Mods frenchpack.VBAE_CRAB_MMP, frenchpack.VAB_MEPHISTO, @@ -59,17 +59,17 @@ TYPE_IFV = [ Armor.IFV_BMP_2, Armor.IFV_BMP_1, Armor.IFV_Marder, - Armor.IFV_MCV_80, + Armor.IFV_Warrior, Armor.IFV_LAV_25, - Armor.SPG_M1128_Stryker_MGS, - Armor.AC_Sd_Kfz_234_2_Puma, + Armor.SPG_Stryker_MGS, + Armor.IFV_Sd_Kfz_234_2_Puma, Armor.IFV_M2A2_Bradley, Armor.IFV_BMD_1, Armor.ZBD_04A, # WW2 - Armor.AC_Sd_Kfz_234_2_Puma, - Armor.LAC_M8_Greyhound, - Armor.Daimler_Armoured_Car, + Armor.IFV_Sd_Kfz_234_2_Puma, + Armor.Car_M8_Greyhound_Armored, + Armor.Car_Daimler_Armored, # Mods frenchpack.ERC_90, frenchpack.VBAE_CRAB, @@ -77,23 +77,23 @@ TYPE_IFV = [ ] TYPE_APC = [ - Armor.APC_M1043_HMMWV_Armament, - Armor.APC_M1126_Stryker_ICV, + Armor.APC_HMMWV__Scout, + Armor.IFV_M1126_Stryker_ICV, Armor.APC_M113, Armor.APC_BTR_80, Armor.APC_BTR_82A, Armor.APC_MTLB, - Armor.APC_M2A1, - Armor.APC_Cobra, - Armor.APC_Sd_Kfz_251, + Armor.APC_M2A1_Halftrack, + Armor.APC_Cobra__Scout, + Armor.APC_Sd_Kfz_251_Halftrack, Armor.APC_AAV_7, - Armor.TPz_Fuchs, - Armor.ARV_BRDM_2, - Armor.ARV_BTR_RD, - Armor.FDDM_Grad, + Armor.APC_TPz_Fuchs, + Armor.IFV_BRDM_2, + Armor.APC_BTR_RD, + Artillery.Grad_MRL_FDDM__FC, # WW2 - Armor.APC_M2A1, - Armor.APC_Sd_Kfz_251, + Armor.APC_M2A1_Halftrack, + Armor.APC_Sd_Kfz_251_Halftrack, # Mods frenchpack.VAB__50, frenchpack.VBL__50, @@ -101,26 +101,26 @@ TYPE_APC = [ ] TYPE_ARTILLERY = [ - Artillery.MLRS_9A52_Smerch, - Artillery.SPH_2S1_Gvozdika, - Artillery.SPH_2S3_Akatsia, - Artillery.MLRS_BM_21_Grad, - Artillery.MLRS_9K57_Uragan_BM_27, - Artillery.SPH_M109_Paladin, - Artillery.MLRS_M270, - Artillery.SPH_2S9_Nona, - Artillery.SpGH_Dana, - Artillery.SPH_2S19_Msta, + Artillery.MLRS_9A52_Smerch_HE_300mm, + Artillery.SPH_2S1_Gvozdika_122mm, + Artillery.SPH_2S3_Akatsia_152mm, + Artillery.MLRS_BM_21_Grad_122mm, + Artillery.MLRS_BM_27_Uragan_220mm, + Artillery.SPH_M109_Paladin_155mm, + Artillery.MLRS_M270_227mm, + Artillery.SPH_2S9_Nona_120mm_M, + Artillery.SPH_Dana_vz77_152mm, + Artillery.SPH_2S19_Msta_152mm, Artillery.MLRS_FDDM, # WW2 - Artillery.Sturmpanzer_IV_Brummbär, - Artillery.M12_GMC, + Artillery.SPG_Sturmpanzer_IV_Brummbar, + Artillery.SPG_M12_GMC_155mm, ] TYPE_LOGI = [ - Unarmed.Transport_M818, + Unarmed.Truck_M818_6x6, Unarmed.Transport_KAMAZ_43101, - Unarmed.Transport_Ural_375, + Unarmed.Truck_Ural_375, Unarmed.Transport_GAZ_66, Unarmed.Transport_GAZ_3307, Unarmed.Transport_GAZ_3308, @@ -139,42 +139,42 @@ TYPE_LOGI = [ ] TYPE_INFANTRY = [ - Infantry.Infantry_Soldier_Insurgents, - Infantry.Soldier_AK, + Infantry.Insurgent_AK_74, + Infantry.Infantry_AK_74, Infantry.Infantry_M1_Garand, Infantry.Infantry_Mauser_98, Infantry.Infantry_SMLE_No_4_Mk_1, - Infantry.Georgian_soldier_with_M4, - Infantry.Infantry_Soldier_Rus, + Infantry.Infantry_M4_Georgia, + Infantry.Infantry_AK_74_Rus, Infantry.Paratrooper_AKS, Infantry.Paratrooper_RPG_16, - Infantry.Soldier_M249, + Infantry.Infantry_M249, Infantry.Infantry_M4, - Infantry.Soldier_RPG, + Infantry.Infantry_RPG, ] TYPE_SHORAD = [ - AirDefence.AAA_ZU_23_on_Ural_375, - AirDefence.AAA_ZU_23_Insurgent_on_Ural_375, - AirDefence.AAA_ZSU_57_2, - AirDefence.SPAAA_ZSU_23_4_Shilka, - AirDefence.SAM_SA_8_Osa_9A33, - AirDefence.SAM_SA_9_Strela_1_9P31, - AirDefence.SAM_SA_13_Strela_10M3_9A35M3, - AirDefence.SAM_SA_15_Tor_9A331, - AirDefence.SAM_SA_19_Tunguska_2S6, + AirDefence.SPAAA_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.AAA_Vulcan_M163, - AirDefence.SAM_Linebacker_M6, + AirDefence.SPAAA_Vulcan_M163, + AirDefence.SAM_Linebacker___Bradley_M6, AirDefence.SAM_Chaparral_M48, - AirDefence.SAM_Avenger_M1097, + 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_40mm_Bofors, AirDefence.AAA_M1_37mm, - AirDefence.AA_gun_QF_3_7, + AirDefence.AAA_QF_3_7, ] diff --git a/gen/missiles/scud_site.py b/gen/missiles/scud_site.py index eb548c19..23e13739 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.Transport_UAZ_469, + Unarmed.LUV_UAZ_469_Jeep, "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, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, "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_9P31, + AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, "STRELA#0", self.position.x + 200, self.position.y + 15, diff --git a/gen/missiles/v1_group.py b/gen/missiles/v1_group.py index bf1511a6..4387e312 100644 --- a/gen/missiles/v1_group.py +++ b/gen/missiles/v1_group.py @@ -46,7 +46,7 @@ class V1GroupGenerator(GroupGenerator): # Self defense flak flak_unit = random.choice( - [AirDefence.AAA_Flak_Vierling_38, AirDefence.AAA_Flak_38] + [AirDefence.AAA_Flak_Vierling_38_Quad_20mm, AirDefence.AAA_Flak_38_20mm] ) self.add_unit( diff --git a/gen/sam/aaa_bofors.py b/gen/sam/aaa_bofors.py index 919ec249..54e06f63 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.AAA_40mm_Bofors, "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 d3386700..6c779869 100644 --- a/gen/sam/aaa_flak.py +++ b/gen/sam/aaa_flak.py @@ -8,12 +8,12 @@ from gen.sam.airdefensegroupgenerator import ( ) GFLAK = [ - AirDefence.AAA_Flak_Vierling_38, + 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.AAA_Flak_38, + AirDefence.AAA_Flak_38_20mm, ] @@ -53,7 +53,7 @@ class FlakGenerator(AirDefenseGroupGenerator): search_pos = self.get_circular_position(random.randint(2, 3), 80) for index, pos in enumerate(search_pos): self.add_unit( - AirDefence.Flak_Searchlight_37, + AirDefence.SL_Flakscheinwerfer_37, "SearchLight#" + str(index), pos[0], pos[1], @@ -62,14 +62,14 @@ class FlakGenerator(AirDefenseGroupGenerator): # Support self.add_unit( - AirDefence.Maschinensatz_33, + AirDefence.PU_Maschinensatz_33, "MC33#", self.position.x - 20, self.position.y - 20, self.heading, ) self.add_unit( - AirDefence.AAA_Kdo_G_40, + AirDefence.AAA_SP_Kdo_G_40, "KDO#", self.position.x - 25, self.position.y - 20, diff --git a/gen/sam/aaa_ww2_ally_flak.py b/gen/sam/aaa_ww2_ally_flak.py index 1d1d06f4..5319ea75 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.AA_gun_QF_3_7, + AirDefence.AAA_QF_3_7, "AA#" + str(i), position[0], position[1], @@ -41,7 +41,7 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator): positions = self.get_circular_position(8, launcher_distance=90, coverage=360) for i, position in enumerate(positions): self.add_unit( - AirDefence.AAA_M45_Quadmount, + AirDefence.AAA_M45_Quadmount_HB_12_7mm, "AA#" + str(12 + i), position[0], position[1], @@ -57,14 +57,14 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator): random.randint(0, 360), ) self.add_unit( - Armor.M30_Cargo_Carrier, + Unarmed.Carrier_M30_Cargo, "LOG#1", self.position.x, self.position.y + 20, random.randint(0, 360), ) self.add_unit( - Armor.M4_Tractor, + Unarmed.Tractor_M4_Hi_Speed, "LOG#2", self.position.x + 20, self.position.y, diff --git a/gen/sam/aaa_zsu57.py b/gen/sam/aaa_zsu57.py index 3c877ee0..ad3c5eea 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.AAA_ZSU_57_2, + AirDefence.SPAAA_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 78ac4218..00e2f41f 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, + AirDefence.AAA_ZU_23_Closed_Emplacement_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 81a184f7..a64733be 100644 --- a/gen/sam/cold_war_flak.py +++ b/gen/sam/cold_war_flak.py @@ -39,14 +39,14 @@ class EarlyColdWarFlakGenerator(AirDefenseGroupGenerator): # Short range guns self.add_unit( - AirDefence.AAA_Bofors_40mm, + AirDefence.AAA_40mm_Bofors, "SHO#1", self.position.x - 40, self.position.y - 40, self.heading + 180, ), self.add_unit( - AirDefence.AAA_Bofors_40mm, + AirDefence.AAA_40mm_Bofors, "SHO#2", self.position.x + spacing * 2 + 40, self.position.y + spacing + 40, @@ -96,14 +96,14 @@ class ColdWarFlakGenerator(AirDefenseGroupGenerator): # Short range guns self.add_unit( - AirDefence.AAA_ZU_23_Closed, + AirDefence.AAA_ZU_23_Closed_Emplacement, "SHO#1", self.position.x - 40, self.position.y - 40, self.heading + 180, ), self.add_unit( - AirDefence.AAA_ZU_23_Closed, + AirDefence.AAA_ZU_23_Closed_Emplacement, "SHO#2", self.position.x + spacing * 2 + 40, self.position.y + spacing + 40, @@ -112,7 +112,7 @@ class ColdWarFlakGenerator(AirDefenseGroupGenerator): # Add a P19 Radar for EWR self.add_unit( - AirDefence.SAM_SR_P_19, + AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, "SR#0", self.position.x - 60, self.position.y - 20, diff --git a/gen/sam/ewrs.py b/gen/sam/ewrs.py index ef94f8b2..7164a09e 100644 --- a/gen/sam/ewrs.py +++ b/gen/sam/ewrs.py @@ -33,7 +33,7 @@ class DogEarGenerator(EwrGenerator): This is the SA-8 search radar, but used as an early warning radar. """ - unit_type = AirDefence.CP_9S80M1_Sborka + unit_type = AirDefence.MCC_SR_Sborka_Dog_Ear_SR class RolandEwrGenerator(EwrGenerator): @@ -51,7 +51,7 @@ class FlatFaceGenerator(EwrGenerator): This is the SA-3 search radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_SR_P_19 + unit_type = AirDefence.SAM_P19_Flat_Face_SR__SA_2_3 class PatriotEwrGenerator(EwrGenerator): @@ -60,7 +60,7 @@ class PatriotEwrGenerator(EwrGenerator): This is the Patriot search/track radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_Patriot_STR_AN_MPQ_53 + unit_type = AirDefence.SAM_Patriot_STR class BigBirdGenerator(EwrGenerator): @@ -69,7 +69,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_300PS_SR_64H6E + unit_type = AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR class SnowDriftGenerator(EwrGenerator): @@ -78,7 +78,7 @@ class SnowDriftGenerator(EwrGenerator): This is the SA-11 search radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_SA_11_Buk_SR_9S18M1 + unit_type = AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR class StraightFlushGenerator(EwrGenerator): @@ -87,7 +87,7 @@ class StraightFlushGenerator(EwrGenerator): This is the SA-6 search/track radar, but used as an early warning radar. """ - unit_type = AirDefence.SAM_SA_6_Kub_STR_9S91 + unit_type = AirDefence.SAM_SA_6_Kub_Long_Track_STR class HawkEwrGenerator(EwrGenerator): @@ -96,4 +96,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.SAM_Hawk_SR__AN_MPQ_50 diff --git a/gen/sam/freya_ewr.py b/gen/sam/freya_ewr.py index af637b91..74e90084 100644 --- a/gen/sam/freya_ewr.py +++ b/gen/sam/freya_ewr.py @@ -28,7 +28,7 @@ class FreyaGenerator(AirDefenseGroupGenerator): positions = self.get_circular_position(4, launcher_distance=50, coverage=360) for i, position in enumerate(positions): self.add_unit( - AirDefence.AAA_Flak_Vierling_38, + AirDefence.AAA_Flak_Vierling_38_Quad_20mm, "AA#" + str(i), position[0], position[1], @@ -68,16 +68,16 @@ class FreyaGenerator(AirDefenseGroupGenerator): self.heading, ) - # Maschinensatz_33 and Kdo.g 40 Telemeter + # PU_Maschinensatz_33 and Kdo.g 40 Telemeter self.add_unit( - AirDefence.Maschinensatz_33, + AirDefence.PU_Maschinensatz_33, "Energy#1", self.position.x + 20, self.position.y - 20, self.heading, ) self.add_unit( - AirDefence.AAA_Kdo_G_40, + AirDefence.AAA_SP_Kdo_G_40, "Telemeter#1", self.position.x + 20, self.position.y - 10, diff --git a/gen/sam/sam_avenger.py b/gen/sam/sam_avenger.py index 982b9471..45b07bc1 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.Transport_M818, + Unarmed.Truck_M818_6x6, "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_M1097, + AirDefence.SAM_Avenger__Stinger, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_chaparral.py b/gen/sam/sam_chaparral.py index a0b1ece2..fb4d6fee 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.Transport_M818, + Unarmed.Truck_M818_6x6, "TRUCK", self.position.x, self.position.y, diff --git a/gen/sam/sam_gepard.py b/gen/sam/sam_gepard.py index df16df31..a8c6c861 100644 --- a/gen/sam/sam_gepard.py +++ b/gen/sam/sam_gepard.py @@ -33,7 +33,7 @@ class GepardGenerator(AirDefenseGroupGenerator): self.heading, ) self.add_unit( - Unarmed.Transport_M818, + Unarmed.Truck_M818_6x6, "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 9d8545fb..73d1ea37 100644 --- a/gen/sam/sam_group_generator.py +++ b/gen/sam/sam_group_generator.py @@ -119,36 +119,36 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = { SAM_PRICES = { - AirDefence.SAM_Hawk_PCP: 35, + AirDefence.SAM_Hawk_Generator__PCP: 35, AirDefence.AAA_ZU_23_Emplacement: 10, - AirDefence.AAA_ZU_23_Closed: 10, - AirDefence.AAA_ZU_23_on_Ural_375: 10, - AirDefence.AAA_ZU_23_Insurgent_on_Ural_375: 10, - AirDefence.AAA_ZU_23_Insurgent_Closed: 10, + AirDefence.AAA_ZU_23_Closed_Emplacement: 10, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375: 10, + AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375: 10, + AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent: 10, AirDefence.AAA_ZU_23_Insurgent: 10, - AirDefence.SPAAA_ZSU_23_4_Shilka: 10, - AirDefence.AAA_Vulcan_M163: 15, - AirDefence.SAM_Linebacker_M6: 20, - AirDefence.Rapier_FSA_Launcher: 20, - AirDefence.SAM_Avenger_M1097: 22, + 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_M901: 85, + AirDefence.SAM_Patriot_LN: 85, AirDefence.SAM_Patriot_EPP_III: 85, AirDefence.SAM_Chaparral_M48: 25, - AirDefence.AAA_Bofors_40mm: 15, + AirDefence.AAA_40mm_Bofors: 15, AirDefence.AAA_8_8cm_Flak_36: 15, - AirDefence.SAM_SA_2_LN_SM_90: 30, - AirDefence.SAM_SA_3_S_125_LN_5P73: 35, - AirDefence.SAM_SA_6_Kub_LN_2P25: 45, - AirDefence.SAM_SA_8_Osa_9A33: 30, - AirDefence.SAM_SA_9_Strela_1_9P31: 25, - AirDefence.SAM_SA_10_S_300PS_LN_5P85C: 80, - AirDefence.SAM_SA_10_S_300PS_CP_54K6: 80, - AirDefence.SAM_SA_11_Buk_LN_9A310M1: 60, - AirDefence.SAM_SA_13_Strela_10M3_9A35M3: 30, - AirDefence.SAM_SA_15_Tor_9A331: 40, - AirDefence.SAM_SA_19_Tunguska_2S6: 35, + 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, } diff --git a/gen/sam/sam_hawk.py b/gen/sam/sam_hawk.py index 651531c0..ab3332cd 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.SAM_Hawk_SR__AN_MPQ_50, "SR", self.position.x + 20, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_Hawk_PCP, + AirDefence.SAM_Hawk_Generator__PCP, "PCP", self.position.x, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_Hawk_TR_AN_MPQ_46, + AirDefence.SAM_Hawk_TR__AN_MPQ_46, "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.AAA_Vulcan_M163, + AirDefence.SPAAA_Vulcan_M163, "AAA", self.position + Point(20, 30), self.heading, diff --git a/gen/sam/sam_hq7.py b/gen/sam/sam_hq7.py index 06bba42f..bbe449a4 100644 --- a/gen/sam/sam_hq7.py +++ b/gen/sam/sam_hq7.py @@ -37,14 +37,14 @@ class HQ7Generator(AirDefenseGroupGenerator): aa_group = self.add_auxiliary_group("AA") self.add_unit_to_group( aa_group, - AirDefence.AAA_ZU_23_on_Ural_375, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, "AAA1", self.position + Point(20, 30), self.heading, ) self.add_unit_to_group( aa_group, - AirDefence.AAA_ZU_23_on_Ural_375, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, "AAA2", self.position - Point(20, 30), self.heading, diff --git a/gen/sam/sam_linebacker.py b/gen/sam/sam_linebacker.py index 1fa89ca2..f0393712 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.Transport_M818, + Unarmed.Truck_M818_6x6, "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_M6, + AirDefence.SAM_Linebacker___Bradley_M6, "M6#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_patriot.py b/gen/sam/sam_patriot.py index 21f78b36..a37dd364 100644 --- a/gen/sam/sam_patriot.py +++ b/gen/sam/sam_patriot.py @@ -20,28 +20,28 @@ class PatriotGenerator(AirDefenseGroupGenerator): def generate(self): # Command Post self.add_unit( - AirDefence.SAM_Patriot_STR_AN_MPQ_53, + AirDefence.SAM_Patriot_STR, "STR", self.position.x + 30, self.position.y + 30, self.heading, ) self.add_unit( - AirDefence.SAM_Patriot_AMG_AN_MRC_137, + AirDefence.SAM_Patriot_CR__AMG_AN_MRC_137, "MRC", self.position.x, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_Patriot_ECS_AN_MSQ_104, + AirDefence.SAM_Patriot_ECS, "MSQ", self.position.x + 30, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_Patriot_ICC, + AirDefence.SAM_Patriot_C2_ICC, "ICC", self.position.x + 60, self.position.y, @@ -61,7 +61,7 @@ class PatriotGenerator(AirDefenseGroupGenerator): ) for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_Patriot_LN_M901, + AirDefence.SAM_Patriot_LN, "LN#" + str(i), position[0], position[1], @@ -76,7 +76,7 @@ class PatriotGenerator(AirDefenseGroupGenerator): ) for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( - aa_group, AirDefence.AAA_Vulcan_M163, f"SPAAA#{i}", Point(x, y), heading + aa_group, AirDefence.SPAAA_Vulcan_M163, f"SPAAA#{i}", Point(x, y), heading ) @classmethod diff --git a/gen/sam/sam_rapier.py b/gen/sam/sam_rapier.py index 1ff8f9ce..f869b17e 100644 --- a/gen/sam/sam_rapier.py +++ b/gen/sam/sam_rapier.py @@ -18,14 +18,14 @@ class RapierGenerator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.Rapier_FSA_Blindfire_Tracker, + AirDefence.SAM_Rapier_Blindfire_TR, "BT", self.position.x, self.position.y, self.heading, ) self.add_unit( - AirDefence.Rapier_FSA_Optical_Tracker, + AirDefence.SAM_Rapier_Tracker, "OT", self.position.x + 20, self.position.y, @@ -39,7 +39,7 @@ class RapierGenerator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.Rapier_FSA_Launcher, + AirDefence.SAM_Rapier_LN, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_roland.py b/gen/sam/sam_roland.py index 26c1bcdf..8511e94a 100644 --- a/gen/sam/sam_roland.py +++ b/gen/sam/sam_roland.py @@ -30,7 +30,7 @@ class RolandGenerator(AirDefenseGroupGenerator): self.heading, ) self.add_unit( - Unarmed.Transport_M818, + Unarmed.Truck_M818_6x6, "TRUCK", self.position.x + 80, self.position.y, diff --git a/gen/sam/sam_sa10.py b/gen/sam/sam_sa10.py index 66ad9ca0..c248c90e 100644 --- a/gen/sam/sam_sa10.py +++ b/gen/sam/sam_sa10.py @@ -23,13 +23,13 @@ class SA10Generator(AirDefenseGroupGenerator): def __init__(self, game: Game, ground_object: SamGroundObject): super().__init__(game, ground_object) - self.sr1 = AirDefence.SAM_SA_10_S_300PS_SR_5N66M - self.sr2 = AirDefence.SAM_SA_10_S_300PS_SR_64H6E - self.cp = AirDefence.SAM_SA_10_S_300PS_CP_54K6 - self.tr1 = AirDefence.SAM_SA_10_S_300PS_TR_30N6 - self.tr2 = AirDefence.SAM_SA_10_S_300PS_TR_30N6 - self.ln1 = AirDefence.SAM_SA_10_S_300PS_LN_5P85C - self.ln2 = AirDefence.SAM_SA_10_S_300PS_LN_5P85D + 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.ln2 = AirDefence.SAM_SA_10_S_300_Grumble_TEL_D def generate(self): # Search Radar @@ -85,7 +85,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, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, f"AA#{i}", Point(x, y), heading, @@ -110,7 +110,7 @@ class Tier2SA10Generator(SA10Generator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( pd_group, - AirDefence.SAM_SA_15_Tor_9A331, + AirDefence.SAM_SA_15_Tor_Gauntlet, f"PD#{i}", Point(x, y), heading, @@ -132,7 +132,7 @@ class Tier3SA10Generator(SA10Generator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( aa_group, - AirDefence.SAM_SA_19_Tunguska_2S6, + AirDefence.SAM_SA_19_Tunguska_Grison, f"AA#{i}", Point(x, y), heading, @@ -147,7 +147,7 @@ class Tier3SA10Generator(SA10Generator): for i, (x, y, heading) in enumerate(positions): self.add_unit_to_group( pd_group, - AirDefence.SAM_SA_15_Tor_9A331, + AirDefence.SAM_SA_15_Tor_Gauntlet, f"PD#{i}", Point(x, y), heading, diff --git a/gen/sam/sam_sa11.py b/gen/sam/sam_sa11.py index adf0362e..6076d69a 100644 --- a/gen/sam/sam_sa11.py +++ b/gen/sam/sam_sa11.py @@ -18,14 +18,14 @@ class SA11Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SA_11_Buk_SR_9S18M1, + AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR, "SR", self.position.x + 20, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_SA_11_Buk_CC_9S470M1, + AirDefence.SAM_SA_11_Buk_Gadfly_C2, "CC", self.position.x, self.position.y, @@ -39,7 +39,7 @@ class SA11Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_11_Buk_LN_9A310M1, + AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa13.py b/gen/sam/sam_sa13.py index dec20085..8144094e 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.Transport_UAZ_469, + Unarmed.LUV_UAZ_469_Jeep, "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_9A35M3, + AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa15.py b/gen/sam/sam_sa15.py index ffd45752..70bb39d2 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_9A331, + AirDefence.SAM_SA_15_Tor_Gauntlet, "ADS", self.position.x, self.position.y, self.heading, ) self.add_unit( - Unarmed.Transport_UAZ_469, + Unarmed.LUV_UAZ_469_Jeep, "EWR", self.position.x + 40, self.position.y, diff --git a/gen/sam/sam_sa17.py b/gen/sam/sam_sa17.py index 52922646..49b864e9 100644 --- a/gen/sam/sam_sa17.py +++ b/gen/sam/sam_sa17.py @@ -17,14 +17,14 @@ class SA17Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SA_11_Buk_SR_9S18M1, + AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR, "SR", self.position.x + 20, self.position.y, self.heading, ) self.add_unit( - AirDefence.SAM_SA_11_Buk_CC_9S470M1, + AirDefence.SAM_SA_11_Buk_Gadfly_C2, "CC", self.position.x, self.position.y, diff --git a/gen/sam/sam_sa19.py b/gen/sam/sam_sa19.py index 02a3ff24..8583f490 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_2S6, + AirDefence.SAM_SA_19_Tunguska_Grison, "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_2S6, + AirDefence.SAM_SA_19_Tunguska_Grison, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa2.py b/gen/sam/sam_sa2.py index 4307371e..aa0b5a6b 100644 --- a/gen/sam/sam_sa2.py +++ b/gen/sam/sam_sa2.py @@ -18,10 +18,10 @@ class SA2Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SR_P_19, "SR", self.position.x, self.position.y, self.heading + AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, "SR", self.position.x, self.position.y, self.heading ) self.add_unit( - AirDefence.SAM_SA_2_TR_SNR_75_Fan_Song, + AirDefence.SAM_SA_2_S_75_Fan_Song_TR, "TR", self.position.x + 20, self.position.y, @@ -35,7 +35,7 @@ class SA2Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_2_LN_SM_90, + AirDefence.SAM_SA_2_S_75_Guideline_LN, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa3.py b/gen/sam/sam_sa3.py index eb689de5..0f74982e 100644 --- a/gen/sam/sam_sa3.py +++ b/gen/sam/sam_sa3.py @@ -18,10 +18,10 @@ class SA3Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SR_P_19, "SR", self.position.x, self.position.y, self.heading + AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, "SR", self.position.x, self.position.y, self.heading ) self.add_unit( - AirDefence.SAM_SA_3_S_125_TR_SNR, + AirDefence.SAM_SA_3_S_125_Low_Blow_TR, "TR", self.position.x + 20, self.position.y, @@ -35,7 +35,7 @@ class SA3Generator(AirDefenseGroupGenerator): for i, position in enumerate(positions): self.add_unit( - AirDefence.SAM_SA_3_S_125_LN_5P73, + AirDefence.SAM_SA_3_S_125_Goa_LN, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa6.py b/gen/sam/sam_sa6.py index eb084aa1..a1def06d 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_STR_9S91, + AirDefence.SAM_SA_6_Kub_Long_Track_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_LN_2P25, + AirDefence.SAM_SA_6_Kub_Gainful_TEL, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_sa8.py b/gen/sam/sam_sa8.py index 3bf14f2e..0ded6973 100644 --- a/gen/sam/sam_sa8.py +++ b/gen/sam/sam_sa8.py @@ -16,7 +16,7 @@ class SA8Generator(AirDefenseGroupGenerator): def generate(self): self.add_unit( - AirDefence.SAM_SA_8_Osa_9A33, + AirDefence.SAM_SA_8_Osa_Gecko_TEL, "OSA", self.position.x, self.position.y, diff --git a/gen/sam/sam_sa9.py b/gen/sam/sam_sa9.py index 0051a03a..9ed7f6c9 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.Transport_UAZ_469, + Unarmed.LUV_UAZ_469_Jeep, "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_9P31, + AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, "LN#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_vulcan.py b/gen/sam/sam_vulcan.py index 44364189..9ce2c04a 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.AAA_Vulcan_M163, + AirDefence.SPAAA_Vulcan_M163, "SPAAA", self.position.x, self.position.y, @@ -26,14 +26,14 @@ class VulcanGenerator(AirDefenseGroupGenerator): ) if random.randint(0, 1) == 1: self.add_unit( - AirDefence.AAA_Vulcan_M163, + AirDefence.SPAAA_Vulcan_M163, "SPAAA2", self.position.x, self.position.y, self.heading, ) self.add_unit( - Unarmed.Transport_M818, + Unarmed.Truck_M818_6x6, "TRUCK", self.position.x + 80, self.position.y, diff --git a/gen/sam/sam_zsu23.py b/gen/sam/sam_zsu23.py index aa70e54b..9caa1f01 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, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, "SPAA#" + str(i), position[0], position[1], diff --git a/gen/sam/sam_zu23.py b/gen/sam/sam_zu23.py index b17367f4..0cd169a1 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, + AirDefence.AAA_ZU_23_Closed_Emplacement, "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 5f075f49..50e57a84 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.AAA_ZU_23_on_Ural_375, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, "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 3e8282e0..6c6f09ff 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.AAA_ZU_23_Insurgent_on_Ural_375, + AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375, "SPAA#" + str(i), position[0], position[1], diff --git a/pydcs_extensions/a4ec/a4ec.py b/pydcs_extensions/a4ec/a4ec.py index 07acdcf5..1bf89e6d 100644 --- a/pydcs_extensions/a4ec/a4ec.py +++ b/pydcs_extensions/a4ec/a4ec.py @@ -832,7 +832,7 @@ class A_4E_C(PlaneType): class Pylon1: LAU_10___4_ZUNI_MK_71 = (1, Weapons.LAU_10___4_ZUNI_MK_71) - LAU_3___19_FFAR_M156_WP = (1, Weapons.LAU_3___19_FFAR_M156_WP) + LAU_3___19_FFAR_M156_WP = (1, Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos) LAU_3___19_FFAR_Mk1_HE = (1, Weapons.LAU_3___19_FFAR_Mk1_HE) LAU_3___19_FFAR_Mk5_HEAT = (1, Weapons.LAU_3___19_FFAR_Mk5_HEAT) LAU_68___7_FFAR_M156_WP = (1, Weapons.LAU_68___7_FFAR_M156_WP) @@ -841,7 +841,7 @@ class A_4E_C(PlaneType): AGM_45A = (1, Weapons.AGM_45A) # ERRR {AGM12_B} Mk_20 = (1, Weapons.Mk_20) - Mk_81 = (1, Weapons.Mk_81) + Mk_81 = (1, Weapons.Mk_81___250lb_GP_Bomb_LD) Mk_81SE = (1, WeaponsA4EC.Mk_81SE) Mk_82 = (1, Weapons.Mk_82) Mk_82_SnakeEye = (1, Weapons.Mk_82_SnakeEye) @@ -889,7 +889,7 @@ class A_4E_C(PlaneType): # ERRR {AGM12_B} AGM_62 = (2, Weapons.AGM_62) Mk_20 = (2, Weapons.Mk_20) - Mk_81 = (2, Weapons.Mk_81) + Mk_81 = (2, Weapons.Mk_81___250lb_GP_Bomb_LD) Mk_81SE = (2, WeaponsA4EC.Mk_81SE) Mk_82 = (2, Weapons.Mk_82) Mk_82_SnakeEye = (2, Weapons.Mk_82_SnakeEye) @@ -963,7 +963,7 @@ class A_4E_C(PlaneType): # ERRR {AGM12_B} AGM_62 = (3, Weapons.AGM_62) Mk_20 = (3, Weapons.Mk_20) - Mk_81 = (3, Weapons.Mk_81) + Mk_81 = (3, Weapons.Mk_81___250lb_GP_Bomb_LD) Mk_81SE = (3, WeaponsA4EC.Mk_81SE) Mk_82 = (3, Weapons.Mk_82) Mk_82_SnakeEye = (3, Weapons.Mk_82_SnakeEye) @@ -1031,7 +1031,7 @@ class A_4E_C(PlaneType): # ERRR {AGM12_B} AGM_62 = (4, Weapons.AGM_62) Mk_20 = (4, Weapons.Mk_20) - Mk_81 = (4, Weapons.Mk_81) + Mk_81 = (4, Weapons.Mk_81___250lb_GP_Bomb_LD) Mk_81SE = (4, WeaponsA4EC.Mk_81SE) Mk_82 = (4, Weapons.Mk_82) Mk_82_SnakeEye = (4, Weapons.Mk_82_SnakeEye) @@ -1082,7 +1082,7 @@ class A_4E_C(PlaneType): AGM_45A = (5, Weapons.AGM_45A) # ERRR {AGM12_B} Mk_20 = (5, Weapons.Mk_20) - Mk_81 = (5, Weapons.Mk_81) + Mk_81 = (5, Weapons.Mk_81___250lb_GP_Bomb_LD) Mk_81SE = (5, WeaponsA4EC.Mk_81SE) Mk_82 = (5, Weapons.Mk_82) Mk_82_SnakeEye = (5, Weapons.Mk_82_SnakeEye) diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json index d108f6d6..9061ae9f 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -36,30 +36,30 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", + "ATGM_Stryker", "IFV_M2A2_Bradley", - "APC_M1126_Stryker_ICV", + "IFV_M1126_Stryker_ICV", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "TPz_Fuchs", - "IFV_MCV_80", + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "APC_TPz_Fuchs", + "IFV_Warrior", "MBT_Challenger_II", "MBT_M60A3_Patton", - "SPG_M1128_Stryker_MGS", - "SAM_Avenger_M1097" + "SPG_Stryker_MGS", + "SAM_Avenger__Stinger" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json index abefb69e..9156a9a7 100644 --- a/resources/factions/allies_1944.json +++ b/resources/factions/allies_1944.json @@ -17,19 +17,19 @@ "frontline_units": [ "MT_M4A4_Sherman_Firefly", "MT_M4_Sherman", - "APC_M2A1", + "APC_M2A1_Halftrack", "CT_Cromwell_IV", "CT_Centaur_IV", "HIT_Churchill_VII", - "LAC_M8_Greyhound", - "TD_M10_GMC", - "Daimler_Armoured_Car", + "Car_M8_Greyhound_Armored", + "SPG_M10_GMC", + "Car_Daimler_Armored", "LT_Mk_VII_Tetrarch", - "AA_gun_QF_3_7", - "AAA_Bofors_40mm" + "AAA_QF_3_7", + "AAA_40mm_Bofors" ], "artillery_units": [ - "M12_GMC" + "SPG_M12_GMC_155mm" ], "logistics_units": [ "Bedford_MWD", diff --git a/resources/factions/allies_1944_free.json b/resources/factions/allies_1944_free.json index cbc68708..e0547dfd 100644 --- a/resources/factions/allies_1944_free.json +++ b/resources/factions/allies_1944_free.json @@ -15,8 +15,8 @@ ], "frontline_units": [ "MT_M4_Sherman", - "APC_M2A1", - "AAA_Bofors_40mm" + "APC_M2A1_Halftrack", + "AAA_40mm_Bofors" ], "artillery_units": [ ], diff --git a/resources/factions/australia_2005.json b/resources/factions/australia_2005.json index 36968b09..da42cc74 100644 --- a/resources/factions/australia_2005.json +++ b/resources/factions/australia_2005.json @@ -21,17 +21,17 @@ "MBT_Leopard_1A3", "APC_M113", "IFV_LAV_25", - "IFV_MCV_80" + "IFV_Warrior" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "HawkGenerator", diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index a5d48362..2a293bdb 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -30,14 +30,14 @@ "SAM_Chaparral_M48" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/bluefor_coldwar_a4.json b/resources/factions/bluefor_coldwar_a4.json index 43f50799..08becffd 100644 --- a/resources/factions/bluefor_coldwar_a4.json +++ b/resources/factions/bluefor_coldwar_a4.json @@ -31,14 +31,14 @@ "SAM_Chaparral_M48" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/bluefor_coldwar_a4_mb339.json b/resources/factions/bluefor_coldwar_a4_mb339.json index 894b5175..be2166db 100644 --- a/resources/factions/bluefor_coldwar_a4_mb339.json +++ b/resources/factions/bluefor_coldwar_a4_mb339.json @@ -32,14 +32,14 @@ "SAM_Chaparral_M48" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json index cbf58fcd..beaa9d91 100644 --- a/resources/factions/bluefor_modern.json +++ b/resources/factions/bluefor_modern.json @@ -38,27 +38,27 @@ "frontline_units": [ "MBT_M1A2_Abrams", "MBT_Leopard_2", - "MBT_Merkava_Mk__4", - "ATGM_M1134_Stryker", + "MBT_Merkava_IV", + "ATGM_Stryker", "IFV_M2A2_Bradley", "IFV_Marder", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "SAM_Linebacker_M6", - "SAM_Avenger_M1097" + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "SAM_Linebacker___Bradley_M6", + "SAM_Avenger__Stinger" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/canada_2005.json b/resources/factions/canada_2005.json index 3312dbac..02e56afc 100644 --- a/resources/factions/canada_2005.json +++ b/resources/factions/canada_2005.json @@ -20,18 +20,18 @@ "MBT_Leopard_2", "IFV_LAV_25", "APC_M113", - "IFV_MCV_80", - "SAM_Avenger_M1097" + "IFV_Warrior", + "SAM_Avenger__Stinger" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json index 2320a4ff..f89c277b 100644 --- a/resources/factions/china_2010.json +++ b/resources/factions/china_2010.json @@ -26,18 +26,18 @@ "HQ_7_Self_Propelled_LN" ], "artillery_units": [ - "MLRS_9A52_Smerch", - "SPH_2S9_Nona" + "MLRS_9A52_Smerch_HE_300mm", + "SPH_2S9_Nona_120mm_M" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "HQ7Generator", diff --git a/resources/factions/dprk_1950_fictional.json b/resources/factions/dprk_1950_fictional.json index 06035f90..29251c1b 100644 --- a/resources/factions/dprk_1950_fictional.json +++ b/resources/factions/dprk_1950_fictional.json @@ -15,23 +15,23 @@ "tankers": [ ], "frontline_units": [ - "ARV_BRDM_2", - "FDDM_Grad", + "IFV_BRDM_2", + "Grad_MRL_FDDM__FC", "APC_MTLB", "MBT_T_55", - "AAA_ZU_23_on_Ural_375", + "SPAAA_ZU_23_2_Mounted_Ural_375", "AAA_8_8cm_Flak_18" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "FlakGenerator", diff --git a/resources/factions/france_1985_frenchpack.json b/resources/factions/france_1985_frenchpack.json index 3837fbc1..637c2e7b 100644 --- a/resources/factions/france_1985_frenchpack.json +++ b/resources/factions/france_1985_frenchpack.json @@ -34,16 +34,16 @@ "SAM_Roland_ADS" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "RolandGenerator", diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json index 25b897ac..797d1265 100644 --- a/resources/factions/france_1995.json +++ b/resources/factions/france_1995.json @@ -19,26 +19,26 @@ ], "frontline_units": [ "MBT_Leclerc", - "TPz_Fuchs", - "APC_Cobra", - "ATGM_M1134_Stryker", + "APC_TPz_Fuchs", + "APC_Cobra__Scout", + "ATGM_Stryker", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", + "APC_HMMWV__Scout", + "ATGM_HMMWV", "SAM_Roland_ADS" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS", - "_2B11_mortar" + "Infantry_M249", + "MANPADS_Stinger", + "Mortar_2B11_120mm" ], "air_defenses": [ "RolandGenerator", diff --git a/resources/factions/france_2005_frenchpack.json b/resources/factions/france_2005_frenchpack.json index 54a709a8..7018b00b 100644 --- a/resources/factions/france_2005_frenchpack.json +++ b/resources/factions/france_2005_frenchpack.json @@ -36,16 +36,16 @@ "SAM_Roland_ADS" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "RolandGenerator", diff --git a/resources/factions/france_2005_modded.json b/resources/factions/france_2005_modded.json index 4b1b0f84..d111f19a 100644 --- a/resources/factions/france_2005_modded.json +++ b/resources/factions/france_2005_modded.json @@ -39,16 +39,16 @@ "SAM_Roland_ADS" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "RolandGenerator", diff --git a/resources/factions/gdr_1985.json b/resources/factions/gdr_1985.json index 07131110..20101e55 100644 --- a/resources/factions/gdr_1985.json +++ b/resources/factions/gdr_1985.json @@ -17,23 +17,23 @@ "frontline_units": [ "IFV_BMP_1", "IFV_BMP_2", - "ARV_BRDM_2", + "IFV_BRDM_2", "APC_MTLB", "MBT_T_55", "MBT_T_72B" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S1_Gvozdika" + "MLRS_BM_21_Grad_122mm", + "SPH_2S1_Gvozdika_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Rus", - "Soldier_RPG", - "_2B11_mortar" + "Infantry_AK_74_Rus", + "Infantry_RPG", + "Mortar_2B11_120mm" ], "air_defenses": [ "ColdWarFlakGenerator", diff --git a/resources/factions/georgia_2008.json b/resources/factions/georgia_2008.json index 0d861108..b1250008 100644 --- a/resources/factions/georgia_2008.json +++ b/resources/factions/georgia_2008.json @@ -13,26 +13,26 @@ "frontline_units": [ "APC_BTR_80", "APC_MTLB", - "APC_Cobra", + "APC_Cobra__Scout", "IFV_BMP_1", "IFV_BMP_2", "MBT_T_72B", "MBT_T_55", - "SAM_SA_13_Strela_10M3_9A35M3" + "SAM_SA_13_Strela_10M3_Gopher_TEL" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S1_Gvozdika", - "SPH_2S3_Akatsia" + "MLRS_BM_21_Grad_122mm", + "SPH_2S1_Gvozdika_122mm", + "SPH_2S3_Akatsia_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA3Generator", diff --git a/resources/factions/germany_1942.json b/resources/factions/germany_1942.json index 1a84e1ff..354d872e 100644 --- a/resources/factions/germany_1942.json +++ b/resources/factions/germany_1942.json @@ -10,14 +10,14 @@ "Ju_88A4" ], "frontline_units": [ - "MT_Pz_Kpfw_IV_Ausf_H", - "APC_Sd_Kfz_251", - "AC_Sd_Kfz_234_2_Puma", - "TD_Jagdpanzer_IV", + "MT_PzIV_H", + "APC_Sd_Kfz_251_Halftrack", + "IFV_Sd_Kfz_234_2_Puma", + "SPG_Jagdpanzer_IV", "AAA_8_8cm_Flak_18" ], "artillery_units": [ - "Sturmpanzer_IV_Brummbär" + "SPG_Sturmpanzer_IV_Brummbar" ], "logistics_units": [ "Blitz_3_6_6700A", diff --git a/resources/factions/germany_1944.json b/resources/factions/germany_1944.json index e9d5ad78..bebdcb6d 100644 --- a/resources/factions/germany_1944.json +++ b/resources/factions/germany_1944.json @@ -11,21 +11,21 @@ ], "frontline_units": [ "MT_Pz_Kpfw_V_Panther_Ausf_G", - "MT_Pz_Kpfw_IV_Ausf_H", + "MT_PzIV_H", "HT_Pz_Kpfw_VI_Tiger_I", "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II", - "APC_Sd_Kfz_251", - "AC_Sd_Kfz_234_2_Puma", - "Sd_Kfz_184_Elefant", - "TD_Jagdpanther_G1", - "TD_Jagdpanzer_IV", - "StuG_III_Ausf__G", - "StuG_IV", + "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" ], "artillery_units": [ - "Sturmpanzer_IV_Brummbär" + "SPG_Sturmpanzer_IV_Brummbar" ], "logistics_units": [ "Blitz_3_6_6700A", diff --git a/resources/factions/germany_1944_free.json b/resources/factions/germany_1944_free.json index a27417aa..643378cd 100644 --- a/resources/factions/germany_1944_free.json +++ b/resources/factions/germany_1944_free.json @@ -9,8 +9,8 @@ "Bf_109K_4" ], "frontline_units": [ - "MT_Pz_Kpfw_IV_Ausf_H", - "APC_Sd_Kfz_251", + "MT_PzIV_H", + "APC_Sd_Kfz_251_Halftrack", "AAA_8_8cm_Flak_18" ], "artillery_units": [ @@ -19,7 +19,7 @@ "Blitz_3_6_6700A" ], "infantry_units": [ - "Infantry_Soldier_Rus" + "Infantry_AK_74_Rus" ], "air_defenses": [ "Flak18Generator" diff --git a/resources/factions/germany_1990.json b/resources/factions/germany_1990.json index c5275de1..587ab67d 100644 --- a/resources/factions/germany_1990.json +++ b/resources/factions/germany_1990.json @@ -19,7 +19,7 @@ "KC130" ], "frontline_units": [ - "TPz_Fuchs", + "APC_TPz_Fuchs", "MBT_Leopard_1A3", "MBT_Leopard_2", "IFV_Marder", @@ -28,13 +28,13 @@ "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "_2B11_mortar", - "Stinger_MANPADS" + "Infantry_M249", + "Mortar_2B11_120mm", + "MANPADS_Stinger" ], "air_defenses": [ "GepardGenerator", diff --git a/resources/factions/greece_2005.json b/resources/factions/greece_2005.json index 21bf75ad..a390525a 100644 --- a/resources/factions/greece_2005.json +++ b/resources/factions/greece_2005.json @@ -18,22 +18,22 @@ "MBT_Leopard_2", "MBT_Leopard_1A3", "MBT_M60A3_Patton", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", + "APC_HMMWV__Scout", + "ATGM_HMMWV", "APC_M113", "IFV_BMP_1" ], "artillery_units": [ - "SPH_M109_Paladin", - "MLRS_M270" + "SPH_M109_Paladin_155mm", + "MLRS_M270_227mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "HawkGenerator", diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json index 609fe738..ce550c59 100644 --- a/resources/factions/india_2010.json +++ b/resources/factions/india_2010.json @@ -23,20 +23,20 @@ "MBT_T_90", "MBT_T_72B", "IFV_BMP_2", - "SAM_SA_19_Tunguska_2S6" + "SAM_SA_19_Tunguska_Grison" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27", - "SPH_2S19_Msta" + "MLRS_BM_27_Uragan_220mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Infantry_M4", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA3Generator", diff --git a/resources/factions/insurgents.json b/resources/factions/insurgents.json index f31a5966..773ea181 100644 --- a/resources/factions/insurgents.json +++ b/resources/factions/insurgents.json @@ -6,24 +6,24 @@ "aircrafts": [ ], "frontline_units": [ - "APC_Cobra", + "APC_Cobra__Scout", "APC_MTLB", - "ARV_BRDM_2", - "AAA_ZU_23_Insurgent_on_Ural_375" + "IFV_BRDM_2", + "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S19_Msta" + "MLRS_BM_21_Grad_122mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Insurgents", - "Soldier_RPG", - "_2B11_mortar", - "SAM_SA_18_Igla_MANPADS" + "Insurgent_AK_74", + "Infantry_RPG", + "Mortar_2B11_120mm", + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "SA9Generator", diff --git a/resources/factions/insurgents_hard.json b/resources/factions/insurgents_hard.json index f824e1c7..086385cd 100644 --- a/resources/factions/insurgents_hard.json +++ b/resources/factions/insurgents_hard.json @@ -6,29 +6,29 @@ "aircrafts": [ ], "frontline_units": [ - "ATGM_M1045_HMMWV_TOW", - "APC_M1043_HMMWV_Armament", - "ARV_BRDM_2", + "ATGM_HMMWV", + "APC_HMMWV__Scout", + "IFV_BRDM_2", "APC_BTR_80", - "ARV_BTR_RD", + "APC_BTR_RD", "IFV_BMP_1", "MBT_T_55", - "AAA_ZU_23_Insurgent_on_Ural_375", - "AAA_ZSU_57_2" + "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S19_Msta" + "MLRS_BM_21_Grad_122mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Insurgents", - "Soldier_RPG", - "_2B11_mortar", - "SAM_SA_18_Igla_MANPADS" + "Insurgent_AK_74", + "Infantry_RPG", + "Mortar_2B11_120mm", + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "SA9Generator", diff --git a/resources/factions/insurgents_modded.json b/resources/factions/insurgents_modded.json index 296ee8b5..cca23cf7 100644 --- a/resources/factions/insurgents_modded.json +++ b/resources/factions/insurgents_modded.json @@ -10,20 +10,20 @@ "DIM__TOYOTA_DESERT", "DIM__TOYOTA_GREEN", "DIM__KAMIKAZE", - "AAA_ZU_23_Insurgent_on_Ural_375" + "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S19_Msta" + "MLRS_BM_21_Grad_122mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Insurgents", - "Soldier_RPG", - "SAM_SA_18_Igla_MANPADS" + "Insurgent_AK_74", + "Infantry_RPG", + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "SA9Generator", diff --git a/resources/factions/iran_1988.json b/resources/factions/iran_1988.json index 5792d311..cb771e92 100644 --- a/resources/factions/iran_1988.json +++ b/resources/factions/iran_1988.json @@ -21,22 +21,22 @@ "APC_BTR_80", "MBT_M60A3_Patton", "IFV_BMP_1", - "SPAAA_ZSU_23_4_Shilka", - "AAA_ZSU_57_2" + "SPAAA_ZSU_23_4_Shilka_Gun_Dish", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S1_Gvozdika" + "MLRS_BM_21_Grad_122mm", + "SPH_2S1_Gvozdika_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Insurgents", - "Soldier_RPG", - "SAM_SA_18_Igla_S_MANPADS" + "Insurgent_AK_74", + "Infantry_RPG", + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "HawkGenerator", diff --git a/resources/factions/iran_2015.json b/resources/factions/iran_2015.json index 725c1069..4fee56f0 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -28,22 +28,22 @@ "MBT_M60A3_Patton", "IFV_BMP_1", "MBT_T_72B", - "SPAAA_ZSU_23_4_Shilka", - "AAA_ZSU_57_2" + "SPAAA_ZSU_23_4_Shilka_Gun_Dish", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S19_Msta" + "MLRS_BM_21_Grad_122mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Insurgents", + "Insurgent_AK_74", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "HawkGenerator", diff --git a/resources/factions/iraq_1991.json b/resources/factions/iraq_1991.json index 82562c1a..25376a66 100644 --- a/resources/factions/iraq_1991.json +++ b/resources/factions/iraq_1991.json @@ -30,23 +30,23 @@ "MBT_T_55", "MBT_T_72B", "APC_BTR_80", - "ARV_BRDM_2", - "SPH_2S1_Gvozdika", - "AAA_ZSU_57_2", - "SPAAA_ZSU_23_4_Shilka" + "IFV_BRDM_2", + "SPH_2S1_Gvozdika_122mm", + "SPAAA_ZSU_57_2", + "SPAAA_ZSU_23_4_Shilka_Gun_Dish" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_MANPADS" + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "ColdWarFlakGenerator", diff --git a/resources/factions/israel_1948.json b/resources/factions/israel_1948.json index 5f296689..4d81443e 100644 --- a/resources/factions/israel_1948.json +++ b/resources/factions/israel_1948.json @@ -13,15 +13,15 @@ ], "frontline_units": [ "MT_M4A4_Sherman_Firefly", - "APC_M2A1", + "APC_M2A1_Halftrack", "MT_M4_Sherman", - "LAC_M8_Greyhound", - "AAA_Bofors_40mm" + "Car_M8_Greyhound_Armored", + "AAA_40mm_Bofors" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" diff --git a/resources/factions/israel_1973.json b/resources/factions/israel_1973.json index 36bef190..da572305 100644 --- a/resources/factions/israel_1973.json +++ b/resources/factions/israel_1973.json @@ -17,7 +17,7 @@ ], "frontline_units": [ "MT_M4_Sherman", - "APC_M2A1", + "APC_M2A1_Halftrack", "MBT_M60A3_Patton", "APC_M113", "SAM_Chaparral_M48" @@ -25,11 +25,11 @@ "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "BoforsGenerator", diff --git a/resources/factions/israel_1982.json b/resources/factions/israel_1982.json index 5c910edd..a938461a 100644 --- a/resources/factions/israel_1982.json +++ b/resources/factions/israel_1982.json @@ -22,17 +22,17 @@ "frontline_units": [ "APC_M113", "MBT_M60A3_Patton", - "MBT_Merkava_Mk__4", - "AAA_Vulcan_M163" + "MBT_Merkava_IV", + "SPAAA_Vulcan_M163" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json index 0cab7580..5d8d5b60 100644 --- a/resources/factions/israel_2000.json +++ b/resources/factions/israel_2000.json @@ -21,22 +21,22 @@ ], "frontline_units": [ "APC_M113", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "MBT_Merkava_Mk__4", - "AAA_Vulcan_M163" + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "MBT_Merkava_IV", + "SPAAA_Vulcan_M163" ], "artillery_units": [ - "SPH_M109_Paladin", - "MLRS_M270" + "SPH_M109_Paladin_155mm", + "MLRS_M270_227mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/italy_1990.json b/resources/factions/italy_1990.json index 1f0250da..ac0304d6 100644 --- a/resources/factions/italy_1990.json +++ b/resources/factions/italy_1990.json @@ -19,18 +19,18 @@ "frontline_units": [ "MBT_Leopard_1A3", "APC_M113", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/italy_1990_mb339.json b/resources/factions/italy_1990_mb339.json index 00cc2914..33a508e7 100644 --- a/resources/factions/italy_1990_mb339.json +++ b/resources/factions/italy_1990_mb339.json @@ -20,18 +20,18 @@ "frontline_units": [ "MBT_Leopard_1A3", "APC_M113", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json index 88f57175..2d994aa6 100644 --- a/resources/factions/japan_2005.json +++ b/resources/factions/japan_2005.json @@ -18,25 +18,25 @@ "KC130" ], "frontline_units": [ - "MBT_Merkava_Mk__4", + "MBT_Merkava_IV", "MBT_M1A2_Abrams", "IFV_Marder", - "TPz_Fuchs", + "APC_TPz_Fuchs", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", + "APC_HMMWV__Scout", "SPAAA_Gepard" ], "artillery_units": [ - "SPH_M109_Paladin", - "MLRS_M270", - "Stinger_MANPADS" + "SPH_M109_Paladin_155mm", + "MLRS_M270_227mm", + "MANPADS_Stinger" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "GepardGenerator", diff --git a/resources/factions/libya_2011.json b/resources/factions/libya_2011.json index dd758824..c73702e6 100644 --- a/resources/factions/libya_2011.json +++ b/resources/factions/libya_2011.json @@ -18,23 +18,23 @@ ], "frontline_units": [ "IFV_BMP_1", - "ARV_BRDM_2", + "IFV_BRDM_2", "MBT_T_72B", "MBT_T_55", - "SPAAA_ZSU_23_4_Shilka", - "SAM_SA_8_Osa_9A33" + "SPAAA_ZSU_23_4_Shilka_Gun_Dish", + "SAM_SA_8_Osa_Gecko_TEL" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Insurgents", + "Insurgent_AK_74", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_MANPADS" + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "HQ7Generator", diff --git a/resources/factions/netherlands_1990.json b/resources/factions/netherlands_1990.json index 26462102..cf4735f9 100644 --- a/resources/factions/netherlands_1990.json +++ b/resources/factions/netherlands_1990.json @@ -18,17 +18,17 @@ "frontline_units": [ "APC_M113", "MBT_Leopard_1A3", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/north_korea_2000.json b/resources/factions/north_korea_2000.json index 794852d4..565ab250 100644 --- a/resources/factions/north_korea_2000.json +++ b/resources/factions/north_korea_2000.json @@ -19,29 +19,29 @@ "IL_78M" ], "frontline_units": [ - "ARV_BRDM_2", + "IFV_BRDM_2", "APC_BTR_80", "IFV_BMP_1", "MBT_T_55", "MBT_T_72B", "MBT_T_80U", - "AAA_ZSU_57_2", - "SAM_SA_9_Strela_1_9P31" + "SPAAA_ZSU_57_2", + "SAM_SA_9_Strela_1_Gaskin_TEL" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "MLRS_9K57_Uragan_BM_27", - "SPH_2S19_Msta" + "MLRS_BM_21_Grad_122mm", + "MLRS_BM_27_Uragan_220mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA2Generator", diff --git a/resources/factions/pakistan_2015.json b/resources/factions/pakistan_2015.json index 32e1495d..1c8c7ef7 100644 --- a/resources/factions/pakistan_2015.json +++ b/resources/factions/pakistan_2015.json @@ -27,18 +27,18 @@ "HQ_7_Self_Propelled_LN" ], "artillery_units": [ - "MLRS_9A52_Smerch", - "SPH_2S9_Nona" + "MLRS_9A52_Smerch_HE_300mm", + "SPH_2S9_Nona_120mm_M" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "Stinger_MANPADS" + "MANPADS_Stinger" ], "air_defenses": [ "HQ7Generator", diff --git a/resources/factions/pmc_russian.json b/resources/factions/pmc_russian.json index 3b20801a..aa273736 100644 --- a/resources/factions/pmc_russian.json +++ b/resources/factions/pmc_russian.json @@ -10,22 +10,22 @@ "Ka_50" ], "frontline_units": [ - "APC_Cobra", + "APC_Cobra__Scout", "APC_BTR_80", - "ARV_BRDM_2", - "SAM_SA_13_Strela_10M3_9A35M3" + "IFV_BRDM_2", + "SAM_SA_13_Strela_10M3_Gopher_TEL" ], "artillery_units": [ - "SPH_2S19_Msta" + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA9Generator", diff --git a/resources/factions/pmc_us.json b/resources/factions/pmc_us.json index 0c46beca..293a4b9d 100644 --- a/resources/factions/pmc_us.json +++ b/resources/factions/pmc_us.json @@ -10,20 +10,20 @@ "SA342M" ], "frontline_units": [ - "APC_M1043_HMMWV_Armament", - "IFV_MCV_80", + "APC_HMMWV__Scout", + "IFV_Warrior", "IFV_LAV_25", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator" diff --git a/resources/factions/pmc_us_with_mb339.json b/resources/factions/pmc_us_with_mb339.json index e4f706e1..8ffdf832 100644 --- a/resources/factions/pmc_us_with_mb339.json +++ b/resources/factions/pmc_us_with_mb339.json @@ -11,20 +11,20 @@ "SA342M" ], "frontline_units": [ - "APC_M1043_HMMWV_Armament", - "IFV_MCV_80", + "APC_HMMWV__Scout", + "IFV_Warrior", "IFV_LAV_25", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator" diff --git a/resources/factions/poland_2010.json b/resources/factions/poland_2010.json index 5090d6e7..35256cfc 100644 --- a/resources/factions/poland_2010.json +++ b/resources/factions/poland_2010.json @@ -13,29 +13,29 @@ "KC130" ], "frontline_units": [ - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "APC_M1126_Stryker_ICV", - "ARV_BRDM_2", + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "IFV_M1126_Stryker_ICV", + "IFV_BRDM_2", "IFV_BMP_1", "APC_MTLB", "MBT_Leopard_2", "MBT_T_72B3" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S1_Gvozdika", - "SpGH_Dana" + "MLRS_BM_21_Grad_122mm", + "SPH_2S1_Gvozdika_122mm", + "SPH_Dana_vz77_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", - "Soldier_RPG", - "SAM_SA_18_Igla_S_MANPADS" + "Infantry_AK_74_Rus", + "Infantry_RPG", + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA6Generator", diff --git a/resources/factions/redfor_china_2010.json b/resources/factions/redfor_china_2010.json index ab7ce609..93d2248d 100644 --- a/resources/factions/redfor_china_2010.json +++ b/resources/factions/redfor_china_2010.json @@ -40,26 +40,26 @@ "MBT_T_72B3", "MBT_T_80U", "MBT_T_90", - "SAM_SA_19_Tunguska_2S6", + "SAM_SA_19_Tunguska_Grison", "ZBD_04A", "ZTZ_96B" ], "artillery_units": [ - "MLRS_9A52_Smerch", - "MLRS_9K57_Uragan_BM_27", - "SPH_2S9_Nona", - "SPH_2S19_Msta" + "MLRS_9A52_Smerch_HE_300mm", + "MLRS_BM_27_Uragan_220mm", + "SPH_2S9_Nona_120mm_M", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "_2B11_mortar", - "Infantry_Soldier_Rus", + "Mortar_2B11_120mm", + "Infantry_AK_74_Rus", "Paratrooper_AKS", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_MANPADS" + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "HQ7Generator", diff --git a/resources/factions/redfor_russia_2010.json b/resources/factions/redfor_russia_2010.json index 363139ec..50facdfe 100644 --- a/resources/factions/redfor_russia_2010.json +++ b/resources/factions/redfor_russia_2010.json @@ -40,26 +40,26 @@ "MBT_T_72B3", "MBT_T_80U", "MBT_T_90", - "SAM_SA_19_Tunguska_2S6", + "SAM_SA_19_Tunguska_Grison", "ZBD_04A", "ZTZ_96B" ], "artillery_units": [ - "MLRS_9A52_Smerch", - "MLRS_9K57_Uragan_BM_27", - "SPH_2S9_Nona", - "SPH_2S19_Msta" + "MLRS_9A52_Smerch_HE_300mm", + "MLRS_BM_27_Uragan_220mm", + "SPH_2S9_Nona_120mm_M", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "_2B11_mortar", - "Infantry_Soldier_Rus", + "Mortar_2B11_120mm", + "Infantry_AK_74_Rus", "Paratrooper_AKS", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_MANPADS" + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "HQ7Generator", diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json index d7cfff94..2f5a0258 100644 --- a/resources/factions/russia_1955.json +++ b/resources/factions/russia_1955.json @@ -13,23 +13,23 @@ "IL_78M" ], "frontline_units": [ - "ARV_BRDM_2", - "FDDM_Grad", + "IFV_BRDM_2", + "Grad_MRL_FDDM__FC", "APC_MTLB", "MBT_T_55", - "AAA_ZU_23_on_Ural_375", + "SPAAA_ZU_23_2_Mounted_Ural_375", "AAA_8_8cm_Flak_18" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "EarlyColdWarFlakGenerator" diff --git a/resources/factions/russia_1965.json b/resources/factions/russia_1965.json index 1c764a45..d9e6aae4 100644 --- a/resources/factions/russia_1965.json +++ b/resources/factions/russia_1965.json @@ -17,25 +17,25 @@ "IL_78M" ], "frontline_units": [ - "ARV_BRDM_2", + "IFV_BRDM_2", "APC_BTR_80", - "ARV_BTR_RD", + "APC_BTR_RD", "IFV_BMD_1", "IFV_BMP_1", "MBT_T_55", - "AAA_ZU_23_on_Ural_375", - "AAA_ZSU_57_2" + "SPAAA_ZU_23_2_Mounted_Ural_375", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "EarlyColdWarFlakGenerator", diff --git a/resources/factions/russia_1970_limited_air.json b/resources/factions/russia_1970_limited_air.json index 9043ad72..5ab6a703 100644 --- a/resources/factions/russia_1970_limited_air.json +++ b/resources/factions/russia_1970_limited_air.json @@ -10,25 +10,25 @@ "Mi_24V" ], "frontline_units": [ - "ARV_BRDM_2", + "IFV_BRDM_2", "APC_BTR_80", "IFV_BMD_1", "IFV_BMP_1", "MBT_T_55", - "AAA_ZSU_57_2" + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S9_Nona", - "SPH_2S1_Gvozdika" + "MLRS_BM_21_Grad_122mm", + "SPH_2S9_Nona_120mm_M", + "SPH_2S1_Gvozdika_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "SA2Generator", diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json index 4fbbf059..d931e313 100644 --- a/resources/factions/russia_1975.json +++ b/resources/factions/russia_1975.json @@ -23,26 +23,26 @@ "IL_78M" ], "frontline_units": [ - "ARV_BRDM_2", + "IFV_BRDM_2", "APC_BTR_80", "IFV_BMD_1", "IFV_BMP_1", "MBT_T_55", - "SAM_SA_8_Osa_9A33" + "SAM_SA_8_Osa_Gecko_TEL" ], "artillery_units": [ - "MLRS_BM_21_Grad", - "SPH_2S9_Nona", - "SPH_2S1_Gvozdika" + "MLRS_BM_21_Grad_122mm", + "SPH_2S9_Nona_120mm_M", + "SPH_2S1_Gvozdika_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ - "Infantry_Soldier_Rus", - "Soldier_RPG", - "_2B11_mortar" + "Infantry_AK_74_Rus", + "Infantry_RPG", + "Mortar_2B11_120mm" ], "air_defenses": [ "ColdWarFlakGenerator", diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json index 497cfb93..f57190ca 100644 --- a/resources/factions/russia_1990.json +++ b/resources/factions/russia_1990.json @@ -32,22 +32,22 @@ "IFV_BMP_2", "MBT_T_72B", "MBT_T_80U", - "SAM_SA_13_Strela_10M3_9A35M3" + "SAM_SA_13_Strela_10M3_Gopher_TEL" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27", - "SPH_2S19_Msta" + "MLRS_BM_27_Uragan_220mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "_2B11_mortar", - "SAM_SA_18_Igla_S_MANPADS" + "Mortar_2B11_120mm", + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA2Generator", diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json index 13e2fbe9..9f3baeb7 100644 --- a/resources/factions/russia_2010.json +++ b/resources/factions/russia_2010.json @@ -38,22 +38,22 @@ "MBT_T_90", "MBT_T_80U", "MBT_T_72B3", - "SAM_SA_19_Tunguska_2S6" + "SAM_SA_19_Tunguska_Grison" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27", - "SPH_2S19_Msta" + "MLRS_BM_27_Uragan_220mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "_2B11_mortar", - "SAM_SA_18_Igla_MANPADS" + "Mortar_2B11_120mm", + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "SA8Generator", diff --git a/resources/factions/russia_2010_hds.json b/resources/factions/russia_2010_hds.json index 7e632c5f..68c613a4 100644 --- a/resources/factions/russia_2010_hds.json +++ b/resources/factions/russia_2010_hds.json @@ -38,22 +38,22 @@ "MBT_T_90", "MBT_T_80U", "MBT_T_72B3", - "SAM_SA_19_Tunguska_2S6" + "SAM_SA_19_Tunguska_Grison" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27", - "SPH_2S19_Msta" + "MLRS_BM_27_Uragan_220mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "_2B11_mortar", - "SAM_SA_18_Igla_MANPADS" + "Mortar_2B11_120mm", + "MANPADS_SA_18_Igla_Grouse" ], "air_defenses": [ "SA17Generator", diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json index 730ecbf2..9ffa9723 100644 --- a/resources/factions/russia_2020.json +++ b/resources/factions/russia_2020.json @@ -36,21 +36,21 @@ "MBT_T_90", "MBT_T_80U", "MBT_T_72B", - "SAM_SA_19_Tunguska_2S6" + "SAM_SA_19_Tunguska_Grison" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27", - "SPH_2S19_Msta" + "MLRS_BM_27_Uragan_220mm", + "SPH_2S19_Msta_152mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA8Generator", diff --git a/resources/factions/soviet_union_1943.json b/resources/factions/soviet_union_1943.json index 3b0bb9a5..57c805fc 100644 --- a/resources/factions/soviet_union_1943.json +++ b/resources/factions/soviet_union_1943.json @@ -9,13 +9,13 @@ ], "frontline_units": [ "MT_M4_Sherman", - "APC_M2A1", - "Daimler_Armoured_Car", + "APC_M2A1_Halftrack", + "Car_Daimler_Armored", "LT_Mk_VII_Tetrarch", - "AAA_Bofors_40mm" + "AAA_40mm_Bofors" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ "Bedford_MWD", diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json index b736b672..06e20a6d 100644 --- a/resources/factions/spain_1990.json +++ b/resources/factions/spain_1990.json @@ -21,16 +21,16 @@ "MBT_M60A3_Patton", "MBT_Leopard_2", "APC_M113", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/sweden_1970.json b/resources/factions/sweden_1970.json index 41a79c1e..30bcdcb7 100644 --- a/resources/factions/sweden_1970.json +++ b/resources/factions/sweden_1970.json @@ -16,19 +16,19 @@ "KC130" ], "frontline_units": [ - "IFV_MCV_80", + "IFV_Warrior", "MBT_Leopard_2", - "APC_M1126_Stryker_ICV", + "IFV_M1126_Stryker_ICV", "SAM_Chaparral_M48" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/sweden_1990.json b/resources/factions/sweden_1990.json index e6c20950..2ea024b9 100644 --- a/resources/factions/sweden_1990.json +++ b/resources/factions/sweden_1990.json @@ -15,20 +15,20 @@ "KC130" ], "frontline_units": [ - "IFV_MCV_80", + "IFV_Warrior", "MBT_Leopard_2", - "APC_M1126_Stryker_ICV", - "SAM_Avenger_M1097" + "IFV_M1126_Stryker_ICV", + "SAM_Avenger__Stinger" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS" + "Infantry_M249", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/syria_1948.json b/resources/factions/syria_1948.json index 3ff2e29d..352688d9 100644 --- a/resources/factions/syria_1948.json +++ b/resources/factions/syria_1948.json @@ -8,17 +8,17 @@ "SpitfireLFMkIXCW" ], "frontline_units": [ - "AC_Sd_Kfz_234_2_Puma", - "APC_Sd_Kfz_251", - "MT_Pz_Kpfw_IV_Ausf_H", + "IFV_Sd_Kfz_234_2_Puma", + "APC_Sd_Kfz_251_Halftrack_Halftrack", + "MT_PzIV_H", "MT_M4_Sherman", - "AAA_Bofors_40mm" + "AAA_40mm_Bofors" ], "artillery_units": [ ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" diff --git a/resources/factions/syria_1967.json b/resources/factions/syria_1967.json index b84c590f..ad2fdd4d 100644 --- a/resources/factions/syria_1967.json +++ b/resources/factions/syria_1967.json @@ -17,23 +17,23 @@ "IL_78M" ], "frontline_units": [ - "ARV_BRDM_2", - "MT_Pz_Kpfw_IV_Ausf_H", + "IFV_BRDM_2", + "MT_PzIV_H", "MBT_T_55", - "AAA_ZU_23_on_Ural_375", - "AAA_ZSU_57_2" + "SPAAA_ZU_23_2_Mounted_Ural_375", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "SA2Generator", diff --git a/resources/factions/syria_1967_with_ww2_weapons.json b/resources/factions/syria_1967_with_ww2_weapons.json index 46b6bb34..0a0a7f6a 100644 --- a/resources/factions/syria_1967_with_ww2_weapons.json +++ b/resources/factions/syria_1967_with_ww2_weapons.json @@ -18,24 +18,24 @@ "IL_78M" ], "frontline_units": [ - "ARV_BRDM_2", + "IFV_BRDM_2", "MBT_T_55", - "MT_Pz_Kpfw_IV_Ausf_H", - "StuG_III_Ausf__G", - "TD_Jagdpanzer_IV", - "AAA_ZSU_57_2" + "MT_PzIV_H", + "SPG_StuG_III_Ausf__G", + "SPG_Jagdpanzer_IV", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "EarlyColdWarFlakGenerator", diff --git a/resources/factions/syria_1973.json b/resources/factions/syria_1973.json index 83af1f67..f2c9c051 100644 --- a/resources/factions/syria_1973.json +++ b/resources/factions/syria_1973.json @@ -20,20 +20,20 @@ "IFV_BMP_1", "APC_MTLB", "MBT_T_55", - "AAA_ZU_23_on_Ural_375", - "AAA_ZSU_57_2" + "SPAAA_ZU_23_2_Mounted_Ural_375", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", - "Soldier_RPG" + "Infantry_AK_74_Rus", + "Infantry_RPG" ], "air_defenses": [ "EarlyColdWarFlakGenerator", diff --git a/resources/factions/syria_1982.json b/resources/factions/syria_1982.json index ab74b0de..02253a32 100644 --- a/resources/factions/syria_1982.json +++ b/resources/factions/syria_1982.json @@ -22,19 +22,19 @@ "APC_MTLB", "MBT_T_55", "MBT_T_72B", - "AAA_ZU_23_on_Ural_375", - "AAA_ZSU_57_2" + "SPAAA_ZU_23_2_Mounted_Ural_375", + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_BM_21_Grad" + "MLRS_BM_21_Grad_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16" ], "air_defenses": [ diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json index 25d94f56..ae2211a5 100644 --- a/resources/factions/syria_2011.json +++ b/resources/factions/syria_2011.json @@ -26,29 +26,29 @@ "IFV_BMP_1", "IFV_BMP_2", "APC_BTR_80", - "ARV_BRDM_2", + "IFV_BRDM_2", "APC_MTLB", - "APC_Cobra", + "APC_Cobra__Scout", "MBT_T_55", "MBT_T_72B", "MBT_T_90", - "AAA_ZSU_57_2" + "SPAAA_ZSU_57_2" ], "artillery_units": [ - "MLRS_9K57_Uragan_BM_27", - "SPH_2S9_Nona", - "MLRS_BM_21_Grad", - "SPH_2S1_Gvozdika" + "MLRS_BM_27_Uragan_220mm", + "SPH_2S9_Nona_120mm_M", + "MLRS_BM_21_Grad_122mm", + "SPH_2S1_Gvozdika_122mm" ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "ColdWarFlakGenerator", diff --git a/resources/factions/turkey_2005.json b/resources/factions/turkey_2005.json index 4aad1c46..f5c7847c 100644 --- a/resources/factions/turkey_2005.json +++ b/resources/factions/turkey_2005.json @@ -20,21 +20,21 @@ "MBT_Leopard_2", "MBT_Leopard_1A3", "MBT_M60A3_Patton", - "APC_Cobra", + "APC_Cobra__Scout", "APC_BTR_80", - "SAM_Avenger_M1097" + "SAM_Avenger__Stinger" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", + "Infantry_M249", "Paratrooper_AKS", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/uae_2005.json b/resources/factions/uae_2005.json index bff684e0..265e2dfb 100644 --- a/resources/factions/uae_2005.json +++ b/resources/factions/uae_2005.json @@ -18,18 +18,18 @@ ], "frontline_units": [ "MBT_Leclerc", - "TPz_Fuchs", + "APC_TPz_Fuchs", "IFV_BMP_3" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "SAM_SA_18_Igla_S_MANPADS" + "Infantry_M249", + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "HawkGenerator", diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json index 418e2d79..33eba987 100644 --- a/resources/factions/uk_1944.json +++ b/resources/factions/uk_1944.json @@ -17,13 +17,13 @@ "frontline_units": [ "MT_M4A4_Sherman_Firefly", "MT_M4_Sherman", - "APC_M2A1", + "APC_M2A1_Halftrack", "CT_Cromwell_IV", "CT_Centaur_IV", "HIT_Churchill_VII", - "Daimler_Armoured_Car", + "Car_Daimler_Armored", "LT_Mk_VII_Tetrarch", - "AAA_Bofors_40mm" + "AAA_40mm_Bofors" ], "artillery_units": [ ], diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json index 2522d20b..8230822e 100644 --- a/resources/factions/uk_1990.json +++ b/resources/factions/uk_1990.json @@ -19,23 +19,23 @@ ], "frontline_units": [ "MBT_Challenger_II", - "IFV_MCV_80", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "SAM_Avenger_M1097" + "IFV_Warrior", + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "SAM_Avenger__Stinger" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "_2B11_mortar", - "Stinger_MANPADS" + "Infantry_M249", + "Mortar_2B11_120mm", + "MANPADS_Stinger" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/ukraine_2010.json b/resources/factions/ukraine_2010.json index b92f90c6..9ecceb81 100644 --- a/resources/factions/ukraine_2010.json +++ b/resources/factions/ukraine_2010.json @@ -20,25 +20,25 @@ "IL_78M" ], "frontline_units": [ - "APC_M1043_HMMWV_Armament", + "APC_HMMWV__Scout", "IFV_BMP_3", "IFV_BMP_2", "APC_BTR_80", "MBT_T_80U", "MBT_T_72B", - "SAM_SA_13_Strela_10M3_9A35M3" + "SAM_SA_13_Strela_10M3_Gopher_TEL" ], "artillery_units": [ ], "logistics_units": [ - "Transport_Ural_375", - "Transport_UAZ_469" + "Truck_Ural_375", + "LUV_UAZ_469_Jeep" ], "infantry_units": [ "Paratrooper_AKS", - "Infantry_Soldier_Rus", + "Infantry_AK_74_Rus", "Paratrooper_RPG_16", - "SAM_SA_18_Igla_S_MANPADS" + "MANPADS_SA_18_Igla_S_Grouse" ], "air_defenses": [ "SA3Generator", diff --git a/resources/factions/unc_1950_fictional.json b/resources/factions/unc_1950_fictional.json index 66864da4..dae56d1f 100644 --- a/resources/factions/unc_1950_fictional.json +++ b/resources/factions/unc_1950_fictional.json @@ -14,15 +14,15 @@ "frontline_units": [ "MT_M4_Sherman", "MBT_M60A3_Patton", - "APC_M2A1", - "LAC_M8_Greyhound", - "AAA_Bofors_40mm" + "APC_M2A1_Halftrack", + "Car_M8_Greyhound_Armored", + "AAA_40mm_Bofors" ], "artillery_units": [ - "M12_GMC" + "SPG_M12_GMC_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4" diff --git a/resources/factions/us_aggressors.json b/resources/factions/us_aggressors.json index b9c7834e..ef43854b 100644 --- a/resources/factions/us_aggressors.json +++ b/resources/factions/us_aggressors.json @@ -32,22 +32,22 @@ "frontline_units": [ "MBT_M1A2_Abrams", "MBT_Leopard_2", - "ATGM_M1134_Stryker", + "ATGM_Stryker", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "SAM_Avenger_M1097" + "APC_HMMWV__Scout", + "SAM_Avenger__Stinger" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/usa_1944.json b/resources/factions/usa_1944.json index bdece25a..bca938a9 100644 --- a/resources/factions/usa_1944.json +++ b/resources/factions/usa_1944.json @@ -16,13 +16,13 @@ "frontline_units": [ "MT_M4A4_Sherman_Firefly", "MT_M4_Sherman", - "APC_M2A1", - "LAC_M8_Greyhound", - "TD_M10_GMC", - "AA_gun_QF_3_7" + "APC_M2A1_Halftrack", + "Car_M8_Greyhound_Armored", + "SPG_M10_GMC", + "AAA_QF_3_7" ], "artillery_units": [ - "M12_GMC" + "SPG_M12_GMC_155mm" ], "logistics_units": [ "CCKW_353" diff --git a/resources/factions/usa_1955.json b/resources/factions/usa_1955.json index 1c2a1ec8..df202d6a 100644 --- a/resources/factions/usa_1955.json +++ b/resources/factions/usa_1955.json @@ -12,14 +12,14 @@ "frontline_units": [ "MT_M4_Sherman", "MBT_M60A3_Patton", - "APC_M2A1", - "AAA_Bofors_40mm" + "APC_M2A1_Halftrack", + "AAA_40mm_Bofors" ], "artillery_units": [ - "M12_GMC" + "SPG_M12_GMC_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4" diff --git a/resources/factions/usa_1960.json b/resources/factions/usa_1960.json index e9d7c4c7..0548300f 100644 --- a/resources/factions/usa_1960.json +++ b/resources/factions/usa_1960.json @@ -13,12 +13,12 @@ "frontline_units": [ "MBT_M60A3_Patton", "APC_M113", - "AAA_Vulcan_M163" + "SPAAA_Vulcan_M163" ], "artillery_units": [ ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4" diff --git a/resources/factions/usa_1965.json b/resources/factions/usa_1965.json index e107e90a..e252c371 100644 --- a/resources/factions/usa_1965.json +++ b/resources/factions/usa_1965.json @@ -15,17 +15,17 @@ "frontline_units": [ "MBT_M60A3_Patton", "APC_M113", - "AAA_Vulcan_M163" + "SPAAA_Vulcan_M163" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index 13093f04..c1e894bb 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -18,17 +18,17 @@ "MBT_M60A3_Patton", "APC_M113", "SAM_Chaparral_M48", - "AAA_Vulcan_M163" + "SPAAA_Vulcan_M163" ], "artillery_units": [ - "SPH_M109_Paladin" + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "air_defenses": [ "ChaparralGenerator", diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index e58b037c..13c12f6f 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -30,26 +30,26 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", - "APC_M1126_Stryker_ICV", + "ATGM_Stryker", + "IFV_M1126_Stryker_ICV", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "SAM_Avenger_M1097" + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "SAM_Avenger__Stinger" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS", - "_2B11_mortar" + "Infantry_M249", + "MANPADS_Stinger", + "Mortar_2B11_120mm" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json index ecd22a2a..64d0f9d5 100644 --- a/resources/factions/usa_2005.json +++ b/resources/factions/usa_2005.json @@ -30,28 +30,28 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", - "APC_M1126_Stryker_ICV", + "ATGM_Stryker", + "IFV_M1126_Stryker_ICV", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "SAM_Avenger_M1097", - "SAM_Linebacker_M6", - "SPG_M1128_Stryker_MGS" + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "SAM_Avenger__Stinger", + "SAM_Linebacker___Bradley_M6", + "SPG_Stryker_MGS" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS", - "_2B11_mortar" + "Infantry_M249", + "MANPADS_Stinger", + "Mortar_2B11_120mm" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/usa_2005_c130.json b/resources/factions/usa_2005_c130.json index e577c65a..85962b89 100644 --- a/resources/factions/usa_2005_c130.json +++ b/resources/factions/usa_2005_c130.json @@ -31,27 +31,27 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", - "APC_M1126_Stryker_ICV", + "ATGM_Stryker", + "IFV_M1126_Stryker_ICV", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "SAM_Avenger_M1097", - "SAM_Linebacker_M6" + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "SAM_Avenger__Stinger", + "SAM_Linebacker___Bradley_M6" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS", - "_2B11_mortar" + "Infantry_M249", + "MANPADS_Stinger", + "Mortar_2B11_120mm" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/usa_2005_modded.json b/resources/factions/usa_2005_modded.json index a2e8d07c..51fe76a8 100644 --- a/resources/factions/usa_2005_modded.json +++ b/resources/factions/usa_2005_modded.json @@ -31,27 +31,27 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", - "APC_M1126_Stryker_ICV", + "ATGM_Stryker", + "IFV_M1126_Stryker_ICV", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW", - "SAM_Avenger_M1097", - "SAM_Linebacker_M6" + "APC_HMMWV__Scout", + "ATGM_HMMWV", + "SAM_Avenger__Stinger", + "SAM_Linebacker___Bradley_M6" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "Stinger_MANPADS", - "_2B11_mortar" + "Infantry_M249", + "MANPADS_Stinger", + "Mortar_2B11_120mm" ], "air_defenses": [ "AvengerGenerator", diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index 08230c1d..21aeb348 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -22,20 +22,20 @@ "MBT_M60A3_Patton", "APC_M113", "APC_M1025_HMMWV", - "AAA_Vulcan_M163" + "SPAAA_Vulcan_M163" ], "artillery_units": [ - "SPH_M109_Paladin", - "MLRS_M270" + "SPH_M109_Paladin_155mm", + "MLRS_M270_227mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249", - "_2B11_mortar", - "Stinger_MANPADS" + "Infantry_M249", + "Mortar_2B11_120mm", + "MANPADS_Stinger" ], "air_defenses": [ "ChaparralGenerator", diff --git a/tests/resources/invalid_faction_country.json b/tests/resources/invalid_faction_country.json index 84579ab0..b677f9a8 100644 --- a/tests/resources/invalid_faction_country.json +++ b/tests/resources/invalid_faction_country.json @@ -26,23 +26,23 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", - "APC_M1126_Stryker_ICV", + "ATGM_Stryker", + "IFV_M1126_Stryker_ICV", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW" + "APC_HMMWV__Scout", + "ATGM_HMMWV" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "shorads": [ "AvengerGenerator" diff --git a/tests/resources/valid_faction.json b/tests/resources/valid_faction.json index b540cc55..18d9b989 100644 --- a/tests/resources/valid_faction.json +++ b/tests/resources/valid_faction.json @@ -28,23 +28,23 @@ ], "frontline_units": [ "MBT_M1A2_Abrams", - "ATGM_M1134_Stryker", - "APC_M1126_Stryker_ICV", + "ATGM_Stryker", + "IFV_M1126_Stryker_ICV", "IFV_M2A2_Bradley", "IFV_LAV_25", - "APC_M1043_HMMWV_Armament", - "ATGM_M1045_HMMWV_TOW" + "APC_HMMWV__Scout", + "ATGM_HMMWV" ], "artillery_units": [ - "MLRS_M270", - "SPH_M109_Paladin" + "MLRS_M270_227mm", + "SPH_M109_Paladin_155mm" ], "logistics_units": [ - "Transport_M818" + "Truck_M818_6x6" ], "infantry_units": [ "Infantry_M4", - "Soldier_M249" + "Infantry_M249" ], "shorads": [ "AvengerGenerator" diff --git a/tests/test_factions.py b/tests/test_factions.py index 3635dfdb..86f12eb3 100644 --- a/tests/test_factions.py +++ b/tests/test_factions.py @@ -78,20 +78,20 @@ class TestFactionLoader(unittest.TestCase): self.assertEqual(faction.jtac_unit, MQ_9_Reaper) self.assertIn(Armor.MBT_M1A2_Abrams, faction.frontline_units) - self.assertIn(Armor.ATGM_M1134_Stryker, faction.frontline_units) - self.assertIn(Armor.APC_M1126_Stryker_ICV, 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.APC_M1043_HMMWV_Armament, faction.frontline_units) - self.assertIn(Armor.ATGM_M1045_HMMWV_TOW, faction.frontline_units) + self.assertIn(Armor.APC_HMMWV__Scout, faction.frontline_units) + self.assertIn(Armor.ATGM_HMMWV, faction.frontline_units) - self.assertIn(Artillery.MLRS_M270, faction.artillery_units) - self.assertIn(Artillery.SPH_M109_Paladin, faction.artillery_units) + self.assertIn(Artillery.MLRS_M270_227mm, faction.artillery_units) + self.assertIn(Artillery.SPH_M109_Paladin_155mm, faction.artillery_units) - self.assertIn(Unarmed.Transport_M818, faction.logistics_units) + self.assertIn(Unarmed.Truck_M818_6x6, faction.logistics_units) self.assertIn(Infantry.Infantry_M4, faction.infantry_units) - self.assertIn(Infantry.Soldier_M249, faction.infantry_units) + self.assertIn(Infantry.Infantry_M249, faction.infantry_units) self.assertIn("AvengerGenerator", faction.air_defenses)