From 020e9797c50c6c08df1465584c02e601ebb06fbf Mon Sep 17 00:00:00 2001 From: zhexu14 <64713351+zhexu14@users.noreply.github.com> Date: Fri, 23 Aug 2024 21:28:36 +1000 Subject: [PATCH] Dcs 2.9.6 (#3428) This PR adds support for DCS 2.9.6 --- pydcs_extensions/a4ec/a4ec.py | 154 ++++---- pydcs_extensions/f104/f104.py | 172 ++++++--- pydcs_extensions/f4/f4.py | 357 +++++++++++------- pydcs_extensions/hercules/hercules.py | 8 +- pydcs_extensions/ov10a/ov10a.py | 140 +++---- pydcs_extensions/su57/su57.py | 101 +++-- requirements.txt | 2 +- resources/campaigns/TblisiGap.yaml | 2 +- resources/campaigns/battle_of_abu_dhabi.yaml | 2 +- resources/campaigns/golan_heights_lite.yaml | 2 +- .../campaigns/operation_allied_sword.yaml | 1 - .../campaigns/operation_velvet_thunder.yaml | 2 +- resources/campaigns/scenic_inland.yaml | 2 +- resources/campaigns/scenic_merge.yaml | 2 +- resources/campaigns/scenic_route.yaml | 6 +- resources/factions/NATO_Desert_Storm.yaml | 1 - resources/factions/bluefor_coldwar.yaml | 1 - resources/factions/blufor_late_coldwar.yaml | 1 - resources/factions/egypt_2000.yaml | 1 - resources/factions/germany_1990.yaml | 2 +- resources/factions/greece_2005.yaml | 1 - resources/factions/iran_1988.yaml | 1 - resources/factions/iran_2015.yaml | 1 - resources/factions/israel_1973.yaml | 1 - resources/factions/israel_1982.yaml | 1 - resources/factions/israel_2000.yaml | 1 - resources/factions/japan_2005.yaml | 1 - resources/factions/turkey_2005.yaml | 1 - resources/factions/uk_1990.yaml | 2 +- resources/factions/usa_1965.yaml | 1 - resources/factions/usa_1970.yaml | 1 - resources/factions/usa_1975.yaml | 1 - resources/factions/usn_1985.yaml | 1 - resources/squadrons/F-4E/IAF 201th Sqn.yaml | 14 - resources/squadrons/F-4E/IRIAF 31 TFS.yaml | 22 -- resources/squadrons/F-4E/IRIAF 32nd TFW.yaml | 23 -- resources/squadrons/F-4E/IRIAF 61 TFS.yaml | 22 -- resources/squadrons/F-4E/IRIAF 91 TFS.yaml | 22 -- resources/units/aircraft/F-4E.yaml | 36 -- 39 files changed, 561 insertions(+), 551 deletions(-) delete mode 100644 resources/squadrons/F-4E/IAF 201th Sqn.yaml delete mode 100644 resources/squadrons/F-4E/IRIAF 31 TFS.yaml delete mode 100644 resources/squadrons/F-4E/IRIAF 32nd TFW.yaml delete mode 100644 resources/squadrons/F-4E/IRIAF 61 TFS.yaml delete mode 100644 resources/squadrons/F-4E/IRIAF 91 TFS.yaml delete mode 100644 resources/units/aircraft/F-4E.yaml diff --git a/pydcs_extensions/a4ec/a4ec.py b/pydcs_extensions/a4ec/a4ec.py index 6a20eaaa..c855ce87 100644 --- a/pydcs_extensions/a4ec/a4ec.py +++ b/pydcs_extensions/a4ec/a4ec.py @@ -940,63 +940,63 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 1, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 1, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 1, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 1, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 1, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 1, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 1, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 1, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU3_WP61 = (1, Weapons.LAU3_WP61) LAU3_WP1B = (1, Weapons.LAU3_WP1B) @@ -1069,15 +1069,15 @@ class A_4E_C(PlaneType): ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 2, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 2, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) _2_x_LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER__ = ( 2, @@ -1093,15 +1093,15 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 2, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 2, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) _2_x_LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER__ = ( 2, @@ -1117,35 +1117,35 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) _2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE__TER__ = ( 2, @@ -1181,7 +1181,7 @@ class A_4E_C(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_MK_71__HE_FRAG__TER__ = ( 2, @@ -1329,15 +1329,15 @@ class A_4E_C(PlaneType): Fuel_Tank_150_gallons__EMPTY_ = (3, WeaponsA4EC.Fuel_Tank_150_gallons__EMPTY_) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 3, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 3, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) _2_x_LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER_ = ( 3, @@ -1365,15 +1365,15 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 3, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 3, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) _2_x_LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER_ = ( 3, @@ -1405,43 +1405,43 @@ class A_4E_C(PlaneType): LAU3_WP1B = (3, Weapons.LAU3_WP1B) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) _2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE__TER_ = ( 3, @@ -1509,7 +1509,7 @@ class A_4E_C(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_MK_71__HE_FRAG__TER_ = ( 3, @@ -1706,15 +1706,15 @@ class A_4E_C(PlaneType): ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 4, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 4, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 4, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) _2_x_LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER___ = ( 4, @@ -1730,15 +1730,15 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 4, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 4, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 4, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) _2_x_LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER___ = ( 4, @@ -1754,35 +1754,35 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) _2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE__TER___ = ( 4, @@ -1818,7 +1818,7 @@ class A_4E_C(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_MK_71__HE_FRAG__TER___ = ( 4, @@ -1984,63 +1984,63 @@ class A_4E_C(PlaneType): ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 5, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 5, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 5, - Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 5, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 5, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 5, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 5, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU3_WP61 = (5, Weapons.LAU3_WP61) LAU3_WP1B = (5, Weapons.LAU3_WP1B) diff --git a/pydcs_extensions/f104/f104.py b/pydcs_extensions/f104/f104.py index 21621e92..c1879ec7 100644 --- a/pydcs_extensions/f104/f104.py +++ b/pydcs_extensions/f104/f104.py @@ -97,32 +97,40 @@ class VSN_F104C(PlaneType): 4, Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 4, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) Mk_82_Snakeye___500lb_GP_Bomb_HD = (4, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 4, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) AIM_9L_Sidewinder_IR_AAM = (4, Weapons.AIM_9L_Sidewinder_IR_AAM) AIM_9B_Sidewinder_IR_AAM = (4, Weapons.AIM_9B_Sidewinder_IR_AAM) @@ -134,7 +142,7 @@ class VSN_F104C(PlaneType): ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 4, @@ -150,7 +158,7 @@ class VSN_F104C(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = ( 4, @@ -189,32 +197,40 @@ class VSN_F104C(PlaneType): 8, Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 8, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 8, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 8, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) Mk_82_Snakeye___500lb_GP_Bomb_HD = (8, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (8, Weapons.Mk_83___1000lb_GP_Bomb_LD) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 8, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) AIM_9L_Sidewinder_IR_AAM = (8, Weapons.AIM_9L_Sidewinder_IR_AAM) AIM_9B_Sidewinder_IR_AAM = (8, Weapons.AIM_9B_Sidewinder_IR_AAM) @@ -226,7 +242,7 @@ class VSN_F104C(PlaneType): ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 8, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 8, @@ -242,7 +258,7 @@ class VSN_F104C(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 8, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = ( 8, @@ -334,32 +350,40 @@ class VSN_F104G(PlaneType): 4, Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 4, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) Mk_82_Snakeye___500lb_GP_Bomb_HD = (4, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 4, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) AIM_9L_Sidewinder_IR_AAM = (4, Weapons.AIM_9L_Sidewinder_IR_AAM) AIM_9B_Sidewinder_IR_AAM = (4, Weapons.AIM_9B_Sidewinder_IR_AAM) @@ -371,7 +395,7 @@ class VSN_F104G(PlaneType): ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 4, @@ -387,7 +411,7 @@ class VSN_F104G(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = ( 4, @@ -435,32 +459,40 @@ class VSN_F104G(PlaneType): 8, Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 8, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 8, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 8, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) Mk_82_Snakeye___500lb_GP_Bomb_HD = (8, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (8, Weapons.Mk_83___1000lb_GP_Bomb_LD) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 8, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) AIM_9L_Sidewinder_IR_AAM = (8, Weapons.AIM_9L_Sidewinder_IR_AAM) AIM_9B_Sidewinder_IR_AAM = (8, Weapons.AIM_9B_Sidewinder_IR_AAM) @@ -472,7 +504,7 @@ class VSN_F104G(PlaneType): ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 8, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 8, @@ -488,7 +520,7 @@ class VSN_F104G(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 8, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = ( 8, @@ -577,6 +609,10 @@ class VSN_F104S(PlaneType): AIM_9M_Sidewinder_IR_AAM = (3, Weapons.AIM_9M_Sidewinder_IR_AAM) AIM_9P_Sidewinder_IR_AAM = (3, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P5_Sidewinder_IR_AAM = (3, Weapons.AIM_9P5_Sidewinder_IR_AAM) + AIM_7E_2_Sparrow_Semi_Active_Radar = ( + 3, + Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar, + ) AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) class Pylon4: @@ -622,6 +658,10 @@ class VSN_F104S(PlaneType): AIM_9M_Sidewinder_IR_AAM = (9, Weapons.AIM_9M_Sidewinder_IR_AAM) AIM_9P_Sidewinder_IR_AAM = (9, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P5_Sidewinder_IR_AAM = (9, Weapons.AIM_9P5_Sidewinder_IR_AAM) + AIM_7E_2_Sparrow_Semi_Active_Radar = ( + 9, + Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar, + ) AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) class Pylon10: @@ -717,11 +757,19 @@ class VSN_F104S_AG(PlaneType): Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) CBU_97___10_x_SFW_Cluster_Bomb = (3, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 3, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 3, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (3, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 3, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) AIM_9L_Sidewinder_IR_AAM = (3, Weapons.AIM_9L_Sidewinder_IR_AAM) AIM_9B_Sidewinder_IR_AAM = (3, Weapons.AIM_9B_Sidewinder_IR_AAM) AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = ( @@ -754,32 +802,40 @@ class VSN_F104S_AG(PlaneType): Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) CBU_97___10_x_SFW_Cluster_Bomb = (4, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 4, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) Mk_82_Snakeye___500lb_GP_Bomb_HD = (4, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 4, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 4, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) AIM_9M_Sidewinder_IR_AAM = (4, Weapons.AIM_9M_Sidewinder_IR_AAM) AIM_9L_Sidewinder_IR_AAM = (4, Weapons.AIM_9L_Sidewinder_IR_AAM) @@ -792,7 +848,7 @@ class VSN_F104S_AG(PlaneType): ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 4, @@ -808,7 +864,7 @@ class VSN_F104S_AG(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 4, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = ( 4, @@ -867,32 +923,40 @@ class VSN_F104S_AG(PlaneType): Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) CBU_97___10_x_SFW_Cluster_Bomb = (8, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 8, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 8, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 8, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) Mk_82_Snakeye___500lb_GP_Bomb_HD = (8, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (8, Weapons.Mk_83___1000lb_GP_Bomb_LD) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 8, - Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 8, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) AIM_9B_Sidewinder_IR_AAM = (8, Weapons.AIM_9B_Sidewinder_IR_AAM) AIM_9L_Sidewinder_IR_AAM = (8, Weapons.AIM_9L_Sidewinder_IR_AAM) @@ -904,7 +968,7 @@ class VSN_F104S_AG(PlaneType): ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 8, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 8, @@ -920,7 +984,7 @@ class VSN_F104S_AG(PlaneType): ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 8, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = ( 8, @@ -960,11 +1024,19 @@ class VSN_F104S_AG(PlaneType): Weapons.BL_755_CBU___450kg__147_Frag_Pen_bomblets, ) CBU_97___10_x_SFW_Cluster_Bomb = (9, Weapons.CBU_97___10_x_SFW_Cluster_Bomb) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 9, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = ( 9, - Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__, + Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) B_8M1___20_S_8OFP2 = (9, Weapons.B_8M1___20_S_8OFP2) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = ( + 9, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, + ) AIM_9P_Sidewinder_IR_AAM = (9, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P5_Sidewinder_IR_AAM = (9, Weapons.AIM_9P5_Sidewinder_IR_AAM) AIM_9L_Sidewinder_IR_AAM = (9, Weapons.AIM_9L_Sidewinder_IR_AAM) diff --git a/pydcs_extensions/f4/f4.py b/pydcs_extensions/f4/f4.py index a7124ee1..efae7cea 100644 --- a/pydcs_extensions/f4/f4.py +++ b/pydcs_extensions/f4/f4.py @@ -8,7 +8,7 @@ from game.modsupport import planemod from pydcs_extensions.weapon_injector import inject_weapons -class WeaponsF4: +class WeaponsF4BC: F4B_Gunpod_w_SAPHEI_T = { "clsid": "{VSN_F4B_Equalizer}", "name": "F4B Gunpod w/SAPHEI-T", @@ -79,9 +79,19 @@ class WeaponsF4: "name": "BRU 42A MK82*3 LAU105 AIM9J*2", "weight": 1500, } + LAU_118a_and_AGM_45A_Shrike___Passive_radar_homing_Anti_Radiation_Missile = { + "clsid": "{F4C_LAU118_AGM45A}", + "name": "LAU-118a and AGM-45A Shrike - Passive radar homing Anti-Radiation-Missile", + "weight": 177, + } + SUU_23A_M61_Gunpod_HE_AP_HE_INV_ = { + "clsid": "{VSN_F4B_Equalizer}", + "name": "SUU-23A M61 Gunpod HE/AP/HE-INV.", + "weight": 744.362, + } -inject_weapons(WeaponsF4) +inject_weapons(WeaponsF4BC) @planemod @@ -99,9 +109,32 @@ class VSN_F4B(PlaneType): chaff_charge_size = 1 flare_charge_size = 1 category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 + radio_frequency = 264 - livery_name = "VSN_F4B" # from type + panel_radio = { + 1: { + "channels": { + 1: 264, + 2: 265, + 4: 254, + 8: 258, + 16: 267, + 17: 251, + 9: 262, + 18: 253, + 5: 250, + 10: 259, + 11: 268, + 3: 256, + 6: 270, + 12: 269, + 13: 260, + 7: 257, + 14: 263, + 15: 261, + }, + }, + } class Pylon1: Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_) @@ -112,31 +145,34 @@ class VSN_F4B(PlaneType): Smoke_Generator___orange_ = (1, Weapons.Smoke_Generator___orange_) class Pylon2: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 2, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = (2, Weapons.GBU_12___500lb_Laser_Guided_Bomb) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 2, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, ) + TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = ( + 2, + Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD, + ) + BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = ( + 2, + Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, + ) Mk_84___2000lb_GP_Bomb_LD = (2, Weapons.Mk_84___2000lb_GP_Bomb_LD) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) Smokewinder___red = (2, Weapons.Smokewinder___red) Smokewinder___green = (2, Weapons.Smokewinder___green) @@ -145,29 +181,20 @@ class VSN_F4B(PlaneType): Smokewinder___yellow = (2, Weapons.Smokewinder___yellow) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = ( 2, Weapons.BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD, ) - BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = ( - 2, - Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb, - ) BIN_200 = (2, Weapons.BIN_200) - VSN_F4EL_PTB = (2, Weapons.VSN_F4EL_PTB) + VSN_F4EL_PTB = (2, WeaponsF4BC.VSN_F4EL_PTB) class Pylon3: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 3, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 3, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, @@ -179,19 +206,19 @@ class VSN_F4B(PlaneType): Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_105_2_AIM_9L = (3, Weapons.LAU_105_2_AIM_9L) LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = ( @@ -203,8 +230,8 @@ class VSN_F4B(PlaneType): 3, Weapons.LAU_7_with_2_x_AIM_9B_Sidewinder_IR_AAM, ) - LAU_105_2_AIM_9J = (3, Weapons.LAU_105_2_AIM_9J) - LAU_105_2_AIM_9JULI = (3, Weapons.LAU_105_2_AIM_9JULI) + LAU_105_2_AIM_9J = (3, WeaponsF4BC.LAU_105_2_AIM_9J) + LAU_105_2_AIM_9JULI = (3, WeaponsF4BC.LAU_105_2_AIM_9JULI) AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) AIM_7E_2_Sparrow_Semi_Active_Radar = ( 3, @@ -224,13 +251,19 @@ class VSN_F4B(PlaneType): Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD, ) BIN_200 = (3, Weapons.BIN_200) - F4B_LAU105_AIM9J_2_BRU42A_M117_3 = (3, Weapons.F4B_LAU105_AIM9J_2_BRU42A_M117_3) - F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = (3, Weapons.F4B_LAU105_AIM9J_2_BRU42A_MK82_3) + F4B_LAU105_AIM9J_2_BRU42A_M117_3 = ( + 3, + WeaponsF4BC.F4B_LAU105_AIM9J_2_BRU42A_M117_3, + ) + F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = ( + 3, + WeaponsF4BC.F4B_LAU105_AIM9J_2_BRU42A_MK82_3, + ) F4B_LAU105_AIM9J_2_TER9A_MK82SE_3 = ( 3, - Weapons.F4B_LAU105_AIM9J_2_TER9A_MK82SE_3, + WeaponsF4BC.F4B_LAU105_AIM9J_2_TER9A_MK82SE_3, ) - F4B_LAU105_AIM9J_2_MER_MK20_3 = (3, Weapons.F4B_LAU105_AIM9J_2_MER_MK20_3) + F4B_LAU105_AIM9J_2_MER_MK20_3 = (3, WeaponsF4BC.F4B_LAU105_AIM9J_2_MER_MK20_3) class Pylon4: AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) @@ -245,6 +278,7 @@ class VSN_F4B(PlaneType): 5, Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar, ) + ALQ_131___ECM_Pod = (5, Weapons.ALQ_131___ECM_Pod) class Pylon6: Smokewinder___red = (6, Weapons.Smokewinder___red) @@ -258,16 +292,18 @@ class VSN_F4B(PlaneType): ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 6, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = ( 6, Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, ) - ALQ_131___ECM_Pod = (6, Weapons.ALQ_131___ECM_Pod) - F4B_Gunpod_w_SAPHEI_T = (6, Weapons.F4B_Gunpod_w_SAPHEI_T) - VSN_F4EC_PTB = (6, Weapons.VSN_F4EC_PTB) - VSN_F4B_C2_PTB = (6, Weapons.VSN_F4B_C2_PTB) + SUU_23A_M61_Gunpod_HE_AP_HE_INV_ = ( + 6, + WeaponsF4BC.SUU_23A_M61_Gunpod_HE_AP_HE_INV_, + ) + VSN_F4EC_PTB = (6, WeaponsF4BC.VSN_F4EC_PTB) + VSN_F4B_C2_PTB = (6, WeaponsF4BC.VSN_F4B_C2_PTB) class Pylon7: AIM_7F_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) @@ -284,11 +320,6 @@ class VSN_F4B(PlaneType): ) class Pylon9: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 9, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = (9, Weapons.GBU_12___500lb_Laser_Guided_Bomb) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 9, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, @@ -300,19 +331,19 @@ class VSN_F4B(PlaneType): Mk_84___2000lb_GP_Bomb_LD = (9, Weapons.Mk_84___2000lb_GP_Bomb_LD) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 9, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 9, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 9, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 9, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_105_2_AIM_9L = (9, Weapons.LAU_105_2_AIM_9L) LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = ( @@ -324,8 +355,8 @@ class VSN_F4B(PlaneType): 9, Weapons.LAU_7_with_2_x_AIM_9B_Sidewinder_IR_AAM, ) - LAU_105_2_AIM_9J = (9, Weapons.LAU_105_2_AIM_9J) - LAU_105_2_AIM_9JULI = (9, Weapons.LAU_105_2_AIM_9JULI) + LAU_105_2_AIM_9J = (9, WeaponsF4BC.LAU_105_2_AIM_9J) + LAU_105_2_AIM_9JULI = (9, WeaponsF4BC.LAU_105_2_AIM_9JULI) AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) AIM_7E_2_Sparrow_Semi_Active_Radar = ( 9, @@ -345,43 +376,49 @@ class VSN_F4B(PlaneType): Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD, ) BIN_200 = (9, Weapons.BIN_200) - F4B_LAU105_AIM9J_2_BRU42A_M117_3 = (9, Weapons.F4B_LAU105_AIM9J_2_BRU42A_M117_3) - F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = (9, Weapons.F4B_LAU105_AIM9J_2_BRU42A_MK82_3) + F4B_LAU105_AIM9J_2_BRU42A_M117_3 = ( + 9, + WeaponsF4BC.F4B_LAU105_AIM9J_2_BRU42A_M117_3, + ) + F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = ( + 9, + WeaponsF4BC.F4B_LAU105_AIM9J_2_BRU42A_MK82_3, + ) F4B_LAU105_AIM9J_2_TER9A_MK82SE_3 = ( 9, - Weapons.F4B_LAU105_AIM9J_2_TER9A_MK82SE_3, + WeaponsF4BC.F4B_LAU105_AIM9J_2_TER9A_MK82SE_3, ) - F4B_LAU105_AIM9J_2_MER_MK20_3 = (9, Weapons.F4B_LAU105_AIM9J_2_MER_MK20_3) + F4B_LAU105_AIM9J_2_MER_MK20_3 = (9, WeaponsF4BC.F4B_LAU105_AIM9J_2_MER_MK20_3) class Pylon10: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 10, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = ( - 10, - Weapons.GBU_12___500lb_Laser_Guided_Bomb, - ) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 10, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, ) Mk_84___2000lb_GP_Bomb_LD = (10, Weapons.Mk_84___2000lb_GP_Bomb_LD) + TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = ( + 10, + Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD, + ) + BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = ( + 10, + Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, + ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 10, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 10, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 10, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 10, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) Smokewinder___red = (10, Weapons.Smokewinder___red) Smokewinder___green = (10, Weapons.Smokewinder___green) @@ -390,27 +427,26 @@ class VSN_F4B(PlaneType): Smokewinder___yellow = (10, Weapons.Smokewinder___yellow) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 10, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 10, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = ( 10, Weapons.BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD, ) - BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = ( - 10, - Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb, - ) BIN_200 = (10, Weapons.BIN_200) - VSN_F4ER_PTB = (10, Weapons.VSN_F4ER_PTB) + VSN_F4ER_PTB = (10, WeaponsF4BC.VSN_F4ER_PTB) + + # ERRR + # ERRR class Pylon11: # all added manually - did not pull using database export - BRU42A_M117_3_LAU105_AIM9J_2 = (11, Weapons.BRU_42A_M117_3_LAU105_AIM9J_2) - BRU42A_MK82_3_LAU105_AIM9J_2 = (11, Weapons.BRU_42A_MK82_3_LAU105_AIM9J_2) + BRU42A_M117_3_LAU105_AIM9J_2 = (11, WeaponsF4BC.BRU_42A_M117_3_LAU105_AIM9J_2) + BRU42A_MK82_3_LAU105_AIM9J_2 = (11, WeaponsF4BC.BRU_42A_MK82_3_LAU105_AIM9J_2) TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = ( 11, Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD, @@ -422,8 +458,8 @@ class VSN_F4B(PlaneType): class Pylon12: # all added manually - did not pull using database export - BRU42A_M117_3_LAU105_AIM9J_2 = (12, Weapons.BRU_42A_M117_3_LAU105_AIM9J_2) - BRU42A_MK82_3_LAU105_AIM9J_2 = (12, Weapons.BRU_42A_MK82_3_LAU105_AIM9J_2) + BRU42A_M117_3_LAU105_AIM9J_2 = (12, WeaponsF4BC.BRU_42A_M117_3_LAU105_AIM9J_2) + BRU42A_MK82_3_LAU105_AIM9J_2 = (12, WeaponsF4BC.BRU_42A_MK82_3_LAU105_AIM9J_2) TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = ( 12, Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD, @@ -445,6 +481,7 @@ class VSN_F4B(PlaneType): task.CAS, task.AFAC, task.RunwayAttack, + task.PinpointStrike, ] task_default = task.CAP @@ -464,9 +501,32 @@ class VSN_F4C(PlaneType): chaff_charge_size = 1 flare_charge_size = 1 category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 + radio_frequency = 264 - livery_name = "VSN_F4C" # from type + panel_radio = { + 1: { + "channels": { + 1: 264, + 2: 265, + 4: 254, + 8: 258, + 16: 267, + 17: 251, + 9: 262, + 18: 253, + 5: 250, + 10: 259, + 11: 268, + 3: 256, + 6: 270, + 12: 269, + 13: 260, + 7: 257, + 14: 263, + 15: 261, + }, + }, + } class Pylon1: Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_) @@ -477,31 +537,34 @@ class VSN_F4C(PlaneType): Smoke_Generator___orange_ = (1, Weapons.Smoke_Generator___orange_) class Pylon2: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 2, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = (2, Weapons.GBU_12___500lb_Laser_Guided_Bomb) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 2, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, ) Mk_84___2000lb_GP_Bomb_LD = (2, Weapons.Mk_84___2000lb_GP_Bomb_LD) + TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = ( + 2, + Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD, + ) + BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = ( + 2, + Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, + ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) Smokewinder___red = (2, Weapons.Smokewinder___red) Smokewinder___green = (2, Weapons.Smokewinder___green) @@ -510,29 +573,20 @@ class VSN_F4C(PlaneType): Smokewinder___yellow = (2, Weapons.Smokewinder___yellow) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = ( 2, Weapons.BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD, ) - BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = ( - 2, - Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb, - ) BIN_200 = (2, Weapons.BIN_200) - VSN_F4EL_PTB = (2, Weapons.VSN_F4EL_PTB) + VSN_F4EL_PTB = (2, WeaponsF4BC.VSN_F4EL_PTB) class Pylon3: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 3, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 3, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, @@ -542,23 +596,25 @@ 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) - AGM_45B_Shrike_ARM = (3, Weapons.AGM_45B_Shrike_ARM) - AGM_45A_Shrike_ARM = (3, Weapons.AGM_45A_Shrike_ARM) + LAU_118A___AGM_45B_Shrike_ARM = ( + 3, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, + ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_105_2_AIM_9L = (3, Weapons.LAU_105_2_AIM_9L) LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = ( @@ -570,8 +626,8 @@ class VSN_F4C(PlaneType): 3, Weapons.LAU_7_with_2_x_AIM_9B_Sidewinder_IR_AAM, ) - LAU_105_2_AIM_9J = (3, Weapons.LAU_105_2_AIM_9J) - LAU_105_2_AIM_9JULI = (3, Weapons.LAU_105_2_AIM_9JULI) + LAU_105_2_AIM_9J = (3, WeaponsF4BC.LAU_105_2_AIM_9J) + LAU_105_2_AIM_9JULI = (3, WeaponsF4BC.LAU_105_2_AIM_9JULI) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 3, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -586,6 +642,10 @@ class VSN_F4C(PlaneType): Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD, ) BIN_200 = (3, Weapons.BIN_200) + LAU_118a_and_AGM_45A_Shrike___Passive_radar_homing_Anti_Radiation_Missile = ( + 3, + WeaponsF4BC.LAU_118a_and_AGM_45A_Shrike___Passive_radar_homing_Anti_Radiation_Missile, + ) class Pylon4: AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) @@ -600,6 +660,7 @@ class VSN_F4C(PlaneType): 5, Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar, ) + ALQ_131___ECM_Pod = (5, Weapons.ALQ_131___ECM_Pod) class Pylon6: Smokewinder___red = (6, Weapons.Smokewinder___red) @@ -613,16 +674,18 @@ class VSN_F4C(PlaneType): ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 6, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = ( 6, Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, ) - ALQ_131___ECM_Pod = (6, Weapons.ALQ_131___ECM_Pod) - F4B_Gunpod_w_SAPHEI_T = (6, Weapons.F4B_Gunpod_w_SAPHEI_T) - VSN_F4EC_PTB = (6, Weapons.VSN_F4EC_PTB) - VSN_F4B_C2_PTB = (6, Weapons.VSN_F4B_C2_PTB) + SUU_23A_M61_Gunpod_HE_AP_HE_INV_ = ( + 6, + WeaponsF4BC.SUU_23A_M61_Gunpod_HE_AP_HE_INV_, + ) + VSN_F4EC_PTB = (6, WeaponsF4BC.VSN_F4EC_PTB) + VSN_F4B_C2_PTB = (6, WeaponsF4BC.VSN_F4B_C2_PTB) class Pylon7: AIM_7F_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) @@ -639,11 +702,6 @@ class VSN_F4C(PlaneType): ) class Pylon9: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 9, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = (9, Weapons.GBU_12___500lb_Laser_Guided_Bomb) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 9, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, @@ -653,23 +711,25 @@ 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) - AGM_45B_Shrike_ARM = (9, Weapons.AGM_45B_Shrike_ARM) - AGM_45A_Shrike_ARM = (9, Weapons.AGM_45A_Shrike_ARM) + LAU_118A___AGM_45B_Shrike_ARM = ( + 9, + Weapons.LAU_118A___AGM_45B_Shrike_ARM, + ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 9, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 9, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 9, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 9, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_105_2_AIM_9L = (9, Weapons.LAU_105_2_AIM_9L) LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = ( @@ -681,8 +741,8 @@ class VSN_F4C(PlaneType): 9, Weapons.LAU_7_with_2_x_AIM_9B_Sidewinder_IR_AAM, ) - LAU_105_2_AIM_9J = (9, Weapons.LAU_105_2_AIM_9J) - LAU_105_2_AIM_9JULI = (9, Weapons.LAU_105_2_AIM_9JULI) + LAU_105_2_AIM_9J = (9, WeaponsF4BC.LAU_105_2_AIM_9J) + LAU_105_2_AIM_9JULI = (9, WeaponsF4BC.LAU_105_2_AIM_9JULI) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 9, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -697,36 +757,40 @@ class VSN_F4C(PlaneType): Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD, ) BIN_200 = (9, Weapons.BIN_200) + LAU_118a_and_AGM_45A_Shrike___Passive_radar_homing_Anti_Radiation_Missile = ( + 9, + WeaponsF4BC.LAU_118a_and_AGM_45A_Shrike___Passive_radar_homing_Anti_Radiation_Missile, + ) class Pylon10: - GBU_10___2000lb_Laser_Guided_Bomb = ( - 10, - Weapons.GBU_10___2000lb_Laser_Guided_Bomb, - ) - GBU_12___500lb_Laser_Guided_Bomb = ( - 10, - Weapons.GBU_12___500lb_Laser_Guided_Bomb, - ) BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = ( 10, Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets, ) Mk_84___2000lb_GP_Bomb_LD = (10, Weapons.Mk_84___2000lb_GP_Bomb_LD) + TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = ( + 10, + Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD, + ) + BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = ( + 10, + Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD, + ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 10, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 10, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 10, - Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 10, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) Smokewinder___red = (10, Weapons.Smokewinder___red) Smokewinder___green = (10, Weapons.Smokewinder___green) @@ -735,22 +799,21 @@ class VSN_F4C(PlaneType): Smokewinder___yellow = (10, Weapons.Smokewinder___yellow) BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 10, - Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 10, - Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = ( 10, Weapons.BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD, ) - BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = ( - 10, - Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb, - ) BIN_200 = (10, Weapons.BIN_200) - VSN_F4ER_PTB = (10, Weapons.VSN_F4ER_PTB) + VSN_F4ER_PTB = (10, WeaponsF4BC.VSN_F4ER_PTB) + + # ERRR + # ERRR pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} @@ -764,5 +827,7 @@ class VSN_F4C(PlaneType): task.CAS, task.AFAC, task.RunwayAttack, + task.SEAD, + task.PinpointStrike, ] task_default = task.CAP diff --git a/pydcs_extensions/hercules/hercules.py b/pydcs_extensions/hercules/hercules.py index 3730edfd..c4ee5e05 100644 --- a/pydcs_extensions/hercules/hercules.py +++ b/pydcs_extensions/hercules/hercules.py @@ -736,7 +736,7 @@ class Hercules(PlaneType): class Pylon2: LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) Smokewinder___red = (2, Weapons.Smokewinder___red) Smokewinder___green = (2, Weapons.Smokewinder___green) @@ -753,7 +753,7 @@ class Hercules(PlaneType): class Pylon3: LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) Smokewinder___red = (3, Weapons.Smokewinder___red) Smokewinder___green = (3, Weapons.Smokewinder___green) @@ -770,7 +770,7 @@ class Hercules(PlaneType): class Pylon4: LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 4, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) Smokewinder___red = (4, Weapons.Smokewinder___red) Smokewinder___green = (4, Weapons.Smokewinder___green) @@ -787,7 +787,7 @@ class Hercules(PlaneType): class Pylon5: LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) Smokewinder___red = (5, Weapons.Smokewinder___red) Smokewinder___green = (5, Weapons.Smokewinder___green) diff --git a/pydcs_extensions/ov10a/ov10a.py b/pydcs_extensions/ov10a/ov10a.py index 0b3efca6..21b96591 100644 --- a/pydcs_extensions/ov10a/ov10a.py +++ b/pydcs_extensions/ov10a/ov10a.py @@ -57,7 +57,7 @@ class Bronco_OV_10A(PlaneType): 1, Weapons.LAU_7_with_AIM_9B_Sidewinder_IR_AAM, ) - LAU_33A = (1, Weapons.LAU_33A) + LAU_33A = (1, WeaponsOV10A.LAU_33A) # ERRR {MK-81} @@ -75,67 +75,67 @@ class Bronco_OV_10A(PlaneType): M260_HYDRA_WP = (2, Weapons.M260_HYDRA_WP) LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 2, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 2, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 2, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 2, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) # ERRR {MK-81} @@ -154,77 +154,77 @@ class Bronco_OV_10A(PlaneType): M260_HYDRA_WP = (3, Weapons.M260_HYDRA_WP) LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 3, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 3, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 3, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 3, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) class Pylon4: - Fuel_Tank_150_gallons_ = (4, Weapons.Fuel_Tank_150_gallons_) + Fuel_Tank_150_gallons_ = (4, WeaponsOV10A.Fuel_Tank_150_gallons_) # ERRR {MK-81} Mk_82___500lb_GP_Bomb_LD = (4, Weapons.Mk_82___500lb_GP_Bomb_LD) Mk_82_Snakeye___500lb_GP_Bomb_HD = (4, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD) Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD) M117___750lb_GP_Bomb_LD = (4, Weapons.M117___750lb_GP_Bomb_LD) - Mk4_mod_0 = (4, Weapons.Mk4_mod_0) + Mk4_mod_0 = (4, WeaponsOV10A.Mk4_mod_0) # ERRR {MK-81} @@ -242,67 +242,67 @@ class Bronco_OV_10A(PlaneType): M260_HYDRA_WP = (5, Weapons.M260_HYDRA_WP) LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 5, - Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 5, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 5, - Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 5, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 5, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 5, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 5, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 5, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 5, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) # ERRR {MK-81} @@ -321,67 +321,67 @@ class Bronco_OV_10A(PlaneType): M260_HYDRA_WP = (6, Weapons.M260_HYDRA_WP) LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 6, - Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_, ) LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = ( 6, - Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG, + Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE, ) LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 6, - Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 6, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_, ) LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 6, - Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = ( 6, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = ( 6, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE, ) LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = ( 6, - Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP, ) LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = ( 6, - Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice, + Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP, ) class Pylon7: @@ -393,13 +393,13 @@ class Bronco_OV_10A(PlaneType): 7, Weapons.LAU_7_with_AIM_9B_Sidewinder_IR_AAM, ) - LAU_33A = (7, Weapons.LAU_33A) + LAU_33A = (7, WeaponsOV10A.LAU_33A) class Pylon8: - OV10_Paratrooper = (8, Weapons.OV10_Paratrooper) + OV10_Paratrooper = (8, WeaponsOV10A.OV10_Paratrooper) class Pylon9: - OV10_SMOKE = (9, Weapons.OV10_SMOKE) + OV10_SMOKE = (9, WeaponsOV10A.OV10_SMOKE) pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9} diff --git a/pydcs_extensions/su57/su57.py b/pydcs_extensions/su57/su57.py index 4b1cf270..df2b43d8 100644 --- a/pydcs_extensions/su57/su57.py +++ b/pydcs_extensions/su57/su57.py @@ -14,11 +14,23 @@ class Su57Weapons: RVV_BD = {"clsid": "{RVV-BD}", "name": "RVV-BD", "weight": 600} RVV_L = {"clsid": "{RVV-L}", "name": "RVV-L", "weight": 748} RVV_M = {"clsid": "{RVV-M}", "name": "RVV-M", "weight": 190} + R_37M_Active_Rdr = {"clsid": "{RVV-BD}", "name": "R-37M Active Rdr", "weight": 600} Su_57_Fuel_Tank = { "clsid": "{SU_57Tank}", "name": "Su-57 Fuel Tank", "weight": 1561.421, } + R_77PD_Active_rdr = { + "clsid": "{RVV-AE}", + "name": "R-77PD Active rdr", + "weight": 250, + } + K_77M_Active_Rdr = {"clsid": "{RVV-M}", "name": "K-77M Active Rdr", "weight": 190} + KS_172_Passive_Rdr = { + "clsid": "{RVV-L}", + "name": "KS-172 Passive Rdr", + "weight": 748, + } inject_weapons(Su57Weapons) @@ -44,8 +56,9 @@ class Su_57(PlaneType): class Pylon1: R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) - RVV_AE = (1, Su57Weapons.RVV_AE) - RVV_M = (1, Su57Weapons.RVV_M) + R_77PD_Active_rdr = (1, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (1, Su57Weapons.K_77M_Active_Rdr) + L_081_Fantasmagoria_ELINT_pod = (1, Weapons.L_081_Fantasmagoria_ELINT_pod) Smoke_Generator___red = (1, Weapons.Smoke_Generator___red) Smoke_Generator___green = (1, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (1, Weapons.Smoke_Generator___blue) @@ -96,13 +109,17 @@ class Su_57(PlaneType): 2, Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 2, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = ( 2, - Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag, + Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( 2, - Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator, + Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( 2, @@ -143,10 +160,10 @@ class Su_57(PlaneType): 2, Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, ) - RVV_BD = (2, Su57Weapons.RVV_BD) - RVV_AE = (2, Su57Weapons.RVV_AE) - RVV_M = (2, Su57Weapons.RVV_M) - RVV_L = (2, Su57Weapons.RVV_L) + R_37M_Active_Rdr = (2, Su57Weapons.R_37M_Active_Rdr) + R_77PD_Active_rdr = (2, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (2, Su57Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (2, Su57Weapons.KS_172_Passive_Rdr) Fuel_tank_800L_Wing = (2, Weapons.Fuel_tank_800L_Wing) RN_28___260_kg__nuclear_bomb__free_fall = ( 2, @@ -213,13 +230,17 @@ class Su_57(PlaneType): 4, Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 4, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = ( 4, - Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag, + Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( 4, - Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator, + Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( 4, @@ -260,10 +281,10 @@ class Su_57(PlaneType): 4, Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, ) - RVV_BD = (4, Su57Weapons.RVV_BD) - RVV_AE = (4, Su57Weapons.RVV_AE) - RVV_M = (4, Su57Weapons.RVV_M) - RVV_L = (4, Su57Weapons.RVV_L) + R_37M_Active_Rdr = (4, Su57Weapons.R_37M_Active_Rdr) + R_77PD_Active_rdr = (4, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (4, Su57Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (4, Su57Weapons.KS_172_Passive_Rdr) RN_28___260_kg__nuclear_bomb__free_fall = ( 4, Weapons.RN_28___260_kg__nuclear_bomb__free_fall, @@ -273,26 +294,26 @@ class Su_57(PlaneType): class Pylon5: R_77__AA_12_Adder____Active_Rdr = (5, Weapons.R_77__AA_12_Adder____Active_Rdr) - RVV_AE = (5, Su57Weapons.RVV_AE) - RVV_M = (5, Su57Weapons.RVV_M) + R_77PD_Active_rdr = (5, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (5, Su57Weapons.K_77M_Active_Rdr) Kh_59MK2 = (5, Su57Weapons.Kh_59MK2) class Pylon6: R_77__AA_12_Adder____Active_Rdr = (6, Weapons.R_77__AA_12_Adder____Active_Rdr) - RVV_AE = (6, Su57Weapons.RVV_AE) - RVV_M = (6, Su57Weapons.RVV_M) + R_77PD_Active_rdr = (6, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (6, Su57Weapons.K_77M_Active_Rdr) Kh_59MK2 = (6, Su57Weapons.Kh_59MK2) class Pylon7: R_77__AA_12_Adder____Active_Rdr = (7, Weapons.R_77__AA_12_Adder____Active_Rdr) - RVV_AE = (7, Su57Weapons.RVV_AE) - RVV_M = (7, Su57Weapons.RVV_M) + R_77PD_Active_rdr = (7, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (7, Su57Weapons.K_77M_Active_Rdr) Kh_59MK2 = (7, Su57Weapons.Kh_59MK2) class Pylon8: R_77__AA_12_Adder____Active_Rdr = (8, Weapons.R_77__AA_12_Adder____Active_Rdr) - RVV_AE = (8, Su57Weapons.RVV_AE) - RVV_M = (8, Su57Weapons.RVV_M) + R_77PD_Active_rdr = (8, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (8, Su57Weapons.K_77M_Active_Rdr) Kh_59MK2 = (8, Su57Weapons.Kh_59MK2) class Pylon9: @@ -338,13 +359,17 @@ class Su_57(PlaneType): 9, Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 9, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = ( 9, - Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag, + Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( 9, - Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator, + Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( 9, @@ -385,10 +410,10 @@ class Su_57(PlaneType): 9, Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, ) - RVV_BD = (9, Su57Weapons.RVV_BD) - RVV_AE = (9, Su57Weapons.RVV_AE) - RVV_M = (9, Su57Weapons.RVV_M) - RVV_L = (9, Su57Weapons.RVV_L) + R_37M_Active_Rdr = (9, Su57Weapons.R_37M_Active_Rdr) + R_77PD_Active_rdr = (9, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (9, Su57Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (9, Su57Weapons.KS_172_Passive_Rdr) RN_28___260_kg__nuclear_bomb__free_fall = ( 9, Weapons.RN_28___260_kg__nuclear_bomb__free_fall, @@ -448,13 +473,17 @@ class Su_57(PlaneType): 11, Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 11, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = ( 11, - Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag, + Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( 11, - Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator, + Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( 11, @@ -499,10 +528,10 @@ class Su_57(PlaneType): Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, ) # ERRR {R-33} - RVV_BD = (11, Su57Weapons.RVV_BD) - RVV_AE = (11, Su57Weapons.RVV_AE) - RVV_M = (11, Su57Weapons.RVV_M) - RVV_L = (11, Su57Weapons.RVV_L) + R_37M_Active_Rdr = (11, Su57Weapons.R_37M_Active_Rdr) + R_77PD_Active_rdr = (11, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (11, Su57Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (11, Su57Weapons.KS_172_Passive_Rdr) Fuel_tank_800L_Wing = (11, Weapons.Fuel_tank_800L_Wing) Su_57_Fuel_Tank = (11, Su57Weapons.Su_57_Fuel_Tank) RN_28___260_kg__nuclear_bomb__free_fall = ( @@ -519,8 +548,8 @@ class Su_57(PlaneType): class Pylon12: R_73__AA_11_Archer____Infra_Red = (12, Weapons.R_73__AA_11_Archer____Infra_Red) - RVV_AE = (12, Su57Weapons.RVV_AE) - RVV_M = (12, Su57Weapons.RVV_M) + R_77PD_Active_rdr = (12, Su57Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (12, Su57Weapons.K_77M_Active_Rdr) Smoke_Generator___red = (12, Weapons.Smoke_Generator___red) Smoke_Generator___green = (12, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (12, Weapons.Smoke_Generator___blue) diff --git a/requirements.txt b/requirements.txt index ac8b28fc..6001ae5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ pre-commit==3.5.0 pydantic==2.5.2 pydantic-settings==2.1.0 pydantic_core==2.14.5 -pydcs @ git+https://github.com/dcs-liberation/dcs@58b4cc91bfb068e094f684e4747190d1dcd57232 +pydcs @ git+https://github.com/dcs-liberation/dcs@fd375b6b797a15b77d48301d9a9cb55d4ed641ad pyinstaller==5.13.1 pyinstaller-hooks-contrib==2023.6 pyproj==3.6.1 diff --git a/resources/campaigns/TblisiGap.yaml b/resources/campaigns/TblisiGap.yaml index 91dd28b9..af2ae7f6 100644 --- a/resources/campaigns/TblisiGap.yaml +++ b/resources/campaigns/TblisiGap.yaml @@ -74,7 +74,7 @@ squadrons: - primary: BARCAP aircraft: - F-16CM Fighting Falcon (Block 50) - - F-4F Phantom II + - F-4E-45MC Phantom II - F-5E Tiger II - MiG-23MLD Flogger-K - FC-1 Fierce Dragon diff --git a/resources/campaigns/battle_of_abu_dhabi.yaml b/resources/campaigns/battle_of_abu_dhabi.yaml index 67387a85..2c20c487 100644 --- a/resources/campaigns/battle_of_abu_dhabi.yaml +++ b/resources/campaigns/battle_of_abu_dhabi.yaml @@ -39,7 +39,7 @@ squadrons: secondary: air-to-ground aircraft: - F-16CM Fighting Falcon (Block 50) - - F-4E Phantom II + - F-4E-45MC Phantom II - primary: AEW&C size: 2 aircraft: diff --git a/resources/campaigns/golan_heights_lite.yaml b/resources/campaigns/golan_heights_lite.yaml index 2106f936..bf8761f0 100644 --- a/resources/campaigns/golan_heights_lite.yaml +++ b/resources/campaigns/golan_heights_lite.yaml @@ -118,7 +118,7 @@ squadrons: - primary: BARCAP secondary: any aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II size: 10 - primary: Strike secondary: air-to-ground diff --git a/resources/campaigns/operation_allied_sword.yaml b/resources/campaigns/operation_allied_sword.yaml index c9ab342b..4d9f811b 100644 --- a/resources/campaigns/operation_allied_sword.yaml +++ b/resources/campaigns/operation_allied_sword.yaml @@ -12,7 +12,6 @@ recommended_player_faction: locales: - en_US aircrafts: - - F-4E Phantom II - F-4E-45MC Phantom II - F-15C Eagle - F-15E Strike Eagle diff --git a/resources/campaigns/operation_velvet_thunder.yaml b/resources/campaigns/operation_velvet_thunder.yaml index 69edb22d..0bec472b 100644 --- a/resources/campaigns/operation_velvet_thunder.yaml +++ b/resources/campaigns/operation_velvet_thunder.yaml @@ -50,7 +50,7 @@ squadrons: - primary: DEAD secondary: any aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II size: 8 - primary: Strike secondary: any diff --git a/resources/campaigns/scenic_inland.yaml b/resources/campaigns/scenic_inland.yaml index 44058bd9..da2e9bf2 100644 --- a/resources/campaigns/scenic_inland.yaml +++ b/resources/campaigns/scenic_inland.yaml @@ -164,7 +164,7 @@ squadrons: - primary: BARCAP secondary: any aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II - primary: TARCAP secondary: air-to-air aircraft: diff --git a/resources/campaigns/scenic_merge.yaml b/resources/campaigns/scenic_merge.yaml index cdfff061..d1cc38c5 100644 --- a/resources/campaigns/scenic_merge.yaml +++ b/resources/campaigns/scenic_merge.yaml @@ -136,7 +136,7 @@ squadrons: - primary: BARCAP secondary: any aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II size: 6 - primary: CAS secondary: air-to-ground diff --git a/resources/campaigns/scenic_route.yaml b/resources/campaigns/scenic_route.yaml index 0ce14041..d992c266 100644 --- a/resources/campaigns/scenic_route.yaml +++ b/resources/campaigns/scenic_route.yaml @@ -93,13 +93,13 @@ squadrons: - primary: BARCAP secondary: any aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II # Havadarya 9: - primary: BARCAP secondary: any aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II size: 10 - primary: CAS secondary: air-to-ground @@ -123,7 +123,7 @@ squadrons: - primary: BARCAP secondary: air-to-ground aircraft: - - F-4E Phantom II + - F-4E-45MC Phantom II # OPFOR First FOB FOB Seerik: - primary: CAS diff --git a/resources/factions/NATO_Desert_Storm.yaml b/resources/factions/NATO_Desert_Storm.yaml index c15d2e6c..2059b1f7 100644 --- a/resources/factions/NATO_Desert_Storm.yaml +++ b/resources/factions/NATO_Desert_Storm.yaml @@ -20,7 +20,6 @@ aircrafts: - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - - F-4E Phantom II - F-4E-45MC Phantom II - F/A-18C Hornet (Lot 20) - Mirage 2000C diff --git a/resources/factions/bluefor_coldwar.yaml b/resources/factions/bluefor_coldwar.yaml index 8000df84..ac41b765 100644 --- a/resources/factions/bluefor_coldwar.yaml +++ b/resources/factions/bluefor_coldwar.yaml @@ -12,7 +12,6 @@ aircrafts: - C-130J-30 Super Hercules - F-14A Tomcat (Block 135-GR Late) - F-14B Tomcat - - F-4E Phantom II - F-4E-45MC Phantom II - F-5E Tiger II - Mirage-F1B diff --git a/resources/factions/blufor_late_coldwar.yaml b/resources/factions/blufor_late_coldwar.yaml index 86c6962f..4588266e 100644 --- a/resources/factions/blufor_late_coldwar.yaml +++ b/resources/factions/blufor_late_coldwar.yaml @@ -23,7 +23,6 @@ aircrafts: - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F/A-18C Hornet (Lot 20) - - F-4E Phantom II - F-4E-45MC Phantom II - F-5E Tiger II - OH-58D(R) Kiowa Warrior diff --git a/resources/factions/egypt_2000.yaml b/resources/factions/egypt_2000.yaml index f02701c8..58752b64 100644 --- a/resources/factions/egypt_2000.yaml +++ b/resources/factions/egypt_2000.yaml @@ -9,7 +9,6 @@ aircrafts: - MiG-29S Fulcrum-C - MiG-21bis Fishbed-N - Mirage 2000C - - F-4E Phantom II - F-4E-45MC Phantom II - F-16CM Fighting Falcon (Block 50) - IL-76MD diff --git a/resources/factions/germany_1990.yaml b/resources/factions/germany_1990.yaml index ba2ead7e..75c49d16 100644 --- a/resources/factions/germany_1990.yaml +++ b/resources/factions/germany_1990.yaml @@ -7,7 +7,7 @@ locales: - de_DE aircrafts: - C-130 - - F-4F Phantom II + - F-4E-45MC Phantom II - MiG-29G Fulcrum-A - SA 342L Gazelle - SA 342M Gazelle diff --git a/resources/factions/greece_2005.yaml b/resources/factions/greece_2005.yaml index 85e1bd0e..936c5d87 100644 --- a/resources/factions/greece_2005.yaml +++ b/resources/factions/greece_2005.yaml @@ -10,7 +10,6 @@ aircrafts: - C-130 - C-130J-30 Super Hercules - F-16CM Fighting Falcon (Block 50) - - F-4E Phantom II - F-4E-45MC Phantom II - Mirage 2000-5 - Mirage 2000C diff --git a/resources/factions/iran_1988.yaml b/resources/factions/iran_1988.yaml index c2f16ef7..29557397 100644 --- a/resources/factions/iran_1988.yaml +++ b/resources/factions/iran_1988.yaml @@ -8,7 +8,6 @@ locales: aircrafts: - AH-1J SeaCobra - F-14A Tomcat (Block 135-GR Late) - - F-4E Phantom II - F-4E-45MC Phantom II - F-5E Tiger II - MiG-21bis Fishbed-N diff --git a/resources/factions/iran_2015.yaml b/resources/factions/iran_2015.yaml index 5db71f16..9f897625 100644 --- a/resources/factions/iran_2015.yaml +++ b/resources/factions/iran_2015.yaml @@ -7,7 +7,6 @@ locales: - fa_IR aircrafts: - F-14A Tomcat (Block 135-GR Late) - - F-4E Phantom II - F-4E-45MC Phantom II - F-5E Tiger II - IL-76MD diff --git a/resources/factions/israel_1973.yaml b/resources/factions/israel_1973.yaml index 86659a64..a2190c75 100644 --- a/resources/factions/israel_1973.yaml +++ b/resources/factions/israel_1973.yaml @@ -7,7 +7,6 @@ locales: - he_IL aircrafts: - A-4E Skyhawk - - F-4E Phantom II - F-4E-45MC Phantom II - UH-1H Iroquois awacs: diff --git a/resources/factions/israel_1982.yaml b/resources/factions/israel_1982.yaml index 8632b4c5..02ace6d1 100644 --- a/resources/factions/israel_1982.yaml +++ b/resources/factions/israel_1982.yaml @@ -11,7 +11,6 @@ aircrafts: - F-15C Eagle - F-16A - F-16CM Fighting Falcon (Block 50) - - F-4E Phantom II - F-4E-45MC Phantom II - UH-1H Iroquois awacs: diff --git a/resources/factions/israel_2000.yaml b/resources/factions/israel_2000.yaml index 2b6d27d3..86e794e1 100644 --- a/resources/factions/israel_2000.yaml +++ b/resources/factions/israel_2000.yaml @@ -15,7 +15,6 @@ aircrafts: - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - - F-4E Phantom II - F-4E-45MC Phantom II - UH-1H Iroquois - UH-60L diff --git a/resources/factions/japan_2005.yaml b/resources/factions/japan_2005.yaml index fb5974b0..ba352bd2 100644 --- a/resources/factions/japan_2005.yaml +++ b/resources/factions/japan_2005.yaml @@ -16,7 +16,6 @@ aircrafts: - C-130J-30 Super Hercules - F-15J Eagle - F-2A - - F-4EJ Kai Phantom II - F-4E-45MC Phantom II awacs: - E-2C Hawkeye diff --git a/resources/factions/turkey_2005.yaml b/resources/factions/turkey_2005.yaml index b8165c6a..54dab7d0 100644 --- a/resources/factions/turkey_2005.yaml +++ b/resources/factions/turkey_2005.yaml @@ -10,7 +10,6 @@ aircrafts: - C-130 - CH-47D - F-16CM Fighting Falcon (Block 50) - - F-4E Phantom II - F-4E-45MC Phantom II - OH-58D Kiowa Warrior - OH-58D(R) Kiowa Warrior diff --git a/resources/factions/uk_1990.yaml b/resources/factions/uk_1990.yaml index 60443b6f..cfae1742 100644 --- a/resources/factions/uk_1990.yaml +++ b/resources/factions/uk_1990.yaml @@ -11,7 +11,7 @@ aircrafts: - C-130 - C-130J-30 Super Hercules - Gazelle AH.1 - - Phantom F.3 + - F-4E-45MC Phantom II - Tornado GR4 awacs: - E-3A diff --git a/resources/factions/usa_1965.yaml b/resources/factions/usa_1965.yaml index 472e3ebf..620bb89b 100644 --- a/resources/factions/usa_1965.yaml +++ b/resources/factions/usa_1965.yaml @@ -9,7 +9,6 @@ aircrafts: - B-52H Stratofortress - C-130 - CH-47D - - F-4E Phantom II - F-4E-45MC Phantom II - F-4B Phantom II - F-4C Phantom II diff --git a/resources/factions/usa_1970.yaml b/resources/factions/usa_1970.yaml index e92b7bba..57850bf8 100644 --- a/resources/factions/usa_1970.yaml +++ b/resources/factions/usa_1970.yaml @@ -9,7 +9,6 @@ aircrafts: - F-14A Tomcat (Block 135-GR Late) - F-4C Phantom II - F-4B Phantom II - - F-4E Phantom II - F-4E-45MC Phantom II - F-5E Tiger II - A-4E Skyhawk diff --git a/resources/factions/usa_1975.yaml b/resources/factions/usa_1975.yaml index 1e7eadc4..601bdc31 100644 --- a/resources/factions/usa_1975.yaml +++ b/resources/factions/usa_1975.yaml @@ -11,7 +11,6 @@ aircrafts: - CH-47D - CH-53E - F-14A Tomcat (Block 135-GR Late) - - F-4E Phantom II - F-4E-45MC Phantom II - F-4B Phantom II - F-4C Phantom II diff --git a/resources/factions/usn_1985.yaml b/resources/factions/usn_1985.yaml index fb4f5304..cbb4a78a 100644 --- a/resources/factions/usn_1985.yaml +++ b/resources/factions/usn_1985.yaml @@ -11,7 +11,6 @@ aircrafts: - F-14A Tomcat (Block 135-GR Late) - F-14B Tomcat - F-4B Phantom II - - F-4E Phantom II - F-4E-45MC Phantom II - S-3B Viking - SH-60B Seahawk diff --git a/resources/squadrons/F-4E/IAF 201th Sqn.yaml b/resources/squadrons/F-4E/IAF 201th Sqn.yaml deleted file mode 100644 index 9491dd7f..00000000 --- a/resources/squadrons/F-4E/IAF 201th Sqn.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: 201th Squadron -nickname: The One -female_pilot_percentage: 0 -country: Israel -role: Air Superiority Fighter -aircraft: F-4E Phantom II -livery: "af standard" -mission_types: - - BARCAP - - Escort - - Intercept - - Fighter sweep - - TARCAP diff --git a/resources/squadrons/F-4E/IRIAF 31 TFS.yaml b/resources/squadrons/F-4E/IRIAF 31 TFS.yaml deleted file mode 100644 index 1530a4f6..00000000 --- a/resources/squadrons/F-4E/IRIAF 31 TFS.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: IRIAF 31 TFS -nickname: 31 TFS -country: Iran -role: Air Superiority Fighter -aircraft: F-4E Phantom II -livery: IRIAF Asia Minor -mission_types: - - Anti-ship - - BAI - - BARCAP - - CAS - - DEAD - - Escort - - Intercept - - OCA/Aircraft - - OCA/Runway - - SEAD - - SEAD Escort - - Strike - - Fighter sweep - - TARCAP diff --git a/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml b/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml deleted file mode 100644 index 61b9c034..00000000 --- a/resources/squadrons/F-4E/IRIAF 32nd TFW.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: IRIAF 32nd TFW -nickname: 32nd TFW -female_pilot_percentage: 0 -country: Iran -role: Air Superiority Fighter -aircraft: F-4E Phantom II -livery: IRIAF Asia Minor -mission_types: - - Anti-ship - - BAI - - BARCAP - - CAS - - DEAD - - Escort - - Intercept - - OCA/Aircraft - - OCA/Runway - - SEAD - - SEAD Escort - - Strike - - Fighter sweep - - TARCAP diff --git a/resources/squadrons/F-4E/IRIAF 61 TFS.yaml b/resources/squadrons/F-4E/IRIAF 61 TFS.yaml deleted file mode 100644 index b3d02543..00000000 --- a/resources/squadrons/F-4E/IRIAF 61 TFS.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: IRIAF 61 TFS -nickname: 61 TFS -country: Iran -role: Air Superiority Fighter -aircraft: F-4E Phantom II -livery: IRIAF Asia Minor -mission_types: - - Anti-ship - - BAI - - BARCAP - - CAS - - DEAD - - Escort - - Intercept - - OCA/Aircraft - - OCA/Runway - - SEAD - - SEAD Escort - - Strike - - Fighter sweep - - TARCAP diff --git a/resources/squadrons/F-4E/IRIAF 91 TFS.yaml b/resources/squadrons/F-4E/IRIAF 91 TFS.yaml deleted file mode 100644 index dfa5a6d5..00000000 --- a/resources/squadrons/F-4E/IRIAF 91 TFS.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: IRIAF 91 TFS -nickname: 91 TFS -country: Iran -role: Air Superiority Fighter -aircraft: F-4E Phantom II -livery: IRIAF Asia Minor -mission_types: - - Anti-ship - - BAI - - BARCAP - - CAS - - DEAD - - Escort - - Intercept - - OCA/Aircraft - - OCA/Runway - - SEAD - - SEAD Escort - - Strike - - Fighter sweep - - TARCAP diff --git a/resources/units/aircraft/F-4E.yaml b/resources/units/aircraft/F-4E.yaml deleted file mode 100644 index 861c585b..00000000 --- a/resources/units/aircraft/F-4E.yaml +++ /dev/null @@ -1,36 +0,0 @@ -description: - Proving highly adaptable, the F-4 entered service with the Navy in 1961 - before it was adopted by the United States Marine Corps and the United States Air - Force, and by the mid-1960s it had become a major part of their air arms. Phantom - production ran from 1958 to 1981 with a total of 5,195 aircraft built, making it - the most produced American supersonic military aircraft in history, and cementing - its position as an iconic combat aircraft of the Cold War. The F-4 was used extensively - during the Vietnam War. It served as the principal air superiority fighter for the - U.S. Air Force, Navy, and Marine Corps and became important in the ground-attack - and aerial reconnaissance roles late in the war. -introduced: 1968 -manufacturer: McDonnell Douglas -origin: USA -price: 10 -role: Fighter-Bomber -max_range: 200 -variants: - F-4E Phantom II: {} - F-4EJ Kai Phantom II: {} - F-4F Phantom II: {} - Phantom F.3: {} -tasks: - BAI: 580 - BARCAP: 410 - CAS: 580 - DEAD: 400 - Escort: 410 - Fighter sweep: 410 - Intercept: 410 - OCA/Aircraft: 580 - OCA/Runway: 400 - SEAD: 120 - SEAD Escort: 120 - Strike: 400 - TARCAP: 410 -hit_points: 20