From 6b310a10de3e265765054ca46f092156d808aa16 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 18 Jun 2021 16:19:38 -0700 Subject: [PATCH] Revert "Adapt to DCS update." This reverts commit 3a11068259c82f7d0890ca81189e22f8e8db5779. --- game/data/groundunitclass.py | 262 ++++++++--------- game/data/radar_db.py | 182 ++++++------ game/db.py | 500 ++++++++++++++++---------------- game/theater/conflicttheater.py | 56 ++-- game/theater/controlpoint.py | 22 +- 5 files changed, 511 insertions(+), 511 deletions(-) diff --git a/game/data/groundunitclass.py b/game/data/groundunitclass.py index c001d169..4b2f6e58 100644 --- a/game/data/groundunitclass.py +++ b/game/data/groundunitclass.py @@ -12,35 +12,35 @@ class GroundUnitClass(Enum): Tank = ( "Tank", ( - Armor.T_55, - Armor.T_72B, - Armor.T_72B3, - Armor.T_80UD, - Armor.T_90, - Armor.Leopard_2A4, - Armor.Leopard_2A4_trs, - Armor.Leopard_2A5, - Armor.Leopard_2, - Armor.Leopard1A3, - Armor.Leclerc, - Armor.Challenger2, - Armor.Chieftain_mk3, - Armor.M_1_Abrams, - Armor.M_60, - Armor.Merkava_Mk4, - Armor.ZTZ96B, + Armor.MBT_T_55, + Armor.MBT_T_72B, + Armor.MBT_T_72B3, + Armor.MBT_T_80U, + Armor.MBT_T_90, + Armor.MBT_Leopard_2A4, + Armor.MBT_Leopard_2A4_Trs, + Armor.MBT_Leopard_2A5, + Armor.MBT_Leopard_2A6M, + Armor.MBT_Leopard_1A3, + Armor.MBT_Leclerc, + Armor.MBT_Challenger_II, + Armor.MBT_Chieftain_Mk_3, + Armor.MBT_M1A2_Abrams, + Armor.MBT_M60A3_Patton, + Armor.MBT_Merkava_IV, + Armor.ZTZ_96B, # WW2 # Axis - Armor.Pz_IV_H, - Armor.SturmPzIV, - Armor.Pz_V_Panther_G, - Armor.Tiger_I, - Armor.Tiger_II_H, + Armor.Tk_PzIV_H, + Armor.SPG_Sturmpanzer_IV_Brummbar, + Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, + Armor.HT_Pz_Kpfw_VI_Tiger_I, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, # Allies - Armor.M4_Sherman, - Armor.Centaur_IV, - Armor.Cromwell_IV, - Armor.Churchill_VII, + Armor.Tk_M4_Sherman, + Armor.CT_Centaur_IV, + Armor.CT_Cromwell_IV, + Armor.HIT_Churchill_VII, # Mods frenchpack.DIM__TOYOTA_BLUE, frenchpack.DIM__TOYOTA_GREEN, @@ -54,20 +54,20 @@ class GroundUnitClass(Enum): Atgm = ( "ATGM", ( - Armor.M1043_HMMWV_Armament, - Armor.VAB_Mephisto, - Armor.M1134_Stryker_ATGM, - Armor.BMP_2, + Armor.ATGM_HMMWV, + Armor.ATGM_VAB_Mephisto, + Armor.ATGM_Stryker, + Armor.IFV_BMP_2, # WW2 (Tank Destroyers) # Axxis - Armor.Stug_III, - Armor.Stug_IV, - Armor.JagdPz_IV, - Armor.Jagdpanther_G1, - Armor.Elefant_SdKfz_184, + Armor.SPG_StuG_III_Ausf__G, + Armor.SPG_StuG_IV, + Armor.SPG_Jagdpanzer_IV, + Armor.SPG_Jagdpanther_G1, + Armor.SPG_Sd_Kfz_184_Elefant, # Allies - Armor.M10_GMC, - Armor.M4A4_Sherman_FF, + Armor.SPG_M10_GMC, + Armor.MT_M4A4_Sherman_Firefly, # Mods frenchpack.VBAE_CRAB_MMP, frenchpack.VAB_MEPHISTO, @@ -78,15 +78,15 @@ class GroundUnitClass(Enum): Ifv = ( "IFV", ( - Armor.BMP_3, - Armor.BMP_2, - Armor.BMP_1, - Armor.Marder, - Armor.MCV_80, - Armor.M1128_Stryker_MGS, - Armor.M_2_Bradley, - Armor.BMD_1, - Armor.ZBD04A, + Armor.IFV_BMP_3, + Armor.IFV_BMP_2, + Armor.IFV_BMP_1, + Armor.IFV_Marder, + Armor.IFV_Warrior, + Armor.SPG_Stryker_MGS, + Armor.IFV_M2A2_Bradley, + Armor.IFV_BMD_1, + Armor.ZBD_04A, # Mods frenchpack.VBAE_CRAB, frenchpack.VAB_T20_13, @@ -96,17 +96,17 @@ class GroundUnitClass(Enum): Apc = ( "APC", ( - Armor.M1126_Stryker_ICV, - Armor.M_113, - Armor.BTR_80, - Armor.BTR_82A, - Armor.MTLB, - Armor.AAV7, - Armor.TPZ, - Armor.BTR_D, + Armor.IFV_M1126_Stryker_ICV, + Armor.APC_M113, + Armor.APC_BTR_80, + Armor.IFV_BTR_82A, + Armor.APC_MTLB, + Armor.APC_AAV_7_Amphibious, + Armor.APC_TPz_Fuchs, + Armor.APC_BTR_RD, # WW2 - Armor.M2A1_halftrack, - Armor.Sd_Kfz_251, + Armor.APC_M2A1_Halftrack, + Armor.APC_Sd_Kfz_251_Halftrack, # Mods frenchpack.VAB__50, frenchpack.VBL__50, @@ -117,44 +117,44 @@ class GroundUnitClass(Enum): Artillery = ( "Artillery", ( - Artillery.Grad_FDDM, - Artillery.Smerch_HE, - Artillery.SAU_Gvozdika, - Artillery.SAU_Akatsia, - Artillery.Grad_URAL, - Artillery.Uragan_BM_27, - Artillery.M_109, - Artillery.MLRS, - Artillery.SAU_2_C9, - Artillery.SpGH_Dana, - Artillery.T155_Firtina, - Artillery.PLZ05, - Artillery.SAU_Msta, - Artillery.Smerch, + Artillery.Grad_MRL_FDDM__FC, + Artillery.MLRS_9A52_Smerch_HE_300mm, + Artillery.SPH_2S1_Gvozdika_122mm, + Artillery.SPH_2S3_Akatsia_152mm, + Artillery.MLRS_BM_21_Grad_122mm, + Artillery.MLRS_9K57_Uragan_BM_27_220mm, + Artillery.SPH_M109_Paladin_155mm, + Artillery.MLRS_M270_227mm, + Artillery.SPM_2S9_Nona_120mm_M, + Artillery.SPH_Dana_vz77_152mm, + Artillery.SPH_T155_Firtina_155mm, + Artillery.PLZ_05, + Artillery.SPH_2S19_Msta_152mm, + Artillery.MLRS_9A52_Smerch_CM_300mm, # WW2 - Artillery.M12_GMC, + Artillery.SPG_M12_GMC_155mm, ), ) Logistics = ( "Logistics", ( - Unarmed.M30_CC, - Unarmed.M_818, - Unarmed.KAMAZ_Truck, - Unarmed.Ural_375, - Unarmed.GAZ_66, - Unarmed.GAZ_3307, - Unarmed.GAZ_3308, - Unarmed.Ural_4320_31, - Unarmed.Ural_4320T, - Unarmed.Blitz_36_6700A, - Unarmed.Kubelwagen_82, - Unarmed.Sd_Kfz_7, - Unarmed.Sd_Kfz_2, - Unarmed.Willys_MB, - Unarmed.Land_Rover_109_S3, - Unarmed.Land_Rover_101_FC, + Unarmed.Carrier_M30_Cargo, + Unarmed.Truck_M818_6x6, + Unarmed.Truck_KAMAZ_43101, + Unarmed.Truck_Ural_375, + Unarmed.Truck_GAZ_66, + Unarmed.Truck_GAZ_3307, + Unarmed.Truck_GAZ_3308, + Unarmed.Truck_Ural_4320_31_Arm_d, + Unarmed.Truck_Ural_4320T, + Unarmed.Truck_Opel_Blitz, + Unarmed.LUV_Kubelwagen_82, + Unarmed.Carrier_Sd_Kfz_7_Tractor, + Unarmed.LUV_Kettenrad, + Unarmed.Car_Willys_Jeep, + Unarmed.LUV_Land_Rover_109, + Unarmed.Truck_Land_Rover_101_FC, # Mods frenchpack.VBL, frenchpack.VAB, @@ -164,16 +164,16 @@ class GroundUnitClass(Enum): Recon = ( "Recon", ( - Armor.M1043_HMMWV_Armament, - Armor.Cobra, - Armor.PT_76, - Armor.LAV_25, - Armor.BRDM_2, + Armor.Scout_HMMWV, + Armor.Scout_Cobra, + Armor.LT_PT_76, + Armor.IFV_LAV_25, + Armor.Scout_BRDM_2, # WW2 - Armor.Tetrarch, - Armor.Sd_Kfz_234_2_Puma, - Armor.M8_Greyhound, - Armor.Daimler_AC, + Armor.LT_Mk_VII_Tetrarch, + Armor.IFV_Sd_Kfz_234_2_Puma, + Armor.Car_M8_Greyhound_Armored, + Armor.Car_Daimler_Armored, # Mods frenchpack.ERC_90, frenchpack.AMX_10RCR, @@ -184,48 +184,48 @@ class GroundUnitClass(Enum): Infantry = ( "Infantry", ( - Infantry.Infantry_AK_Ins, - Infantry.Soldier_AK, - Infantry.Soldier_wwii_us, - Infantry.Soldier_mauser98, - Infantry.Soldier_wwii_br_01, - Infantry.Soldier_M4_GRG, - Infantry.Infantry_AK, - Infantry.Paratrooper_AKS_74, + Infantry.Insurgent_AK_74, + Infantry.Infantry_AK_74, + Infantry.Infantry_M1_Garand, + Infantry.Infantry_Mauser_98, + Infantry.Infantry_SMLE_No_4_Mk_1, + Infantry.Infantry_M4_Georgia, + Infantry.Infantry_AK_74_Rus, + Infantry.Paratrooper_AKS, Infantry.Paratrooper_RPG_16, - Infantry.Soldier_M249, - Infantry.Soldier_M4, - Infantry.Soldier_RPG, + Infantry.Infantry_M249, + Infantry.Infantry_M4, + Infantry.Infantry_RPG, ), ) Shorads = ( "SHORADS", ( - AirDefence.Ural_375_ZU_23, - AirDefence.Ural_375_ZU_23_Insurgent, - AirDefence.ZSU_57_2, - AirDefence.ZSU_23_4_Shilka, - AirDefence.Osa_9A33_ln, - AirDefence.Strela_1_9P31, - AirDefence.Strela_10M3, - AirDefence.Tor_9A331, - AirDefence._2S6_Tunguska, - AirDefence.Gepard, - AirDefence.Vulcan, - AirDefence.M6_Linebacker, - AirDefence.M48_Chaparral, - AirDefence.M1097_Avenger, - AirDefence.Roland_ADS, - AirDefence.HQ_7_LN_SP, - AirDefence.Flak18, - AirDefence.Flak36, - AirDefence.Flak37, - AirDefence.Flak41, - AirDefence.Bofors40, - AirDefence.S_60_Type59_Artillery, - AirDefence.M1_37mm, - AirDefence.QF_37_AA, + AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375, + AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375, + AirDefence.SPAAA_ZSU_57_2, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.SAM_SA_8_Osa_Gecko_TEL, + AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL, + AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL, + AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.SAM_SA_19_Tunguska_Grison, + AirDefence.SPAAA_Gepard, + AirDefence.SPAAA_Vulcan_M163, + AirDefence.SAM_Linebacker___Bradley_M6, + AirDefence.SAM_Chaparral_M48, + AirDefence.SAM_Avenger__Stinger, + AirDefence.SAM_Roland_ADS, + AirDefence.HQ_7_Self_Propelled_LN, + AirDefence.AAA_8_8cm_Flak_18, + AirDefence.AAA_8_8cm_Flak_36, + AirDefence.AAA_8_8cm_Flak_37, + AirDefence.AAA_8_8cm_Flak_41, + AirDefence.AAA_Bofors_40mm, + AirDefence.AAA_S_60_57mm, + AirDefence.AAA_M1_37mm, + AirDefence.AAA_QF_3_7, ), ) diff --git a/game/data/radar_db.py b/game/data/radar_db.py index 7cd7403d..9bd384af 100644 --- a/game/data/radar_db.py +++ b/game/data/radar_db.py @@ -1,108 +1,108 @@ from dcs.ships import ( - PIOTR, - MOSCOW, - VINSON, - CVN_71, - CVN_72, - CVN_73, - Stennis, - KUZNECOW, - CV_1143_5, - NEUSTRASH, - ALBATROS, - REZKY, - MOLNIYA, - LHA_Tarawa, - PERRY, - TICONDEROG, - Type_052B, - Type_052C, - Type_054A, - USS_Arleigh_Burke_IIa, + Battlecruiser_1144_2_Pyotr_Velikiy, + Cruiser_1164_Moskva, + CVN_70_Carl_Vinson, + CVN_71_Theodore_Roosevelt, + CVN_72_Abraham_Lincoln, + CVN_73_George_Washington, + CVN_74_John_C__Stennis, + CV_1143_5_Admiral_Kuznetsov, + CV_1143_5_Admiral_Kuznetsov_2017, + Frigate_11540_Neustrashimy, + Corvette_1124_4_Grisha, + Frigate_1135M_Rezky, + Corvette_1241_1_Molniya, + LHA_1_Tarawa, + FFG_Oliver_Hazzard_Perry, + CG_Ticonderoga, + Type_052B_Destroyer, + Type_052C_Destroyer, + Type_054A_Frigate, + DDG_Arleigh_Burke_IIa, ) from dcs.vehicles import AirDefence TELARS = { - AirDefence._2S6_Tunguska, - AirDefence.SA_11_Buk_SR_9S18M1, - AirDefence.Osa_9A33_ln, - AirDefence.Tor_9A331, - AirDefence.Roland_ADS, + AirDefence.SAM_SA_19_Tunguska_Grison, + AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL, + AirDefence.SAM_SA_8_Osa_Gecko_TEL, + AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.SAM_Roland_ADS, } TRACK_RADARS = { - AirDefence.Kub_1S91_str, - AirDefence.Snr_s_125_tr, - AirDefence.S_300PS_40B6M_tr, - AirDefence.Hawk_tr, - AirDefence.Patriot_str, - AirDefence.SNR_75V, - AirDefence.Rapier_fsa_blindfire_radar, - AirDefence.HQ_7_STR_SP, + AirDefence.SAM_SA_6_Kub_Straight_Flush_STR, + AirDefence.SAM_SA_3_S_125_Low_Blow_TR, + AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR, + AirDefence.SAM_Hawk_TR__AN_MPQ_46, + AirDefence.SAM_Patriot_STR, + AirDefence.SAM_SA_2_S_75_Fan_Song_TR, + AirDefence.SAM_Rapier_Blindfire_TR, + AirDefence.HQ_7_Self_Propelled_STR, } LAUNCHER_TRACKER_PAIRS = { - AirDefence.Kub_2P25_ln: AirDefence.Kub_1S91_str, - AirDefence._5p73_s_125_ln: AirDefence.Snr_s_125_tr, - AirDefence.S_300PS_5P85C_ln: AirDefence.S_300PS_40B6M_tr, - AirDefence.S_300PS_5P85D_ln: AirDefence.S_300PS_40B6M_tr, - AirDefence.Hawk_ln: AirDefence.Hawk_tr, - AirDefence.Patriot_ln: AirDefence.Patriot_str, - AirDefence.S_75M_Volhov: AirDefence.SNR_75V, - AirDefence.Rapier_fsa_launcher: AirDefence.Rapier_fsa_blindfire_radar, - AirDefence.HQ_7_LN_SP: AirDefence.HQ_7_STR_SP, + AirDefence.SAM_SA_6_Kub_Gainful_TEL: AirDefence.SAM_SA_6_Kub_Straight_Flush_STR, + AirDefence.SAM_SA_3_S_125_Goa_LN: AirDefence.SAM_SA_3_S_125_Low_Blow_TR, + AirDefence.SAM_SA_10_S_300_Grumble_TEL_D: 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_Flap_Lid_TR, + AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_TR__AN_MPQ_46, + AirDefence.SAM_Patriot_LN: AirDefence.SAM_Patriot_STR, + AirDefence.SAM_SA_2_S_75_Guideline_LN: AirDefence.SAM_SA_2_S_75_Fan_Song_TR, + AirDefence.SAM_Rapier_LN: AirDefence.SAM_Rapier_Blindfire_TR, + AirDefence.HQ_7_Self_Propelled_LN: AirDefence.HQ_7_Self_Propelled_STR, } UNITS_WITH_RADAR = { # Radars - AirDefence._2S6_Tunguska, - AirDefence.SA_11_Buk_LN_9A310M1, - AirDefence.Osa_9A33_ln, - AirDefence.Tor_9A331, - AirDefence.Gepard, - AirDefence.Vulcan, - AirDefence.Roland_ADS, - AirDefence.ZSU_23_4_Shilka, - AirDefence._1L13_EWR, - AirDefence.Kub_1S91_str, - AirDefence.S_300PS_40B6M_tr, - AirDefence.S_300PS_40B6MD_sr, - AirDefence._55G6_EWR, - AirDefence.S_300PS_64H6E_sr, - AirDefence.SA_11_Buk_SR_9S18M1, - AirDefence.Dog_Ear_radar, - AirDefence.Hawk_tr, - AirDefence.Hawk_sr, - AirDefence.Patriot_str, - AirDefence.Hawk_cwar, - AirDefence.P_19_s_125_sr, - AirDefence.Roland_Radar, - AirDefence.Snr_s_125_tr, - AirDefence.SNR_75V, - AirDefence.Rapier_fsa_blindfire_radar, - AirDefence.HQ_7_LN_SP, - AirDefence.HQ_7_STR_SP, - AirDefence.FuMG_401, - AirDefence.FuSe_65, + AirDefence.SAM_SA_19_Tunguska_Grison, + AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL, + AirDefence.SAM_SA_8_Osa_Gecko_TEL, + AirDefence.SAM_SA_15_Tor_Gauntlet, + AirDefence.SPAAA_Gepard, + AirDefence.SPAAA_Vulcan_M163, + AirDefence.SAM_Roland_ADS, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish, + AirDefence.EWR_1L13, + AirDefence.SAM_SA_6_Kub_Straight_Flush_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_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_P19_Flat_Face_SR__SA_2_3, + AirDefence.SAM_Roland_EWR, + AirDefence.SAM_SA_3_S_125_Low_Blow_TR, + AirDefence.SAM_SA_2_S_75_Fan_Song_TR, + AirDefence.SAM_Rapier_Blindfire_TR, + AirDefence.HQ_7_Self_Propelled_LN, + AirDefence.HQ_7_Self_Propelled_STR, + AirDefence.EWR_FuMG_401_Freya_LZ, + AirDefence.EWR_FuSe_65_Würzburg_Riese, # Ships - VINSON, - PERRY, - TICONDEROG, - ALBATROS, - KUZNECOW, - MOLNIYA, - MOSCOW, - NEUSTRASH, - PIOTR, - REZKY, - CV_1143_5, - Stennis, - CVN_71, - CVN_72, - CVN_73, - USS_Arleigh_Burke_IIa, - LHA_Tarawa, - Type_052B, - Type_054A, - Type_052C, + CVN_70_Carl_Vinson, + FFG_Oliver_Hazzard_Perry, + CG_Ticonderoga, + Corvette_1124_4_Grisha, + CV_1143_5_Admiral_Kuznetsov, + Corvette_1241_1_Molniya, + Cruiser_1164_Moskva, + Frigate_11540_Neustrashimy, + Battlecruiser_1144_2_Pyotr_Velikiy, + Frigate_1135M_Rezky, + CV_1143_5_Admiral_Kuznetsov_2017, + CVN_74_John_C__Stennis, + CVN_71_Theodore_Roosevelt, + CVN_72_Abraham_Lincoln, + CVN_73_George_Washington, + DDG_Arleigh_Burke_IIa, + LHA_1_Tarawa, + Type_052B_Destroyer, + Type_054A_Frigate, + Type_052C_Destroyer, } diff --git a/game/db.py b/game/db.py index 14f08e72..b374f16a 100644 --- a/game/db.py +++ b/game/db.py @@ -116,19 +116,19 @@ from dcs.planes import ( Tu_142, ) from dcs.ships import ( + Boat_Armed_Hi_speed, + Bulker_Yakushev, + CVN_71_Theodore_Roosevelt, + CVN_72_Abraham_Lincoln, + CVN_73_George_Washington, + CVN_74_John_C__Stennis, + CVN_75_Harry_S__Truman, + CV_1143_5_Admiral_Kuznetsov, + CV_1143_5_Admiral_Kuznetsov_2017, + Cargo_Ivanov, + LHA_1_Tarawa, + Tanker_Elnya_160, ship_map, - Speedboat, - ELNYA, - Dry_cargo_ship_2, - Dry_cargo_ship_1, - LHA_Tarawa, - Stennis, - KUZNECOW, - CVN_71, - CVN_75, - CVN_73, - CVN_72, - CV_1143_5, ) from dcs.task import ( AWACS, @@ -488,190 +488,190 @@ PRICES = { RQ_1A_Predator: 6, WingLoong_I: 6, # armor - Armor.MTLB: 4, - Artillery.Grad_FDDM: 4, - Armor.BRDM_2: 6, - Armor.BTR_D: 6, - Armor.BTR_80: 8, - Armor.BTR_82A: 10, - Armor.T_55: 18, - Armor.T_72B: 20, - Armor.T_72B3: 25, - Armor.T_80UD: 25, - Armor.T_90: 30, - Armor.BMD_1: 8, - Armor.BMP_1: 14, - Armor.BMP_2: 16, - Armor.BMP_3: 18, - Armor.PT_76: 9, - Armor.ZBD04A: 12, - Armor.ZTZ96B: 30, - Armor.Cobra: 4, - Armor.M_113: 6, - Armor.M1043_HMMWV_Armament: 2, - Armor.M1045_HMMWV_TOW: 8, - Armor.VAB_Mephisto: 12, - Armor.M_2_Bradley: 12, - Armor.M1126_Stryker_ICV: 10, - Armor.M1128_Stryker_MGS: 14, - Armor.M1134_Stryker_ATGM: 12, - Armor.M_60: 16, - Armor.M_1_Abrams: 25, - Armor.Leclerc: 25, - Armor.Leopard1A3: 18, - Armor.Leopard_2A4: 20, - Armor.Leopard_2A4_trs: 20, - Armor.Leopard_2A5: 22, - Armor.Leopard_2: 25, - Armor.Merkava_Mk4: 25, - Armor.TPZ: 5, - Armor.Challenger2: 25, - Armor.Chieftain_mk3: 20, - Armor.Marder: 10, - Armor.MCV_80: 10, - Armor.LAV_25: 7, - Armor.AAV7: 10, - Artillery.MLRS: 55, - Artillery.M_109: 25, - Artillery.SAU_2_C9: 12, - Artillery.SAU_Gvozdika: 18, - Artillery.SAU_Akatsia: 24, - Artillery.SAU_Msta: 30, - Artillery.Grad_URAL: 15, - Artillery.Uragan_BM_27: 50, - Artillery.Smerch_HE: 40, - Artillery._2B11_mortar: 4, - Artillery.SpGH_Dana: 26, - Artillery.PLZ05: 25, - Artillery.T155_Firtina: 28, - Artillery.Smerch: 60, - Unarmed.UAZ_469: 3, - Unarmed.Ural_375: 3, - Unarmed.GAZ_3307: 2, - Infantry.Soldier_M4: 1, - Infantry.Soldier_AK: 1, - Unarmed.M_818: 3, - Unarmed.Land_Rover_109_S3: 1, - Unarmed.GAZ_3308: 1, - Unarmed.GAZ_66: 1, - Unarmed.KAMAZ_Truck: 1, - Unarmed.Land_Rover_101_FC: 1, - Unarmed.Ural_4320_31: 1, - Unarmed.Ural_4320T: 1, + Armor.APC_MTLB: 4, + Artillery.Grad_MRL_FDDM__FC: 4, + Armor.Scout_BRDM_2: 6, + Armor.APC_BTR_RD: 6, + Armor.APC_BTR_80: 8, + Armor.IFV_BTR_82A: 10, + Armor.MBT_T_55: 18, + Armor.MBT_T_72B: 20, + Armor.MBT_T_72B3: 25, + Armor.MBT_T_80U: 25, + Armor.MBT_T_90: 30, + Armor.IFV_BMD_1: 8, + Armor.IFV_BMP_1: 14, + Armor.IFV_BMP_2: 16, + Armor.IFV_BMP_3: 18, + Armor.LT_PT_76: 9, + Armor.ZBD_04A: 12, + Armor.ZTZ_96B: 30, + Armor.Scout_Cobra: 4, + Armor.APC_M113: 6, + Armor.Scout_HMMWV: 2, + Armor.ATGM_HMMWV: 8, + Armor.ATGM_VAB_Mephisto: 12, + Armor.IFV_M2A2_Bradley: 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: 18, + Armor.MBT_Leopard_2A4: 20, + Armor.MBT_Leopard_2A4_Trs: 20, + Armor.MBT_Leopard_2A5: 22, + Armor.MBT_Leopard_2A6M: 25, + Armor.MBT_Merkava_IV: 25, + Armor.APC_TPz_Fuchs: 5, + Armor.MBT_Challenger_II: 25, + Armor.MBT_Chieftain_Mk_3: 20, + Armor.IFV_Marder: 10, + Armor.IFV_Warrior: 10, + Armor.IFV_LAV_25: 7, + Armor.APC_AAV_7_Amphibious: 10, + Artillery.MLRS_M270_227mm: 55, + Artillery.SPH_M109_Paladin_155mm: 25, + Artillery.SPM_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_9K57_Uragan_BM_27_220mm: 50, + Artillery.MLRS_9A52_Smerch_HE_300mm: 40, + Artillery.Mortar_2B11_120mm: 4, + Artillery.SPH_Dana_vz77_152mm: 26, + Artillery.PLZ_05: 25, + Artillery.SPH_T155_Firtina_155mm: 28, + Artillery.MLRS_9A52_Smerch_CM_300mm: 60, + Unarmed.LUV_UAZ_469_Jeep: 3, + Unarmed.Truck_Ural_375: 3, + Unarmed.Truck_GAZ_3307: 2, + Infantry.Infantry_M4: 1, + Infantry.Infantry_AK_74: 1, + Unarmed.Truck_M818_6x6: 3, + Unarmed.LUV_Land_Rover_109: 1, + Unarmed.Truck_GAZ_3308: 1, + Unarmed.Truck_GAZ_66: 1, + Unarmed.Truck_KAMAZ_43101: 1, + Unarmed.Truck_Land_Rover_101_FC: 1, + Unarmed.Truck_Ural_4320_31_Arm_d: 1, + Unarmed.Truck_Ural_4320T: 1, # WW2 - Armor.Pz_V_Panther_G: 24, - Armor.Pz_IV_H: 16, - Armor.Tiger_I: 24, - Armor.Tiger_II_H: 26, - Armor.Jagdpanther_G1: 18, - Armor.JagdPz_IV: 11, - Armor.Elefant_SdKfz_184: 18, - Armor.Sd_Kfz_251: 4, - Armor.Sd_Kfz_234_2_Puma: 8, - Armor.M4_Sherman: 12, - Armor.M4A4_Sherman_FF: 16, - Armor.Cromwell_IV: 12, - Unarmed.M30_CC: 2, - Armor.M2A1_halftrack: 4, - Armor.Centaur_IV: 10, - Armor.Churchill_VII: 16, - Armor.M8_Greyhound: 8, - Armor.M10_GMC: 14, - Armor.Stug_III: 12, - Armor.Stug_IV: 14, - Artillery.M12_GMC: 10, - Armor.SturmPzIV: 10, - Armor.Daimler_AC: 8, - Armor.Tetrarch: 8, - Unarmed.M4_Tractor: 2, - Unarmed.Sd_Kfz_7: 1, - Unarmed.Sd_Kfz_2: 1, - Unarmed.Kubelwagen_82: 1, - Unarmed.Blitz_36_6700A: 1, - Unarmed.Bedford_MWD: 1, - Unarmed.CCKW_353: 1, - Unarmed.Willys_MB: 1, + Armor.MT_Pz_Kpfw_V_Panther_Ausf_G: 24, + Armor.Tk_PzIV_H: 16, + Armor.HT_Pz_Kpfw_VI_Tiger_I: 24, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II: 26, + 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.Tk_M4_Sherman: 12, + Armor.MT_M4A4_Sherman_Firefly: 16, + Armor.CT_Cromwell_IV: 12, + Unarmed.Carrier_M30_Cargo: 2, + Armor.APC_M2A1_Halftrack: 4, + Armor.CT_Centaur_IV: 10, + Armor.HIT_Churchill_VII: 16, + 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, + Armor.SPG_Sturmpanzer_IV_Brummbar: 10, + Armor.Car_Daimler_Armored: 8, + Armor.LT_Mk_VII_Tetrarch: 8, + Unarmed.Tractor_M4_Hi_Speed: 2, + Unarmed.Carrier_Sd_Kfz_7_Tractor: 1, + Unarmed.LUV_Kettenrad: 1, + Unarmed.LUV_Kubelwagen_82: 1, + Unarmed.Truck_Opel_Blitz: 1, + Unarmed.Truck_Bedford: 1, + Unarmed.Truck_GMC_Jimmy_6x6_Truck: 1, + Unarmed.Car_Willys_Jeep: 1, # ship - KUZNECOW: 100, - Stennis: 100, - LHA_Tarawa: 50, - Dry_cargo_ship_1: 10, - Speedboat: 10, - Dry_cargo_ship_2: 10, - ELNYA: 10, + CV_1143_5_Admiral_Kuznetsov: 100, + CVN_74_John_C__Stennis: 100, + LHA_1_Tarawa: 50, + Bulker_Yakushev: 10, + Boat_Armed_Hi_speed: 10, + Cargo_Ivanov: 10, + Tanker_Elnya_160: 10, # Air Defence units - AirDefence._2S6_Tunguska: 30, - AirDefence.Kub_2P25_ln: 20, - AirDefence._5p73_s_125_ln: 6, - AirDefence.SA_11_Buk_LN_9A310M1: 30, - AirDefence.SA_11_Buk_CC_9S470M1: 25, - AirDefence.SA_11_Buk_SR_9S18M1: 28, - AirDefence.Osa_9A33_ln: 28, - AirDefence.Tor_9A331: 40, - AirDefence.Strela_10M3: 16, - AirDefence.Strela_1_9P31: 12, - AirDefence.SA_8_Osa_LD_9T217: 22, - AirDefence.Patriot_AMG: 35, - AirDefence.Patriot_ECS: 30, - AirDefence.Gepard: 24, - AirDefence.Hawk_pcp: 14, - AirDefence.Vulcan: 10, - AirDefence.Hawk_ln: 8, - AirDefence.M48_Chaparral: 16, - AirDefence.M6_Linebacker: 18, - AirDefence.Patriot_ln: 15, - AirDefence.M1097_Avenger: 20, - AirDefence.Patriot_EPP: 15, - AirDefence.Patriot_cp: 18, - AirDefence.Roland_ADS: 12, - AirDefence.Soldier_stinger: 6, - AirDefence.Stinger_comm_dsr: 4, - AirDefence.Stinger_comm: 4, - AirDefence.ZSU_23_4_Shilka: 10, - AirDefence.ZSU_57_2: 12, - AirDefence.ZU_23_Emplacement_Closed: 6, - AirDefence.ZU_23_Emplacement: 6, - AirDefence.Ural_375_ZU_23: 7, - AirDefence.ZU_23_Closed_Insurgent: 6, - AirDefence.Ural_375_ZU_23_Insurgent: 7, - AirDefence.ZU_23_Insurgent: 6, - AirDefence.SA_18_Igla_manpad: 10, - AirDefence.SA_18_Igla_comm: 8, - AirDefence.SA_18_Igla_S_manpad: 12, - AirDefence.SA_18_Igla_S_comm: 8, - AirDefence._1L13_EWR: 30, - AirDefence.Kub_1S91_str: 22, - AirDefence._55G6_EWR: 30, - AirDefence.Dog_Ear_radar: 10, - AirDefence.Hawk_tr: 14, - AirDefence.Hawk_sr: 18, - AirDefence.Patriot_str: 22, - AirDefence.Hawk_cwar: 20, - AirDefence.P_19_s_125_sr: 14, - AirDefence.Roland_Radar: 16, - AirDefence.Snr_s_125_tr: 14, - AirDefence.S_75M_Volhov: 8, - AirDefence.SNR_75V: 12, - AirDefence.Rapier_fsa_launcher: 6, - AirDefence.Rapier_fsa_optical_tracker_unit: 6, - AirDefence.Rapier_fsa_blindfire_radar: 8, - AirDefence.HQ_7_LN_SP: 20, - AirDefence.HQ_7_STR_SP: 24, - AirDefence.Flak18: 6, - AirDefence.Flak30: 6, - AirDefence.Flak36: 8, - AirDefence.Flak37: 9, - AirDefence.Flak38: 5, - AirDefence.KDO_Mod40: 8, - AirDefence.Flakscheinwerfer_37: 4, - AirDefence.Maschinensatz_33: 10, - AirDefence.Flak41: 10, - AirDefence.FuMG_401: 25, - AirDefence.Bofors40: 8, - AirDefence.S_60_Type59_Artillery: 8, - AirDefence.M1_37mm: 7, - AirDefence.M45_Quadmount: 4, - AirDefence.QF_37_AA: 10, + 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_CR__AMG_AN_MRC_137: 35, + AirDefence.SAM_Patriot_ECS: 30, + AirDefence.SPAAA_Gepard: 24, + AirDefence.SAM_Hawk_Platoon_Command_Post__PCP: 14, + AirDefence.SPAAA_Vulcan_M163: 10, + AirDefence.SAM_Hawk_LN_M192: 8, + AirDefence.SAM_Chaparral_M48: 16, + 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_C2_ICC: 18, + AirDefence.SAM_Roland_ADS: 12, + 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.SPAAA_ZU_23_2_Mounted_Ural_375: 7, + AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement: 6, + AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375: 7, + AirDefence.AAA_ZU_23_Insurgent_Emplacement: 6, + 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_Straight_Flush_STR: 22, + AirDefence.EWR_55G6: 30, + 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_P19_Flat_Face_SR__SA_2_3: 14, + AirDefence.SAM_Roland_EWR: 16, + 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_20mm: 6, + AirDefence.AAA_8_8cm_Flak_36: 8, + AirDefence.AAA_8_8cm_Flak_37: 9, + 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_S_60_57mm: 8, + AirDefence.AAA_M1_37mm: 7, + 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, @@ -702,12 +702,12 @@ PRICES = { frenchpack.DIM__TOYOTA_DESERT: 2, frenchpack.DIM__KAMIKAZE: 6, # SA-10 - AirDefence.S_300PS_54K6_cp: 18, - AirDefence.S_300PS_40B6M_tr: 24, - AirDefence.S_300PS_40B6MD_sr: 30, - AirDefence.S_300PS_64H6E_sr: 30, - AirDefence.S_300PS_5P85C_ln: 22, - AirDefence.S_300PS_5P85D_ln: 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, @@ -1337,21 +1337,21 @@ StartingPosition = Union[ShipGroup, StaticGroup, Airport, Point] def upgrade_to_supercarrier(unit, name: str): - if unit == Stennis: + if unit == CVN_74_John_C__Stennis: if name == "CVN-71 Theodore Roosevelt": - return CVN_71 + return CVN_71_Theodore_Roosevelt elif name == "CVN-72 Abraham Lincoln": - return CVN_72 + return CVN_72_Abraham_Lincoln elif name == "CVN-73 George Washington": - return CVN_73 + return CVN_73_George_Washington elif name == "CVN-75 Harry S. Truman": - return CVN_75 + return CVN_75_Harry_S__Truman elif name == "Carrier Strike Group 8": - return CVN_75 + return CVN_75_Harry_S__Truman else: - return CVN_71 - elif unit == KUZNECOW: - return CV_1143_5 + return CVN_71_Theodore_Roosevelt + elif unit == CV_1143_5_Admiral_Kuznetsov: + return CV_1143_5_Admiral_Kuznetsov_2017 else: return unit @@ -1373,52 +1373,52 @@ def find_unittype(for_task: Type[MainTask], country_name: str) -> List[Type[Unit MANPADS: List[Type[VehicleType]] = [ - AirDefence.SA_18_Igla_manpad, - AirDefence.SA_18_Igla_S_manpad, - AirDefence.Soldier_stinger, + AirDefence.MANPADS_SA_18_Igla_Grouse, + AirDefence.MANPADS_SA_18_Igla_S_Grouse, + AirDefence.MANPADS_Stinger, ] INFANTRY: List[VehicleType] = [ - Infantry.Paratrooper_AKS_74, - Infantry.Paratrooper_AKS_74, - Infantry.Paratrooper_AKS_74, - Infantry.Paratrooper_AKS_74, - Infantry.Paratrooper_AKS_74, - Infantry.Soldier_RPG, - Infantry.Soldier_M4, - Infantry.Soldier_M4, - Infantry.Soldier_M4, - Infantry.Soldier_M4, - Infantry.Soldier_M4, - Infantry.Soldier_M249, - Artillery._2B11_mortar, - Infantry.Soldier_AK, - Infantry.Soldier_AK, - Infantry.Soldier_AK, - Infantry.Soldier_AK, - Infantry.Soldier_AK, + Infantry.Paratrooper_AKS, + Infantry.Paratrooper_AKS, + Infantry.Paratrooper_AKS, + Infantry.Paratrooper_AKS, + Infantry.Paratrooper_AKS, + Infantry.Infantry_RPG, + Infantry.Infantry_M4, + Infantry.Infantry_M4, + Infantry.Infantry_M4, + Infantry.Infantry_M4, + Infantry.Infantry_M4, + 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.Soldier_M4_GRG, - Infantry.Soldier_M4_GRG, - Infantry.Soldier_M4_GRG, - Infantry.Soldier_M4_GRG, - Infantry.Infantry_AK, - Infantry.Infantry_AK, - Infantry.Infantry_AK, - Infantry.Infantry_AK, - Infantry.Soldier_wwii_br_01, - Infantry.Soldier_wwii_br_01, - Infantry.Soldier_wwii_br_01, - Infantry.Soldier_mauser98, - Infantry.Soldier_mauser98, - Infantry.Soldier_mauser98, - Infantry.Soldier_mauser98, - Infantry.Soldier_wwii_us, - Infantry.Soldier_wwii_us, - Infantry.Soldier_wwii_us, - Infantry.Infantry_AK_Ins, - Infantry.Infantry_AK_Ins, - Infantry.Infantry_AK_Ins, + 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, + Infantry.Infantry_Mauser_98, + Infantry.Infantry_Mauser_98, + Infantry.Infantry_Mauser_98, + Infantry.Infantry_Mauser_98, + Infantry.Infantry_M1_Garand, + Infantry.Infantry_M1_Garand, + Infantry.Infantry_M1_Garand, + 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 0d49b1e6..867a7c5b 100644 --- a/game/theater/conflicttheater.py +++ b/game/theater/conflicttheater.py @@ -16,10 +16,10 @@ from dcs.country import Country from dcs.mapping import Point from dcs.planes import F_15C from dcs.ships import ( - HandyWind, - Stennis, - USS_Arleigh_Burke_IIa, - LHA_Tarawa, + Bulker_Handy_Wind, + CVN_74_John_C__Stennis, + DDG_Arleigh_Burke_IIa, + LHA_1_Tarawa, ) from dcs.statics import Fortification, Warehouse from dcs.terrain import ( @@ -77,53 +77,53 @@ class MizCampaignLoader: OFF_MAP_UNIT_TYPE = F_15C.id - CV_UNIT_TYPE = Stennis.id - LHA_UNIT_TYPE = LHA_Tarawa.id - FRONT_LINE_UNIT_TYPE = Armor.M_113.id - SHIPPING_LANE_UNIT_TYPE = HandyWind.id + CV_UNIT_TYPE = CVN_74_John_C__Stennis.id + LHA_UNIT_TYPE = LHA_1_Tarawa.id + FRONT_LINE_UNIT_TYPE = Armor.APC_M113.id + SHIPPING_LANE_UNIT_TYPE = Bulker_Handy_Wind.id - FOB_UNIT_TYPE = Unarmed.SKP_11.id + FOB_UNIT_TYPE = Unarmed.Truck_SKP_11_Mobile_ATC.id FARP_HELIPAD = "SINGLE_HELIPAD" OFFSHORE_STRIKE_TARGET_UNIT_TYPE = Fortification.Oil_platform.id - SHIP_UNIT_TYPE = USS_Arleigh_Burke_IIa.id - MISSILE_SITE_UNIT_TYPE = MissilesSS.Scud_B.id - COASTAL_DEFENSE_UNIT_TYPE = MissilesSS.Hy_launcher.id + SHIP_UNIT_TYPE = DDG_Arleigh_Burke_IIa.id + MISSILE_SITE_UNIT_TYPE = MissilesSS.SSM_SS_1C_Scud_B.id + COASTAL_DEFENSE_UNIT_TYPE = MissilesSS.AShM_SS_N_2_Silkworm.id # Multiple options for air defenses so campaign designers can more accurately see # the coverage of their IADS for the expected type. LONG_RANGE_SAM_UNIT_TYPES = { - AirDefence.Patriot_ln.id, - AirDefence.S_300PS_5P85C_ln.id, - AirDefence.S_300PS_5P85D_ln.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, } MEDIUM_RANGE_SAM_UNIT_TYPES = { - AirDefence.Hawk_ln.id, - AirDefence.S_75M_Volhov.id, - AirDefence._5p73_s_125_ln.id, + AirDefence.SAM_Hawk_LN_M192.id, + AirDefence.SAM_SA_2_S_75_Guideline_LN.id, + AirDefence.SAM_SA_3_S_125_Goa_LN.id, } SHORT_RANGE_SAM_UNIT_TYPES = { - AirDefence.M1097_Avenger.id, - AirDefence.Rapier_fsa_launcher.id, - AirDefence._2S6_Tunguska.id, - AirDefence.Strela_1_9P31.id, + AirDefence.SAM_Avenger__Stinger.id, + AirDefence.SAM_Rapier_LN.id, + AirDefence.SAM_SA_19_Tunguska_Grison.id, + AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL.id, } AAA_UNIT_TYPES = { - AirDefence.Flak18.id, - AirDefence.Vulcan.id, - AirDefence.ZSU_23_4_Shilka.id, + AirDefence.AAA_8_8cm_Flak_18.id, + AirDefence.SPAAA_Vulcan_M163.id, + AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish.id, } - EWR_UNIT_TYPE = AirDefence._1L13_EWR.id + EWR_UNIT_TYPE = AirDefence.EWR_1L13.id - ARMOR_GROUP_UNIT_TYPE = Armor.M_1_Abrams.id + ARMOR_GROUP_UNIT_TYPE = Armor.MBT_M1A2_Abrams.id FACTORY_UNIT_TYPE = Fortification.Workshop_A.id - AMMUNITION_DEPOT_UNIT_TYPE = Warehouse._Ammunition_depot.id + AMMUNITION_DEPOT_UNIT_TYPE = Warehouse.Ammunition_depot.id STRIKE_TARGET_UNIT_TYPE = Fortification.Tech_combine.id diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index 2128e716..85afd44f 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -25,10 +25,10 @@ from typing import ( from dcs.mapping import Point from dcs.ships import ( - Stennis, - KUZNECOW, - LHA_Tarawa, - Type_071, + CVN_74_John_C__Stennis, + CV_1143_5_Admiral_Kuznetsov, + LHA_1_Tarawa, + Type_071_Amphibious_Transport_Dock, ) from dcs.terrain.terrain import Airport, ParkingSlot from dcs.unit import Unit @@ -486,14 +486,14 @@ class ControlPoint(MissionTarget, ABC): for group in g.groups: for u in group.units: if db.unit_type_from_name(u.type) in [ - Stennis, - KUZNECOW, + CVN_74_John_C__Stennis, + CV_1143_5_Admiral_Kuznetsov, ]: return group.name elif g.dcs_identifier == "LHA": for group in g.groups: for u in group.units: - if db.unit_type_from_name(u.type) in [LHA_Tarawa]: + if db.unit_type_from_name(u.type) in [LHA_1_Tarawa]: return group.name return None @@ -899,10 +899,10 @@ class NavalControlPoint(ControlPoint, ABC): for group in self.find_main_tgo().groups: for u in group.units: if db.unit_type_from_name(u.type) in [ - Stennis, - LHA_Tarawa, - KUZNECOW, - Type_071, + CVN_74_John_C__Stennis, + LHA_1_Tarawa, + CV_1143_5_Admiral_Kuznetsov, + Type_071_Amphibious_Transport_Dock, ]: return True return False