diff --git a/pydcs_extensions/coldwarassets/coldwarassets.py b/pydcs_extensions/coldwarassets/coldwarassets.py index e306f847..6424571b 100644 --- a/pydcs_extensions/coldwarassets/coldwarassets.py +++ b/pydcs_extensions/coldwarassets/coldwarassets.py @@ -152,18 +152,21 @@ class B_47(PlaneType): property_defaults: Dict[str, Any] = {} + properties = {} + livery_name = "B_47" # from type class Pylon1: - GAM_63_RASCAL = (1, WeaponsColdWarAssets.GAM_63_RASCAL) + GAM_63_RASCAL = (1, Weapons.GAM_63_RASCAL) class Pylon2: - Mk_53 = (2, WeaponsColdWarAssets.Mk_53) + Mk_53 = (2, Weapons.Mk_53) # ERRR {72CAC282-AE18-490B-BD4D-35E7EE969E73} # ERRR {B84DFE16-6AC7-4854-8F6D-34137892E166} Mk_84_28 = (2, Weapons.Mk_84_28) - # ERRR {F092B80C-BB54-477E-9408-66DEEF740008} - # ERRR {574EDEDF-20DE-4942-B2A2-B2EDFD621562} + + # ERRR {F092B80C-BB54-477E-9408-66DEEF740008} + # ERRR {574EDEDF-20DE-4942-B2A2-B2EDFD621562} pylons: Set[int] = {1, 2} @@ -176,7 +179,6 @@ class B_47(PlaneType): task.CAS, task.Reconnaissance, ] - task_default = task.AntishipStrike @@ -197,26 +199,23 @@ class B_58(PlaneType): livery_name = "B_58" # from type class Pylon1: - B_43 = (1, WeaponsColdWarAssets.B_43) + B_43 = (1, Weapons.B_43) Mk_84___2000lb_GP_Bomb_LD = (1, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon2: - B_43 = (2, WeaponsColdWarAssets.B_43) + B_43 = (2, Weapons.B_43) Mk_84___2000lb_GP_Bomb_LD = (2, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon3: - B_43 = (3, WeaponsColdWarAssets.B_43) + B_43 = (3, Weapons.B_43) Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon4: - B_43 = (4, WeaponsColdWarAssets.B_43) + B_43 = (4, Weapons.B_43) Mk_84___2000lb_GP_Bomb_LD = (4, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon5: - W_53_H_Bomb_with_fuel_tank = ( - 5, - WeaponsColdWarAssets.W_53_H_Bomb_with_fuel_tank, - ) + W_53_H_Bomb_with_fuel_tank = (5, Weapons.W_53_H_Bomb_with_fuel_tank) pylons: Set[int] = {1, 2, 3, 4, 5} @@ -246,16 +245,17 @@ class Tu_4K(PlaneType): } class Properties: + class Belly_Bay_Door: id = "Belly Bay Door" livery_name = "TU-4K" # from type class Pylon1: - KS_1 = (1, WeaponsColdWarAssets.KS_1) + KS_1 = (1, Weapons.KS_1) class Pylon2: - KS_1 = (2, WeaponsColdWarAssets.KS_1) + KS_1 = (2, Weapons.KS_1) pylons: Set[int] = {1, 2} @@ -280,44 +280,40 @@ class Tu_16(PlaneType): property_defaults: Dict[str, Any] = {} + properties = {} + livery_name = "TU-16" # from type class Pylon1: - KS_1_late = (1, WeaponsColdWarAssets.KS_1_late) - KSR_2 = (1, WeaponsColdWarAssets.KSR_2) - KSR_2_086__Passive_seeker_ = ( - 1, - WeaponsColdWarAssets.KSR_2_086__Passive_seeker_, - ) - KSR_2D_decoy_missile = (1, WeaponsColdWarAssets.KSR_2D_decoy_missile) - KSR5P__Passive_seeker_ = (1, WeaponsColdWarAssets.KSR5P__Passive_seeker_) - KSR_5 = (1, WeaponsColdWarAssets.KSR_5) + KS_1_late = (1, Weapons.KS_1_late) + KSR_2 = (1, Weapons.KSR_2) + KSR_2_086__Passive_seeker_ = (1, Weapons.KSR_2_086__Passive_seeker_) + KSR_2D_decoy_missile = (1, Weapons.KSR_2D_decoy_missile) + KSR5P__Passive_seeker_ = (1, Weapons.KSR5P__Passive_seeker_) + KSR_5 = (1, Weapons.KSR_5) class Pylon2: - FAB_3000_M54 = (2, WeaponsColdWarAssets.FAB_3000_M54) - FAB_9000_M54 = (2, WeaponsColdWarAssets.FAB_9000_M54) - RDS_37 = (2, WeaponsColdWarAssets.RDS_37) + FAB_3000_M54 = (2, Weapons.FAB_3000_M54) + FAB_9000_M54 = (2, Weapons.FAB_9000_M54) + RDS_37 = (2, Weapons.RDS_37) # ERRR class Pylon3: - _33_x_FAB_250___250kg_GP_Bombs_LD = ( + _33_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons._33_x_FAB_250___250kg_GP_Bombs_LD, + Weapons._33_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) # ERRR class Pylon4: - KS_1_late = (4, WeaponsColdWarAssets.KS_1_late) - KSR_2 = (4, WeaponsColdWarAssets.KSR_2) - KSR_2_086__Passive_seeker_ = ( - 4, - WeaponsColdWarAssets.KSR_2_086__Passive_seeker_, - ) - KSR_2D_decoy_missile = (4, WeaponsColdWarAssets.KSR_2D_decoy_missile) - KSR5P__Passive_seeker_ = (4, WeaponsColdWarAssets.KSR5P__Passive_seeker_) - KSR_5 = (4, WeaponsColdWarAssets.KSR_5) + KS_1_late = (4, Weapons.KS_1_late) + KSR_2 = (4, Weapons.KSR_2) + KSR_2_086__Passive_seeker_ = (4, Weapons.KSR_2_086__Passive_seeker_) + KSR_2D_decoy_missile = (4, Weapons.KSR_2D_decoy_missile) + KSR5P__Passive_seeker_ = (4, Weapons.KSR5P__Passive_seeker_) + KSR_5 = (4, Weapons.KSR_5) pylons: Set[int] = {1, 2, 3, 4} @@ -350,10 +346,12 @@ class Tu_95K(PlaneType): property_defaults: Dict[str, Any] = {} + properties = {} + livery_name = "TU_95K" # from type class Pylon1: - Kh_20 = (1, WeaponsColdWarAssets.Kh_20) + Kh_20 = (1, Weapons.Kh_20) pylons: Set[int] = {1} @@ -387,8 +385,8 @@ class tu_22D(PlaneType): livery_name = "TU_22D" # from type class Pylon1: - FAB_3000_M54 = (1, WeaponsColdWarAssets.FAB_3000_M54) - FAB_9000_M54 = (1, WeaponsColdWarAssets.FAB_9000_M54) + FAB_3000_M54 = (1, Weapons.FAB_3000_M54) + FAB_9000_M54 = (1, Weapons.FAB_9000_M54) _6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD = ( 1, Weapons._6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD, @@ -397,9 +395,9 @@ class tu_22D(PlaneType): 1, Weapons.MBD3_U2T_with_2_x_FAB_1500_M_54___1500kg_GP_Bombs_LD, ) - MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_FAB_500M_62___500_kg_GP_Bomb_LD = ( 1, - Weapons.MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_FAB_500M_62___500_kg_GP_Bomb_LD, ) RN_24___470kg__nuclear_bomb__free_fall = ( 1, @@ -409,14 +407,14 @@ class tu_22D(PlaneType): 1, Weapons.RN_28___260_kg__nuclear_bomb__free_fall, ) - RDS_37 = (1, WeaponsColdWarAssets.RDS_37) + RDS_37 = (1, Weapons.RDS_37) # ERRR class Pylon2: - _33_x_FAB_250___250kg_GP_Bombs_LD = ( + _33_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 2, - Weapons._33_x_FAB_250___250kg_GP_Bombs_LD, + Weapons._33_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) # ERRR @@ -455,12 +453,12 @@ class tu_22KD(PlaneType): 1, Weapons.Kh_22__AS_4_Kitchen____1000kg__AShM__IN__Act_Pas_Rdr, ) - Kh_22MA = (1, WeaponsColdWarAssets.Kh_22MA) - Kh_22P__Passive_seeker_ = (1, WeaponsColdWarAssets.Kh_22P__Passive_seeker_) + Kh_22MA = (1, Weapons.Kh_22MA) + Kh_22P__Passive_seeker_ = (1, Weapons.Kh_22P__Passive_seeker_) class Pylon2: - FAB_3000_M54 = (2, WeaponsColdWarAssets.FAB_3000_M54) - FAB_9000_M54 = (2, WeaponsColdWarAssets.FAB_9000_M54) + FAB_3000_M54 = (2, Weapons.FAB_3000_M54) + FAB_9000_M54 = (2, Weapons.FAB_9000_M54) _6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD = ( 2, Weapons._6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD, @@ -469,18 +467,18 @@ class tu_22KD(PlaneType): 2, Weapons.MBD3_U2T_with_2_x_FAB_1500_M_54___1500kg_GP_Bombs_LD, ) - MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_FAB_500M_62___500_kg_GP_Bomb_LD = ( 2, - Weapons.MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_FAB_500M_62___500_kg_GP_Bomb_LD, ) - RDS_37 = (1, WeaponsColdWarAssets.RDS_37) + RDS_37 = (2, Weapons.RDS_37) # ERRR class Pylon3: - _33_x_FAB_250___250kg_GP_Bombs_LD = ( + _33_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons._33_x_FAB_250___250kg_GP_Bombs_LD, + Weapons._33_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) # ERRR @@ -517,20 +515,20 @@ class Yak_28(PlaneType): 1, Weapons.APU_13U_2_with_R_3S__AA_2_Atoll_B____IR_AAM, ) - R_8M1R = (1, WeaponsColdWarAssets.R_8M1R_Yak_28) - R_8M1T = (1, WeaponsColdWarAssets.R_8M1T_Yak_28) - R_98MT = (1, WeaponsColdWarAssets.R_98MT_Yak_28) - R_98MR = (1, WeaponsColdWarAssets.R_98MR_Yak_28) + R_8M1R = (1, Weapons.R_8M1R) + R_8M1T = (1, Weapons.R_8M1T) + R_98MT = (1, Weapons.R_98MT) + R_98MR = (1, Weapons.R_98MR) class Pylon2: APU_13U_2_with_R_3S__AA_2_Atoll_B____IR_AAM = ( 2, Weapons.APU_13U_2_with_R_3S__AA_2_Atoll_B____IR_AAM, ) - R_8M1R = (2, WeaponsColdWarAssets.R_8M1R_Yak_28) - R_8M1T = (2, WeaponsColdWarAssets.R_8M1T_Yak_28) - R_98MT = (2, WeaponsColdWarAssets.R_98MT_Yak_28) - R_98MR = (2, WeaponsColdWarAssets.R_98MR_Yak_28) + R_8M1R = (2, Weapons.R_8M1R) + R_8M1T = (2, Weapons.R_8M1T) + R_98MT = (2, Weapons.R_98MT) + R_98MR = (2, Weapons.R_98MR) ORO_57K___S_5M_x_8 = (2, Weapons.ORO_57K___S_5M_x_8) class Pylon3: @@ -546,25 +544,29 @@ class Yak_28(PlaneType): 3, Weapons.FAB_1500_M_54___1500kg_GP_Bomb_LD, ) - MBD3_U4T_with_4_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U4T___4_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U4T_with_4_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U4T___4_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_3_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___3_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_3_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___3_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) FAB_500_M54_TU___480_kg__bomb__parachute = ( 3, Weapons.FAB_500_M54_TU___480_kg__bomb__parachute, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, + ) + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( + 3, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) class Pylon4: @@ -572,20 +574,20 @@ class Yak_28(PlaneType): 4, Weapons.APU_13U_2_with_R_3S__AA_2_Atoll_B____IR_AAM, ) - R_8M1R = (4, WeaponsColdWarAssets.R_8M1R_Yak_28) - R_8M1T = (4, WeaponsColdWarAssets.R_8M1T_Yak_28) - R_98MT = (4, WeaponsColdWarAssets.R_98MT_Yak_28) - R_98MR = (4, WeaponsColdWarAssets.R_98MR_Yak_28) + R_8M1R = (4, Weapons.R_8M1R) + R_8M1T = (4, Weapons.R_8M1T) + R_98MT = (4, Weapons.R_98MT) + R_98MR = (4, Weapons.R_98MR) class Pylon5: APU_13U_2_with_R_3S__AA_2_Atoll_B____IR_AAM = ( 5, Weapons.APU_13U_2_with_R_3S__AA_2_Atoll_B____IR_AAM, ) - R_8M1R = (5, WeaponsColdWarAssets.R_8M1R_Yak_28) - R_8M1T = (5, WeaponsColdWarAssets.R_8M1T_Yak_28) - R_98MT = (5, WeaponsColdWarAssets.R_98MT_Yak_28) - R_98MR = (5, WeaponsColdWarAssets.R_98MR_Yak_28) + R_8M1R = (5, Weapons.R_8M1R) + R_8M1T = (5, Weapons.R_8M1T) + R_98MT = (5, Weapons.R_98MT) + R_98MR = (5, Weapons.R_98MR) ORO_57K___S_5M_x_8 = (5, Weapons.ORO_57K___S_5M_x_8) pylons: Set[int] = {1, 2, 3, 4, 5} @@ -618,6 +620,8 @@ class Tu_126(PlaneType): property_defaults: Dict[str, Any] = {} + properties = {} + livery_name = "TU_126" # from type pylons: Set[int] = set() @@ -645,20 +649,20 @@ class Tu_128M(PlaneType): livery_name = "TU_128M" # from type class Pylon1: - R_4RM = (1, WeaponsColdWarAssets.R_4RM) - R_4TM = (1, WeaponsColdWarAssets.R_4TM) + R_4RM = (1, Weapons.R_4RM) + R_4TM = (1, Weapons.R_4TM) class Pylon2: - R_4RM = (2, WeaponsColdWarAssets.R_4RM) - R_4TM = (2, WeaponsColdWarAssets.R_4TM) + R_4RM = (2, Weapons.R_4RM) + R_4TM = (2, Weapons.R_4TM) class Pylon3: - R_4RM = (3, WeaponsColdWarAssets.R_4RM) - R_4TM = (3, WeaponsColdWarAssets.R_4TM) + R_4RM = (3, Weapons.R_4RM) + R_4TM = (3, Weapons.R_4TM) class Pylon4: - R_4RM = (4, WeaponsColdWarAssets.R_4RM) - R_4TM = (4, WeaponsColdWarAssets.R_4TM) + R_4RM = (4, Weapons.R_4RM) + R_4TM = (4, Weapons.R_4TM) pylons: Set[int] = {1, 2, 3, 4} diff --git a/pydcs_extensions/russianmilitaryassetspack/russianmilitaryassetspack.py b/pydcs_extensions/russianmilitaryassetspack/russianmilitaryassetspack.py index 18b07bc0..4b3f34ed 100644 --- a/pydcs_extensions/russianmilitaryassetspack/russianmilitaryassetspack.py +++ b/pydcs_extensions/russianmilitaryassetspack/russianmilitaryassetspack.py @@ -580,9 +580,9 @@ class CH_Ka52K(HelicopterType): 1, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (1, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (1, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (1, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (1, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (1, Weapons.Fuel_tank_PTB_450) APU_6___6_x_9M127_Vikhr___ATGM__LOSBR__Tandem_HEAT_Frag = ( 1, @@ -625,9 +625,9 @@ class CH_Ka52K(HelicopterType): 2, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (2, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (2, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (2, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (2, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (2, Weapons.Fuel_tank_PTB_450) APU_6___6_x_9M127_Vikhr___ATGM__LOSBR__Tandem_HEAT_Frag = ( 2, @@ -673,9 +673,9 @@ class CH_Ka52K(HelicopterType): 3, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (3, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (3, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (3, Weapons.Fuel_tank_PTB_450) APU_6___6_x_9M127_Vikhr___ATGM__LOSBR__Tandem_HEAT_Frag = ( 3, @@ -721,9 +721,9 @@ class CH_Ka52K(HelicopterType): 4, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (4, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (4, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (4, Weapons.Fuel_tank_PTB_450) APU_6___6_x_9M127_Vikhr___ATGM__LOSBR__Tandem_HEAT_Frag = ( 4, @@ -797,9 +797,9 @@ class CH_Ka52(HelicopterType): 1, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (1, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (1, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (1, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (1, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (1, Weapons.Fuel_tank_PTB_450) APU_6___6_x_9M127_Vikhr___ATGM__LOSBR__Tandem_HEAT_Frag = ( 1, @@ -838,9 +838,9 @@ class CH_Ka52(HelicopterType): 2, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (2, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (2, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (2, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (2, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (2, Weapons.Fuel_tank_PTB_450) class Pylon3: @@ -867,9 +867,9 @@ class CH_Ka52(HelicopterType): 3, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (3, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (3, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (3, Weapons.Fuel_tank_PTB_450) class Pylon4: @@ -900,9 +900,9 @@ class CH_Ka52(HelicopterType): 4, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (4, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (4, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (4, Weapons.Fuel_tank_PTB_450) APU_6___6_x_9M127_Vikhr___ATGM__LOSBR__Tandem_HEAT_Frag = ( 4, @@ -979,9 +979,9 @@ class CH_Mi28N(HelicopterType): 1, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (1, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (1, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (1, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (1, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (1, Weapons.Fuel_tank_PTB_450) _6_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT = ( 1, @@ -1017,9 +1017,9 @@ class CH_Mi28N(HelicopterType): 2, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (2, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (2, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (2, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (2, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (2, Weapons.Fuel_tank_PTB_450) _6_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT = ( 2, @@ -1055,9 +1055,9 @@ class CH_Mi28N(HelicopterType): 3, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (3, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (3, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (3, Weapons.Fuel_tank_PTB_450) _6_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT = ( 3, @@ -1089,9 +1089,9 @@ class CH_Mi28N(HelicopterType): 4, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_250_M62___250_kg_GP_Bomb_LD = (4, Weapons.FAB_250_M62___250_kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_250M_62___250_kg_GP_Bomb_LD = (4, Weapons.FAB_250M_62___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) Fuel_tank_PTB_450 = (4, Weapons.Fuel_tank_PTB_450) _6_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT = ( 4, @@ -1136,6 +1136,8 @@ class CH_Tu_95MSM(PlaneType): property_defaults: Dict[str, Any] = {} + properties = {} + livery_name = "CH_TU-95MSM" # from type class Pylon1: diff --git a/pydcs_extensions/su15/su15.py b/pydcs_extensions/su15/su15.py index f772fed3..dd650de2 100644 --- a/pydcs_extensions/su15/su15.py +++ b/pydcs_extensions/su15/su15.py @@ -40,15 +40,15 @@ class Su_15TM(PlaneType): livery_name = "SU_15TM" # from type class Pylon1: - R_98MR = (1, WeaponsSu15.R_98MR) - R_98MT = (1, WeaponsSu15.R_98MT) - R_8M1R = (1, WeaponsSu15.R_8M1R) - R_8M1T = (1, WeaponsSu15.R_8M1T) - UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + R_98MR = (1, Weapons.R_98MR) + R_98MT = (1, Weapons.R_98MT) + R_8M1R = (1, Weapons.R_8M1R) + R_8M1T = (1, Weapons.R_8M1T) + UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 1, Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) - UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 1, Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) @@ -56,9 +56,9 @@ class Su_15TM(PlaneType): 1, Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) - FAB_100___100kg_GP_Bomb_LD = (1, Weapons.FAB_100___100kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (1, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_100_120___100_kg_GP_Bomb_LD = (1, Weapons.OFAB_100_120___100_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (1, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) class Pylon2: APU_60_1M_with_R_60__AA_8_Aphid____IR_AAM = ( @@ -75,12 +75,12 @@ class Su_15TM(PlaneType): 3, Weapons.SPPU_22_1___2_x_23mm__GSh_23L_Autocannon_Pod, ) - PTB_600 = (3, WeaponsSu15.PTB_600) - UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + PTB_600 = (3, Weapons.PTB_600) + UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 3, Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) - UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 3, Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) @@ -88,21 +88,21 @@ class Su_15TM(PlaneType): 3, Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) - FAB_100___100kg_GP_Bomb_LD = (3, Weapons.FAB_100___100kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_100_120___100_kg_GP_Bomb_LD = (3, Weapons.OFAB_100_120___100_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) class Pylon4: SPPU_22_1___2_x_23mm__GSh_23L_Autocannon_Pod = ( 4, Weapons.SPPU_22_1___2_x_23mm__GSh_23L_Autocannon_Pod, ) - PTB_600 = (4, WeaponsSu15.PTB_600) - UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + PTB_600 = (4, Weapons.PTB_600) + UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 4, Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) - UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 4, Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) @@ -110,9 +110,9 @@ class Su_15TM(PlaneType): 4, Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) - FAB_100___100kg_GP_Bomb_LD = (4, Weapons.FAB_100___100kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_100_120___100_kg_GP_Bomb_LD = (4, Weapons.OFAB_100_120___100_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) class Pylon5: APU_60_1M_with_R_60__AA_8_Aphid____IR_AAM = ( @@ -125,15 +125,15 @@ class Su_15TM(PlaneType): ) class Pylon6: - R_98MR = (6, WeaponsSu15.R_98MR) - R_98MT = (6, WeaponsSu15.R_98MT) - R_8M1R = (6, WeaponsSu15.R_8M1R) - R_8M1T = (6, WeaponsSu15.R_8M1T) - UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + R_98MR = (6, Weapons.R_98MR) + R_98MT = (6, Weapons.R_98MT) + R_8M1R = (6, Weapons.R_8M1R) + R_8M1T = (6, Weapons.R_8M1T) + UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 6, Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) - UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = ( + UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 6, Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag, ) @@ -141,9 +141,9 @@ class Su_15TM(PlaneType): 6, Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, ) - FAB_100___100kg_GP_Bomb_LD = (6, Weapons.FAB_100___100kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (6, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_100_120___100_kg_GP_Bomb_LD = (6, Weapons.OFAB_100_120___100_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (6, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) pylons: Set[int] = {1, 2, 3, 4, 5, 6} diff --git a/pydcs_extensions/su30/su30.py b/pydcs_extensions/su30/su30.py index 55b17d3c..2c153e70 100644 --- a/pydcs_extensions/su30/su30.py +++ b/pydcs_extensions/su30/su30.py @@ -529,51 +529,51 @@ class Su_30SM(PlaneType): R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 1, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 1, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) R_74M2__AA_11_Archer_M2____Infra_Red = ( 1, - WeaponsSu30.R_74M2__AA_11_Archer_M2____Infra_Red, + Weapons.R_74M2__AA_11_Archer_M2____Infra_Red, ) L005_Sorbtsiya_ECM_pod__left_ = (1, Weapons.L005_Sorbtsiya_ECM_pod__left_) - SAP_518_ECM_Pod__Left_ = (1, WeaponsSu30.SAP_518_ECM_Pod__Left_) + SAP_518_ECM_Pod__Left_ = (1, Weapons.SAP_518_ECM_Pod__Left_) Smoke_Generator___red = (1, Weapons.Smoke_Generator___red) Smoke_Generator___green = (1, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (1, Weapons.Smoke_Generator___blue) Smoke_Generator___white = (1, Weapons.Smoke_Generator___white) Smoke_Generator___yellow = (1, Weapons.Smoke_Generator___yellow) Smoke_Generator___orange = (1, Weapons.Smoke_Generator___orange) - Smoke_Generator___Black = (1, WeaponsSu30.Smoke_Generator___Black) + Smoke_Generator___Black = (1, Weapons.Smoke_Generator___Black) class Pylon2: R_73__AA_11_Archer____Infra_Red = (2, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 2, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 2, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) R_74M2__AA_11_Archer_M2____Infra_Red = ( 2, - WeaponsSu30.R_74M2__AA_11_Archer_M2____Infra_Red, + Weapons.R_74M2__AA_11_Archer_M2____Infra_Red, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 2, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 2, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 2, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) Smoke_Generator___red = (2, Weapons.Smoke_Generator___red) Smoke_Generator___green = (2, Weapons.Smoke_Generator___green) @@ -581,7 +581,7 @@ class Su_30SM(PlaneType): Smoke_Generator___white = (2, Weapons.Smoke_Generator___white) Smoke_Generator___yellow = (2, Weapons.Smoke_Generator___yellow) Smoke_Generator___orange = (2, Weapons.Smoke_Generator___orange) - Smoke_Generator___Black = (2, WeaponsSu30.Smoke_Generator___Black) + Smoke_Generator___Black = (2, Weapons.Smoke_Generator___Black) # ERRR @@ -589,108 +589,96 @@ class Su_30SM(PlaneType): R_73__AA_11_Archer____Infra_Red = (3, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 3, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 3, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) R_74M2__AA_11_Archer_M2____Infra_Red = ( 3, - WeaponsSu30.R_74M2__AA_11_Archer_M2____Infra_Red, + Weapons.R_74M2__AA_11_Archer_M2____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 3, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 3, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 3, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 3, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 3, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) R_27EP1__AA_10_Alamo_F____Passive_Rdr_Extended_Range = ( 3, - WeaponsSu30.R_27EP1__AA_10_Alamo_F____Passive_Rdr_Extended_Range, + Weapons.R_27EP1__AA_10_Alamo_F____Passive_Rdr_Extended_Range, ) R_27P1__AA_10_Alamo_E____Passive_Rdr = ( 3, - WeaponsSu30.R_27P1__AA_10_Alamo_E____Passive_Rdr, + Weapons.R_27P1__AA_10_Alamo_E____Passive_Rdr, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 3, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 3, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 3, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 3, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 3, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (3, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (3, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 3, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_36__AS_23____600kg_Grom_E1 = (3, WeaponsSu30.Kh_36__AS_23____600kg_Grom_E1) - KH_38MTE__AS_23__IR_Guided = (3, WeaponsSu30.KH_38MTE__AS_23__IR_Guided) - KH_38MLE__AS_23___Semi_Act_Laser = ( - 3, - WeaponsSu30.KH_38MLE__AS_23___Semi_Act_Laser, - ) - Kh_38MAE__AS_23____500kg = (3, WeaponsSu30.Kh_38MAE__AS_23____500kg) + Kh_36__AS_23____600kg_Grom_E1 = (3, Weapons.Kh_36__AS_23____600kg_Grom_E1) + KH_38MTE__AS_23__IR_Guided = (3, Weapons.KH_38MTE__AS_23__IR_Guided) + KH_38MLE__AS_23___Semi_Act_Laser = (3, Weapons.KH_38MLE__AS_23___Semi_Act_Laser) + Kh_38MAE__AS_23____500kg = (3, Weapons.Kh_38MAE__AS_23____500kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 3, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 3, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 3, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 3, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (3, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) # ERRR {JAS39_AGM_65K} - Kh_59MK__AS_18_Kazoo____930kg = (3, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (3, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (3, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - Kh_35UE__AS_20_Kayak____520kg = (3, WeaponsSu30.Kh_35UE__AS_20_Kayak____520kg) - Kh_31AD__AS_17_Krypton____715kg = ( - 3, - WeaponsSu30.Kh_31AD__AS_17_Krypton____715kg, - ) - Kh_31PD__AS_17_Krypton____710kg = ( - 3, - WeaponsSu30.Kh_31PD__AS_17_Krypton____710kg, - ) - Kh_59MK2__AS_22_Kazoo____700kg = (3, WeaponsSu30.Kh_59MK2__AS_22_Kazoo____700kg) + Kh_59MK__AS_18_Kazoo____930kg = (3, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (3, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (3, Weapons.Kh_35__AS_20_Kayak____520kg) + Kh_35UE__AS_20_Kayak____520kg = (3, Weapons.Kh_35UE__AS_20_Kayak____520kg) + Kh_31AD__AS_17_Krypton____715kg = (3, Weapons.Kh_31AD__AS_17_Krypton____715kg) + Kh_31PD__AS_17_Krypton____710kg = (3, Weapons.Kh_31PD__AS_17_Krypton____710kg) + Kh_59MK2__AS_22_Kazoo____700kg = (3, Weapons.Kh_59MK2__AS_22_Kazoo____700kg) KAB_500Kr___500kg_TV_Guided_Bomb = (3, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (3, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (3, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 3, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -708,32 +696,33 @@ class Su_30SM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (3, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 3, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 3, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 3, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (3, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (3, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 3, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (3, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (3, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} MBD3_U6_68_with_6_x_FAB_250___250kg = ( 3, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 3, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 3, @@ -762,81 +751,69 @@ class Su_30SM(PlaneType): class Pylon4: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 4, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 4, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 4, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 4, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 4, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 4, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 4, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 4, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (4, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_36__AS_23____600kg_Grom_E1 = (4, WeaponsSu30.Kh_36__AS_23____600kg_Grom_E1) - KH_38MTE__AS_23__IR_Guided = (4, WeaponsSu30.KH_38MTE__AS_23__IR_Guided) - KH_38MLE__AS_23___Semi_Act_Laser = ( - 4, - WeaponsSu30.KH_38MLE__AS_23___Semi_Act_Laser, - ) - Kh_38MAE__AS_23____500kg = (4, WeaponsSu30.Kh_38MAE__AS_23____500kg) + Kh_31P__AS_17_Krypton____600kg = (4, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_36__AS_23____600kg_Grom_E1 = (4, Weapons.Kh_36__AS_23____600kg_Grom_E1) + KH_38MTE__AS_23__IR_Guided = (4, Weapons.KH_38MTE__AS_23__IR_Guided) + KH_38MLE__AS_23___Semi_Act_Laser = (4, Weapons.KH_38MLE__AS_23___Semi_Act_Laser) + Kh_38MAE__AS_23____500kg = (4, Weapons.Kh_38MAE__AS_23____500kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 4, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 4, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 4, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 4, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (4, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 4, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (4, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (4, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (4, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - Kh_35UE__AS_20_Kayak____520kg = (4, WeaponsSu30.Kh_35UE__AS_20_Kayak____520kg) - Kh_31AD__AS_17_Krypton____715kg = ( - 4, - WeaponsSu30.Kh_31AD__AS_17_Krypton____715kg, - ) - Kh_31PD__AS_17_Krypton____710kg = ( - 4, - WeaponsSu30.Kh_31PD__AS_17_Krypton____710kg, - ) - Kh_59MK2__AS_22_Kazoo____700kg = (4, WeaponsSu30.Kh_59MK2__AS_22_Kazoo____700kg) + Kh_59MK__AS_18_Kazoo____930kg = (4, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (4, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (4, Weapons.Kh_35__AS_20_Kayak____520kg) + Kh_35UE__AS_20_Kayak____520kg = (4, Weapons.Kh_35UE__AS_20_Kayak____520kg) + Kh_31AD__AS_17_Krypton____715kg = (4, Weapons.Kh_31AD__AS_17_Krypton____715kg) + Kh_31PD__AS_17_Krypton____710kg = (4, Weapons.Kh_31PD__AS_17_Krypton____710kg) + Kh_59MK2__AS_22_Kazoo____700kg = (4, Weapons.Kh_59MK2__AS_22_Kazoo____700kg) KAB_500Kr___500kg_TV_Guided_Bomb = (4, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (4, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (4, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (4, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (4, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (4, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (4, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 4, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -858,44 +835,45 @@ class Su_30SM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (4, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 4, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 4, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 4, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (4, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (4, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 4, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (4, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (4, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 4, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 4, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 4, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) # ERRR @@ -903,71 +881,59 @@ class Su_30SM(PlaneType): class Pylon5: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 5, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 5, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 5, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 5, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 5, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 5, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 5, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 5, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (5, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_36__AS_23____600kg_Grom_E1 = (5, WeaponsSu30.Kh_36__AS_23____600kg_Grom_E1) - KH_38MTE__AS_23__IR_Guided = (5, WeaponsSu30.KH_38MTE__AS_23__IR_Guided) - KH_38MLE__AS_23___Semi_Act_Laser = ( - 5, - WeaponsSu30.KH_38MLE__AS_23___Semi_Act_Laser, - ) - Kh_38MAE__AS_23____500kg = (5, WeaponsSu30.Kh_38MAE__AS_23____500kg) + Kh_31P__AS_17_Krypton____600kg = (5, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_36__AS_23____600kg_Grom_E1 = (5, Weapons.Kh_36__AS_23____600kg_Grom_E1) + KH_38MTE__AS_23__IR_Guided = (5, Weapons.KH_38MTE__AS_23__IR_Guided) + KH_38MLE__AS_23___Semi_Act_Laser = (5, Weapons.KH_38MLE__AS_23___Semi_Act_Laser) + Kh_38MAE__AS_23____500kg = (5, Weapons.Kh_38MAE__AS_23____500kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 5, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 5, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 5, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 5, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (5, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_31AD__AS_17_Krypton____715kg = ( - 5, - WeaponsSu30.Kh_31AD__AS_17_Krypton____715kg, - ) - Kh_31PD__AS_17_Krypton____710kg = ( - 5, - WeaponsSu30.Kh_31PD__AS_17_Krypton____710kg, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (5, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (5, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31AD__AS_17_Krypton____715kg = (5, Weapons.Kh_31AD__AS_17_Krypton____715kg) + Kh_31PD__AS_17_Krypton____710kg = (5, Weapons.Kh_31PD__AS_17_Krypton____710kg) KAB_500Kr___500kg_TV_Guided_Bomb = (5, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (5, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (5, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 5, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -977,42 +943,43 @@ class Su_30SM(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (5, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 5, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 5, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 5, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (5, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (5, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (5, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (5, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 5, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (5, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (5, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 5, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 5, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 5, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 5, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) - APK_9_POD = (5, WeaponsSu30.APK_9_POD) + APK_9_POD = (5, Weapons.APK_9_POD) L_081_Fantasmagoria_ELINT_pod = (5, Weapons.L_081_Fantasmagoria_ELINT_pod) # ERRR @@ -1020,40 +987,40 @@ class Su_30SM(PlaneType): class Pylon6: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 6, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 6, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 6, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 6, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 6, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 6, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 6, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 6, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) KAB_500Kr___500kg_TV_Guided_Bomb = (6, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (6, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (6, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (6, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (6, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (6, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (6, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 6, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -1075,44 +1042,45 @@ class Su_30SM(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (6, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 6, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 6, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 6, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (6, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (6, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 6, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (6, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (6, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RN_244___260kg__Tactic_Nuclear_bomb = ( 6, - WeaponsSu30.RN_244___260kg__Tactic_Nuclear_bomb, + Weapons.RN_244___260kg__Tactic_Nuclear_bomb, ) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 6, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 6, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 6, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 6, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag = ( 6, @@ -1128,38 +1096,38 @@ class Su_30SM(PlaneType): class Pylon7: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 7, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 7, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 7, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 7, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 7, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 7, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 7, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 7, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) KAB_500Kr___500kg_TV_Guided_Bomb = (7, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (7, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (7, Weapons.KAB_500S___500kg__GPS_Guided) KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP = ( 7, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, @@ -1169,25 +1137,26 @@ class Su_30SM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (7, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 7, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 7, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 7, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (7, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (7, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (7, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (7, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 7, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (7, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (7, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 7, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, @@ -1200,17 +1169,17 @@ class Su_30SM(PlaneType): 7, Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 7, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 7, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 7, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) Smoke_Generator___red = (7, Weapons.Smoke_Generator___red) Smoke_Generator___green = (7, Weapons.Smoke_Generator___green) @@ -1218,7 +1187,7 @@ class Su_30SM(PlaneType): Smoke_Generator___white = (7, Weapons.Smoke_Generator___white) Smoke_Generator___yellow = (7, Weapons.Smoke_Generator___yellow) Smoke_Generator___orange = (7, Weapons.Smoke_Generator___orange) - Smoke_Generator___Black = (7, WeaponsSu30.Smoke_Generator___Black) + Smoke_Generator___Black = (7, Weapons.Smoke_Generator___Black) RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag = ( 7, Weapons.RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag, @@ -1233,71 +1202,59 @@ class Su_30SM(PlaneType): class Pylon8: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 8, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 8, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 8, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 8, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 8, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 8, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 8, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 8, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (8, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_36__AS_23____600kg_Grom_E1 = (8, WeaponsSu30.Kh_36__AS_23____600kg_Grom_E1) - KH_38MTE__AS_23__IR_Guided = (8, WeaponsSu30.KH_38MTE__AS_23__IR_Guided) - KH_38MLE__AS_23___Semi_Act_Laser = ( - 8, - WeaponsSu30.KH_38MLE__AS_23___Semi_Act_Laser, - ) - Kh_38MAE__AS_23____500kg = (8, WeaponsSu30.Kh_38MAE__AS_23____500kg) + Kh_31P__AS_17_Krypton____600kg = (8, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_36__AS_23____600kg_Grom_E1 = (8, Weapons.Kh_36__AS_23____600kg_Grom_E1) + KH_38MTE__AS_23__IR_Guided = (8, Weapons.KH_38MTE__AS_23__IR_Guided) + KH_38MLE__AS_23___Semi_Act_Laser = (8, Weapons.KH_38MLE__AS_23___Semi_Act_Laser) + Kh_38MAE__AS_23____500kg = (8, Weapons.Kh_38MAE__AS_23____500kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 8, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 8, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 8, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 8, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (8, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_31AD__AS_17_Krypton____715kg = ( - 8, - WeaponsSu30.Kh_31AD__AS_17_Krypton____715kg, - ) - Kh_31PD__AS_17_Krypton____710kg = ( - 8, - WeaponsSu30.Kh_31PD__AS_17_Krypton____710kg, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (8, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (8, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31AD__AS_17_Krypton____715kg = (8, Weapons.Kh_31AD__AS_17_Krypton____715kg) + Kh_31PD__AS_17_Krypton____710kg = (8, Weapons.Kh_31PD__AS_17_Krypton____710kg) KAB_500Kr___500kg_TV_Guided_Bomb = (8, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (8, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (8, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 8, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -1307,123 +1264,112 @@ class Su_30SM(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (8, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 8, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 8, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 8, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (8, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (8, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (8, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (8, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 8, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (8, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (8, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 8, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 8, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 8, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 8, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) - T220_FLIR_LDT_POD = (8, WeaponsSu30.T220_FLIR_LDT_POD) + T220_FLIR_LDT_POD = (8, Weapons.T220_FLIR_LDT_POD) # ERRR class Pylon9: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 9, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 9, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 9, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 9, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 9, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 9, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 9, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 9, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (9, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_36__AS_23____600kg_Grom_E1 = (9, WeaponsSu30.Kh_36__AS_23____600kg_Grom_E1) - KH_38MTE__AS_23__IR_Guided = (9, WeaponsSu30.KH_38MTE__AS_23__IR_Guided) - KH_38MLE__AS_23___Semi_Act_Laser = ( - 9, - WeaponsSu30.KH_38MLE__AS_23___Semi_Act_Laser, - ) - Kh_38MAE__AS_23____500kg = (9, WeaponsSu30.Kh_38MAE__AS_23____500kg) + Kh_31P__AS_17_Krypton____600kg = (9, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_36__AS_23____600kg_Grom_E1 = (9, Weapons.Kh_36__AS_23____600kg_Grom_E1) + KH_38MTE__AS_23__IR_Guided = (9, Weapons.KH_38MTE__AS_23__IR_Guided) + KH_38MLE__AS_23___Semi_Act_Laser = (9, Weapons.KH_38MLE__AS_23___Semi_Act_Laser) + Kh_38MAE__AS_23____500kg = (9, Weapons.Kh_38MAE__AS_23____500kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 9, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 9, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 9, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 9, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (9, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 9, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (9, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (9, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (9, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - Kh_35UE__AS_20_Kayak____520kg = (9, WeaponsSu30.Kh_35UE__AS_20_Kayak____520kg) - Kh_31AD__AS_17_Krypton____715kg = ( - 9, - WeaponsSu30.Kh_31AD__AS_17_Krypton____715kg, - ) - Kh_31PD__AS_17_Krypton____710kg = ( - 9, - WeaponsSu30.Kh_31PD__AS_17_Krypton____710kg, - ) - Kh_59MK2__AS_22_Kazoo____700kg = (9, WeaponsSu30.Kh_59MK2__AS_22_Kazoo____700kg) + Kh_59MK__AS_18_Kazoo____930kg = (9, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (9, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (9, Weapons.Kh_35__AS_20_Kayak____520kg) + Kh_35UE__AS_20_Kayak____520kg = (9, Weapons.Kh_35UE__AS_20_Kayak____520kg) + Kh_31AD__AS_17_Krypton____715kg = (9, Weapons.Kh_31AD__AS_17_Krypton____715kg) + Kh_31PD__AS_17_Krypton____710kg = (9, Weapons.Kh_31PD__AS_17_Krypton____710kg) + Kh_59MK2__AS_22_Kazoo____700kg = (9, Weapons.Kh_59MK2__AS_22_Kazoo____700kg) KAB_500Kr___500kg_TV_Guided_Bomb = (9, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (9, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (9, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (9, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (9, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (9, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (9, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 9, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -1445,45 +1391,46 @@ class Su_30SM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (9, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 9, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 9, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 9, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (9, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (9, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (9, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (9, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 9, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) # ERRR {DIS_UMPK_FAB_5002} - FAB_250_M62___227kg__freefall = (9, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (9, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 9, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 9, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 9, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 9, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 9, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) # ERRR @@ -1492,82 +1439,79 @@ class Su_30SM(PlaneType): R_73__AA_11_Archer____Infra_Red = (10, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 10, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 10, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) R_74M2__AA_11_Archer_M2____Infra_Red = ( 10, - WeaponsSu30.R_74M2__AA_11_Archer_M2____Infra_Red, + Weapons.R_74M2__AA_11_Archer_M2____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 10, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 10, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range = ( 10, - WeaponsSu30.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, + Weapons.R_27EA__AA_10_Alamo____Active_Rdr_Extended_Range, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 10, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 10, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) R_27EP1__AA_10_Alamo_F____Passive_Rdr_Extended_Range = ( 10, - WeaponsSu30.R_27EP1__AA_10_Alamo_F____Passive_Rdr_Extended_Range, + Weapons.R_27EP1__AA_10_Alamo_F____Passive_Rdr_Extended_Range, ) R_27P1__AA_10_Alamo_E____Passive_Rdr = ( 10, - WeaponsSu30.R_27P1__AA_10_Alamo_E____Passive_Rdr, + Weapons.R_27P1__AA_10_Alamo_E____Passive_Rdr, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 10, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 10, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 10, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) R_77PD__AA_12_Adder____Active_Rdr_Ramjet = ( 10, - WeaponsSu30.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, + Weapons.R_77PD__AA_12_Adder____Active_Rdr_Ramjet, ) R_37M__AA_13_Axehead____Active_Rdr = ( 10, - WeaponsSu30.R_37M__AA_13_Axehead____Active_Rdr, + Weapons.R_37M__AA_13_Axehead____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = ( - 10, - WeaponsSu30.Kh_31P__AS_17_Krypton____600kg, - ) - Kh_36__AS_23____600kg_Grom_E1 = (10, WeaponsSu30.Kh_36__AS_23____600kg_Grom_E1) - KH_38MTE__AS_23__IR_Guided = (10, WeaponsSu30.KH_38MTE__AS_23__IR_Guided) + Kh_31P__AS_17_Krypton____600kg = (10, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_36__AS_23____600kg_Grom_E1 = (10, Weapons.Kh_36__AS_23____600kg_Grom_E1) + KH_38MTE__AS_23__IR_Guided = (10, Weapons.KH_38MTE__AS_23__IR_Guided) KH_38MLE__AS_23___Semi_Act_Laser = ( 10, - WeaponsSu30.KH_38MLE__AS_23___Semi_Act_Laser, + Weapons.KH_38MLE__AS_23___Semi_Act_Laser, ) - Kh_38MAE__AS_23____500kg = (10, WeaponsSu30.Kh_38MAE__AS_23____500kg) + Kh_38MAE__AS_23____500kg = (10, Weapons.Kh_38MAE__AS_23____500kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 10, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 10, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 10, @@ -1575,37 +1519,25 @@ class Su_30SM(PlaneType): ) KH_29TE__AS_14_Kedge___TV_Guided = ( 10, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, + Weapons.KH_29TE__AS_14_Kedge___TV_Guided, ) # ERRR {JAS39_AGM_65H} Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 10, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (10, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = ( - 10, - WeaponsSu30.Kh_31A__AS_17_Krypton____610kg, - ) - Kh_35__AS_20_Kayak____520kg = (10, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - Kh_35UE__AS_20_Kayak____520kg = (10, WeaponsSu30.Kh_35UE__AS_20_Kayak____520kg) - Kh_31AD__AS_17_Krypton____715kg = ( - 10, - WeaponsSu30.Kh_31AD__AS_17_Krypton____715kg, - ) - Kh_31PD__AS_17_Krypton____710kg = ( - 10, - WeaponsSu30.Kh_31PD__AS_17_Krypton____710kg, - ) - Kh_59MK2__AS_22_Kazoo____700kg = ( - 10, - WeaponsSu30.Kh_59MK2__AS_22_Kazoo____700kg, - ) + Kh_59MK__AS_18_Kazoo____930kg = (10, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (10, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (10, Weapons.Kh_35__AS_20_Kayak____520kg) + Kh_35UE__AS_20_Kayak____520kg = (10, Weapons.Kh_35UE__AS_20_Kayak____520kg) + Kh_31AD__AS_17_Krypton____715kg = (10, Weapons.Kh_31AD__AS_17_Krypton____715kg) + Kh_31PD__AS_17_Krypton____710kg = (10, Weapons.Kh_31PD__AS_17_Krypton____710kg) + Kh_59MK2__AS_22_Kazoo____700kg = (10, Weapons.Kh_59MK2__AS_22_Kazoo____700kg) KAB_500Kr___500kg_TV_Guided_Bomb = ( 10, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb, ) - KAB_500S___500kg__GPS_Guided = (10, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (10, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 10, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -1623,44 +1555,45 @@ class Su_30SM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (10, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 10, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 10, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 10, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (10, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (10, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500_M54___474kg__freefall = (10, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (10, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) FAB_500M62_UMPK__500kg_Glide_Bomb = ( 10, - WeaponsSu30.FAB_500M62_UMPK__500kg_Glide_Bomb, + Weapons.FAB_500M62_UMPK__500kg_Glide_Bomb, ) - FAB_250_M62___227kg__freefall = (10, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_250_M62___227kg__freefall = (10, Weapons.FAB_250_M62___227kg__freefall) + # ERRR {37DCC01E-9E02-432F-B61D-10C166CA2798NV} RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 10, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 10, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 10, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 10, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 10, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 10, @@ -1686,27 +1619,27 @@ class Su_30SM(PlaneType): R_73__AA_11_Archer____Infra_Red = (11, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 11, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 11, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) R_74M2__AA_11_Archer_M2____Infra_Red = ( 11, - WeaponsSu30.R_74M2__AA_11_Archer_M2____Infra_Red, + Weapons.R_74M2__AA_11_Archer_M2____Infra_Red, ) R_77__AA_12_Adder_Early____Active_Rdr = ( 11, - WeaponsSu30.R_77__AA_12_Adder_Early____Active_Rdr, + Weapons.R_77__AA_12_Adder_Early____Active_Rdr, ) R_77_1__AA_12_Adder_B____Active_Rdr = ( 11, - WeaponsSu30.R_77_1__AA_12_Adder_B____Active_Rdr, + Weapons.R_77_1__AA_12_Adder_B____Active_Rdr, ) R_77M__AA_12_Adder_C____Active_Rdr = ( 11, - WeaponsSu30.R_77M__AA_12_Adder_C____Active_Rdr, + Weapons.R_77M__AA_12_Adder_C____Active_Rdr, ) Smoke_Generator___red = (11, Weapons.Smoke_Generator___red) Smoke_Generator___green = (11, Weapons.Smoke_Generator___green) @@ -1714,7 +1647,7 @@ class Su_30SM(PlaneType): Smoke_Generator___white = (11, Weapons.Smoke_Generator___white) Smoke_Generator___yellow = (11, Weapons.Smoke_Generator___yellow) Smoke_Generator___orange = (11, Weapons.Smoke_Generator___orange) - Smoke_Generator___Black = (11, WeaponsSu30.Smoke_Generator___Black) + Smoke_Generator___Black = (11, Weapons.Smoke_Generator___Black) # ERRR @@ -1722,25 +1655,25 @@ class Su_30SM(PlaneType): R_73__AA_11_Archer____Infra_Red = (12, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 12, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 12, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) R_74M2__AA_11_Archer_M2____Infra_Red = ( 12, - WeaponsSu30.R_74M2__AA_11_Archer_M2____Infra_Red, + Weapons.R_74M2__AA_11_Archer_M2____Infra_Red, ) L005_Sorbtsiya_ECM_pod__right_ = (12, Weapons.L005_Sorbtsiya_ECM_pod__right_) - SAP_518_ECM_Pod__Right_ = (12, WeaponsSu30.SAP_518_ECM_Pod__Right_) + SAP_518_ECM_Pod__Right_ = (12, Weapons.SAP_518_ECM_Pod__Right_) Smoke_Generator___red = (12, Weapons.Smoke_Generator___red) Smoke_Generator___green = (12, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (12, Weapons.Smoke_Generator___blue) Smoke_Generator___white = (12, Weapons.Smoke_Generator___white) Smoke_Generator___yellow = (12, Weapons.Smoke_Generator___yellow) Smoke_Generator___orange = (12, Weapons.Smoke_Generator___orange) - Smoke_Generator___Black = (12, WeaponsSu30.Smoke_Generator___Black) + Smoke_Generator___Black = (12, Weapons.Smoke_Generator___Black) pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} @@ -1948,10 +1881,10 @@ class Su_30MKA(PlaneType): R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 1, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) L005_Sorbtsiya_ECM_pod__left_ = (1, Weapons.L005_Sorbtsiya_ECM_pod__left_) - SAP_518_ECM_Pod__Left_ = (1, WeaponsSu30.SAP_518_ECM_Pod__Left_) + SAP_518_ECM_Pod__Left_ = (1, Weapons.SAP_518_ECM_Pod__Left_) Smoke_Generator___red = (1, Weapons.Smoke_Generator___red) Smoke_Generator___green = (1, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (1, Weapons.Smoke_Generator___blue) @@ -1963,15 +1896,15 @@ class Su_30MKA(PlaneType): R_73__AA_11_Archer____Infra_Red = (2, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 2, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 2, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 2, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Smoke_Generator___red = (2, Weapons.Smoke_Generator___red) Smoke_Generator___green = (2, Weapons.Smoke_Generator___green) @@ -1986,31 +1919,31 @@ class Su_30MKA(PlaneType): R_73__AA_11_Archer____Infra_Red = (3, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 3, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 3, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 3, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 3, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 3, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 3, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 3, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 3, @@ -2020,19 +1953,16 @@ class Su_30MKA(PlaneType): 3, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 3, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (3, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 3, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (3, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (3, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (3, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (3, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (3, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (3, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = (3, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (3, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (3, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 3, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -2050,13 +1980,13 @@ class Su_30MKA(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (3, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 3, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 3, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 3, @@ -2066,16 +1996,16 @@ class Su_30MKA(PlaneType): 3, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (3, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (3, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (3, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (3, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 3, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 3, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 3, @@ -2099,21 +2029,21 @@ class Su_30MKA(PlaneType): class Pylon4: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 4, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 4, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 4, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 4, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (4, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (4, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 4, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -2122,21 +2052,18 @@ class Su_30MKA(PlaneType): 4, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 4, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (4, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 4, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (4, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (4, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (4, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (4, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (4, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (4, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = (4, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (4, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (4, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (4, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (4, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (4, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (4, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 4, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -2158,13 +2085,13 @@ class Su_30MKA(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (4, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 4, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 4, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 4, @@ -2174,16 +2101,16 @@ class Su_30MKA(PlaneType): 4, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (4, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (4, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (4, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (4, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 4, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 4, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) # ERRR @@ -2191,21 +2118,21 @@ class Su_30MKA(PlaneType): class Pylon5: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 5, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 5, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 5, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 5, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (5, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (5, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 5, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, @@ -2214,13 +2141,10 @@ class Su_30MKA(PlaneType): 5, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 5, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (5, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) + KH_29TE__AS_14_Kedge___TV_Guided = (5, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (5, Weapons.Kh_31A__AS_17_Krypton____610kg) KAB_500Kr___500kg_TV_Guided_Bomb = (5, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (5, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (5, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 5, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -2230,13 +2154,13 @@ class Su_30MKA(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (5, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 5, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 5, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 5, @@ -2246,18 +2170,18 @@ class Su_30MKA(PlaneType): 5, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (5, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (5, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (5, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (5, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (5, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (5, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 5, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 5, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) - APK_9_POD = (5, WeaponsSu30.APK_9_POD) + APK_9_POD = (5, Weapons.APK_9_POD) L_081_Fantasmagoria_ELINT_pod = (5, Weapons.L_081_Fantasmagoria_ELINT_pod) # ERRR @@ -2265,24 +2189,24 @@ class Su_30MKA(PlaneType): class Pylon6: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 6, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 6, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 6, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 6, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KAB_500Kr___500kg_TV_Guided_Bomb = (6, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (6, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (6, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (6, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (6, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (6, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (6, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 6, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -2304,13 +2228,13 @@ class Su_30MKA(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (6, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 6, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 6, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 6, @@ -2320,16 +2244,16 @@ class Su_30MKA(PlaneType): 6, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (6, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (6, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (6, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (6, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 6, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 6, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag = ( 6, @@ -2345,22 +2269,22 @@ class Su_30MKA(PlaneType): class Pylon7: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 7, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 7, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 7, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 7, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KAB_500Kr___500kg_TV_Guided_Bomb = (7, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (7, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (7, Weapons.KAB_500S___500kg__GPS_Guided) KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP = ( 7, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, @@ -2378,13 +2302,13 @@ class Su_30MKA(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (7, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 7, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 7, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 7, @@ -2394,16 +2318,16 @@ class Su_30MKA(PlaneType): 7, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (7, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (7, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (7, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (7, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (7, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (7, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 7, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 7, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) Smoke_Generator___red = (7, Weapons.Smoke_Generator___red) Smoke_Generator___green = (7, Weapons.Smoke_Generator___green) @@ -2425,21 +2349,21 @@ class Su_30MKA(PlaneType): class Pylon8: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 8, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 8, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 8, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 8, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (8, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (8, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 8, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -2448,13 +2372,10 @@ class Su_30MKA(PlaneType): 8, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 8, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (8, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) + KH_29TE__AS_14_Kedge___TV_Guided = (8, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (8, Weapons.Kh_31A__AS_17_Krypton____610kg) KAB_500Kr___500kg_TV_Guided_Bomb = (8, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (8, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (8, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 8, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -2464,13 +2385,13 @@ class Su_30MKA(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (8, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 8, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 8, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 8, @@ -2480,38 +2401,39 @@ class Su_30MKA(PlaneType): 8, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (8, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (8, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (8, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (8, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (8, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (8, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 8, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 8, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) + # ERRR {DAMOCLES} # ERRR class Pylon9: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 9, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 9, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 9, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 9, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (9, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (9, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 9, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -2520,21 +2442,18 @@ class Su_30MKA(PlaneType): 9, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 9, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (9, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 9, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (9, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (9, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (9, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (9, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (9, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (9, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = (9, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (9, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (9, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (9, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (9, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (9, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (9, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 9, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -2556,13 +2475,13 @@ class Su_30MKA(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (9, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 9, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 9, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 9, @@ -2572,16 +2491,16 @@ class Su_30MKA(PlaneType): 9, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (9, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (9, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (9, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (9, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (9, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (9, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 9, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 9, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) # ERRR @@ -2590,36 +2509,33 @@ class Su_30MKA(PlaneType): R_73__AA_11_Archer____Infra_Red = (10, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 10, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 10, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 10, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 10, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 10, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 10, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 10, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, - ) - Kh_31P__AS_17_Krypton____600kg = ( - 10, - WeaponsSu30.Kh_31P__AS_17_Krypton____600kg, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) + Kh_31P__AS_17_Krypton____600kg = (10, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 10, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -2630,23 +2546,20 @@ class Su_30MKA(PlaneType): ) KH_29TE__AS_14_Kedge___TV_Guided = ( 10, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, + Weapons.KH_29TE__AS_14_Kedge___TV_Guided, ) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 10, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (10, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = ( - 10, - WeaponsSu30.Kh_31A__AS_17_Krypton____610kg, - ) - Kh_35__AS_20_Kayak____520kg = (10, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (10, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (10, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (10, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = ( 10, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb, ) - KAB_500S___500kg__GPS_Guided = (10, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (10, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 10, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -2664,13 +2577,13 @@ class Su_30MKA(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (10, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 10, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 10, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 10, @@ -2680,16 +2593,16 @@ class Su_30MKA(PlaneType): 10, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (10, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (10, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (10, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (10, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (10, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (10, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 10, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 10, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 10, @@ -2715,15 +2628,15 @@ class Su_30MKA(PlaneType): R_73__AA_11_Archer____Infra_Red = (11, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 11, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 11, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 11, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Smoke_Generator___red = (11, Weapons.Smoke_Generator___red) Smoke_Generator___green = (11, Weapons.Smoke_Generator___green) @@ -2738,10 +2651,10 @@ class Su_30MKA(PlaneType): R_73__AA_11_Archer____Infra_Red = (12, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 12, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) L005_Sorbtsiya_ECM_pod__right_ = (12, Weapons.L005_Sorbtsiya_ECM_pod__right_) - SAP_518_ECM_Pod__Right_ = (12, WeaponsSu30.SAP_518_ECM_Pod__Right_) + SAP_518_ECM_Pod__Right_ = (12, Weapons.SAP_518_ECM_Pod__Right_) Smoke_Generator___red = (12, Weapons.Smoke_Generator___red) Smoke_Generator___green = (12, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (12, Weapons.Smoke_Generator___blue) @@ -2955,18 +2868,18 @@ class Su_30MKM(PlaneType): R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 1, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 1, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 1, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) L005_Sorbtsiya_ECM_pod__left_ = (1, Weapons.L005_Sorbtsiya_ECM_pod__left_) - SAP_518_ECM_Pod__Left_ = (1, WeaponsSu30.SAP_518_ECM_Pod__Left_) + SAP_518_ECM_Pod__Left_ = (1, Weapons.SAP_518_ECM_Pod__Left_) Smoke_Generator___red = (1, Weapons.Smoke_Generator___red) Smoke_Generator___green = (1, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (1, Weapons.Smoke_Generator___blue) @@ -2978,23 +2891,23 @@ class Su_30MKM(PlaneType): R_73__AA_11_Archer____Infra_Red = (2, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 2, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 2, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 2, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 2, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 2, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Smoke_Generator___red = (2, Weapons.Smoke_Generator___red) Smoke_Generator___green = (2, Weapons.Smoke_Generator___green) @@ -3009,41 +2922,41 @@ class Su_30MKM(PlaneType): R_73__AA_11_Archer____Infra_Red = (3, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 3, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 3, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 3, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 3, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 3, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 3, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 3, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 3, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 3, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (3, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (3, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 3, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, @@ -3058,17 +2971,14 @@ class Su_30MKM(PlaneType): ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 3, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 3, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_59MK__AS_18_Kazoo____930kg = (3, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (3, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (3, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + KH_29TE__AS_14_Kedge___TV_Guided = (3, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_59MK__AS_18_Kazoo____930kg = (3, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (3, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (3, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = (3, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (3, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (3, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 3, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -3086,31 +2996,31 @@ class Su_30MKM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (3, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 3, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 3, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 3, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 3, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 3, @@ -3132,7 +3042,7 @@ class Su_30MKM(PlaneType): Mk_82___500lb_GP_Bomb_LD = (3, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 3, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb) @@ -3141,21 +3051,21 @@ class Su_30MKM(PlaneType): class Pylon4: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 4, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 4, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 4, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 4, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (4, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (4, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 4, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -3166,23 +3076,20 @@ class Su_30MKM(PlaneType): ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 4, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, - ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 4, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) + KH_29TE__AS_14_Kedge___TV_Guided = (4, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 4, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (4, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (4, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (4, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (4, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (4, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (4, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = (4, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (4, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (4, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (4, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (4, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (4, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (4, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 4, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -3204,77 +3111,74 @@ class Su_30MKM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (4, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 4, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 4, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 4, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 4, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) # ERRR Mk_82___500lb_GP_Bomb_LD = (4, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 4, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb) class Pylon5: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 5, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 5, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 5, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 5, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (5, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (5, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 5, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 5, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 5, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 5, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (5, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) + KH_29TE__AS_14_Kedge___TV_Guided = (5, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (5, Weapons.Kh_31A__AS_17_Krypton____610kg) KAB_500Kr___500kg_TV_Guided_Bomb = (5, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (5, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (5, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 5, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -3284,58 +3188,58 @@ class Su_30MKM(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (5, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 5, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 5, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (5, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (5, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 5, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (5, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (5, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 5, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 5, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - APK_9_POD = (5, WeaponsSu30.APK_9_POD) + APK_9_POD = (5, Weapons.APK_9_POD) # ERRR Mk_82___500lb_GP_Bomb_LD = (5, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 5, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (5, Weapons.GBU_12___500lb_Laser_Guided_Bomb) class Pylon6: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 6, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 6, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 6, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 6, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KAB_500Kr___500kg_TV_Guided_Bomb = (6, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (6, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (6, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (6, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (6, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (6, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (6, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 6, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -3357,27 +3261,27 @@ class Su_30MKM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (6, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 6, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 6, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (6, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (6, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 6, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 6, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 6, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag = ( 6, @@ -3391,29 +3295,29 @@ class Su_30MKM(PlaneType): Mk_82___500lb_GP_Bomb_LD = (6, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 6, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb) class Pylon7: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 7, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 7, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 7, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 7, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KAB_500Kr___500kg_TV_Guided_Bomb = (7, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (7, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (7, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 7, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -3431,27 +3335,27 @@ class Su_30MKM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (7, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 7, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 7, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (7, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (7, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 7, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (7, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (7, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 7, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 7, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag = ( 7, @@ -3471,28 +3375,28 @@ class Su_30MKM(PlaneType): Mk_82___500lb_GP_Bomb_LD = (7, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 7, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb) class Pylon8: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 8, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 8, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 8, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 8, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (8, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (8, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 8, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -3503,15 +3407,12 @@ class Su_30MKM(PlaneType): ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 8, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 8, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (8, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) + KH_29TE__AS_14_Kedge___TV_Guided = (8, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (8, Weapons.Kh_31A__AS_17_Krypton____610kg) KAB_500Kr___500kg_TV_Guided_Bomb = (8, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (8, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (8, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 8, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -3521,55 +3422,55 @@ class Su_30MKM(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (8, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 8, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 8, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (8, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (8, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 8, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (8, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (8, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 8, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 8, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - DAMOCLES___Targeting_Pod = (8, WeaponsSu30.DAMOCLES___Targeting_Pod) + DAMOCLES___Targeting_Pod = (8, Weapons.DAMOCLES___Targeting_Pod) # ERRR Mk_82___500lb_GP_Bomb_LD = (8, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 8, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (8, Weapons.GBU_12___500lb_Laser_Guided_Bomb) class Pylon9: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 9, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 9, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 9, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 9, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - Kh_31P__AS_17_Krypton____600kg = (9, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) + Kh_31P__AS_17_Krypton____600kg = (9, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 9, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -3580,23 +3481,20 @@ class Su_30MKM(PlaneType): ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 9, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, - ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 9, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) + KH_29TE__AS_14_Kedge___TV_Guided = (9, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 9, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (9, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (9, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_35__AS_20_Kayak____520kg = (9, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (9, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (9, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (9, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = (9, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (9, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (9, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (9, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (9, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (9, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (9, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 9, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -3618,37 +3516,37 @@ class Su_30MKM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (9, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 9, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 9, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) - FAB_250___250kg_GP_Bomb_LD = (9, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (9, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 9, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (9, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (9, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 9, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 9, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 9, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) # ERRR Mk_82___500lb_GP_Bomb_LD = (9, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 9, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = (9, Weapons.GBU_12___500lb_Laser_Guided_Bomb) @@ -3656,44 +3554,41 @@ class Su_30MKM(PlaneType): R_73__AA_11_Archer____Infra_Red = (10, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 10, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 10, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 10, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 10, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 10, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 10, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 10, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 10, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 10, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, - ) - Kh_31P__AS_17_Krypton____600kg = ( - 10, - WeaponsSu30.Kh_31P__AS_17_Krypton____600kg, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) + Kh_31P__AS_17_Krypton____600kg = (10, Weapons.Kh_31P__AS_17_Krypton____600kg) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 10, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, @@ -3704,27 +3599,24 @@ class Su_30MKM(PlaneType): ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 10, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) KH_29TE__AS_14_Kedge___TV_Guided = ( 10, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, + Weapons.KH_29TE__AS_14_Kedge___TV_Guided, ) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 10, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (10, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = ( - 10, - WeaponsSu30.Kh_31A__AS_17_Krypton____610kg, - ) - Kh_35__AS_20_Kayak____520kg = (10, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) + Kh_59MK__AS_18_Kazoo____930kg = (10, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (10, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_35__AS_20_Kayak____520kg = (10, Weapons.Kh_35__AS_20_Kayak____520kg) KAB_500Kr___500kg_TV_Guided_Bomb = ( 10, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb, ) - KAB_500S___500kg__GPS_Guided = (10, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (10, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 10, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -3742,31 +3634,34 @@ class Su_30MKM(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (10, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 10, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 10, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, + ) + OFAB_250_270___250_kg_GP_Bomb_LD = ( + 10, + Weapons.OFAB_250_270___250_kg_GP_Bomb_LD, ) - FAB_250___250kg_GP_Bomb_LD = (10, Weapons.FAB_250___250kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 10, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (10, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (10, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 10, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 10, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 10, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 10, @@ -3789,7 +3684,7 @@ class Su_30MKM(PlaneType): Mk_82___500lb_GP_Bomb_LD = (10, Weapons.Mk_82___500lb_GP_Bomb_LD) GBU_38___JDAM__500lb_GPS_Guided_Bomb = ( 10, - WeaponsSu30.GBU_38___JDAM__500lb_GPS_Guided_Bomb, + Weapons.GBU_38___JDAM__500lb_GPS_Guided_Bomb, ) GBU_12___500lb_Laser_Guided_Bomb = ( 10, @@ -3800,23 +3695,23 @@ class Su_30MKM(PlaneType): R_73__AA_11_Archer____Infra_Red = (11, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 11, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 11, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 11, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 11, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 11, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Smoke_Generator___red = (11, Weapons.Smoke_Generator___red) Smoke_Generator___green = (11, Weapons.Smoke_Generator___green) @@ -3831,18 +3726,18 @@ class Su_30MKM(PlaneType): R_73__AA_11_Archer____Infra_Red = (12, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 12, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 12, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 12, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) L005_Sorbtsiya_ECM_pod__right_ = (12, Weapons.L005_Sorbtsiya_ECM_pod__right_) - SAP_518_ECM_Pod__Right_ = (12, WeaponsSu30.SAP_518_ECM_Pod__Right_) + SAP_518_ECM_Pod__Right_ = (12, Weapons.SAP_518_ECM_Pod__Right_) Smoke_Generator___red = (12, Weapons.Smoke_Generator___red) Smoke_Generator___green = (12, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (12, Weapons.Smoke_Generator___blue) @@ -4056,18 +3951,18 @@ class Su_30MKI(PlaneType): R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 1, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 1, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 1, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) L005_Sorbtsiya_ECM_pod__left_ = (1, Weapons.L005_Sorbtsiya_ECM_pod__left_) - SAP_518_ECM_Pod__Left_ = (1, WeaponsSu30.SAP_518_ECM_Pod__Left_) + SAP_518_ECM_Pod__Left_ = (1, Weapons.SAP_518_ECM_Pod__Left_) Smoke_Generator___red = (1, Weapons.Smoke_Generator___red) Smoke_Generator___green = (1, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (1, Weapons.Smoke_Generator___blue) @@ -4079,25 +3974,25 @@ class Su_30MKI(PlaneType): R_73__AA_11_Archer____Infra_Red = (2, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 2, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 2, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 2, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) - Astra_Mk_1___Active_Rdr_AAM = (2, WeaponsSu30.Astra_Mk_1___Active_Rdr_AAM) - I_Derby_ER___Active_Rdr_AAM = (2, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + Astra_Mk_1___Active_Rdr_AAM = (2, Weapons.Astra_Mk_1___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (2, Weapons.I_Derby_ER___Active_Rdr_AAM) RVV_AE__AA_12_Adder____Active_Rdr = ( 2, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 2, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Smoke_Generator___red = (2, Weapons.Smoke_Generator___red) Smoke_Generator___green = (2, Weapons.Smoke_Generator___green) @@ -4112,45 +4007,45 @@ class Su_30MKI(PlaneType): R_73__AA_11_Archer____Infra_Red = (3, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 3, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 3, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 3, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 3, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 3, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 3, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 3, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) - Astra_Mk_1___Active_Rdr_AAM = (3, WeaponsSu30.Astra_Mk_1___Active_Rdr_AAM) - I_Derby_ER___Active_Rdr_AAM = (3, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + Astra_Mk_1___Active_Rdr_AAM = (3, Weapons.Astra_Mk_1___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (3, Weapons.I_Derby_ER___Active_Rdr_AAM) RVV_AE__AA_12_Adder____Active_Rdr = ( 3, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 3, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 3, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 3, @@ -4160,23 +4055,20 @@ class Su_30MKI(PlaneType): 3, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 3, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (3, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 3, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (3, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (3, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_31P__AS_17_Krypton____600kg = (3, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_35__AS_20_Kayak____520kg = (3, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - CMII__TV_Guided = (3, WeaponsSu30.CMII__TV_Guided) - Rudra_M1 = (3, WeaponsSu30.Rudra_M1) - SAAW_POD = (3, WeaponsSu30.SAAW_POD) + Kh_59MK__AS_18_Kazoo____930kg = (3, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (3, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31P__AS_17_Krypton____600kg = (3, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_35__AS_20_Kayak____520kg = (3, Weapons.Kh_35__AS_20_Kayak____520kg) + CMII__TV_Guided = (3, Weapons.CMII__TV_Guided) + Rudra_M1 = (3, Weapons.Rudra_M1) + SAAW_POD = (3, Weapons.SAAW_POD) KAB_500Kr___500kg_TV_Guided_Bomb = (3, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (3, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (3, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 3, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -4194,13 +4086,13 @@ class Su_30MKI(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (3, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 3, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 3, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 3, @@ -4210,16 +4102,16 @@ class Su_30MKI(PlaneType): 3, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (3, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (3, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (3, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (3, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 3, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 3, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 3, @@ -4244,24 +4136,24 @@ class Su_30MKI(PlaneType): class Pylon4: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 4, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 4, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) - I_Derby_ER___Active_Rdr_AAM = (4, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (4, Weapons.I_Derby_ER___Active_Rdr_AAM) RVV_AE__AA_12_Adder____Active_Rdr = ( 4, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 4, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 4, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 4, @@ -4271,25 +4163,22 @@ class Su_30MKI(PlaneType): 4, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 4, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (4, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 4, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (4, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (4, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_31P__AS_17_Krypton____600kg = (4, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_35__AS_20_Kayak____520kg = (4, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - CMII__TV_Guided = (4, WeaponsSu30.CMII__TV_Guided) - Rudra_M1 = (4, WeaponsSu30.Rudra_M1) - SAAW_POD = (4, WeaponsSu30.SAAW_POD) + Kh_59MK__AS_18_Kazoo____930kg = (4, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (4, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31P__AS_17_Krypton____600kg = (4, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_35__AS_20_Kayak____520kg = (4, Weapons.Kh_35__AS_20_Kayak____520kg) + CMII__TV_Guided = (4, Weapons.CMII__TV_Guided) + Rudra_M1 = (4, Weapons.Rudra_M1) + SAAW_POD = (4, Weapons.SAAW_POD) KAB_500Kr___500kg_TV_Guided_Bomb = (4, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (4, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (4, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (4, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (4, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (4, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (4, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 4, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -4311,13 +4200,13 @@ class Su_30MKI(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (4, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 4, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 4, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 4, @@ -4327,16 +4216,16 @@ class Su_30MKI(PlaneType): 4, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (4, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (4, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (4, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (4, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 4, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 4, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) # ERRR @@ -4344,45 +4233,42 @@ class Su_30MKI(PlaneType): class Pylon5: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 5, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 5, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) - I_Derby_ER___Active_Rdr_AAM = (5, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (5, Weapons.I_Derby_ER___Active_Rdr_AAM) RVV_AE__AA_12_Adder____Active_Rdr = ( 5, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 5, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( 5, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 5, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (5, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 5, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 5, Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__, ) - Kh_31A__AS_17_Krypton____610kg = (5, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) + Kh_31A__AS_17_Krypton____610kg = (5, Weapons.Kh_31A__AS_17_Krypton____610kg) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 5, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Rudra_M1 = (5, WeaponsSu30.Rudra_M1) + Rudra_M1 = (5, Weapons.Rudra_M1) KAB_500Kr___500kg_TV_Guided_Bomb = (5, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (5, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (5, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 5, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -4392,13 +4278,13 @@ class Su_30MKI(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (5, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 5, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 5, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 5, @@ -4408,18 +4294,18 @@ class Su_30MKI(PlaneType): 5, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (5, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (5, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (5, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (5, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (5, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (5, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 5, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 5, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) - APK_9_POD = (5, WeaponsSu30.APK_9_POD) + APK_9_POD = (5, Weapons.APK_9_POD) L_081_Fantasmagoria_ELINT_pod = (5, Weapons.L_081_Fantasmagoria_ELINT_pod) # ERRR @@ -4427,28 +4313,28 @@ class Su_30MKI(PlaneType): class Pylon6: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 6, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 6, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 6, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 6, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - I_Derby_ER___Active_Rdr_AAM = (6, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (6, Weapons.I_Derby_ER___Active_Rdr_AAM) # ERRR {BRAHMOS_AG} - BRAHMOS_A_Ship = (6, WeaponsSu30.BRAHMOS_A_Ship) - BRAHMOS_SEAD = (6, WeaponsSu30.BRAHMOS_SEAD) + BRAHMOS_A_Ship = (6, Weapons.BRAHMOS_A_Ship) + BRAHMOS_SEAD = (6, Weapons.BRAHMOS_SEAD) KAB_500Kr___500kg_TV_Guided_Bomb = (6, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (6, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (6, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (6, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (6, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (6, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (6, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 6, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -4470,13 +4356,13 @@ class Su_30MKI(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (6, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 6, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 6, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 6, @@ -4486,16 +4372,16 @@ class Su_30MKI(PlaneType): 6, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (6, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (6, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (6, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (6, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 6, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 6, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) RBK_500U___126_x_OAB_2_5RT__500kg_CBU_HE_Frag = ( 6, @@ -4505,30 +4391,30 @@ class Su_30MKI(PlaneType): 6, Weapons.RBK_500___268_x_PTAB_1M__500kg_CBU_Light_HEAT_AP, ) - EL_M_2060 = (6, WeaponsSu30.EL_M_2060) + EL_M_2060 = (6, Weapons.EL_M_2060) # ERRR class Pylon7: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 7, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 7, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 7, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 7, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - I_Derby_ER___Active_Rdr_AAM = (7, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (7, Weapons.I_Derby_ER___Active_Rdr_AAM) KAB_500Kr___500kg_TV_Guided_Bomb = (7, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (7, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (7, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 7, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -4546,13 +4432,13 @@ class Su_30MKI(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (7, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 7, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 7, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 7, @@ -4562,16 +4448,16 @@ class Su_30MKI(PlaneType): 7, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (7, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (7, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (7, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (7, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (7, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (7, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 7, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 7, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) Smoke_Generator___red = (7, Weapons.Smoke_Generator___red) Smoke_Generator___green = (7, Weapons.Smoke_Generator___green) @@ -4592,24 +4478,24 @@ class Su_30MKI(PlaneType): class Pylon8: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 8, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 8, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 8, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 8, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - I_Derby_ER___Active_Rdr_AAM = (8, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (8, Weapons.I_Derby_ER___Active_Rdr_AAM) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 8, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 8, @@ -4619,15 +4505,12 @@ class Su_30MKI(PlaneType): 8, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 8, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) - Kh_31A__AS_17_Krypton____610kg = (8, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_31P__AS_17_Krypton____600kg = (8, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Rudra_M1 = (8, WeaponsSu30.Rudra_M1) + KH_29TE__AS_14_Kedge___TV_Guided = (8, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) + Kh_31A__AS_17_Krypton____610kg = (8, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31P__AS_17_Krypton____600kg = (8, Weapons.Kh_31P__AS_17_Krypton____600kg) + Rudra_M1 = (8, Weapons.Rudra_M1) KAB_500Kr___500kg_TV_Guided_Bomb = (8, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (8, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (8, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 8, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -4637,13 +4520,13 @@ class Su_30MKI(PlaneType): Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) P_50T___50kg_Practice_Bomb_LD = (8, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 8, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 8, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 8, @@ -4653,42 +4536,42 @@ class Su_30MKI(PlaneType): 8, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (8, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (8, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (8, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (8, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (8, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (8, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 8, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 8, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) - LITENING___Targeting_Pod = (8, WeaponsSu30.LITENING___Targeting_Pod) + LITENING___Targeting_Pod = (8, Weapons.LITENING___Targeting_Pod) # ERRR class Pylon9: R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 9, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 9, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) RVV_AE__AA_12_Adder____Active_Rdr = ( 9, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 9, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) - I_Derby_ER___Active_Rdr_AAM = (9, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (9, Weapons.I_Derby_ER___Active_Rdr_AAM) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 9, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 9, @@ -4698,19 +4581,16 @@ class Su_30MKI(PlaneType): 9, Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, ) - KH_29TE__AS_14_Kedge___TV_Guided = ( - 9, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, - ) + KH_29TE__AS_14_Kedge___TV_Guided = (9, Weapons.KH_29TE__AS_14_Kedge___TV_Guided) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 9, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (9, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = (9, WeaponsSu30.Kh_31A__AS_17_Krypton____610kg) - Kh_31P__AS_17_Krypton____600kg = (9, WeaponsSu30.Kh_31P__AS_17_Krypton____600kg) - Kh_35__AS_20_Kayak____520kg = (9, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - CMII__TV_Guided = (9, WeaponsSu30.CMII__TV_Guided) + Kh_59MK__AS_18_Kazoo____930kg = (9, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (9, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31P__AS_17_Krypton____600kg = (9, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_35__AS_20_Kayak____520kg = (9, Weapons.Kh_35__AS_20_Kayak____520kg) + CMII__TV_Guided = (9, Weapons.CMII__TV_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 9, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -4719,12 +4599,12 @@ class Su_30MKI(PlaneType): 9, Weapons.SAB_100MN___100_kg_Illumination_Bomb, ) - Rudra_M1 = (9, WeaponsSu30.Rudra_M1) - SAAW_POD = (9, WeaponsSu30.SAAW_POD) + Rudra_M1 = (9, Weapons.Rudra_M1) + SAAW_POD = (9, Weapons.SAAW_POD) KAB_500Kr___500kg_TV_Guided_Bomb = (9, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - KAB_500S___500kg__GPS_Guided = (9, WeaponsSu30.KAB_500S___500kg__GPS_Guided) - KAB_1500Kr___1500kg = (9, WeaponsSu30.KAB_1500Kr___1500kg) - KAB_1500LG_PR___1500kg = (9, WeaponsSu30.KAB_1500LG_PR___1500kg) + KAB_500S___500kg__GPS_Guided = (9, Weapons.KAB_500S___500kg__GPS_Guided) + KAB_1500Kr___1500kg = (9, Weapons.KAB_1500Kr___1500kg) + KAB_1500LG_PR___1500kg = (9, Weapons.KAB_1500LG_PR___1500kg) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 9, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -4738,13 +4618,13 @@ class Su_30MKI(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (9, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 9, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 9, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 9, @@ -4754,16 +4634,16 @@ class Su_30MKI(PlaneType): 9, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (9, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (9, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (9, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (9, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (9, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (9, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 9, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 9, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) # ERRR @@ -4772,45 +4652,45 @@ class Su_30MKI(PlaneType): R_73__AA_11_Archer____Infra_Red = (10, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 10, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 10, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 10, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) R_27R1__AA_10_Alamo_A____Semi_Act_Rdr = ( 10, - WeaponsSu30.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, + Weapons.R_27R1__AA_10_Alamo_A____Semi_Act_Rdr, ) R_27T1__AA_10_Alamo_B____Infra_Red = ( 10, - WeaponsSu30.R_27T1__AA_10_Alamo_B____Infra_Red, + Weapons.R_27T1__AA_10_Alamo_B____Infra_Red, ) R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range = ( 10, - WeaponsSu30.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, + Weapons.R_27ER1__AA_10_Alamo_C____Semi_Act_Extended_Range, ) R_27ET1__AA_10_Alamo_D____IR_Extended_Range = ( 10, - WeaponsSu30.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, + Weapons.R_27ET1__AA_10_Alamo_D____IR_Extended_Range, ) - Astra_Mk_1___Active_Rdr_AAM = (10, WeaponsSu30.Astra_Mk_1___Active_Rdr_AAM) - I_Derby_ER___Active_Rdr_AAM = (10, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + Astra_Mk_1___Active_Rdr_AAM = (10, Weapons.Astra_Mk_1___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (10, Weapons.I_Derby_ER___Active_Rdr_AAM) RVV_AE__AA_12_Adder____Active_Rdr = ( 10, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 10, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) KH_29L__AS_14_Kedge___Semi_Act_Laser = ( 10, - WeaponsSu30.KH_29L__AS_14_Kedge___Semi_Act_Laser, + Weapons.KH_29L__AS_14_Kedge___Semi_Act_Laser, ) Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser__ = ( 10, @@ -4822,30 +4702,24 @@ class Su_30MKI(PlaneType): ) KH_29TE__AS_14_Kedge___TV_Guided = ( 10, - WeaponsSu30.KH_29TE__AS_14_Kedge___TV_Guided, + Weapons.KH_29TE__AS_14_Kedge___TV_Guided, ) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 10, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - Kh_59MK__AS_18_Kazoo____930kg = (10, WeaponsSu30.Kh_59MK__AS_18_Kazoo____930kg) - Kh_31A__AS_17_Krypton____610kg = ( - 10, - WeaponsSu30.Kh_31A__AS_17_Krypton____610kg, - ) - Kh_31P__AS_17_Krypton____600kg = ( - 10, - WeaponsSu30.Kh_31P__AS_17_Krypton____600kg, - ) - Kh_35__AS_20_Kayak____520kg = (10, WeaponsSu30.Kh_35__AS_20_Kayak____520kg) - CMII__TV_Guided = (10, WeaponsSu30.CMII__TV_Guided) - Rudra_M1 = (10, WeaponsSu30.Rudra_M1) - SAAW_POD = (10, WeaponsSu30.SAAW_POD) + Kh_59MK__AS_18_Kazoo____930kg = (10, Weapons.Kh_59MK__AS_18_Kazoo____930kg) + Kh_31A__AS_17_Krypton____610kg = (10, Weapons.Kh_31A__AS_17_Krypton____610kg) + Kh_31P__AS_17_Krypton____600kg = (10, Weapons.Kh_31P__AS_17_Krypton____600kg) + Kh_35__AS_20_Kayak____520kg = (10, Weapons.Kh_35__AS_20_Kayak____520kg) + CMII__TV_Guided = (10, Weapons.CMII__TV_Guided) + Rudra_M1 = (10, Weapons.Rudra_M1) + SAAW_POD = (10, Weapons.SAAW_POD) KAB_500Kr___500kg_TV_Guided_Bomb = ( 10, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb, ) - KAB_500S___500kg__GPS_Guided = (10, WeaponsSu30.KAB_500S___500kg__GPS_Guided) + KAB_500S___500kg__GPS_Guided = (10, Weapons.KAB_500S___500kg__GPS_Guided) KAB_500LG___500kg_Laser_Guided_Bomb = ( 10, Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, @@ -4863,13 +4737,13 @@ class Su_30MKI(PlaneType): Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, ) P_50T___50kg_Practice_Bomb_LD = (10, Weapons.P_50T___50kg_Practice_Bomb_LD) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 10, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) - BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb = ( + BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster = ( 10, - Weapons.BetAB_500ShP___500kg_Concrete_Piercing_HD_w_booster_Bomb, + Weapons.BetAB_500ShP___500_kg_Concrete_Piercing_Bomb_HD_w_booster, ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 10, @@ -4879,16 +4753,16 @@ class Su_30MKI(PlaneType): 10, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, ) - FAB_500_M54___474kg__freefall = (10, WeaponsSu30.FAB_500_M54___474kg__freefall) - FAB_500_M_62___500kg_GP_Bomb_LD = (10, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250_M62___227kg__freefall = (10, WeaponsSu30.FAB_250_M62___227kg__freefall) + FAB_500_M54___474kg__freefall = (10, Weapons.FAB_500_M54___474kg__freefall) + FAB_500M_62___500_kg_GP_Bomb_LD = (10, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + FAB_250_M62___227kg__freefall = (10, Weapons.FAB_250_M62___227kg__freefall) MBD3_U6_68_with_6_x_FAB_250___250kg = ( 10, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_250___250kg, + Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg, ) MBD3_U6_68_with_6_x_FAB_100___100kg = ( 10, - WeaponsSu30.MBD3_U6_68_with_6_x_FAB_100___100kg, + Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 10, @@ -4914,25 +4788,25 @@ class Su_30MKI(PlaneType): R_73__AA_11_Archer____Infra_Red = (11, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 11, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 11, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 11, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) - Astra_Mk_1___Active_Rdr_AAM = (11, WeaponsSu30.Astra_Mk_1___Active_Rdr_AAM) - I_Derby_ER___Active_Rdr_AAM = (11, WeaponsSu30.I_Derby_ER___Active_Rdr_AAM) + Astra_Mk_1___Active_Rdr_AAM = (11, Weapons.Astra_Mk_1___Active_Rdr_AAM) + I_Derby_ER___Active_Rdr_AAM = (11, Weapons.I_Derby_ER___Active_Rdr_AAM) RVV_AE__AA_12_Adder____Active_Rdr = ( 11, - WeaponsSu30.RVV_AE__AA_12_Adder____Active_Rdr, + Weapons.RVV_AE__AA_12_Adder____Active_Rdr, ) RVV_SD__AA_12_Adder_B____Active_Rdr = ( 11, - WeaponsSu30.RVV_SD__AA_12_Adder_B____Active_Rdr, + Weapons.RVV_SD__AA_12_Adder_B____Active_Rdr, ) Smoke_Generator___red = (11, Weapons.Smoke_Generator___red) Smoke_Generator___green = (11, Weapons.Smoke_Generator___green) @@ -4947,18 +4821,18 @@ class Su_30MKI(PlaneType): R_73__AA_11_Archer____Infra_Red = (12, Weapons.R_73__AA_11_Archer____Infra_Red) R_73L__AA_11_Archer_L____Infra_Red = ( 12, - WeaponsSu30.R_73L__AA_11_Archer_L____Infra_Red, + Weapons.R_73L__AA_11_Archer_L____Infra_Red, ) R_74M__AA_11_Archer_M____Infra_Red = ( 12, - WeaponsSu30.R_74M__AA_11_Archer_M____Infra_Red, + Weapons.R_74M__AA_11_Archer_M____Infra_Red, ) RVV_MD2__AA_11_Archer_M2____Infra_Red = ( 12, - WeaponsSu30.RVV_MD2__AA_11_Archer_M2____Infra_Red, + Weapons.RVV_MD2__AA_11_Archer_M2____Infra_Red, ) L005_Sorbtsiya_ECM_pod__right_ = (12, Weapons.L005_Sorbtsiya_ECM_pod__right_) - SAP_518_ECM_Pod__Right_ = (12, WeaponsSu30.SAP_518_ECM_Pod__Right_) + SAP_518_ECM_Pod__Right_ = (12, Weapons.SAP_518_ECM_Pod__Right_) 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/pydcs_extensions/su57/su57.py b/pydcs_extensions/su57/su57.py index df2b43d8..c3907b4e 100644 --- a/pydcs_extensions/su57/su57.py +++ b/pydcs_extensions/su57/su57.py @@ -9,17 +9,11 @@ from pydcs_extensions.weapon_injector import inject_weapons class Su57Weapons: - Kh_59MK2 = {"clsid": "{KH_59MK2}", "name": "Kh-59MK2", "weight": None} RVV_AE = {"clsid": "{RVV-AE}", "name": "RVV-AE", "weight": 250} 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", @@ -56,8 +50,10 @@ class Su_57(PlaneType): class Pylon1: R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) - R_77PD_Active_rdr = (1, Su57Weapons.R_77PD_Active_rdr) - K_77M_Active_Rdr = (1, Su57Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (1, Weapons.KS_172_Passive_Rdr) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (1, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (1, Weapons.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) @@ -93,37 +89,37 @@ class Su_57(PlaneType): 2, Weapons.Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr, ) - Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser = ( + Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_ = ( 2, - Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser, + Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_, ) - Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided = ( + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_ = ( 2, - Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_, ) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 2, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 2, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_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 = ( + B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 2, Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) - S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( + O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator = ( 2, Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 2, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag = ( 2, @@ -133,12 +129,12 @@ class Su_57(PlaneType): 2, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 2, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (2, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (2, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 2, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, @@ -156,21 +152,20 @@ class Su_57(PlaneType): 2, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 2, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - 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) + R_37M_Active_Rdr = (2, Weapons.R_37M_Active_Rdr) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (2, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (2, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (2, Weapons.KS_172_Passive_Rdr) Fuel_tank_800L_Wing = (2, Weapons.Fuel_tank_800L_Wing) RN_28___260_kg__nuclear_bomb__free_fall = ( 2, Weapons.RN_28___260_kg__nuclear_bomb__free_fall, ) - Su_57_Fuel_Tank = (2, Su57Weapons.Su_57_Fuel_Tank) - Kh_59MK2 = (2, Su57Weapons.Kh_59MK2) Smoke_Generator___red = (2, Weapons.Smoke_Generator___red) Smoke_Generator___green = (2, Weapons.Smoke_Generator___green) Smoke_Generator___blue = (2, Weapons.Smoke_Generator___blue) @@ -214,37 +209,37 @@ class Su_57(PlaneType): 4, Weapons.Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr, ) - Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser = ( + Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_ = ( 4, - Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser, + Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_, ) - Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided = ( + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_ = ( 4, - Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_, ) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 4, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_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 = ( + B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 4, Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) - S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( + O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator = ( 4, Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 4, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag = ( 4, @@ -254,12 +249,12 @@ class Su_57(PlaneType): 4, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 4, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 4, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, @@ -277,158 +272,61 @@ class Su_57(PlaneType): 4, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - 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) + R_37M_Active_Rdr = (4, Weapons.R_37M_Active_Rdr) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (4, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (4, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (4, Weapons.KS_172_Passive_Rdr) RN_28___260_kg__nuclear_bomb__free_fall = ( 4, Weapons.RN_28___260_kg__nuclear_bomb__free_fall, ) - Su_57_Fuel_Tank = (4, Su57Weapons.Su_57_Fuel_Tank) - Kh_59MK2 = (4, Su57Weapons.Kh_59MK2) class Pylon5: R_77__AA_12_Adder____Active_Rdr = (5, Weapons.R_77__AA_12_Adder____Active_Rdr) - 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) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (5, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (5, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (5, Weapons.KS_172_Passive_Rdr) class Pylon6: R_77__AA_12_Adder____Active_Rdr = (6, Weapons.R_77__AA_12_Adder____Active_Rdr) - 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) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (6, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (6, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (6, Weapons.KS_172_Passive_Rdr) class Pylon7: R_77__AA_12_Adder____Active_Rdr = (7, Weapons.R_77__AA_12_Adder____Active_Rdr) - 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) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (7, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (7, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (7, Weapons.KS_172_Passive_Rdr) class Pylon8: R_77__AA_12_Adder____Active_Rdr = (8, Weapons.R_77__AA_12_Adder____Active_Rdr) - 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) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (8, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (8, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (8, Weapons.KS_172_Passive_Rdr) class Pylon9: - R_27R__AA_10_Alamo_A____Semi_Act_Rdr = ( - 9, - Weapons.R_27R__AA_10_Alamo_A____Semi_Act_Rdr, - ) - R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range = ( - 9, - Weapons.R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range, - ) - R_27T__AA_10_Alamo_B____Infra_Red = ( - 9, - Weapons.R_27T__AA_10_Alamo_B____Infra_Red, - ) - R_27ET__AA_10_Alamo_D____IR_Extended_Range = ( - 9, - Weapons.R_27ET__AA_10_Alamo_D____IR_Extended_Range, - ) R_77__AA_12_Adder____Active_Rdr = (9, Weapons.R_77__AA_12_Adder____Active_Rdr) - R_73__AA_11_Archer____Infra_Red = (9, Weapons.R_73__AA_11_Archer____Infra_Red) - Kh_31P__AS_17_Krypton____600kg__ARM__IN__Pas_Rdr = ( - 9, - Weapons.Kh_31P__AS_17_Krypton____600kg__ARM__IN__Pas_Rdr, - ) - Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr = ( - 9, - Weapons.Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr, - ) - Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser = ( - 9, - Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser, - ) - Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided = ( - 9, - Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided, - ) - Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( - 9, - Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, - ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( - 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___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, - ) - S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( - 9, - Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, - ) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( - 9, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, - ) - KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag = ( - 9, - Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, - ) - KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP = ( - 9, - Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, - ) - FAB_250___250kg_GP_Bomb_LD = (9, Weapons.FAB_250___250kg_GP_Bomb_LD) - RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( - 9, - Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, - ) - FAB_500_M_62___500kg_GP_Bomb_LD = (9, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( - 9, - Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, - ) - KAB_500LG___500kg_Laser_Guided_Bomb = ( - 9, - Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, - ) - KAB_500Kr___500kg_TV_Guided_Bomb = (9, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) - FAB_1500_M_54___1500kg_GP_Bomb_LD = ( - 9, - Weapons.FAB_1500_M_54___1500kg_GP_Bomb_LD, - ) - KAB_1500L___1500kg_Laser_Guided_Bomb = ( - 9, - Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, - ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( - 9, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, - ) - 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, - ) - Su_57_Fuel_Tank = (9, Su57Weapons.Su_57_Fuel_Tank) - Kh_59MK2 = (9, Su57Weapons.Kh_59MK2) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (9, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (9, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (9, Weapons.KS_172_Passive_Rdr) class Pylon10: - R_73__AA_11_Archer____Infra_Red = (10, Weapons.R_73__AA_11_Archer____Infra_Red) - Smoke_Generator___red = (10, Weapons.Smoke_Generator___red) - Smoke_Generator___green = (10, Weapons.Smoke_Generator___green) - Smoke_Generator___blue = (10, Weapons.Smoke_Generator___blue) - Smoke_Generator___white = (10, Weapons.Smoke_Generator___white) - Smoke_Generator___yellow = (10, Weapons.Smoke_Generator___yellow) - Smoke_Generator___orange = (10, Weapons.Smoke_Generator___orange) + R_77__AA_12_Adder____Active_Rdr = (10, Weapons.R_77__AA_12_Adder____Active_Rdr) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (10, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (10, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (10, Weapons.KS_172_Passive_Rdr) class Pylon11: R_27R__AA_10_Alamo_A____Semi_Act_Rdr = ( @@ -457,37 +355,37 @@ class Su_57(PlaneType): 11, Weapons.Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr, ) - Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser = ( + Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_ = ( 11, - Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser, + Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_, ) - Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided = ( + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_ = ( 11, - Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_, ) Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( 11, Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 11, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_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 = ( + B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 11, Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, ) - S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = ( + O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator = ( 11, Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, ) - BetAB_500___500kg_Concrete_Piercing_Bomb_LD = ( + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( 11, - Weapons.BetAB_500___500kg_Concrete_Piercing_Bomb_LD, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, ) KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag = ( 11, @@ -497,12 +395,15 @@ class Su_57(PlaneType): 11, Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, ) - FAB_250___250kg_GP_Bomb_LD = (11, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = ( + 11, + Weapons.OFAB_250_270___250_kg_GP_Bomb_LD, + ) RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( 11, Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (11, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (11, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( 11, Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, @@ -523,33 +424,22 @@ class Su_57(PlaneType): 11, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 11, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) - # ERRR {R-33} - 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) + R_37M_Active_Rdr = (11, Weapons.R_37M_Active_Rdr) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (11, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (11, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (11, Weapons.KS_172_Passive_Rdr) RN_28___260_kg__nuclear_bomb__free_fall = ( 11, Weapons.RN_28___260_kg__nuclear_bomb__free_fall, ) - Smoke_Generator___red = (11, Weapons.Smoke_Generator___red) - Smoke_Generator___green = (11, Weapons.Smoke_Generator___green) - Smoke_Generator___blue = (11, Weapons.Smoke_Generator___blue) - Smoke_Generator___white = (11, Weapons.Smoke_Generator___white) - Smoke_Generator___yellow = (11, Weapons.Smoke_Generator___yellow) - Smoke_Generator___orange = (11, Weapons.Smoke_Generator___orange) - Kh_59MK2 = (11, Su57Weapons.Kh_59MK2) class Pylon12: R_73__AA_11_Archer____Infra_Red = (12, Weapons.R_73__AA_11_Archer____Infra_Red) - 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) @@ -557,7 +447,140 @@ class Su_57(PlaneType): Smoke_Generator___yellow = (12, Weapons.Smoke_Generator___yellow) Smoke_Generator___orange = (12, Weapons.Smoke_Generator___orange) - pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} + class Pylon13: + R_27R__AA_10_Alamo_A____Semi_Act_Rdr = ( + 13, + Weapons.R_27R__AA_10_Alamo_A____Semi_Act_Rdr, + ) + R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range = ( + 13, + Weapons.R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range, + ) + R_27T__AA_10_Alamo_B____Infra_Red = ( + 13, + Weapons.R_27T__AA_10_Alamo_B____Infra_Red, + ) + R_27ET__AA_10_Alamo_D____IR_Extended_Range = ( + 13, + Weapons.R_27ET__AA_10_Alamo_D____IR_Extended_Range, + ) + R_77__AA_12_Adder____Active_Rdr = (13, Weapons.R_77__AA_12_Adder____Active_Rdr) + R_73__AA_11_Archer____Infra_Red = (13, Weapons.R_73__AA_11_Archer____Infra_Red) + Kh_31P__AS_17_Krypton____600kg__ARM__IN__Pas_Rdr = ( + 13, + Weapons.Kh_31P__AS_17_Krypton____600kg__ARM__IN__Pas_Rdr, + ) + Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr = ( + 13, + Weapons.Kh_31A__AS_17_Krypton____610kg__AShM__IN__Act_Rdr, + ) + Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_ = ( + 13, + Weapons.Kh_29L__AS_14_Kedge____657kg__ASM__Semi_Act_Laser_, + ) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_ = ( + 13, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_, + ) + Kh_59M__AS_18_Kazoo____930kg__ASM__IN = ( + 13, + Weapons.Kh_59M__AS_18_Kazoo____930kg__ASM__IN, + ) + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( + 13, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, + ) + B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = ( + 13, + Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, + ) + B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( + 13, + Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, + ) + O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator = ( + 13, + Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator, + ) + BetAB_500___500_kg_Concrete_Piercing_Bomb_LD = ( + 13, + Weapons.BetAB_500___500_kg_Concrete_Piercing_Bomb_LD, + ) + KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag = ( + 13, + Weapons.KMGU_2___96_x_AO_2_5RT_Dispenser__CBU__HE_Frag, + ) + KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP = ( + 13, + Weapons.KMGU_2___96_x_PTAB_2_5KO_Dispenser__CBU__HEAT_AP, + ) + OFAB_250_270___250_kg_GP_Bomb_LD = ( + 13, + Weapons.OFAB_250_270___250_kg_GP_Bomb_LD, + ) + RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP = ( + 13, + Weapons.RBK_250___42_x_PTAB_2_5M__250kg_CBU_Medium_HEAT_AP, + ) + FAB_500M_62___500_kg_GP_Bomb_LD = (13, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP = ( + 13, + Weapons.RBK_500_255___30_x_PTAB_10_5__500kg_CBU_Heavy_HEAT_AP, + ) + KAB_500LG___500kg_Laser_Guided_Bomb = ( + 13, + Weapons.KAB_500LG___500kg_Laser_Guided_Bomb, + ) + KAB_500Kr___500kg_TV_Guided_Bomb = ( + 13, + Weapons.KAB_500Kr___500kg_TV_Guided_Bomb, + ) + FAB_1500_M_54___1500kg_GP_Bomb_LD = ( + 13, + Weapons.FAB_1500_M_54___1500kg_GP_Bomb_LD, + ) + KAB_1500L___1500kg_Laser_Guided_Bomb = ( + 13, + Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, + ) + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( + 13, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, + ) + # ERRR {R-33} + R_37M_Active_Rdr = (13, Weapons.R_37M_Active_Rdr) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (13, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (13, Weapons.K_77M_Active_Rdr) + KS_172_Passive_Rdr = (13, Weapons.KS_172_Passive_Rdr) + Fuel_tank_800L_Wing = (13, Weapons.Fuel_tank_800L_Wing) + RN_28___260_kg__nuclear_bomb__free_fall = ( + 13, + Weapons.RN_28___260_kg__nuclear_bomb__free_fall, + ) + Smoke_Generator___red = (13, Weapons.Smoke_Generator___red) + Smoke_Generator___green = (13, Weapons.Smoke_Generator___green) + Smoke_Generator___blue = (13, Weapons.Smoke_Generator___blue) + Smoke_Generator___white = (13, Weapons.Smoke_Generator___white) + Smoke_Generator___yellow = (13, Weapons.Smoke_Generator___yellow) + Smoke_Generator___orange = (13, Weapons.Smoke_Generator___orange) + + class Pylon14: + R_73__AA_11_Archer____Infra_Red = (14, Weapons.R_73__AA_11_Archer____Infra_Red) + # ERRR {RVV-AE} + R_77PD_Active_rdr = (14, Weapons.R_77PD_Active_rdr) + K_77M_Active_Rdr = (14, Weapons.K_77M_Active_Rdr) + Smoke_Generator___red = (14, Weapons.Smoke_Generator___red) + Smoke_Generator___green = (14, Weapons.Smoke_Generator___green) + Smoke_Generator___blue = (14, Weapons.Smoke_Generator___blue) + Smoke_Generator___white = (14, Weapons.Smoke_Generator___white) + Smoke_Generator___yellow = (14, Weapons.Smoke_Generator___yellow) + Smoke_Generator___orange = (14, Weapons.Smoke_Generator___orange) + + class Pylon15: + Mercury_LLTV_Pod = (15, Weapons.Mercury_LLTV_Pod) + + pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} tasks = [ task.CAP, diff --git a/pydcs_extensions/ukrainemilitaryassetspack/ukrainemilitaryassetspack.py b/pydcs_extensions/ukrainemilitaryassetspack/ukrainemilitaryassetspack.py index be2597cb..aca0f9eb 100644 --- a/pydcs_extensions/ukrainemilitaryassetspack/ukrainemilitaryassetspack.py +++ b/pydcs_extensions/ukrainemilitaryassetspack/ukrainemilitaryassetspack.py @@ -170,9 +170,9 @@ class Su_24MU(PlaneType): class Pylon1: R_60M__AA_8_Aphid_B____IR_AAM = (1, Weapons.R_60M__AA_8_Aphid_B____IR_AAM) R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 1, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 1, @@ -182,7 +182,7 @@ class Su_24MU(PlaneType): 1, Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, ) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 1, Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, @@ -202,9 +202,9 @@ class Su_24MU(PlaneType): CH_AASM_250_PGM = (1, Weapons.CH_AASM_250_PGM) class Pylon2: - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 2, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_ = ( 2, @@ -214,8 +214,8 @@ class Su_24MU(PlaneType): 2, Weapons.Kh_25ML__AS_10_Karen____300kg__ASM__Semi_Act_Laser_, ) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (2, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (2, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) KAB_500Kr___500kg_TV_Guided_Bomb = (2, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 2, @@ -247,12 +247,12 @@ class Su_24MU(PlaneType): CH_AASM_250_PGM = (2, Weapons.CH_AASM_250_PGM) class Pylon3: - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) KAB_500Kr___500kg_TV_Guided_Bomb = (3, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 3, @@ -269,11 +269,11 @@ class Su_24MU(PlaneType): CH_AASM_250_PGM = (3, Weapons.CH_AASM_250_PGM) class Pylon4: - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) KAB_1500L___1500kg_Laser_Guided_Bomb = ( 4, Weapons.KAB_1500L___1500kg_Laser_Guided_Bomb, @@ -283,15 +283,15 @@ class Su_24MU(PlaneType): class Pylon5: Fuel_tank_2000L = (5, Weapons.Fuel_tank_2000L) L_081_Fantasmagoria_ELINT_pod = (5, Weapons.L_081_Fantasmagoria_ELINT_pod) - FAB_250___250kg_GP_Bomb_LD = (5, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (5, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) class Pylon6: - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 6, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - FAB_250___250kg_GP_Bomb_LD = (6, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (6, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) KAB_500Kr___500kg_TV_Guided_Bomb = (6, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 6, @@ -308,9 +308,9 @@ class Su_24MU(PlaneType): CH_AASM_250_PGM = (6, Weapons.CH_AASM_250_PGM) class Pylon7: - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 7, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided_ = ( 7, @@ -320,8 +320,8 @@ class Su_24MU(PlaneType): 7, Weapons.Kh_25ML__AS_10_Karen____300kg__ASM__Semi_Act_Laser_, ) - FAB_250___250kg_GP_Bomb_LD = (7, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (7, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (7, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (7, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) KAB_500Kr___500kg_TV_Guided_Bomb = (7, Weapons.KAB_500Kr___500kg_TV_Guided_Bomb) UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 7, @@ -355,9 +355,9 @@ class Su_24MU(PlaneType): class Pylon8: R_60M__AA_8_Aphid_B____IR_AAM = (8, Weapons.R_60M__AA_8_Aphid_B____IR_AAM) R_73__AA_11_Archer____Infra_Red = (8, Weapons.R_73__AA_11_Archer____Infra_Red) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 8, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag = ( 8, @@ -367,7 +367,7 @@ class Su_24MU(PlaneType): 8, Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, ) - FAB_250___250kg_GP_Bomb_LD = (8, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (8, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 8, Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation, @@ -505,8 +505,8 @@ class MiG_29MU2(PlaneType): 2, Weapons.Kh_25ML__AS_10_Karen____300kg__ASM__Semi_Act_Laser__, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (2, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (2, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = ( 2, Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, @@ -577,8 +577,8 @@ class MiG_29MU2(PlaneType): 3, Weapons.Kh_25ML__AS_10_Karen____300kg__ASM__Semi_Act_Laser__, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = ( 3, Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, @@ -656,8 +656,8 @@ class MiG_29MU2(PlaneType): 5, Weapons.Kh_25ML__AS_10_Karen____300kg__ASM__Semi_Act_Laser__, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (5, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (5, Weapons.FAB_250___250kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (5, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (5, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = ( 5, Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, @@ -735,8 +735,8 @@ class MiG_29MU2(PlaneType): 6, Weapons.Kh_25ML__AS_10_Karen____300kg__ASM__Semi_Act_Laser__, ) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - FAB_250___250kg_GP_Bomb_LD = (6, Weapons.FAB_250___250kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (6, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = ( 6, Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_, @@ -807,6 +807,8 @@ class CH_Su_27P1M(PlaneType): property_defaults: Dict[str, Any] = {} + properties = {} + livery_name = "CH_SU-27P1M" # from type class Pylon1: @@ -828,8 +830,8 @@ class CH_Su_27P1M(PlaneType): Weapons.R_27ET__AA_10_Alamo_D____IR_Extended_Range, ) B_8M1___20_S_8OFP2 = (3, Weapons.B_8M1___20_S_8OFP2) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (3, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (3, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) 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, @@ -842,13 +844,13 @@ class CH_Su_27P1M(PlaneType): 3, Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 3, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 3, @@ -890,15 +892,15 @@ class CH_Su_27P1M(PlaneType): 4, Weapons.R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range, ) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (4, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (4, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_5_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___5_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 4, - Weapons.MBD3_U6_68_with_5_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___5_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) ADM_160B_MALD___Miniature_Air_Launched_Decoy_ = ( 4, @@ -924,15 +926,15 @@ class CH_Su_27P1M(PlaneType): 5, Weapons.R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range, ) - FAB_250___250kg_GP_Bomb_LD = (5, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (5, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + OFAB_250_270___250_kg_GP_Bomb_LD = (5, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (5, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 5, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_3_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___3_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 5, - Weapons.MBD3_U6_68_with_3_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___3_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) ADM_160B_MALD___Miniature_Air_Launched_Decoy_ = ( 5, @@ -954,15 +956,15 @@ class CH_Su_27P1M(PlaneType): 6, Weapons.R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range, ) - FAB_250___250kg_GP_Bomb_LD = (6, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (6, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + OFAB_250_270___250_kg_GP_Bomb_LD = (6, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (6, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 6, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 6, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) ADM_160B_MALD___Miniature_Air_Launched_Decoy_ = ( 6, @@ -984,15 +986,15 @@ class CH_Su_27P1M(PlaneType): 7, Weapons.R_27ER__AA_10_Alamo_C____Semi_Act_Extended_Range, ) - FAB_250___250kg_GP_Bomb_LD = (7, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (7, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + OFAB_250_270___250_kg_GP_Bomb_LD = (7, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (7, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 7, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_5_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___5_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 7, - Weapons.MBD3_U6_68_with_5_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___5_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) ADM_160B_MALD___Miniature_Air_Launched_Decoy_ = ( 7, @@ -1024,8 +1026,8 @@ class CH_Su_27P1M(PlaneType): Weapons.R_27ET__AA_10_Alamo_D____IR_Extended_Range, ) B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2) - FAB_250___250kg_GP_Bomb_LD = (8, Weapons.FAB_250___250kg_GP_Bomb_LD) - FAB_500_M_62___500kg_GP_Bomb_LD = (8, Weapons.FAB_500_M_62___500kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (8, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) + FAB_500M_62___500_kg_GP_Bomb_LD = (8, Weapons.FAB_500M_62___500_kg_GP_Bomb_LD) 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, @@ -1038,13 +1040,13 @@ class CH_Su_27P1M(PlaneType): 8, Weapons.B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange, ) - MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD = ( 8, - Weapons.MBD3_U6_68_with_6_x_FAB_100___100kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_100_120___100_kg_GP_Bomb_LD, ) - MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD = ( + MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD = ( 8, - Weapons.MBD3_U6_68_with_6_x_FAB_250___250kg_GP_Bombs_LD, + Weapons.MBD3_U6_68___6_x_OFAB_250_270___250_kg_GP_Bomb_LD, ) _2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation = ( 8, diff --git a/pydcs_extensions/vietnamwarvessels/vietnamwarvessels.py b/pydcs_extensions/vietnamwarvessels/vietnamwarvessels.py index 3d060f47..7363f9a1 100644 --- a/pydcs_extensions/vietnamwarvessels/vietnamwarvessels.py +++ b/pydcs_extensions/vietnamwarvessels/vietnamwarvessels.py @@ -761,7 +761,7 @@ class vwv_mig17f(PlaneType): class Pylon1: FAB_50 = (1, Weapons.FAB_50) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_8V20A_CM = (1, Weapons.B_8V20A_CM) B_8V20A_OM = (1, Weapons.B_8V20A_OM) B_8M1___20_S_8OFP2 = (1, Weapons.B_8M1___20_S_8OFP2) @@ -774,7 +774,7 @@ class vwv_mig17f(PlaneType): class Pylon2: FAB_50 = (2, Weapons.FAB_50) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_8V20A_CM = (2, Weapons.B_8V20A_CM) B_8V20A_OM = (2, Weapons.B_8V20A_OM) B_8M1___20_S_8OFP2 = (2, Weapons.B_8M1___20_S_8OFP2) @@ -828,7 +828,7 @@ class vwv_mig21mf(PlaneType): class Pylon1: FAB_50 = (1, Weapons.FAB_50) - FAB_250___250kg_GP_Bomb_LD = (1, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (1, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_8V20A_CM = (1, Weapons.B_8V20A_CM) B_8V20A_OM = (1, Weapons.B_8V20A_OM) B_8M1___20_S_8OFP2 = (1, Weapons.B_8M1___20_S_8OFP2) @@ -854,7 +854,7 @@ class vwv_mig21mf(PlaneType): class Pylon2: FAB_50 = (2, Weapons.FAB_50) - FAB_250___250kg_GP_Bomb_LD = (2, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (2, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_8V20A_CM = (2, Weapons.B_8V20A_CM) B_8V20A_OM = (2, Weapons.B_8V20A_OM) B_8M1___20_S_8OFP2 = (2, Weapons.B_8M1___20_S_8OFP2) @@ -880,7 +880,7 @@ class vwv_mig21mf(PlaneType): class Pylon3: FAB_50 = (3, Weapons.FAB_50) - FAB_250___250kg_GP_Bomb_LD = (3, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (3, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_8V20A_CM = (3, Weapons.B_8V20A_CM) B_8V20A_OM = (3, Weapons.B_8V20A_OM) B_8M1___20_S_8OFP2 = (3, Weapons.B_8M1___20_S_8OFP2) @@ -906,7 +906,7 @@ class vwv_mig21mf(PlaneType): class Pylon4: FAB_50 = (4, Weapons.FAB_50) - FAB_250___250kg_GP_Bomb_LD = (4, Weapons.FAB_250___250kg_GP_Bomb_LD) + OFAB_250_270___250_kg_GP_Bomb_LD = (4, Weapons.OFAB_250_270___250_kg_GP_Bomb_LD) B_8V20A_CM = (4, Weapons.B_8V20A_CM) B_8V20A_OM = (4, Weapons.B_8V20A_OM) B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2) diff --git a/requirements.txt b/requirements.txt index 9a77c202..4113b9d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,7 +33,7 @@ pluggy==1.5.0 pre-commit==4.2.0 pydantic==2.11.0b2 pydantic-settings==2.8.1 -pydcs @ git+https://github.com/dcs-retribution/pydcs@842fdf022e01f9b5f8695008bd4c9ab54c23d722 +pydcs @ git+https://github.com/dcs-retribution/pydcs@f50627d79c1b24786139eed3a35329d55a03cef5 pyinstaller==5.13.2 pyinstaller-hooks-contrib==2024.0 pyparsing==3.2.1 diff --git a/resources/dcs/beacons/caucasus.json b/resources/dcs/beacons/caucasus.json index ba758ed5..6ce88a1c 100644 --- a/resources/dcs/beacons/caucasus.json +++ b/resources/dcs/beacons/caucasus.json @@ -140,53 +140,53 @@ "channel": 67 }, "airfield13_0": { - "name": "Krasnodar-Center", - "callsign": "OC", - "beacon_type": 11, - "hertz": 625000, - "channel": null - }, - "airfield13_1": { "name": "Krasnodar-Center", "callsign": "O", "beacon_type": 12, "hertz": 303000, "channel": null }, - "airfield13_2": { - "name": "Krasnodar-Center", - "callsign": "MB", - "beacon_type": 11, - "hertz": 625000, - "channel": null - }, - "airfield13_3": { + "airfield13_1": { "name": "Krasnodar-Center", "callsign": "M", "beacon_type": 12, "hertz": 303000, "channel": null }, + "airfield13_2": { + "name": "Krasnodar-Center", + "callsign": "OC", + "beacon_type": 11, + "hertz": 625000, + "channel": null + }, + "airfield13_3": { + "name": "Krasnodar-Center", + "callsign": "MB", + "beacon_type": 16, + "hertz": null, + "channel": 38 + }, "airfield13_4": { "name": "Krasnodar-Center", "callsign": "MB", "beacon_type": 15, - "hertz": 838000000, + "hertz": null, "channel": 38 }, "airfield13_5": { "name": "Krasnodar-Center", "callsign": "MB", - "beacon_type": 16, - "hertz": 838000000, - "channel": 38 + "beacon_type": 6, + "hertz": null, + "channel": 40 }, "airfield13_6": { "name": "Krasnodar-Center", "callsign": "MB", - "beacon_type": 6, - "hertz": 840000000, - "channel": 40 + "beacon_type": 11, + "hertz": 625000, + "channel": null }, "airfield19_0": { "name": "Krasnodar-Pashkovsky", @@ -224,67 +224,67 @@ "channel": 105 }, "airfield15_0": { + "name": "Krymsk", + "callsign": "KW", + "beacon_type": 15, + "hertz": null, + "channel": 26 + }, + "airfield15_1": { "name": "Krymsk", "callsign": "KW", "beacon_type": 11, "hertz": 408000, "channel": null }, - "airfield15_1": { + "airfield15_2": { + "name": "Krymsk", + "callsign": "KW", + "beacon_type": 6, + "hertz": null, + "channel": 28 + }, + "airfield15_3": { + "name": "Krymsk", + "callsign": "OX", + "beacon_type": 15, + "hertz": null, + "channel": 26 + }, + "airfield15_4": { "name": "Krymsk", "callsign": "K", "beacon_type": 12, "hertz": 803000, "channel": null }, - "airfield15_2": { + "airfield15_5": { "name": "Krymsk", "callsign": "OX", "beacon_type": 11, "hertz": 408000, "channel": null }, - "airfield15_3": { - "name": "Krymsk", - "callsign": "O", - "beacon_type": 12, - "hertz": 803000, - "channel": null - }, - "airfield15_4": { - "name": "Krymsk", - "callsign": "OX", - "beacon_type": 16, - "hertz": 826000000, - "channel": null - }, - "airfield15_5": { - "name": "Krymsk", - "callsign": "KW", - "beacon_type": 16, - "hertz": 826000000, - "channel": null - }, "airfield15_6": { "name": "Krymsk", "callsign": "KW", - "beacon_type": 15, - "hertz": 826000000, + "beacon_type": 16, + "hertz": null, "channel": 26 }, "airfield15_7": { "name": "Krymsk", "callsign": "OX", - "beacon_type": 15, - "hertz": 826000000, + "beacon_type": 16, + "hertz": null, "channel": 26 }, "airfield15_8": { "name": "Krymsk", - "callsign": "KW", - "beacon_type": 6, - "hertz": 828000000, - "channel": 28 + "callsign": "O", + "beacon_type": 12, + "hertz": 803000, + "channel": null }, "airfield25_0": { "name": "Kutaisi", @@ -393,52 +393,52 @@ }, "airfield16_0": { "name": "Maykop-Khanskaya", - "callsign": "RK", - "beacon_type": 11, - "hertz": 289000, - "channel": null + "callsign": "DG", + "beacon_type": 6, + "hertz": null, + "channel": 34 }, "airfield16_1": { + "name": "Maykop-Khanskaya", + "callsign": "DG", + "beacon_type": 16, + "hertz": null, + "channel": 36 + }, + "airfield16_2": { "name": "Maykop-Khanskaya", "callsign": "R", "beacon_type": 12, "hertz": 591000, "channel": null }, - "airfield16_2": { + "airfield16_3": { "name": "Maykop-Khanskaya", - "callsign": "DG", + "callsign": "RK", "beacon_type": 11, "hertz": 289000, "channel": null }, - "airfield16_3": { + "airfield16_4": { "name": "Maykop-Khanskaya", "callsign": "D", "beacon_type": 12, "hertz": 591000, "channel": null }, - "airfield16_4": { - "name": "Maykop-Khanskaya", - "callsign": "DG", - "beacon_type": 15, - "hertz": 836000000, - "channel": 36 - }, "airfield16_5": { "name": "Maykop-Khanskaya", "callsign": "DG", - "beacon_type": 16, - "hertz": 836000000, - "channel": 36 + "beacon_type": 11, + "hertz": 289000, + "channel": null }, "airfield16_6": { "name": "Maykop-Khanskaya", "callsign": "DG", - "beacon_type": 6, - "hertz": 834000000, - "channel": 34 + "beacon_type": 15, + "hertz": null, + "channel": 36 }, "airfield26_0": { "name": "MineralnyeVody", @@ -505,66 +505,66 @@ }, "airfield28_0": { "name": "Mozdok", - "callsign": "DO", - "beacon_type": 11, - "hertz": 525000, - "channel": null + "callsign": "MK", + "beacon_type": 15, + "hertz": null, + "channel": 22 }, "airfield28_1": { "name": "Mozdok", - "callsign": "D", - "beacon_type": 12, - "hertz": 1065000, - "channel": null + "callsign": "MZ", + "beacon_type": 16, + "hertz": null, + "channel": 22 }, "airfield28_2": { "name": "Mozdok", - "callsign": "RM", - "beacon_type": 11, - "hertz": 525000, - "channel": null + "callsign": "MZ", + "beacon_type": 6, + "hertz": null, + "channel": 20 }, "airfield28_3": { + "name": "Mozdok", + "callsign": "MK", + "beacon_type": 16, + "hertz": null, + "channel": 22 + }, + "airfield28_4": { "name": "Mozdok", "callsign": "R", "beacon_type": 12, "hertz": 1065000, "channel": null }, - "airfield28_4": { - "name": "Mozdok", - "callsign": "MZ", - "beacon_type": 15, - "hertz": 822000000, - "channel": 22 - }, "airfield28_5": { "name": "Mozdok", - "callsign": "MZ", - "beacon_type": 16, - "hertz": 822000000, - "channel": 22 + "callsign": "D", + "beacon_type": 12, + "hertz": 1065000, + "channel": null }, "airfield28_6": { "name": "Mozdok", - "callsign": "MK", - "beacon_type": 15, - "hertz": 822000000, - "channel": 22 + "callsign": "DO", + "beacon_type": 11, + "hertz": 525000, + "channel": null }, "airfield28_7": { "name": "Mozdok", - "callsign": "MK", - "beacon_type": 16, - "hertz": 822000000, - "channel": 22 + "callsign": "RM", + "beacon_type": 11, + "hertz": 525000, + "channel": null }, "airfield28_8": { "name": "Mozdok", "callsign": "MZ", - "beacon_type": 6, - "hertz": 820000000, - "channel": 20 + "beacon_type": 15, + "hertz": null, + "channel": 22 }, "airfield27_0": { "name": "Nalchik", diff --git a/resources/dcs/beacons/sinai.json b/resources/dcs/beacons/sinai.json index 7d7d4581..e00d6893 100644 --- a/resources/dcs/beacons/sinai.json +++ b/resources/dcs/beacons/sinai.json @@ -56,454 +56,447 @@ "channel": 95 }, "world_8": { - "name": "Taba", - "callsign": "TBA", - "beacon_type": 3, - "hertz": 114500000, - "channel": 92 - }, - "world_9": { "name": "Nuweibaa", "callsign": "NWB", "beacon_type": 8, "hertz": 288000, "channel": 0 }, - "world_10": { + "world_9": { "name": "Jerusalem", "callsign": "IRM", "beacon_type": 8, "hertz": 336000, "channel": 0 }, - "world_11": { + "world_10": { "name": "Almaza", "callsign": "A", "beacon_type": 8, "hertz": 490000, "channel": 0 }, - "world_12": { + "world_11": { "name": "Amman", "callsign": "AMN", "beacon_type": 3, "hertz": 116300000, "channel": 110 }, - "world_13": { + "world_12": { "name": "BenGurion", "callsign": "BGN", "beacon_type": 5, "hertz": 113500000, "channel": 82 }, - "world_14": { + "world_13": { "name": "Almaza", "callsign": "MXR", "beacon_type": 4, "hertz": 116300000, "channel": 110 }, - "world_15": { + "world_14": { "name": "Haifa", "callsign": "HFA", "beacon_type": 8, "hertz": 323000, "channel": 0 }, - "world_16": { + "world_15": { "name": "Aqaba", "callsign": "AQ", "beacon_type": 8, "hertz": 404000, "channel": 0 }, - "world_17": { + "world_16": { "name": "Alexandria", "callsign": "AXD", "beacon_type": 8, "hertz": 403000, "channel": 0 }, - "world_18": { + "world_17": { "name": "Baltim", "callsign": "BLT", "beacon_type": 3, "hertz": 116900000, "channel": 116 }, - "world_19": { + "world_18": { "name": "Turaif", "callsign": "TRF", "beacon_type": 3, "hertz": 116100000, "channel": 108 }, - "world_20": { + "world_19": { "name": "Wejh", "callsign": "WEJ", "beacon_type": 5, "hertz": 113900000, "channel": 86 }, - "world_21": { + "world_20": { "name": "Metzada", "callsign": "MZD", "beacon_type": 5, "hertz": 115000000, "channel": 97 }, - "world_22": { + "world_21": { "name": "RoshPina", "callsign": "RPN", "beacon_type": 8, "hertz": 243000, "channel": 0 }, - "world_23": { + "world_22": { "name": "Chekka", "callsign": "CAK", "beacon_type": 3, "hertz": 116200000, "channel": 109 }, - "world_24": { + "world_23": { "name": "QueenAlia", "callsign": "QA", "beacon_type": 8, "hertz": 410000, "channel": 0 }, - "world_25": { + "world_24": { "name": "October", "callsign": "OCT", "beacon_type": 8, "hertz": 340000, "channel": 0 }, - "world_26": { + "world_25": { "name": "PortSaid", "callsign": "PSD", "beacon_type": 3, "hertz": 112700000, "channel": 74 }, - "world_27": { + "world_26": { "name": "Alexandria", "callsign": "NOZ", "beacon_type": 3, "hertz": 115900000, "channel": 106 }, - "world_28": { + "world_27": { "name": "DeirZzor", "callsign": "DRZ", "beacon_type": 8, "hertz": 295000, "channel": 0 }, - "world_29": { + "world_28": { "name": "DeirZzor", "callsign": "DRZ", "beacon_type": 3, "hertz": 117000000, "channel": 117 }, - "world_30": { + "world_29": { "name": "Cairo", "callsign": "ALI", "beacon_type": 8, "hertz": 310000, "channel": 0 }, - "world_31": { + "world_30": { "name": "Al-Shigar", "callsign": "ASH", "beacon_type": 3, "hertz": 112300000, "channel": 70 }, - "world_32": { + "world_31": { "name": "Cairo", "callsign": "MKT", "beacon_type": 8, "hertz": 317000, "channel": 0 }, - "world_33": { + "world_32": { "name": "MarsaAlam", "callsign": "MAK", "beacon_type": 3, "hertz": 115500000, "channel": 102 }, - "world_34": { + "world_33": { "name": "Taba", "callsign": "TBA", "beacon_type": 8, "hertz": 316000, "channel": 0 }, - "world_35": { + "world_34": { "name": "Zofar", "callsign": "ZFR", "beacon_type": 3, "hertz": 115600000, "channel": 103 }, - "world_36": { + "world_35": { "name": "Natania", "callsign": "NAT", "beacon_type": 5, "hertz": 112400000, "channel": 71 }, - "world_37": { + "world_36": { "name": "Kariatain", "callsign": "KTN", "beacon_type": 3, "hertz": 117700000, "channel": 124 }, - "world_38": { + "world_37": { "name": "Herzlia", "callsign": "HRZ", "beacon_type": 8, "hertz": 273000, "channel": 0 }, - "world_39": { + "world_38": { "name": "Guriat", "callsign": "GRY", "beacon_type": 5, "hertz": 114700000, "channel": 94 }, - "world_40": { + "world_39": { "name": "Gaza", "callsign": "GZA", "beacon_type": 3, "hertz": 113350000, "channel": 80 }, - "world_41": { + "world_40": { "name": "Cairo", "callsign": "CVO", "beacon_type": 3, "hertz": 115200000, "channel": 99 }, - "world_42": { + "world_41": { "name": "ReneMouawad", "callsign": "RA", "beacon_type": 8, "hertz": 450000, "channel": 0 }, - "world_43": { + "world_42": { "name": "Amman", "callsign": "JYO", "beacon_type": 8, "hertz": 391000, "channel": 0 }, - "world_44": { + "world_43": { "name": "Aqaba", "callsign": "AQA", "beacon_type": 8, "hertz": 418000, "channel": 0 }, - "world_45": { + "world_44": { "name": "Cairo", "callsign": "CAI", "beacon_type": 3, "hertz": 112500000, "channel": 72 }, - "world_46": { + "world_45": { "name": "BasselAlAssad", "callsign": "LTK", "beacon_type": 8, "hertz": 414000, "channel": 0 }, - "world_47": { + "world_46": { "name": "QueenAlia(Locator)", "callsign": "QL", "beacon_type": 8, "hertz": 307000, "channel": 0 }, - "world_48": { + "world_47": { "name": "ElDaba", "callsign": "DBA", "beacon_type": 3, "hertz": 115700000, "channel": 104 }, - "world_49": { + "world_48": { "name": "InnerBeacon", "callsign": "D", "beacon_type": 8, "hertz": 273000, "channel": 0 }, - "world_50": { + "world_49": { "name": "CairoWest", "callsign": "BLA", "beacon_type": 4, "hertz": 116700000, "channel": 114 }, - "world_51": { + "world_50": { "name": "Gaza", "callsign": "RFH", "beacon_type": 8, "hertz": 380000, "channel": 0 }, - "world_52": { + "world_51": { "name": "Palmyra", "callsign": "PAL", "beacon_type": 8, "hertz": 337000, "channel": 0 }, - "world_53": { + "world_52": { "name": "ElKharga", "callsign": "KHG", "beacon_type": 3, "hertz": 113800000, "channel": 85 }, - "world_54": { + "world_53": { "name": "Halaifa", "callsign": "HLF", "beacon_type": 3, "hertz": 116700000, "channel": 114 }, - "world_55": { + "world_54": { "name": "Aqaba", "callsign": "AQB", "beacon_type": 3, "hertz": 113100000, "channel": 78 }, - "world_56": { + "world_55": { "name": "Beirut", "callsign": "BAB", "beacon_type": 8, "hertz": 312000, "channel": 0 }, - "world_57": { + "world_56": { "name": "SidiBarrani", "callsign": "BRN", "beacon_type": 3, "hertz": 116200000, "channel": 109 }, - "world_58": { + "world_57": { "name": "Luxor", "callsign": "LXR", "beacon_type": 3, "hertz": 114400000, "channel": 91 }, - "world_59": { + "world_58": { "name": "Luxor", "callsign": "LO", "beacon_type": 8, "hertz": 364000, "channel": 0 }, - "world_60": { + "world_59": { "name": "Tabuk", "callsign": "TBK", "beacon_type": 5, "hertz": 115700000, "channel": 104 }, - "world_61": { + "world_60": { "name": "Tanf", "callsign": "TAN", "beacon_type": 3, "hertz": 114000000, "channel": 87 }, - "world_62": { + "world_61": { "name": "Qatraneh", "callsign": "JYT", "beacon_type": 8, "hertz": 302000, "channel": 0 }, - "world_63": { + "world_62": { "name": "BorgElArab", "callsign": "DJ", "beacon_type": 8, "hertz": 563000, "channel": 0 }, - "world_64": { + "world_63": { "name": "Beer-Sheba", "callsign": "BSA", "beacon_type": 5, "hertz": 114300000, "channel": 90 }, - "world_65": { + "world_64": { "name": "Dakhla", "callsign": "MB", "beacon_type": 8, "hertz": 387000, "channel": 0 }, - "world_66": { + "world_65": { "name": "Eilot", "callsign": "LOT", "beacon_type": 3, "hertz": 112000000, "channel": 57 }, - "world_67": { + "world_66": { "name": "SharmElSheikh", "callsign": "SKH", "beacon_type": 8, "hertz": 335000, "channel": 0 }, - "world_68": { + "world_67": { "name": "RoshPina", "callsign": "ROP", "beacon_type": 3, "hertz": 115300000, "channel": 100 }, - "world_69": { + "world_68": { "name": "Ovda", "callsign": "OVD", "beacon_type": 5, "hertz": 114100000, "channel": 88 }, - "world_70": { + "world_69": { "name": "Qatraneh", "callsign": "QTR", "beacon_type": 3, "hertz": 112900000, "channel": 76 }, - "world_71": { + "world_70": { "name": "Fayoum", "callsign": "FYM", "beacon_type": 3, "hertz": 117300000, "channel": 120 }, - "world_72": { + "world_71": { "name": "SHG", "callsign": "SHG", "beacon_type": 3, @@ -554,74 +547,74 @@ }, "airfield24_0": { "name": "BenGurion", - "callsign": "BC", + "callsign": "BA", "beacon_type": 13, - "hertz": 110900000, + "hertz": 108700000, "channel": null }, "airfield24_1": { "name": "BenGurion", - "callsign": "BC", - "beacon_type": 14, - "hertz": 110900000, + "callsign": "BD", + "beacon_type": 13, + "hertz": 111900000, "channel": null }, "airfield24_2": { "name": "BenGurion", - "callsign": "BG", + "callsign": "BC", "beacon_type": 14, - "hertz": 110300000, + "hertz": 110900000, "channel": null }, "airfield24_3": { "name": "BenGurion", "callsign": "BN", - "beacon_type": 13, + "beacon_type": 14, "hertz": 109700000, "channel": null }, "airfield24_4": { "name": "BenGurion", "callsign": "BN", - "beacon_type": 14, + "beacon_type": 13, "hertz": 109700000, "channel": null }, "airfield24_5": { - "name": "BenGurion", - "callsign": "BA", - "beacon_type": 14, - "hertz": 108700000, - "channel": null - }, - "airfield24_6": { - "name": "BenGurion", - "callsign": "BA", - "beacon_type": 13, - "hertz": 108700000, - "channel": null - }, - "airfield24_7": { - "name": "BenGurion", - "callsign": "BD", - "beacon_type": 14, - "hertz": 111900000, - "channel": null - }, - "airfield24_8": { "name": "BenGurion", "callsign": "BG", "beacon_type": 13, "hertz": 110300000, "channel": null }, - "airfield24_9": { + "airfield24_6": { "name": "BenGurion", "callsign": "BD", - "beacon_type": 13, + "beacon_type": 14, "hertz": 111900000, "channel": null }, + "airfield24_7": { + "name": "BenGurion", + "callsign": "BC", + "beacon_type": 13, + "hertz": 110900000, + "channel": null + }, + "airfield24_8": { + "name": "BenGurion", + "callsign": "BA", + "beacon_type": 14, + "hertz": 108700000, + "channel": null + }, + "airfield24_9": { + "name": "BenGurion", + "callsign": "BG", + "beacon_type": 14, + "hertz": 110300000, + "channel": null + }, "airfield16_0": { "name": "BilbeisAirBase", "callsign": "BA", @@ -667,29 +660,29 @@ "airfield17_0": { "name": "CairoInternationalAirport", "callsign": "IZFL", - "beacon_type": 14, + "beacon_type": 13, "hertz": 110900000, "channel": null }, "airfield17_1": { + "name": "CairoInternationalAirport", + "callsign": "IZFC", + "beacon_type": 13, + "hertz": 109900000, + "channel": null + }, + "airfield17_2": { "name": "CairoInternationalAirport", "callsign": "IZFCs", "beacon_type": 14, "hertz": 109900000, "channel": null }, - "airfield17_2": { - "name": "CairoInternationalAirport", - "callsign": "IZFR", - "beacon_type": 14, - "hertz": 108900000, - "channel": null - }, "airfield17_3": { "name": "CairoInternationalAirport", - "callsign": "IZFR", + "callsign": "ITTC", "beacon_type": 13, - "hertz": 108900000, + "hertz": 109500000, "channel": null }, "airfield17_4": { @@ -700,45 +693,45 @@ "channel": null }, "airfield17_5": { - "name": "CairoInternationalAirport", - "callsign": "ITTC", - "beacon_type": 14, - "hertz": 109500000, - "channel": null - }, - "airfield17_6": { "name": "CairoInternationalAirport", "callsign": "ITTR", "beacon_type": 14, "hertz": 110300000, "channel": null }, - "airfield17_7": { - "name": "CairoInternationalAirportd", - "callsign": "ITTL", + "airfield17_6": { + "name": "CairoInternationalAirport", + "callsign": "IZFR", "beacon_type": 13, - "hertz": 108700000, + "hertz": 108900000, + "channel": null + }, + "airfield17_7": { + "name": "CairoInternationalAirport", + "callsign": "IZFL", + "beacon_type": 14, + "hertz": 110900000, "channel": null }, "airfield17_8": { "name": "CairoInternationalAirport", - "callsign": "ITTC", - "beacon_type": 13, - "hertz": 109500000, + "callsign": "IZFR", + "beacon_type": 14, + "hertz": 108900000, "channel": null }, "airfield17_9": { "name": "CairoInternationalAirport", - "callsign": "IZFC", - "beacon_type": 13, - "hertz": 109900000, + "callsign": "ITTC", + "beacon_type": 14, + "hertz": 109500000, "channel": null }, "airfield17_10": { - "name": "CairoInternationalAirport", - "callsign": "IZFL", + "name": "CairoInternationalAirportd", + "callsign": "ITTL", "beacon_type": 13, - "hertz": 110900000, + "hertz": 108700000, "channel": null }, "airfield17_11": { @@ -853,20 +846,20 @@ "hertz": 111300000, "channel": null }, - "airfield20_1": { - "name": "Hatzor", - "callsign": "HZR", - "beacon_type": 5, - "hertz": 115900000, - "channel": 106 - }, - "airfield20_2": { + "airfield20_0": { "name": "Hatzor", "callsign": "HZR", "beacon_type": 14, "hertz": 108500000, "channel": null }, + "airfield20_2": { + "name": "Hatzor", + "callsign": "HZR", + "beacon_type": 5, + "hertz": 115900000, + "channel": 106 + }, "airfield20_3": { "name": "Hatzor", "callsign": "HZR", @@ -926,21 +919,28 @@ "airfield8_0": { "name": "Nevatim", "callsign": "NEV", - "beacon_type": 14, + "beacon_type": 13, "hertz": 108300000, "channel": null }, "airfield8_1": { "name": "Nevatim", "callsign": "NGV", - "beacon_type": 14, + "beacon_type": 13, "hertz": 111500000, "channel": null }, "airfield8_2": { + "name": "Nevatim", + "callsign": "NEV", + "beacon_type": 14, + "hertz": 108300000, + "channel": null + }, + "airfield8_3": { "name": "Nevatim", "callsign": "NGV", - "beacon_type": 13, + "beacon_type": 14, "hertz": 111500000, "channel": null }, @@ -1077,13 +1077,34 @@ "hertz": 114200000, "channel": 89 }, - "airfield47_0": { - "name": "", - "callsign": "ITBK", + "airfield53_0": { + "name": "Taba", + "callsign": "ITBA", + "beacon_type": 13, + "hertz": 109500000, + "channel": null + }, + "airfield53_1": { + "name": "Taba", + "callsign": "ITBA", "beacon_type": 14, "hertz": 109500000, "channel": null }, + "airfield53_2": { + "name": "Taba", + "callsign": "TBA", + "beacon_type": 3, + "hertz": 114500000, + "channel": 92 + }, + "airfield47_0": { + "name": "", + "callsign": "IPKS", + "beacon_type": 14, + "hertz": 111900000, + "channel": null + }, "airfield47_1": { "name": "TABUK", "callsign": "TBK", @@ -1092,24 +1113,24 @@ "channel": 104 }, "airfield47_2": { - "name": "", - "callsign": "IPKA", - "beacon_type": 13, - "hertz": 111900000, - "channel": null - }, - "airfield47_3": { "name": "", "callsign": "ITBK", "beacon_type": 13, "hertz": 109500000, "channel": null }, + "airfield47_3": { + "name": "", + "callsign": "IPKA", + "beacon_type": 13, + "hertz": 111900000, + "channel": null + }, "airfield47_4": { "name": "", - "callsign": "IPKS", + "callsign": "ITBK", "beacon_type": 14, - "hertz": 111900000, + "hertz": 109500000, "channel": null }, "airfield23_0": {