From c09a5b68d54efbc853a7b30c9cde88a761c3ce8d Mon Sep 17 00:00:00 2001 From: Raffson Date: Fri, 24 May 2024 19:14:12 +0200 Subject: [PATCH] Pydcs update for Phantom II Save compat changes included --- game/campaignloader/mizcampaignloader.py | 12 +-- game/data/alic.py | 14 +-- game/data/radar_db.py | 24 ++--- game/persistency.py | 19 ++++ game/theater/controlpoint.py | 8 +- pydcs_extensions/a4ec/a4ec.py | 8 +- pydcs_extensions/a6a/a6a.py | 9 +- pydcs_extensions/a7e/a7e.py | 16 ++-- pydcs_extensions/f100/f100.py | 8 +- pydcs_extensions/f16i_idf/f16i_idf.py | 112 +++++++++++------------ pydcs_extensions/f4/f4.py | 10 +- requirements.txt | 2 +- resources/customized_payloads/A-4E-C.lua | 16 ++-- resources/weapons/standoff/AGM-45B.yaml | 1 + 14 files changed, 139 insertions(+), 120 deletions(-) diff --git a/game/campaignloader/mizcampaignloader.py b/game/campaignloader/mizcampaignloader.py index f5faa7ae..eafc372d 100644 --- a/game/campaignloader/mizcampaignloader.py +++ b/game/campaignloader/mizcampaignloader.py @@ -56,7 +56,7 @@ class MizCampaignLoader: 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 + COASTAL_DEFENSE_UNIT_TYPE = MissilesSS.hy_launcher.id COMMAND_CENTER_UNIT_TYPE = Fortification._Command_Center.id CONNECTION_NODE_UNIT_TYPE = Fortification.Comms_tower_M.id @@ -73,23 +73,23 @@ class MizCampaignLoader: MEDIUM_RANGE_SAM_UNIT_TYPES = { AirDefence.Hawk_ln.id, AirDefence.S_75M_Volhov.id, - AirDefence.X_5p73_s_125_ln.id, + AirDefence.x_5p73_s_125_ln.id, } SHORT_RANGE_SAM_UNIT_TYPES = { AirDefence.M1097_Avenger.id, - AirDefence.Rapier_fsa_launcher.id, - AirDefence.X_2S6_Tunguska.id, + AirDefence.rapier_fsa_launcher.id, + AirDefence.x_2S6_Tunguska.id, AirDefence.Strela_1_9P31.id, } AAA_UNIT_TYPES = { - AirDefence.Flak18.id, + AirDefence.flak18.id, AirDefence.Vulcan.id, AirDefence.ZSU_23_4_Shilka.id, } - EWR_UNIT_TYPE = AirDefence.X_1L13_EWR.id + EWR_UNIT_TYPE = AirDefence.x_1L13_EWR.id ARMOR_GROUP_UNIT_TYPE = Armor.M_1_Abrams.id diff --git a/game/data/alic.py b/game/data/alic.py index ac884085..9e16a32d 100644 --- a/game/data/alic.py +++ b/game/data/alic.py @@ -5,8 +5,8 @@ from game.theater.theatergroup import TheaterUnit class AlicCodes: CODES = { - AirDefence.X_1L13_EWR.id: 101, - AirDefence.X_55G6_EWR.id: 102, + AirDefence.x_1L13_EWR.id: 101, + AirDefence.x_55G6_EWR.id: 102, AirDefence.S_300PS_40B6MD_sr.id: 103, AirDefence.S_300PS_64H6E_sr.id: 104, AirDefence.SA_11_Buk_SR_9S18M1.id: 107, @@ -17,12 +17,12 @@ class AlicCodes: AirDefence.Osa_9A33_ln.id: 117, AirDefence.Strela_10M3.id: 118, AirDefence.Tor_9A331.id: 119, - AirDefence.X_2S6_Tunguska.id: 120, + AirDefence.x_2S6_Tunguska.id: 120, AirDefence.ZSU_23_4_Shilka.id: 121, - AirDefence.P_19_s_125_sr.id: 122, - AirDefence.Snr_s_125_tr.id: 123, - AirDefence.Rapier_fsa_blindfire_radar.id: 124, - AirDefence.Rapier_fsa_launcher.id: 125, + AirDefence.p_19_s_125_sr.id: 122, + AirDefence.snr_s_125_tr.id: 123, + AirDefence.rapier_fsa_blindfire_radar.id: 124, + AirDefence.rapier_fsa_launcher.id: 125, AirDefence.SNR_75V.id: 126, AirDefence.HQ_7_LN_SP.id: 127, AirDefence.HQ_7_STR_SP.id: 128, diff --git a/game/data/radar_db.py b/game/data/radar_db.py index 7131223a..30334d06 100644 --- a/game/data/radar_db.py +++ b/game/data/radar_db.py @@ -26,7 +26,7 @@ from dcs.vehicles import AirDefence from pydcs_extensions import highdigitsams as hds TELARS = { - AirDefence.X_2S6_Tunguska, + AirDefence.x_2S6_Tunguska, AirDefence.SA_11_Buk_LN_9A310M1, AirDefence.Osa_9A33_ln, AirDefence.Tor_9A331, @@ -36,14 +36,14 @@ TELARS = { TRACK_RADARS = { AirDefence.Kub_1S91_str, - AirDefence.Snr_s_125_tr, + AirDefence.snr_s_125_tr, AirDefence.S_300PS_40B6M_tr, AirDefence.S_300PS_5H63C_30H6_tr, AirDefence.Hawk_tr, AirDefence.Patriot_str, AirDefence.SNR_75V, AirDefence.RPC_5N62V, - AirDefence.Rapier_fsa_blindfire_radar, + AirDefence.rapier_fsa_blindfire_radar, AirDefence.HQ_7_STR_SP, AirDefence.NASAMS_Radar_MPQ64F1, hds.SAM_SA_10B_S_300PS_30N6_TR, @@ -55,7 +55,7 @@ TRACK_RADARS = { LAUNCHER_TRACKER_PAIRS = { AirDefence.Kub_2P25_ln: (AirDefence.Kub_1S91_str,), - AirDefence.X_5p73_s_125_ln: (AirDefence.Snr_s_125_tr,), + AirDefence.x_5p73_s_125_ln: (AirDefence.snr_s_125_tr,), AirDefence.S_300PS_5P85C_ln: ( AirDefence.S_300PS_40B6M_tr, AirDefence.S_300PS_5H63C_30H6_tr, @@ -67,14 +67,14 @@ LAUNCHER_TRACKER_PAIRS = { 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.rapier_fsa_launcher: (AirDefence.rapier_fsa_blindfire_radar,), AirDefence.HQ_7_LN_SP: (AirDefence.HQ_7_STR_SP,), AirDefence.S_200_Launcher: (AirDefence.RPC_5N62V,), AirDefence.NASAMS_LN_B: (AirDefence.NASAMS_Radar_MPQ64F1,), AirDefence.NASAMS_LN_C: (AirDefence.NASAMS_Radar_MPQ64F1,), hds.SAM_SA_2__V759__LN_SM_90: (AirDefence.SNR_75V,), hds.SAM_HQ_2_LN_SM_90: (AirDefence.SNR_75V,), - hds.SAM_SA_3__V_601P__LN_5P73: (AirDefence.Snr_s_125_tr,), + hds.SAM_SA_3__V_601P__LN_5P73: (AirDefence.snr_s_125_tr,), hds.SAM_SA_10B_S_300PS_5P85SE_LN: (hds.SAM_SA_10B_S_300PS_30N6_TR,), hds.SAM_SA_10B_S_300PS_5P85SU_LN: (hds.SAM_SA_10B_S_300PS_30N6_TR,), hds.SAM_SA_12_S_300V_9A82_LN: (hds.SAM_SA_12_S_300V_9S32_TR,), @@ -88,7 +88,7 @@ LAUNCHER_TRACKER_PAIRS = { UNITS_WITH_RADAR = { # Radars - AirDefence.X_2S6_Tunguska, + AirDefence.x_2S6_Tunguska, AirDefence.SA_11_Buk_LN_9A310M1, AirDefence.Osa_9A33_ln, AirDefence.Tor_9A331, @@ -96,11 +96,11 @@ UNITS_WITH_RADAR = { AirDefence.Vulcan, AirDefence.Roland_ADS, AirDefence.ZSU_23_4_Shilka, - AirDefence.X_1L13_EWR, + AirDefence.x_1L13_EWR, AirDefence.Kub_1S91_str, AirDefence.S_300PS_40B6M_tr, AirDefence.S_300PS_40B6MD_sr, - AirDefence.X_55G6_EWR, + AirDefence.x_55G6_EWR, AirDefence.S_300PS_64H6E_sr, AirDefence.SA_11_Buk_SR_9S18M1, AirDefence.Dog_Ear_radar, @@ -108,13 +108,13 @@ UNITS_WITH_RADAR = { AirDefence.Hawk_sr, AirDefence.Patriot_str, AirDefence.Hawk_cwar, - AirDefence.P_19_s_125_sr, + AirDefence.p_19_s_125_sr, AirDefence.Roland_Radar, - AirDefence.Snr_s_125_tr, + AirDefence.snr_s_125_tr, AirDefence.SNR_75V, AirDefence.RLS_19J6, AirDefence.RPC_5N62V, - AirDefence.Rapier_fsa_blindfire_radar, + AirDefence.rapier_fsa_blindfire_radar, AirDefence.HQ_7_LN_SP, AirDefence.HQ_7_STR_SP, AirDefence.FuMG_401, diff --git a/game/persistency.py b/game/persistency.py index 4e485639..d83ceb55 100644 --- a/game/persistency.py +++ b/game/persistency.py @@ -74,6 +74,25 @@ class MigrationUnpickler(pickle.Unpickler): return ELM2084_MMR_AD_RT elif name == "IRON_DOME_CP": return Iron_Dome_David_Sling_CP + if module == "dcs.terrain.kola.airports": + if name == "Lakselv": + from dcs.terrain.kola.airports import Banak + return Banak + elif name == "Severomorsk1": + from dcs.terrain.kola.airports import Severomorsk_1 + return Severomorsk_1 + elif name == "Severomorsk3": + from dcs.terrain.kola.airports import Severomorsk_3 + return Severomorsk_3 + elif name == "Olenegorsk": + from dcs.terrain.kola.airports import Olenya + return Olenya + if module == "dcs.vehicles": + try: + return super().find_class(module, name) + except AttributeError: + alternate = name.split('.')[:-1] + [name.split('.')[-1][0].lower() + name.split('.')[-1][1:]] + name = '.'.join(alternate) return super().find_class(module, name) # fmt: on diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index 988dac7b..7add8807 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -28,7 +28,7 @@ from uuid import UUID from dcs.mapping import Point from dcs.ships import ( - Ara_vdm, + ara_vdm, CVN_71, CVN_72, CVN_73, @@ -39,7 +39,7 @@ from dcs.ships import ( LHA_Tarawa, Stennis, Type_071, - Hms_invincible, + hms_invincible, ) from dcs.terrain.terrain import Airport, ParkingSlot from dcs.unitgroup import ShipGroup, StaticGroup @@ -1385,13 +1385,13 @@ class NavalControlPoint( for group in self.find_main_tgo().groups: for u in group.units: if u.alive and u.type in [ - Ara_vdm, + ara_vdm, Forrestal, Stennis, LHA_Tarawa, KUZNECOW, Type_071, - Hms_invincible, + hms_invincible, L02, L52, L61, diff --git a/pydcs_extensions/a4ec/a4ec.py b/pydcs_extensions/a4ec/a4ec.py index 8f88b6f9..6a20eaaa 100644 --- a/pydcs_extensions/a4ec/a4ec.py +++ b/pydcs_extensions/a4ec/a4ec.py @@ -1004,7 +1004,7 @@ class A_4E_C(PlaneType): LAU3_WP156 = (1, Weapons.LAU3_WP156) LAU3_HE151 = (1, Weapons.LAU3_HE151) AGM_45A_Shrike_ARM = (1, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (1, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (1, Weapons.AGM_45B_Shrike_ARM) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 1, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -1213,7 +1213,7 @@ class A_4E_C(PlaneType): WeaponsA4EC._2_x_LAU_3_pod___19_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice__TER__, ) AGM_45A_Shrike_ARM = (2, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (2, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (2, Weapons.AGM_45B_Shrike_ARM) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 2, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -1850,7 +1850,7 @@ class A_4E_C(PlaneType): WeaponsA4EC._2_x_LAU_3_pod___19_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice__TER___, ) AGM_45A_Shrike_ARM = (4, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (4, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (4, Weapons.AGM_45B_Shrike_ARM) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 4, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -2048,7 +2048,7 @@ class A_4E_C(PlaneType): LAU3_WP156 = (5, Weapons.LAU3_WP156) LAU3_HE151 = (5, Weapons.LAU3_HE151) AGM_45A_Shrike_ARM = (5, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (5, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (5, Weapons.AGM_45B_Shrike_ARM) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 5, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, diff --git a/pydcs_extensions/a6a/a6a.py b/pydcs_extensions/a6a/a6a.py index ebdde391..7ebd2861 100644 --- a/pydcs_extensions/a6a/a6a.py +++ b/pydcs_extensions/a6a/a6a.py @@ -7,7 +7,6 @@ from dcs.weapons_data import Weapons from game.modsupport import planemod from pydcs_extensions import inject_weapons, WeaponsA7E - inject_weapons(WeaponsA7E) @@ -61,7 +60,7 @@ class VSN_A6A(PlaneType): Weapons.LAU_7_with_AIM_9P_Sidewinder_IR_AAM, ) AGM_45A_Shrike_ARM = (1, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (1, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (1, Weapons.AGM_45B_Shrike_ARM) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( 1, Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, @@ -213,7 +212,7 @@ class VSN_A6A(PlaneType): Weapons.LAU_7_with_AIM_9P_Sidewinder_IR_AAM, ) AGM_45A_Shrike_ARM = (2, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (2, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (2, Weapons.AGM_45B_Shrike_ARM) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( 2, Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, @@ -423,7 +422,7 @@ class VSN_A6A(PlaneType): Weapons.LAU_7_with_AIM_9P_Sidewinder_IR_AAM, ) AGM_45A_Shrike_ARM = (4, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (4, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (4, Weapons.AGM_45B_Shrike_ARM) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( 4, Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, @@ -578,7 +577,7 @@ class VSN_A6A(PlaneType): Weapons.LAU_7_with_AIM_9P_Sidewinder_IR_AAM, ) AGM_45A_Shrike_ARM = (5, Weapons.AGM_45A_Shrike_ARM) - AGM_45B_Shrike_ARM__Imp_ = (5, Weapons.AGM_45B_Shrike_ARM__Imp_) + AGM_45B_Shrike_ARM = (5, Weapons.AGM_45B_Shrike_ARM) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( 5, Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, diff --git a/pydcs_extensions/a7e/a7e.py b/pydcs_extensions/a7e/a7e.py index c4239b80..1999b03d 100644 --- a/pydcs_extensions/a7e/a7e.py +++ b/pydcs_extensions/a7e/a7e.py @@ -503,9 +503,9 @@ class A_7E(PlaneType): 1, Weapons.AGM_62_Walleye_II___Guided_Weapon_Mk_5__TV_Guided_, ) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 1, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = ( 1, @@ -698,9 +698,9 @@ class A_7E(PlaneType): LAU_117_AGM_65G = (2, Weapons.LAU_117_AGM_65G) LAU_117_AGM_65H = (2, Weapons.LAU_117_AGM_65H) LAU_88_AGM_65H_2_L = (2, Weapons.LAU_88_AGM_65H_2_L) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 2, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = ( 2, @@ -1116,9 +1116,9 @@ class A_7E(PlaneType): LAU_117_AGM_65G = (7, Weapons.LAU_117_AGM_65G) LAU_117_AGM_65H = (7, Weapons.LAU_117_AGM_65H) LAU_88_AGM_65H_2_R = (7, Weapons.LAU_88_AGM_65H_2_R) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 7, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = ( 7, @@ -1275,9 +1275,9 @@ class A_7E(PlaneType): 8, Weapons.AGM_62_Walleye_II___Guided_Weapon_Mk_5__TV_Guided_, ) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 8, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = ( 8, diff --git a/pydcs_extensions/f100/f100.py b/pydcs_extensions/f100/f100.py index bcf6f2e2..ec0b48d2 100644 --- a/pydcs_extensions/f100/f100.py +++ b/pydcs_extensions/f100/f100.py @@ -212,9 +212,9 @@ class VSN_F100(PlaneType): 5, Weapons.LAU_7_with_AIM_9B_Sidewinder_IR_AAM, ) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 5, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) Fuel_tank_500_Liter = (5, WeaponsF100.Fuel_tank_500_Liter) @@ -295,9 +295,9 @@ class VSN_F100(PlaneType): 7, Weapons.LAU_7_with_AIM_9P_Sidewinder_IR_AAM, ) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 7, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) Fuel_tank_500_Liter = (7, WeaponsF100.Fuel_tank_500_Liter) diff --git a/pydcs_extensions/f16i_idf/f16i_idf.py b/pydcs_extensions/f16i_idf/f16i_idf.py index 0919ba89..09a4d72e 100644 --- a/pydcs_extensions/f16i_idf/f16i_idf.py +++ b/pydcs_extensions/f16i_idf/f16i_idf.py @@ -612,9 +612,9 @@ class F_16D_52(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -795,9 +795,9 @@ class F_16D_52(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -919,9 +919,9 @@ class F_16D_52(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -1046,9 +1046,9 @@ class F_16D_52(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -1499,9 +1499,9 @@ class F_16D_50(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -1682,9 +1682,9 @@ class F_16D_50(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -1806,9 +1806,9 @@ class F_16D_50(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -1933,9 +1933,9 @@ class F_16D_50(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -2386,9 +2386,9 @@ class F_16D_52_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -2569,9 +2569,9 @@ class F_16D_52_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -2693,9 +2693,9 @@ class F_16D_52_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -2820,9 +2820,9 @@ class F_16D_52_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -3272,9 +3272,9 @@ class F_16D_50_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -3455,9 +3455,9 @@ class F_16D_50_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -3579,9 +3579,9 @@ class F_16D_50_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -3706,9 +3706,9 @@ class F_16D_50_NS(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -4159,9 +4159,9 @@ class F_16D_Barak_40(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -4342,9 +4342,9 @@ class F_16D_Barak_40(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -4454,9 +4454,9 @@ class F_16D_Barak_40(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -4570,9 +4570,9 @@ class F_16D_Barak_40(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -5020,9 +5020,9 @@ class F_16D_Barak_30(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -5203,9 +5203,9 @@ class F_16D_Barak_30(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -5315,9 +5315,9 @@ class F_16D_Barak_30(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -5431,9 +5431,9 @@ class F_16D_Barak_30(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -5880,9 +5880,9 @@ class F_16I(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 3, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (3, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -6063,9 +6063,9 @@ class F_16I(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 4, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -6187,9 +6187,9 @@ class F_16I(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 6, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (6, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (6, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) @@ -6314,9 +6314,9 @@ class F_16I(PlaneType): Weapons.GBU_10___2000lb_Laser_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) - GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb = ( + GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = ( 7, - Weapons.GBU_24_Paveway_III___2000lb_Laser_Guided_Bomb, + Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb, ) CBU_87___202_x_CEM_Cluster_Bomb = (7, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) CBU_97___10_x_SFW_Cluster_Bomb = (7, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) diff --git a/pydcs_extensions/f4/f4.py b/pydcs_extensions/f4/f4.py index eed1dfac..eee7e259 100644 --- a/pydcs_extensions/f4/f4.py +++ b/pydcs_extensions/f4/f4.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, Set +from typing import Set from dcs import task from dcs.planes import PlaneType @@ -596,9 +596,9 @@ class VSN_F4C(PlaneType): Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, ) Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 3, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, @@ -711,9 +711,9 @@ class VSN_F4C(PlaneType): Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, ) Mk_84___2000lb_GP_Bomb_LD = (9, Weapons.Mk_84___2000lb_GP_Bomb_LD) - LAU_118A___AGM_45B_Shrike_ARM__Imp_ = ( + LAU_118A___AGM_45B_Shrike_ARM = ( 9, - Weapons.LAU_118A___AGM_45B_Shrike_ARM__Imp_, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 9, diff --git a/requirements.txt b/requirements.txt index 268346e0..689fc4b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ pluggy==1.5.0 pre-commit==3.7.0 pydantic==2.7.1 pydantic-settings==2.2.1 -pydcs @ git+https://github.com/dcs-retribution/pydcs@961b5e1109c416f1a168d10db52c34bede6306af +pydcs @ git+https://github.com/dcs-retribution/pydcs@a8f3a0b26b78c37c88e58e7f32a30305a1568de5 pyinstaller==5.13.2 pyinstaller-hooks-contrib==2024.0 pyparsing==3.1.2 diff --git a/resources/customized_payloads/A-4E-C.lua b/resources/customized_payloads/A-4E-C.lua index 45397376..39a8bc90 100644 --- a/resources/customized_payloads/A-4E-C.lua +++ b/resources/customized_payloads/A-4E-C.lua @@ -104,19 +104,19 @@ local unitPayloads = { ["name"] = "SEAD", ["pylons"] = { [1] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 4, }, [2] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 5, }, [3] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 2, }, [4] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 1, }, [5] = { @@ -132,19 +132,19 @@ local unitPayloads = { ["name"] = "ANTISHIP", ["pylons"] = { [1] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 5, }, [2] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 4, }, [3] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 2, }, [4] = { - ["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + ["CLSID"] = "{AGM_45B}", ["num"] = 1, }, [5] = { diff --git a/resources/weapons/standoff/AGM-45B.yaml b/resources/weapons/standoff/AGM-45B.yaml index 12d55673..afd8c8f6 100644 --- a/resources/weapons/standoff/AGM-45B.yaml +++ b/resources/weapons/standoff/AGM-45B.yaml @@ -5,3 +5,4 @@ fallback: AGM-45A Shrike ARM clsids: - "{3E6B632D-65EB-44D2-9501-1C2D04515404}" - "{3E6B632D-65EB-44D2-9501-1C2D04515405}" + - "{AGM_45B}"