diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 160dcaa2..8f469615 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v2 diff --git a/dcs/countries.py b/dcs/countries.py index 71936472..eaa10e06 100644 --- a/dcs/countries.py +++ b/dcs/countries.py @@ -278,6 +278,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -365,6 +366,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -835,6 +837,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -913,6 +916,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -1248,6 +1252,7 @@ class Plane: F4U_1D = planes.F4U_1D F4U_1D_CW = planes.F4U_1D_CW I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -1336,6 +1341,7 @@ class Plane: Plane.F4U_1D, Plane.F4U_1D_CW, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -1702,6 +1708,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -1768,6 +1775,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -2119,6 +2127,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -2184,6 +2193,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -2531,6 +2541,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -2601,6 +2612,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_15bis, @@ -3025,6 +3037,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -3092,6 +3105,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -3108,6 +3122,7 @@ class Helicopter: Ka_50 = helicopters.Ka_50 Mi_8MT = helicopters.Mi_8MT UH_1H = helicopters.UH_1H + CHAP_TigerUHT = helicopters.CHAP_TigerUHT AH_64D_BLK_II = helicopters.AH_64D_BLK_II CH_47Fbl1 = helicopters.CH_47Fbl1 OH58D = helicopters.OH58D @@ -3120,6 +3135,7 @@ class Helicopter: Helicopter.Ka_50, Helicopter.Mi_8MT, Helicopter.UH_1H, + Helicopter.CHAP_TigerUHT, Helicopter.AH_64D_BLK_II, Helicopter.CH_47Fbl1, Helicopter.OH58D, @@ -3693,6 +3709,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -3832,6 +3849,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -3952,6 +3970,7 @@ class Helicopter: OH_58D = helicopters.OH_58D AH_64A = helicopters.AH_64A AH_1W = helicopters.AH_1W + CHAP_TigerUHT = helicopters.CHAP_TigerUHT SH_60B = helicopters.SH_60B CH_53E = helicopters.CH_53E @@ -3976,6 +3995,7 @@ class Helicopter: Helicopter.OH_58D, Helicopter.AH_64A, Helicopter.AH_1W, + Helicopter.CHAP_TigerUHT, Helicopter.SH_60B, Helicopter.CH_53E, ] @@ -4319,6 +4339,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -4380,6 +4401,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -4706,6 +4728,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -4773,6 +4796,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -5134,6 +5158,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -5199,6 +5224,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -5538,6 +5564,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -5601,6 +5628,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -5917,6 +5945,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -5980,6 +6009,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -6294,6 +6324,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -6357,6 +6388,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -6688,6 +6720,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -6754,6 +6787,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -7131,6 +7165,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -7194,6 +7229,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -7525,6 +7561,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -7582,6 +7619,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -7845,6 +7883,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -7905,6 +7944,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -8154,6 +8194,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -8209,6 +8250,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -8449,6 +8491,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -8516,6 +8559,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339APAN, Plane.MiG_15bis, @@ -8847,6 +8891,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -8908,6 +8953,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -9211,6 +9257,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -9268,6 +9315,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -9552,6 +9600,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -9609,6 +9658,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -10002,6 +10052,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -10069,6 +10120,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -10374,6 +10426,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -10439,6 +10492,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -10776,6 +10830,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -10837,6 +10892,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -11183,6 +11239,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -11251,6 +11308,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -11466,6 +11524,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -11522,6 +11581,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -11897,6 +11957,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_19P = planes.MiG_19P @@ -11960,6 +12021,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_19P, @@ -12331,6 +12393,7 @@ class Plane: F_A_18A = planes.F_A_18A FA_18C_hornet = planes.FA_18C_hornet L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -12387,6 +12450,7 @@ class Plane: Plane.F_A_18A, Plane.FA_18C_hornet, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -12732,6 +12796,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -12796,6 +12861,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_15bis, @@ -13180,6 +13246,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -13240,6 +13307,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -13567,6 +13635,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -13632,6 +13701,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_15bis, @@ -13999,6 +14069,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -14067,6 +14138,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -14433,6 +14505,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -14499,6 +14572,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -14849,6 +14923,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -14908,6 +14983,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -15314,6 +15390,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -15382,6 +15459,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -15701,6 +15779,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -15759,6 +15838,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -16077,6 +16157,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -16141,6 +16222,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -16511,6 +16593,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -16578,6 +16661,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -16946,6 +17030,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -17008,6 +17093,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -17333,6 +17419,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -17396,6 +17483,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -17745,6 +17833,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -17805,6 +17894,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -18128,6 +18218,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -18188,6 +18279,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -18506,6 +18598,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -18568,6 +18661,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -18867,6 +18961,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -18927,6 +19022,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -19286,6 +19382,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -19349,6 +19446,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -19668,6 +19766,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -19728,6 +19827,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -20067,6 +20167,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -20128,6 +20229,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -20447,6 +20549,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -20506,6 +20609,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -20792,6 +20896,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -20849,6 +20954,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -21148,6 +21254,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -21208,6 +21315,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -21517,6 +21625,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -21578,6 +21687,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -21861,6 +21971,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -21920,6 +22031,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -22230,6 +22342,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -22291,6 +22404,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -22583,6 +22697,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -22641,6 +22756,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -22942,6 +23058,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -23000,6 +23117,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339APAN, Plane.MiG_15bis, @@ -23323,6 +23441,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -23385,6 +23504,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -23698,6 +23818,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -23759,6 +23880,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -24098,6 +24220,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -24162,6 +24285,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -24452,6 +24576,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -24509,6 +24634,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -24818,6 +24944,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -24877,6 +25004,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -25183,6 +25311,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -25246,6 +25375,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -25564,6 +25694,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -25622,6 +25753,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_15bis, @@ -25929,6 +26061,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -25984,6 +26117,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -26294,6 +26428,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -26350,6 +26485,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -26670,6 +26806,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -26728,6 +26865,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -27088,6 +27226,7 @@ class Plane: F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -27169,6 +27308,7 @@ class Plane: Plane.F_A_18C, Plane.FA_18C_hornet, Plane.Hawk, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -27408,6 +27548,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -27463,6 +27604,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -27864,6 +28006,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -27937,6 +28080,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -28265,6 +28409,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -28324,6 +28469,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -28623,6 +28769,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -28682,6 +28829,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_15bis, @@ -29000,6 +29148,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -29059,6 +29208,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -29384,6 +29534,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis MiG_15bis_FC = planes.MiG_15bis_FC @@ -29445,6 +29596,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339APAN, Plane.MiG_15bis, Plane.MiG_15bis_FC, @@ -29741,6 +29893,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -29802,6 +29955,7 @@ class Plane: Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -30154,6 +30308,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -30220,6 +30375,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -30523,6 +30679,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -30585,6 +30742,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -30931,6 +31089,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -30992,6 +31151,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -31303,6 +31463,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -31360,6 +31521,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339A, Plane.MB_339APAN, Plane.MiG_15bis, @@ -31958,6 +32120,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -32097,6 +32260,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -32219,6 +32383,7 @@ class Helicopter: OH_58D = helicopters.OH_58D AH_64A = helicopters.AH_64A AH_1W = helicopters.AH_1W + CHAP_TigerUHT = helicopters.CHAP_TigerUHT SH_60B = helicopters.SH_60B CH_53E = helicopters.CH_53E @@ -32243,6 +32408,7 @@ class Helicopter: Helicopter.OH_58D, Helicopter.AH_64A, Helicopter.AH_1W, + Helicopter.CHAP_TigerUHT, Helicopter.SH_60B, Helicopter.CH_53E, ] @@ -32856,6 +33022,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -32995,6 +33162,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -33117,6 +33285,7 @@ class Helicopter: OH_58D = helicopters.OH_58D AH_64A = helicopters.AH_64A AH_1W = helicopters.AH_1W + CHAP_TigerUHT = helicopters.CHAP_TigerUHT SH_60B = helicopters.SH_60B CH_53E = helicopters.CH_53E @@ -33141,6 +33310,7 @@ class Helicopter: Helicopter.OH_58D, Helicopter.AH_64A, Helicopter.AH_1W, + Helicopter.CHAP_TigerUHT, Helicopter.SH_60B, Helicopter.CH_53E, ] @@ -33754,6 +33924,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -33893,6 +34064,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -34015,6 +34187,7 @@ class Helicopter: OH_58D = helicopters.OH_58D AH_64A = helicopters.AH_64A AH_1W = helicopters.AH_1W + CHAP_TigerUHT = helicopters.CHAP_TigerUHT SH_60B = helicopters.SH_60B CH_53E = helicopters.CH_53E @@ -34039,6 +34212,7 @@ class Helicopter: Helicopter.OH_58D, Helicopter.AH_64A, Helicopter.AH_1W, + Helicopter.CHAP_TigerUHT, Helicopter.SH_60B, Helicopter.CH_53E, ] @@ -34349,6 +34523,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -34407,6 +34582,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339APAN, Plane.MiG_15bis, @@ -34720,6 +34896,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -34776,6 +34953,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -35074,6 +35252,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -35131,6 +35310,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -35433,6 +35613,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -35492,6 +35673,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -35777,6 +35959,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -35833,6 +36016,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339APAN, Plane.MiG_15bis, @@ -36133,6 +36317,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -36190,6 +36375,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339APAN, Plane.MiG_15bis, @@ -36499,6 +36685,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis MiG_15bis_FC = planes.MiG_15bis_FC @@ -36561,6 +36748,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.MB_339APAN, Plane.MiG_15bis, Plane.MiG_15bis_FC, @@ -36856,6 +37044,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -36913,6 +37102,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -37243,6 +37433,7 @@ class Plane: FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk I_16 = planes.I_16 + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339A = planes.MB_339A MB_339APAN = planes.MB_339APAN @@ -37302,6 +37493,7 @@ class Plane: Plane.FA_18C_hornet, Plane.Hawk, Plane.I_16, + Plane.La_7, Plane.M_2000C, Plane.MB_339A, Plane.MB_339APAN, @@ -37616,6 +37808,7 @@ class Plane: Hawk = planes.Hawk I_16 = planes.I_16 L_39C = planes.L_39C + La_7 = planes.La_7 M_2000C = planes.M_2000C MB_339APAN = planes.MB_339APAN MiG_15bis = planes.MiG_15bis @@ -37673,6 +37866,7 @@ class Plane: Plane.Hawk, Plane.I_16, Plane.L_39C, + Plane.La_7, Plane.M_2000C, Plane.MB_339APAN, Plane.MiG_15bis, diff --git a/dcs/helicopters.py b/dcs/helicopters.py index 7ad1a3c9..2d553085 100644 --- a/dcs/helicopters.py +++ b/dcs/helicopters.py @@ -992,6 +992,57 @@ class Pylon2: task_default = task.AFAC +class CHAP_TigerUHT(HelicopterType): + id = "CHAP_TigerUHT" + height = 3.83 + width = 13 + length = 14.08 + fuel_max = 1420 + max_speed = 315 + chaff = 16 + flare = 48 + charge_total = 64 + chaff_charge_size = 1 + flare_charge_size = 1 + eplrs = True + radio_frequency = 124 + + livery_name = "CHAP_TIGERUHT" # from type + + class Pylon1: + FZ225___19_x_70_mm_UnGd_Rkts__M151_HE = (1, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M151_HE) + FZ225___19_x_70_mm_UnGd_Rkts__M229_HE = (1, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M229_HE) + _2_x_FIM_92C_Stinger = (1, Weapons._2_x_FIM_92C_Stinger) +#ERRR + + class Pylon2: + HMP400LC = (2, Weapons.HMP400LC) + FZ225___19_x_70_mm_UnGd_Rkts__M151_HE = (2, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M151_HE) + FZ225___19_x_70_mm_UnGd_Rkts__M229_HE = (2, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M229_HE) + _4_x_HOT3___ATGM__SACLOS__Tandem_HEAT = (2, Weapons._4_x_HOT3___ATGM__SACLOS__Tandem_HEAT) + _2_x_FIM_92C_Stinger = (2, Weapons._2_x_FIM_92C_Stinger) + Fuel_tank_350_liters = (2, Weapons.Fuel_tank_350_liters) + + class Pylon3: + HMP400LC = (3, Weapons.HMP400LC) + FZ225___19_x_70_mm_UnGd_Rkts__M151_HE = (3, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M151_HE) + FZ225___19_x_70_mm_UnGd_Rkts__M229_HE = (3, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M229_HE) + _4_x_HOT3___ATGM__SACLOS__Tandem_HEAT = (3, Weapons._4_x_HOT3___ATGM__SACLOS__Tandem_HEAT) + _2_x_FIM_92C_Stinger = (3, Weapons._2_x_FIM_92C_Stinger) + Fuel_tank_350_liters = (3, Weapons.Fuel_tank_350_liters) + + class Pylon4: + FZ225___19_x_70_mm_UnGd_Rkts__M151_HE = (4, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M151_HE) + FZ225___19_x_70_mm_UnGd_Rkts__M229_HE = (4, Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M229_HE) + _2_x_FIM_92C_Stinger = (4, Weapons._2_x_FIM_92C_Stinger) +#ERRR + + pylons: Set[int] = {1, 2, 3, 4} + + tasks = [task.CAS, task.GroundAttack, task.Escort, task.AFAC, task.AntishipStrike, task.Transport, task.Reconnaissance] + task_default = task.CAS + + class AH_64D_BLK_II(HelicopterType): id = "AH-64D_BLK_II" flyable = True @@ -1206,6 +1257,12 @@ class OwnshipCallSign: label="Allow Cpg NVG", default=True, ), + "flaresProgram_Label": UnitPropertyDescription( + identifier="flaresProgram_Label", + control="label", + label="FLARES", + x_lbl=150, + ), "FlareBurstCount": UnitPropertyDescription( identifier="FlareBurstCount", control="comboList", @@ -3131,6 +3188,7 @@ class Pylon7: "UH-1H": UH_1H, "Mi-28N": Mi_28N, "OH-58D": OH_58D, + "CHAP_TigerUHT": CHAP_TigerUHT, "AH-64D_BLK_II": AH_64D_BLK_II, "CH-47Fbl1": CH_47Fbl1, "Ka-50": Ka_50, diff --git a/dcs/planes.py b/dcs/planes.py index 6a3a5ebf..d22c243a 100644 --- a/dcs/planes.py +++ b/dcs/planes.py @@ -10873,6 +10873,7 @@ class C_130J_30(PlaneType): "ramp_down": False, "save_custom_data": True, "allow_air_load": False, + "allow_moab": True, "cargo_1": None, "cargo_2": None, "cargo_3": None, @@ -10908,6 +10909,9 @@ class save_custom_data: class allow_air_load: id = "allow_air_load" + class allow_moab: + id = "allow_moab" + class cargo_1: id = "cargo_1" @@ -10976,6 +10980,12 @@ class cargo_10: label="Allow Cargo Loading In Flight", default=False, ), + "allow_moab": UnitPropertyDescription( + identifier="allow_moab", + control="checkbox", + label="Allow MOAB Cargo", + default=True, + ), "cargo_1": UnitPropertyDescription( identifier="cargo_1", control="editbox", @@ -11401,7 +11411,7 @@ class Pylon2: DIS_MK_20_DUAL_GDJ_II19_L = (2, Weapons.DIS_MK_20_DUAL_GDJ_II19_L) DIS_GBU_12_DUAL_GDJ_II19_L = (2, Weapons.DIS_GBU_12_DUAL_GDJ_II19_L) DIS_BRM1_90 = (2, Weapons.DIS_BRM1_90) - DIS_RKT_90_UG = (2, Weapons.DIS_RKT_90_UG) + DIS_HF20_90_1_HE = (2, Weapons.DIS_HF20_90_1_HE) DIS_LAU68_MK5_DUAL_GDJ_II19_L = (2, Weapons.DIS_LAU68_MK5_DUAL_GDJ_II19_L) DIS_WMD7 = (2, Weapons.DIS_WMD7) DIS_AKG_DLPOD = (2, Weapons.DIS_AKG_DLPOD) @@ -11497,7 +11507,7 @@ class Pylon6: DIS_MK_20_DUAL_GDJ_II19_R = (6, Weapons.DIS_MK_20_DUAL_GDJ_II19_R) DIS_GBU_12_DUAL_GDJ_II19_R = (6, Weapons.DIS_GBU_12_DUAL_GDJ_II19_R) DIS_BRM1_90 = (6, Weapons.DIS_BRM1_90) - DIS_RKT_90_UG = (6, Weapons.DIS_RKT_90_UG) + DIS_HF20_90_1_HE = (6, Weapons.DIS_HF20_90_1_HE) DIS_LAU68_MK5_DUAL_GDJ_II19_R = (6, Weapons.DIS_LAU68_MK5_DUAL_GDJ_II19_R) DIS_WMD7 = (6, Weapons.DIS_WMD7) DIS_AKG_DLPOD = (6, Weapons.DIS_AKG_DLPOD) @@ -13451,6 +13461,7 @@ class Pylon3: _3x_BDU_33___25lb_Practice_Bomb_LD__TER__ = (3, Weapons._3x_BDU_33___25lb_Practice_Bomb_LD__TER__) _2x_BDU_33___25lb_Practice_Bomb_LD__TER_ = (3, Weapons._2x_BDU_33___25lb_Practice_Bomb_LD__TER_) _Special_Weapons_Adapter__2x_BDU_33___25lb_Practice_Bomb_LD__TER_ = (3, Weapons._Special_Weapons_Adapter__2x_BDU_33___25lb_Practice_Bomb_LD__TER_) + _Special_Weapons_Adapter__3x_BDU_33___25lb_Practice_Bomb_LD__TER_ = (3, Weapons._Special_Weapons_Adapter__3x_BDU_33___25lb_Practice_Bomb_LD__TER_) AGM_65A___Maverick_A__TV_Guided___LAU_117_ = (3, Weapons.AGM_65A___Maverick_A__TV_Guided___LAU_117_) _Special_Weapons_Adapter__AGM_65A___Maverick_A__TV_Guided___LAU_117__Special_Weapons_Adapter__ = (3, Weapons._Special_Weapons_Adapter__AGM_65A___Maverick_A__TV_Guided___LAU_117__Special_Weapons_Adapter__) AGM_65B___Maverick_B__TV_Guided___LAU_117_ = (3, Weapons.AGM_65B___Maverick_B__TV_Guided___LAU_117_) @@ -13664,6 +13675,7 @@ class Pylon11: _3x_BDU_33___25lb_Practice_Bomb_LD__TER__ = (11, Weapons._3x_BDU_33___25lb_Practice_Bomb_LD__TER__) _2x_BDU_33___25lb_Practice_Bomb_LD__TER_ = (11, Weapons._2x_BDU_33___25lb_Practice_Bomb_LD__TER_) _Special_Weapons_Adapter__2x_BDU_33___25lb_Practice_Bomb_LD__TER_ = (11, Weapons._Special_Weapons_Adapter__2x_BDU_33___25lb_Practice_Bomb_LD__TER_) + _Special_Weapons_Adapter__3x_BDU_33___25lb_Practice_Bomb_LD__TER_ = (11, Weapons._Special_Weapons_Adapter__3x_BDU_33___25lb_Practice_Bomb_LD__TER_) AGM_65A___Maverick_A__TV_Guided___LAU_117_ = (11, Weapons.AGM_65A___Maverick_A__TV_Guided___LAU_117_) _Special_Weapons_Adapter__AGM_65A___Maverick_A__TV_Guided___LAU_117__Special_Weapons_Adapter__ = (11, Weapons._Special_Weapons_Adapter__AGM_65A___Maverick_A__TV_Guided___LAU_117__Special_Weapons_Adapter__) AGM_65B___Maverick_B__TV_Guided___LAU_117_ = (11, Weapons.AGM_65B___Maverick_B__TV_Guided___LAU_117_) @@ -16811,9 +16823,9 @@ class F4U_1D_CW(PlaneType): "F4U_GunsConvergence_Mid": 2, "F4U_GunsConvergence_Outer": 2, "F4U_CW_number": True, - "F4U_CW_number_1": 7, - "F4U_CW_number_2": 8, - "F4U_CW_number_3": 5, + "F4U_CW_number_1": 3, + "F4U_CW_number_2": 3, + "F4U_CW_number_3": 7, } class Properties: @@ -16961,7 +16973,7 @@ class Values: identifier="F4U_CW_number_1", control="comboList", label="1st number", - default=7, + default=3, values={ 0: "0", 1: "1", @@ -16979,7 +16991,7 @@ class Values: identifier="F4U_CW_number_2", control="comboList", label="2nd number", - default=8, + default=3, values={ 0: "0", 1: "1", @@ -16997,7 +17009,7 @@ class Values: identifier="F4U_CW_number_3", control="comboList", label="3rd number", - default=5, + default=7, values={ 0: "0", 1: "1", @@ -18090,25 +18102,25 @@ class Hawk(PlaneType): livery_name = "HAWK" # from type class Pylon1: - LAU_7_with_AIM_9M_Sidewinder_IR_AAM_ = (1, Weapons.LAU_7_with_AIM_9M_Sidewinder_IR_AAM_) + LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_ = (1, Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_) + CBU_87___202_x_CEM_Cluster_Bomb = (1, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) + BRU_42_3_BDU_33 = (1, Weapons.BRU_42_3_BDU_33) + BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = (1, Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD) class Pylon2: - Matra_Type_155_Rocket_Pod = (2, Weapons.Matra_Type_155_Rocket_Pod) - CBU_87___202_x_CEM_Cluster_Bomb = (2, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) - BRU_42_3_BDU_33 = (2, Weapons.BRU_42_3_BDU_33) - Mk_82___500lb_GP_Bomb_LD = (2, Weapons.Mk_82___500lb_GP_Bomb_LD) + LAU_7_with_AIM_9M_Sidewinder_IR_AAM_ = (2, Weapons.LAU_7_with_AIM_9M_Sidewinder_IR_AAM_) class Pylon3: ADEN_GUNPOD = (3, Weapons.ADEN_GUNPOD) class Pylon4: - Matra_Type_155_Rocket_Pod = (4, Weapons.Matra_Type_155_Rocket_Pod) - CBU_87___202_x_CEM_Cluster_Bomb = (4, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) - BRU_42_3_BDU_33 = (4, Weapons.BRU_42_3_BDU_33) - Mk_82___500lb_GP_Bomb_LD = (4, Weapons.Mk_82___500lb_GP_Bomb_LD) + LAU_7_with_AIM_9M_Sidewinder_IR_AAM_ = (4, Weapons.LAU_7_with_AIM_9M_Sidewinder_IR_AAM_) class Pylon5: - LAU_7_with_AIM_9M_Sidewinder_IR_AAM_ = (5, Weapons.LAU_7_with_AIM_9M_Sidewinder_IR_AAM_) + LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_ = (5, Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_) + CBU_87___202_x_CEM_Cluster_Bomb = (5, Weapons.CBU_87___202_x_CEM_Cluster_Bomb) + BRU_42_3_BDU_33 = (5, Weapons.BRU_42_3_BDU_33) + BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = (5, Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD) class Pylon6: Smoke_Generator___red = (6, Weapons.Smoke_Generator___red) @@ -18554,6 +18566,50 @@ class Pylon5: task_default = task.CAS +class La_7(PlaneType): + id = "La-7" + flyable = True + height = 2.54 + width = 9.8 + length = 8.6 + fuel_max = 333 + max_speed = 658.8 + category = "Interceptor" #{78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} + radio_frequency = 124 + + panel_radio = { + 1: { + "channels": { + 1: 105, + 2: 124, + 4: 139, + 3: 131 + }, + }, + } + + property_defaults: Dict[str, Any] = { + } + + properties = { + } + + livery_name = "LA-7" # from type + + class Pylon1: + LA7_AO_25SL = (1, Weapons.LA7_AO_25SL) + I16_FAB_100SV = (1, Weapons.I16_FAB_100SV) + + class Pylon2: + LA7_AO_25SL = (2, Weapons.LA7_AO_25SL) + I16_FAB_100SV = (2, Weapons.I16_FAB_100SV) + + pylons: Set[int] = {1, 2} + + tasks = [task.CAP, task.CAS, task.Escort, task.FighterSweep, task.GroundAttack, task.Intercept] + task_default = task.CAP + + class M_2000C(PlaneType): id = "M-2000C" flyable = True @@ -21369,14 +21425,6 @@ class Pylon3: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (3, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (3, Weapons.R530F_EM) R530F_IR = (3, Weapons.R530F_IR) S530F = (3, Weapons.S530F) @@ -21415,14 +21463,6 @@ class Pylon4: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (4, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (4, Weapons.R530F_EM) R530F_IR = (4, Weapons.R530F_IR) PTB_580G_F1 = (4, Weapons.PTB_580G_F1) @@ -21474,14 +21514,6 @@ class Pylon5: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (5, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (5, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (5, Weapons.R530F_EM) R530F_IR = (5, Weapons.R530F_IR) S530F = (5, Weapons.S530F) @@ -22049,14 +22081,6 @@ class Pylon3: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (3, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (3, Weapons.R530F_EM) R530F_IR = (3, Weapons.R530F_IR) S530F = (3, Weapons.S530F) @@ -22095,14 +22119,6 @@ class Pylon4: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (4, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (4, Weapons.R530F_EM) R530F_IR = (4, Weapons.R530F_IR) PTB_580G_F1 = (4, Weapons.PTB_580G_F1) @@ -22154,14 +22170,6 @@ class Pylon5: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (5, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (5, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (5, Weapons.R530F_EM) R530F_IR = (5, Weapons.R530F_IR) S530F = (5, Weapons.S530F) @@ -22578,6 +22586,7 @@ class IFFMode2Code: #ERRR class Pylon1: + AIM_9B_Sidewinder_IR_AAM = (1, Weapons.AIM_9B_Sidewinder_IR_AAM) AIM_9J_Sidewinder_IR_AAM = (1, Weapons.AIM_9J_Sidewinder_IR_AAM) AIM_9P_Sidewinder_IR_AAM = (1, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P3_Sidewinder_IR_AAM = (1, Weapons.AIM_9P3_Sidewinder_IR_AAM) @@ -22613,12 +22622,6 @@ class Pylon2: MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_254_F1B_SM_Green = (2, Weapons.MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_254_F1B_SM_Green) MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_256_F1B_HE_Frag = (2, Weapons.MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_256_F1B_HE_Frag) MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_257_F1B_HE_Frag_Lg_Whd = (2, Weapons.MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_257_F1B_HE_Frag_Lg_Whd) - AIM_9J_Sidewinder_IR_AAM = (2, Weapons.AIM_9J_Sidewinder_IR_AAM) - AIM_9P_Sidewinder_IR_AAM = (2, Weapons.AIM_9P_Sidewinder_IR_AAM) - AIM_9P3_Sidewinder_IR_AAM = (2, Weapons.AIM_9P3_Sidewinder_IR_AAM) - AIM_9JULI_Sidewinder_IR_AAM = (2, Weapons.AIM_9JULI_Sidewinder_IR_AAM) - R550_Magic_1_IR_AAM = (2, Weapons.R550_Magic_1_IR_AAM) - R550_Magic_2_IR_AAM = (2, Weapons.R550_Magic_2_IR_AAM) Mk_82___500lb_GP_Bomb_LD = (2, Weapons.Mk_82___500lb_GP_Bomb_LD) Mk_83___1000lb_GP_Bomb_LD = (2, Weapons.Mk_83___1000lb_GP_Bomb_LD) BR_250 = (2, Weapons.BR_250) @@ -22672,6 +22675,8 @@ class Pylon3: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (3, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) + R530F_EM = (3, Weapons.R530F_EM) + R530F_IR = (3, Weapons.R530F_IR) S530F = (3, Weapons.S530F) #ERRR @@ -22708,8 +22713,11 @@ class Pylon4: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (4, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) + R530F_EM = (4, Weapons.R530F_EM) + R530F_IR = (4, Weapons.R530F_IR) PTB_580G_F1 = (4, Weapons.PTB_580G_F1) PTB_580G_F1_EMPTY = (4, Weapons.PTB_580G_F1_EMPTY) +#ERRR {AM39_exocet} #ERRR class Pylon5: @@ -22757,6 +22765,8 @@ class Pylon5: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (5, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (5, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) + R530F_EM = (5, Weapons.R530F_EM) + R530F_IR = (5, Weapons.R530F_IR) S530F = (5, Weapons.S530F) #ERRR @@ -22787,12 +22797,6 @@ class Pylon6: MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_254_F1B_SM_Green = (6, Weapons.MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_254_F1B_SM_Green) MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_256_F1B_HE_Frag = (6, Weapons.MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_256_F1B_HE_Frag) MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_257_F1B_HE_Frag_Lg_Whd = (6, Weapons.MATRA_F4___18_x_UnGd_Rkts__68_mm_SNEB_Type_257_F1B_HE_Frag_Lg_Whd) - AIM_9J_Sidewinder_IR_AAM = (6, Weapons.AIM_9J_Sidewinder_IR_AAM) - AIM_9P_Sidewinder_IR_AAM = (6, Weapons.AIM_9P_Sidewinder_IR_AAM) - AIM_9P3_Sidewinder_IR_AAM = (6, Weapons.AIM_9P3_Sidewinder_IR_AAM) - AIM_9JULI_Sidewinder_IR_AAM = (6, Weapons.AIM_9JULI_Sidewinder_IR_AAM) - R550_Magic_1_IR_AAM = (6, Weapons.R550_Magic_1_IR_AAM) - R550_Magic_2_IR_AAM = (6, Weapons.R550_Magic_2_IR_AAM) Mk_82___500lb_GP_Bomb_LD = (6, Weapons.Mk_82___500lb_GP_Bomb_LD) Mk_83___1000lb_GP_Bomb_LD = (6, Weapons.Mk_83___1000lb_GP_Bomb_LD) BR_250 = (6, Weapons.BR_250) @@ -22802,6 +22806,7 @@ class Pylon6: #ERRR class Pylon7: + AIM_9B_Sidewinder_IR_AAM = (7, Weapons.AIM_9B_Sidewinder_IR_AAM) AIM_9J_Sidewinder_IR_AAM = (7, Weapons.AIM_9J_Sidewinder_IR_AAM) AIM_9P_Sidewinder_IR_AAM = (7, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P3_Sidewinder_IR_AAM = (7, Weapons.AIM_9P3_Sidewinder_IR_AAM) @@ -23264,14 +23269,6 @@ class Pylon3: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (3, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (3, Weapons.R530F_EM) R530F_IR = (3, Weapons.R530F_IR) S530F = (3, Weapons.S530F) @@ -23310,14 +23307,6 @@ class Pylon4: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (4, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (4, Weapons.R530F_EM) R530F_IR = (4, Weapons.R530F_IR) PTB_580G_F1 = (4, Weapons.PTB_580G_F1) @@ -23369,14 +23358,6 @@ class Pylon5: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (5, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (5, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (5, Weapons.R530F_EM) R530F_IR = (5, Weapons.R530F_IR) S530F = (5, Weapons.S530F) @@ -32658,14 +32639,6 @@ class Pylon3: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (3, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (3, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (3, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (3, Weapons.R530F_EM) R530F_IR = (3, Weapons.R530F_IR) S530F = (3, Weapons.S530F) @@ -32704,14 +32677,6 @@ class Pylon4: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (4, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (4, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (4, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (4, Weapons.R530F_EM) R530F_IR = (4, Weapons.R530F_IR) PTB_580G_F1 = (4, Weapons.PTB_580G_F1) @@ -32763,14 +32728,6 @@ class Pylon5: #ERRR {AUF2_BRP250} AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD = (5, Weapons.AUF_2___2_x_Mk_82___500lb_GP_Bomb_LD) AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb = (5, Weapons.AUF_2___2_x_GBU_12___500lb_Laser_Guided_Bomb) - _14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___6_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._14_3_M2___9_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___12_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster = (5, Weapons._30_6_M2___18_x_BAP_100___32kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster) - _14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___6_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._14_3_M2___9_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___12_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) - _30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD = (5, Weapons._30_6_M2___18_x_BAT_120_ABL___34kg_HE_Frag_Chute_Retarded_Bomb_HD) R530F_EM = (5, Weapons.R530F_EM) R530F_IR = (5, Weapons.R530F_IR) S530F = (5, Weapons.S530F) @@ -35264,6 +35221,7 @@ class C_47(PlaneType): "I-16": I_16, "L-39C": L_39C, "L-39ZA": L_39ZA, + "La-7": La_7, "M-2000C": M_2000C, "MB-339A": MB_339A, "MB-339APAN": MB_339APAN, diff --git a/dcs/vehicles.py b/dcs/vehicles.py index 5c3430b8..2ff4858c 100644 --- a/dcs/vehicles.py +++ b/dcs/vehicles.py @@ -985,8 +985,8 @@ class Bofors40(unittype.VehicleType): id = "bofors40" name = "AAA Bofors 40mm" detection_range = 0 - threat_range = 4000 - air_weapon_dist = 4000 + threat_range = 2000 + air_weapon_dist = 2000 class Flak18(unittype.VehicleType): id = "flak18" @@ -2415,28 +2415,28 @@ class Locomotive: class Electric_locomotive(unittype.VehicleType): id = "Electric locomotive" - name = "Loco VL80 Electric" + name = "Rwy. Loco VL80 Electric" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Locomotive(unittype.VehicleType): id = "Locomotive" - name = "Loco CHME3T" + name = "Rwy. Loco CHME3T" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class ES44AH(unittype.VehicleType): id = "ES44AH" - name = "Loco ES44AH" + name = "Rwy. Loco ES44AH" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class DRG_Class_86(unittype.VehicleType): id = "DRG_Class_86" - name = "Loco DRG Class 86" + name = "Rwy. Loco DRG Class 86 (Germany, WWII)" detection_range = 0 threat_range = 0 air_weapon_dist = 0 @@ -2446,63 +2446,63 @@ class Carriage: class Coach_cargo(unittype.VehicleType): id = "Coach cargo" - name = "Freight Van" + name = "Rwy. Freight Van" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Coach_cargo_open(unittype.VehicleType): id = "Coach cargo open" - name = "Open Wagon" + name = "Rwy. Open Wagon" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Coach_a_tank_blue(unittype.VehicleType): id = "Coach a tank blue" - name = "Tank Car blue" + name = "Rwy. Tank Car blue" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Coach_a_tank_yellow(unittype.VehicleType): id = "Coach a tank yellow" - name = "Tank Car yellow" + name = "Rwy. Tank Car yellow" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Coach_a_passenger(unittype.VehicleType): id = "Coach a passenger" - name = "Passenger Car" + name = "Rwy. Passenger Car" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Coach_a_platform(unittype.VehicleType): id = "Coach a platform" - name = "Coach Platform" + name = "Rwy. Coach Platform" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Boxcartrinity(unittype.VehicleType): id = "Boxcartrinity" - name = "Flatcar" + name = "Rwy. Flat Car" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Tankcartrinity(unittype.VehicleType): id = "Tankcartrinity" - name = "Tank Cartrinity" + name = "Rwy. Tank Cartrinity" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class Wellcarnsc(unittype.VehicleType): id = "Wellcarnsc" - name = "Well Car" + name = "Rwy. Well Car" detection_range = 0 threat_range = 0 air_weapon_dist = 0 @@ -2516,14 +2516,14 @@ class DR_50Ton_Flat_Wagon(unittype.VehicleType): class German_covered_wagon_G10(unittype.VehicleType): id = "German_covered_wagon_G10" - name = "Wagon G10 (Germany)" + name = "Rwy. Wagon G10 (Germany, WWII)" detection_range = 0 threat_range = 0 air_weapon_dist = 0 class German_tank_wagon(unittype.VehicleType): id = "German_tank_wagon" - name = "Tank Car (Germany)" + name = "Rwy. Tank Car (Germany, WWII)" detection_range = 0 threat_range = 0 air_weapon_dist = 0 diff --git a/dcs/weapons_data.py b/dcs/weapons_data.py index c058c3e5..3c58b6cb 100644 --- a/dcs/weapons_data.py +++ b/dcs/weapons_data.py @@ -113,6 +113,7 @@ class Weapons: ALQ_167__non_functional_ = {"clsid": "{F14-ALQ167}", "name": "ALQ-167 (non-functional)", "weight": 164.38} ALQ_184 = {"clsid": "ALQ_184", "name": "ALQ-184 - ECM Pod", "weight": 215} ALQ_184_Long = {"clsid": "ALQ_184_Long", "name": "ALQ-184 Long - ECM Pod", "weight": 286} + AM39_EXOCET_AShM = {"clsid": "{AM39}", "name": "AM39 EXOCET AShM", "weight": 670} AN_AAQ_13_LANTIRN_NAV_POD = {"clsid": "{F-15E_AAQ-13_LANTIRN}", "name": "AN/AAQ-13 LANTIRN NAV POD", "weight": 235.86784} AN_AAQ_14_LANTIRN_TGT_Pod = {"clsid": "{F-15E_AAQ-14_LANTIRN}", "name": "AN/AAQ-14 LANTIRN TGT Pod", "weight": 281.680632} AN_AAQ_28_LITENING_AT = {"clsid": "{F-15E_AAQ-28_LITENING}", "name": "AN/AAQ-28 LITENING AT", "weight": 211.373872} @@ -391,7 +392,7 @@ class Weapons: CBU_105___10_x_SFW__CBU_with_WCMD = {"clsid": "{CBU_105}", "name": "CBU-105 - 10 x SFW, CBU with WCMD", "weight": 417} CBU_105___3 = {"clsid": "{CFT_L_CBU_105_x_3}", "name": "CBU-105 * 3", "weight": 1251} CBU_105___3_ = {"clsid": "{CFT_R_CBU_105_x_3}", "name": "CBU-105 * 3", "weight": 1251} - CBU_52B___220_x_HE_Frag_bomblets = {"clsid": "{CBU-52B}", "name": "CBU-52B - 220 x HE/Frag bomblets", "weight": 356} + CBU_52B___220_x_HE_Frag_bomblets = {"clsid": "{CBU-52B}", "name": "CBU-52B - 220 x HE/Frag bomblets", "weight": 244.6} CBU_87___202_x_CEM_Cluster_Bomb = {"clsid": "{CBU-87}", "name": "CBU-87 - 202 x CEM Cluster Bomb", "weight": 430} CBU_87___3 = {"clsid": "{CFT_L_CBU_87_x_3}", "name": "CBU-87 * 3", "weight": 1290} CBU_87___3_ = {"clsid": "{CFT_R_CBU_87_x_3}", "name": "CBU-87 * 3", "weight": 1290} @@ -434,7 +435,7 @@ class Weapons: DIS_AKG_DLPOD = {"clsid": "DIS_AKG_DLPOD", "name": "DATA-LINK POD", "weight": 295} DIS_BOMB_250_2 = {"clsid": "DIS_BOMB_250_2", "name": "250-2 - 250kg GP Bombs HD", "weight": 250} DIS_BOMB_250_3 = {"clsid": "DIS_BOMB_250_3", "name": "250-3 - 250kg GP Bombs LD", "weight": 250} - DIS_BRM1_90 = {"clsid": "DIS_BRM1_90", "name": "HF20 - 16 x BRM-1 90mm Laser-guided Rocket", "weight": 462.5} + DIS_BRM1_90 = {"clsid": "DIS_BRM1_90", "name": "HF20 - 16 x BRM-1 90mm Laser-guided Rocket", "weight": 361.8} DIS_CM_400AKG = {"clsid": "DIS_CM-400AKG", "name": "CM-400AKG", "weight": 960} DIS_CM_802AKG = {"clsid": "DIS_CM-802AKG", "name": "CM802AKG (DIS)", "weight": 720} DIS_CM_802AKG_AI = {"clsid": "DIS_CM-802AKG_AI", "name": "CM802AKG (DIS) for AI", "weight": 720} @@ -456,6 +457,7 @@ class Weapons: DIS_GDJ_YJ83K = {"clsid": "DIS_GDJ_YJ83K", "name": "YJ-83K", "weight": 765} DIS_H6_250_2_N12 = {"clsid": "DIS_H6_250_2_N12", "name": "12 x 250-2 - 250kg GP Bombs HD", "weight": 3000} DIS_H6_250_2_N24 = {"clsid": "DIS_H6_250_2_N24", "name": "24 x 250-2 - 250kg GP Bombs HD", "weight": 6000} + DIS_HF20_90_1_HE = {"clsid": "DIS_HF20_90_1_HE", "name": "HF20 - 16 x 90-1 90mm Rocket (HE)", "weight": 326.6} DIS_HJ_12 = {"clsid": "DIS_HJ-12", "name": "HJ-12", "weight": 20.5} DIS_KD20 = {"clsid": "DIS_KD20", "name": "KD-20", "weight": 1700} DIS_KD63 = {"clsid": "DIS_KD63", "name": "KD-63", "weight": 2000} @@ -488,7 +490,6 @@ class Weapons: DIS_PL_5EII = {"clsid": "DIS_PL-5EII", "name": "PL-5EII", "weight": 153} DIS_PL_8A = {"clsid": "DIS_PL-8A", "name": "PL-8A", "weight": 115} DIS_PL_8B = {"clsid": "DIS_PL-8B", "name": "PL-8B", "weight": 115} - DIS_RKT_90_UG = {"clsid": "DIS_RKT_90_UG", "name": "HF20 - 16 x 90-1 90mm Rocket (HE)", "weight": 376.1} DIS_SD_10 = {"clsid": "DIS_SD-10", "name": "SD-10A AAM", "weight": 259} DIS_SD_10_DUAL_L = {"clsid": "DIS_SD-10_DUAL_L", "name": "SD-10A AAM x 2", "weight": 528} DIS_SD_10_DUAL_R = {"clsid": "DIS_SD-10_DUAL_R", "name": "SD-10A AAM x 2", "weight": 528} @@ -567,6 +568,7 @@ class Weapons: Fuel_tank_300_gal__empty_ = {"clsid": "{F14-300gal-empty}", "name": "Fuel tank 300 gal (empty)", "weight": 70} Fuel_tank_330_gal = {"clsid": "{EFEC8200-B922-11d7-9897-000476191836}", "name": "Fuel tank 330 gal", "weight": 1067.750921} Fuel_tank_330_gal_ = {"clsid": "{EFEC8201-B922-11d7-9897-000476191836}", "name": "Fuel tank 330 gal", "weight": 1067.750921} + Fuel_tank_350_liters = {"clsid": "{CHAP_TigerUHT_fueltank}", "name": "Fuel tank 350 liters", "weight": 355} Fuel_tank_367_gal = {"clsid": "{82364E69-5564-4043-A866-E13032926C3E}", "name": "Fuel tank 367 gal", "weight": 1181.8623879} Fuel_tank_370_gal = {"clsid": "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", "name": "Fuel tank 370 gal", "weight": 1338.1101068} Fuel_tank_5000L = {"clsid": "{0855A3A1-FA50-4C89-BDBB-5D5360ABA071}", "name": "Fuel tank 5000L", "weight": 4420} @@ -579,6 +581,8 @@ class Weapons: Fuel_tank_PTB_450_ = {"clsid": "{B99EE8A8-99BC-4a8d-89AC-A26831920DCE}", "name": "Fuel tank PTB-450", "weight": 550} Fuel_tank_S_3 = {"clsid": "{A504D93B-4E80-4B4F-A533-0D9B65F2C55F}", "name": "Fuel tank S-3", "weight": 964} FW109_FUEL_TANK = {"clsid": "FW109_FUEL_TANK", "name": "300 liter Fuel Tank Type E2", "weight": 266} + FZ225___19_x_70_mm_UnGd_Rkts__M151_HE = {"clsid": "{CHAP_FZ225_M151}", "name": "FZ225 - 19 x 70 mm UnGd Rkts, M151 HE", "weight": 112.1} + FZ225___19_x_70_mm_UnGd_Rkts__M229_HE = {"clsid": "{CHAP_FZ225_M229}", "name": "FZ225 - 19 x 70 mm UnGd Rkts, M229 HE", "weight": 184.3} F_4_Fuel_tank_C = {"clsid": "{8B9E3FD0-F034-4A07-B6CE-C269884CC71B}", "name": "F-4 Fuel tank-C", "weight": 2345} F_4_Fuel_tank_W = {"clsid": "{7B4B122D-C12C-4DB4-834E-4D8BB4D863A8}", "name": "F-4 Fuel tank-W", "weight": 1420} F_5_150Gal_Fuel_tank = {"clsid": "{PTB-150GAL}", "name": "F-5 150Gal Fuel tank", "weight": 509} @@ -614,13 +618,16 @@ class Weapons: GBU_31_V_1_B___2_ = {"clsid": "{CFT_R_GBU_31_x_2}", "name": "GBU-31(V)1/B * 2", "weight": 1788} GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {"clsid": "{GBU-31}", "name": "GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb", "weight": 934} GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = {"clsid": "{GBU_31_V_2B}", "name": "GBU-31(V)2/B - JDAM, 2000lb GPS Guided Bomb", "weight": 934} + GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb_ = {"clsid": "{BRU-32 GBU_31_V_2B}", "name": "GBU-31(V)2/B - JDAM, 2000lb GPS Guided Bomb", "weight": 991.38} GBU_31_V_3_B___2 = {"clsid": "{CFT_L_GBU_31V3B_x_2}", "name": "GBU-31(V)3/B * 2", "weight": 1962} GBU_31_V_3_B___2_ = {"clsid": "{CFT_R_GBU_31V3B_x_2}", "name": "GBU-31(V)3/B * 2", "weight": 1962} GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = {"clsid": "{GBU-31V3B}", "name": "GBU-31(V)3/B - JDAM, 2000lb GPS Guided Penetrator Bomb", "weight": 981} GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = {"clsid": "{GBU_31_V_4B}", "name": "GBU-31(V)4/B - JDAM, 2000lb GPS Guided Penetrator Bomb", "weight": 970} + GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb_ = {"clsid": "{BRU-32 GBU_31_V_4B}", "name": "GBU-31(V)4/B - JDAM, 2000lb GPS Guided Penetrator Bomb", "weight": 1027.38} GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb = {"clsid": "{GBU_32_V_2B}", "name": "GBU-32(V)2/B - JDAM, 1000lb GPS Guided Bomb", "weight": 467} GBU_38_16 = {"clsid": "GBU-38*16", "name": "28 x GBU-38 - JDAM, 500lb GPS Guided Bombs", "weight": 8522.2} GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = {"clsid": "{GBU-38}", "name": "GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb", "weight": 241} + GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb_ = {"clsid": "{BRU-32 GBU-38}", "name": "GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb", "weight": 298.38} GBU_38___3 = {"clsid": "{CFT_L_GBU_38_x_3}", "name": "GBU-38 * 3", "weight": 723} GBU_38___3_ = {"clsid": "{CFT_R_GBU_38_x_3}", "name": "GBU-38 * 3", "weight": 723} GBU_39 = {"clsid": "{GBU-39}", "name": "GBU-39", "weight": 130} @@ -643,6 +650,7 @@ class Weapons: HB_F4E_CBU_2B_A_pod___19_x_tubes_of_Bomblets_BLU_3B_x_22__HE = {"clsid": "{HB_F4E_CBU-2B/A}", "name": "HB_F4E_CBU-2B/A pod - 19 x tubes of Bomblets BLU-3B x 22, HE", "weight": 382.89515088} HB_F4E_CBU_2_A_pod___19_x_tubes_of_Bomblets_BLU_3B_x_19__HE = {"clsid": "{HB_F4E_CBU-2/A}", "name": "HB_F4E_CBU-2/A pod - 19 x tubes of Bomblets BLU-3B x 19, HE", "weight": 338.16644376} High_Performance_Centerline_Tank_600_gallons = {"clsid": "{F4_HIGH_PERFORMANCE_CENTERLINE_600_GAL}", "name": "High Performance Centerline Tank 600 gallons", "weight": 1926.3} + HMP400LC = {"clsid": "{CHAP_HMP400LC}", "name": "HMP400LC", "weight": 135.8} HSAB_with_6_x_AGM_84 = {"clsid": "{HSAB-6xAGM-84}", "name": "HSAB with 6 x AGM-84", "weight": 5054.6} HSAB___2_x_GBU_28___5000lb_Laser_Guided_Penetrator_Bomb = {"clsid": "{HSAB_2x_GBU28}", "name": "HSAB - 2 x GBU-28 - 5000lb Laser Guided Penetrator Bomb", "weight": 5348.6} HSAB___4_x_AGM_84D_Harpoon_AShM = {"clsid": "{HSAB_4x_AGM84D_L}", "name": "HSAB - 4 x AGM-84D Harpoon AShM", "weight": 3248.6} @@ -736,6 +744,7 @@ class Weapons: L005_Sorbtsiya_ECM_pod__left_ = {"clsid": "{44EE8698-89F9-48EE-AF36-5FD31896A82F}", "name": "L005 Sorbtsiya ECM pod (left)", "weight": 150} L005_Sorbtsiya_ECM_pod__right_ = {"clsid": "{44EE8698-89F9-48EE-AF36-5FD31896A82A}", "name": "L005 Sorbtsiya ECM pod (right)", "weight": 150} L175V_Khibiny_ECM_pod = {"clsid": "{ECM_POD_L_175V}", "name": "L175V Khibiny ECM pod", "weight": 150} + LA7_AO_25SL = {"clsid": "LA7_AO_25SL", "name": "AO-25SL", "weight": 25} LANTIRN_Targeting_Pod = {"clsid": "{F14-LANTIRN-TP}", "name": "LANTIRN Targeting Pod", "weight": 342} LAU3_HE151 = {"clsid": "LAU3_HE151", "name": "LAU-3 - 19 x UnGd Rkts, 70 mm Hydra 70 M151 HE", "weight": 231.2} LAU3_HE5 = {"clsid": "LAU3_HE5", "name": "LAU-3 - 19 x UnGd Rkts, 70 mm Hydra 70 Mk 5 HEAT", "weight": 208.4} @@ -909,7 +918,7 @@ class Weapons: M10_Smoke_Tank___red = {"clsid": "{US_M10_SMOKE_TANK_RED}", "name": "M10 Smoke Tank - red", "weight": 266.7} M10_Smoke_Tank___white = {"clsid": "{US_M10_SMOKE_TANK_WHITE}", "name": "M10 Smoke Tank - white", "weight": 266.7} M10_Smoke_Tank___yellow = {"clsid": "{US_M10_SMOKE_TANK_YELLOW}", "name": "M10 Smoke Tank - yellow", "weight": 266.7} - M117___750lb_GP_Bomb_LD = {"clsid": "{00F5DAC4-0466-4122-998F-B1A298E34113}", "name": "M117 - 750lb GP Bomb LD", "weight": 340} + M117___750lb_GP_Bomb_LD = {"clsid": "{00F5DAC4-0466-4122-998F-B1A298E34113}", "name": "M117 - 750lb GP Bomb LD", "weight": 408} M134D = {"clsid": "{CH47_PORT_M134D}", "name": "M134D", "weight": 270.4} M134D_ = {"clsid": "{CH47_STBD_M134D}", "name": "M134D", "weight": 270.4} M134_L = {"clsid": "M134_L", "name": "M134 - 6 x 7.62mm MiniGun left", "weight": 146.4} @@ -1068,9 +1077,9 @@ class Weapons: MER2_with_2_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = {"clsid": "{0B9ABA77-93B8-45FC-9C63-82AFB2CB50A4}", "name": "MER2 with 2 x Mk-20 Rockeye - 490lbs CBUs, 247 x HEAT Bomblets", "weight": 553} MER2_with_2_x_Mk_82___500lb_GP_Bombs_LD = {"clsid": "{D5D51E24-348C-4702-96AF-97A714E72697}", "name": "MER2 with 2 x Mk-82 - 500lb GP Bombs LD", "weight": 565} MER2_with_2_x_Mk_83___1000lb_GP_Bombs_LD = {"clsid": "{18617C93-78E7-4359-A8CE-D754103EDF63}", "name": "MER2 with 2 x Mk-83 - 1000lb GP Bombs LD", "weight": 1017} - MER3_with_3_x_M117___750lb_GP_Bombs_LD = {"clsid": "{82F90BEC-0E2E-4CE5-A66E-1E4ADA2B5D1E}", "name": "MER3 with 3 x M117 - 750lb GP Bombs LD", "weight": 1060} + MER3_with_3_x_M117___750lb_GP_Bombs_LD = {"clsid": "{82F90BEC-0E2E-4CE5-A66E-1E4ADA2B5D1E}", "name": "MER3 with 3 x M117 - 750lb GP Bombs LD", "weight": 1224} MER6_with_6_x_BLU_107___440lb_Anti_Runway_Penetrator_Bombs = {"clsid": "{752B9782-F962-11d5-9190-00A0249B6F00}", "name": "MER6 with 6 x BLU-107 - 440lb Anti-Runway Penetrator Bombs", "weight": 1800} - MER6_with_6_x_M117___750lb_GP_Bombs_LD = {"clsid": "{6CDB6B36-7165-47D0-889F-6625FB333561}", "name": "MER6 with 6 x M117 - 750lb GP Bombs LD", "weight": 2100} + MER6_with_6_x_M117___750lb_GP_Bombs_LD = {"clsid": "{6CDB6B36-7165-47D0-889F-6625FB333561}", "name": "MER6 with 6 x M117 - 750lb GP Bombs LD", "weight": 2448} MER6_with_6_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = {"clsid": "{3C7CD675-7D39-41C5-8735-0F4F537818A8}", "name": "MER6 with 6 x Mk-20 Rockeye - 490lbs CBUs, 247 x HEAT Bomblets", "weight": 1392} MER6_with_6_x_Mk_82___500lb_GP_Bombs_LD = {"clsid": "{1C97B4A0-AA3B-43A8-8EE7-D11071457185}", "name": "MER6 with 6 x Mk-82 - 500lb GP Bombs LD", "weight": 1506} Mercury_LLTV_Pod = {"clsid": "{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}", "name": "Mercury LLTV Pod", "weight": 230} @@ -1466,7 +1475,7 @@ class Weapons: _250_lb_MC_Mk_I_ = {"clsid": "{British_MC_250LB_Bomb_Mk1_on_Handley_Page_Type_B_Cut_Bar}", "name": "250 lb MC Mk.I", "weight": 107.3} _250_lb_S_A_P_ = {"clsid": "{British_SAP_250LB_Bomb_Mk5}", "name": "250 lb S.A.P.", "weight": 111.13} _250_lb_S_A_P__ = {"clsid": "{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}", "name": "250 lb S.A.P.", "weight": 116.43} - _27_x_M117___750lb_GP_Bombs_LD = {"clsid": "{B58F99BA-5480-4572-8602-28B0449F5260}", "name": "27 x M117 - 750lb GP Bombs LD", "weight": 9180} + _27_x_M117___750lb_GP_Bombs_LD = {"clsid": "{B58F99BA-5480-4572-8602-28B0449F5260}", "name": "27 x M117 - 750lb GP Bombs LD", "weight": 11016} _27_x_M117___750lb_GP_Bomb_LD = {"clsid": "{B52H_BAY_M117}", "name": "27 x M117 - 750lb GP Bomb LD", "weight": 11016} _27_x_Mk_82_AIR_Ballute___500lb_GP_Bomb_HD = {"clsid": "{B52H_BAY_Mk82AIR}", "name": "27 x Mk-82 AIR Ballute - 500lb GP Bomb HD", "weight": 6534} _27_x_Mk_82___500lb_GP_Bomb_LD = {"clsid": "{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}", "name": "27 x Mk-82 - 500lb GP Bomb LD", "weight": 6156} @@ -1695,6 +1704,7 @@ class Weapons: _2_x_FAB_250_ = {"clsid": "{FAB_250_DUAL_R}", "name": "2 x FAB-250", "weight": 532} _2_x_FAB_500 = {"clsid": "{FAB_500_DUAL_L}", "name": "2 x FAB-500", "weight": 1044} _2_x_FAB_500_ = {"clsid": "{FAB_500_DUAL_R}", "name": "2 x FAB-500", "weight": 1044} + _2_x_FIM_92C_Stinger = {"clsid": "{CHAP_AIM92}", "name": "2 x FIM-92C Stinger", "weight": 47} _2_x_HOT_3___ATGM__SACLOS__HEAT = {"clsid": "{HOT3_L2_M}", "name": "2 x HOT-3 - ATGM, SACLOS, HEAT", "weight": 62.5} _2_x_HOT_3___ATGM__SACLOS__HEAT_ = {"clsid": "{HOT3_L2}", "name": "2 x HOT-3 - ATGM, SACLOS, HEAT", "weight": 62.5} _2_x_HOT_3___ATGM__SACLOS__HEAT__ = {"clsid": "{HOT3_R2_M}", "name": "2 x HOT-3 - ATGM, SACLOS, HEAT", "weight": 62.5} @@ -1836,6 +1846,7 @@ class Weapons: _4_x_AN_M64___500lb_GP_Bomb_LD = {"clsid": "{4xAN-M64_on_InvCountedAttachmentPoints}", "name": "4 x AN-M64 - 500lb GP Bomb LD", "weight": 908} _4_x_BGM_71D_TOW_ATGM = {"clsid": "{3EA17AB0-A805-4D9E-8732-4CE00CB00F17}", "name": "4 x BGM-71D TOW ATGM", "weight": 250} _4_x_GBU_27___2000lb_Laser_Guided_Penetrator_Bombs = {"clsid": "{B8C99F40-E486-4040-B547-6639172A5D57}", "name": "4 x GBU-27 - 2000lb Laser Guided Penetrator Bombs", "weight": 3936} + _4_x_HOT3___ATGM__SACLOS__Tandem_HEAT = {"clsid": "{CHAP_HOT3}", "name": "4 x HOT3 - ATGM, SACLOS, Tandem HEAT", "weight": 168} _4_x_RP_3_25lb_AP_Mk_I = {"clsid": "{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}", "name": "4 x RP-3 25lb AP Mk.I", "weight": 218} _4_x_RP_3_25lb_AP_Mk_I_ = {"clsid": "{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}", "name": "4 x RP-3 25lb AP Mk.I", "weight": 218} _4_x_RP_3_60lb_F_No1_Mk_I = {"clsid": "{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}", "name": "4 x RP-3 60lb F No1 Mk.I", "weight": 256.4} @@ -1921,6 +1932,7 @@ class Weapons: _Special_Weapons_Adapter__2x_Mk_82_AIR_Ballute___500lb_GP_Bomb_HD__TER_ = {"clsid": "{HB_F4E_MK-82AIR_2x_SWA}", "name": "(Special Weapons Adapter) 2x Mk-82 AIR Ballute - 500lb GP Bomb HD (TER)", "weight": 612} _Special_Weapons_Adapter__2x_Mk_82_Snakeye___500lb_GP_Bomb_HD__TER_ = {"clsid": "{HB_F4E_MK-82_Snakeye_2x_SWA}", "name": "(Special Weapons Adapter) 2x Mk-82 Snakeye - 500lb GP Bomb HD (TER)", "weight": 627} _Special_Weapons_Adapter__2x_Mk_82___500lb_GP_Bomb_LD__TER_ = {"clsid": "{HB_F4E_MK-82_2x_SWA}", "name": "(Special Weapons Adapter) 2x Mk-82 - 500lb GP Bomb LD (TER)", "weight": 584} + _Special_Weapons_Adapter__3x_BDU_33___25lb_Practice_Bomb_LD__TER_ = {"clsid": "{HB_F4E_BDU-33_3x_SWA}", "name": "(Special Weapons Adapter) 3x BDU-33 - 25lb Practice Bomb LD (TER)", "weight": 161.9} _Special_Weapons_Adapter__3x_BLU_107_B_Durandal___219kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster__TER_ = {"clsid": "{HB_F4E_BLU-107B_3x_SWA}", "name": "(Special Weapons Adapter) 3x BLU-107/B Durandal - 219kg Concrete Piercing Chute Retarded Bomb w/Booster (TER)", "weight": 785} _Special_Weapons_Adapter__AGM_12A_Bullpup_MCLOS_ASM__LAU_34_ = {"clsid": "{AGM_12A_SWA}", "name": "(Special Weapons Adapter) AGM-12A Bullpup MCLOS ASM (LAU-34)", "weight": 296} _Special_Weapons_Adapter__AGM_12B_Bullpup_MCLOS_ASM__LAU_34_ = {"clsid": "{AGM_12B_SWA}", "name": "(Special Weapons Adapter) AGM-12B Bullpup MCLOS ASM (LAU-34)", "weight": 302} @@ -2054,6 +2066,7 @@ class Weapons: "{F14-ALQ167}": Weapons.ALQ_167__non_functional_, "ALQ_184": Weapons.ALQ_184, "ALQ_184_Long": Weapons.ALQ_184_Long, + "{AM39}": Weapons.AM39_EXOCET_AShM, "{F-15E_AAQ-13_LANTIRN}": Weapons.AN_AAQ_13_LANTIRN_NAV_POD, "{F-15E_AAQ-14_LANTIRN}": Weapons.AN_AAQ_14_LANTIRN_TGT_Pod, "{F-15E_AAQ-28_LITENING}": Weapons.AN_AAQ_28_LITENING_AT, @@ -2397,6 +2410,7 @@ class Weapons: "DIS_GDJ_YJ83K": Weapons.DIS_GDJ_YJ83K, "DIS_H6_250_2_N12": Weapons.DIS_H6_250_2_N12, "DIS_H6_250_2_N24": Weapons.DIS_H6_250_2_N24, + "DIS_HF20_90_1_HE": Weapons.DIS_HF20_90_1_HE, "DIS_HJ-12": Weapons.DIS_HJ_12, "DIS_KD20": Weapons.DIS_KD20, "DIS_KD63": Weapons.DIS_KD63, @@ -2429,7 +2443,6 @@ class Weapons: "DIS_PL-5EII": Weapons.DIS_PL_5EII, "DIS_PL-8A": Weapons.DIS_PL_8A, "DIS_PL-8B": Weapons.DIS_PL_8B, - "DIS_RKT_90_UG": Weapons.DIS_RKT_90_UG, "DIS_SD-10": Weapons.DIS_SD_10, "DIS_SD-10_DUAL_L": Weapons.DIS_SD_10_DUAL_L, "DIS_SD-10_DUAL_R": Weapons.DIS_SD_10_DUAL_R, @@ -2508,6 +2521,7 @@ class Weapons: "{F14-300gal-empty}": Weapons.Fuel_tank_300_gal__empty_, "{EFEC8200-B922-11d7-9897-000476191836}": Weapons.Fuel_tank_330_gal, "{EFEC8201-B922-11d7-9897-000476191836}": Weapons.Fuel_tank_330_gal_, + "{CHAP_TigerUHT_fueltank}": Weapons.Fuel_tank_350_liters, "{82364E69-5564-4043-A866-E13032926C3E}": Weapons.Fuel_tank_367_gal, "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}": Weapons.Fuel_tank_370_gal, "{0855A3A1-FA50-4C89-BDBB-5D5360ABA071}": Weapons.Fuel_tank_5000L, @@ -2520,6 +2534,8 @@ class Weapons: "{B99EE8A8-99BC-4a8d-89AC-A26831920DCE}": Weapons.Fuel_tank_PTB_450_, "{A504D93B-4E80-4B4F-A533-0D9B65F2C55F}": Weapons.Fuel_tank_S_3, "FW109_FUEL_TANK": Weapons.FW109_FUEL_TANK, + "{CHAP_FZ225_M151}": Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M151_HE, + "{CHAP_FZ225_M229}": Weapons.FZ225___19_x_70_mm_UnGd_Rkts__M229_HE, "{8B9E3FD0-F034-4A07-B6CE-C269884CC71B}": Weapons.F_4_Fuel_tank_C, "{7B4B122D-C12C-4DB4-834E-4D8BB4D863A8}": Weapons.F_4_Fuel_tank_W, "{PTB-150GAL}": Weapons.F_5_150Gal_Fuel_tank, @@ -2555,13 +2571,16 @@ class Weapons: "{CFT_R_GBU_31_x_2}": Weapons.GBU_31_V_1_B___2_, "{GBU-31}": Weapons.GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb, "{GBU_31_V_2B}": Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb, + "{BRU-32 GBU_31_V_2B}": Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb_, "{CFT_L_GBU_31V3B_x_2}": Weapons.GBU_31_V_3_B___2, "{CFT_R_GBU_31V3B_x_2}": Weapons.GBU_31_V_3_B___2_, "{GBU-31V3B}": Weapons.GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb, "{GBU_31_V_4B}": Weapons.GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb, + "{BRU-32 GBU_31_V_4B}": Weapons.GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb_, "{GBU_32_V_2B}": Weapons.GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb, "GBU-38*16": Weapons.GBU_38_16, "{GBU-38}": Weapons.GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb, + "{BRU-32 GBU-38}": Weapons.GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb_, "{CFT_L_GBU_38_x_3}": Weapons.GBU_38___3, "{CFT_R_GBU_38_x_3}": Weapons.GBU_38___3_, "{GBU-39}": Weapons.GBU_39, @@ -2584,6 +2603,7 @@ class Weapons: "{HB_F4E_CBU-2B/A}": Weapons.HB_F4E_CBU_2B_A_pod___19_x_tubes_of_Bomblets_BLU_3B_x_22__HE, "{HB_F4E_CBU-2/A}": Weapons.HB_F4E_CBU_2_A_pod___19_x_tubes_of_Bomblets_BLU_3B_x_19__HE, "{F4_HIGH_PERFORMANCE_CENTERLINE_600_GAL}": Weapons.High_Performance_Centerline_Tank_600_gallons, + "{CHAP_HMP400LC}": Weapons.HMP400LC, "{HSAB-6xAGM-84}": Weapons.HSAB_with_6_x_AGM_84, "{HSAB_2x_GBU28}": Weapons.HSAB___2_x_GBU_28___5000lb_Laser_Guided_Penetrator_Bomb, "{HSAB_4x_AGM84D_L}": Weapons.HSAB___4_x_AGM_84D_Harpoon_AShM, @@ -2677,6 +2697,7 @@ class Weapons: "{44EE8698-89F9-48EE-AF36-5FD31896A82F}": Weapons.L005_Sorbtsiya_ECM_pod__left_, "{44EE8698-89F9-48EE-AF36-5FD31896A82A}": Weapons.L005_Sorbtsiya_ECM_pod__right_, "{ECM_POD_L_175V}": Weapons.L175V_Khibiny_ECM_pod, + "LA7_AO_25SL": Weapons.LA7_AO_25SL, "{F14-LANTIRN-TP}": Weapons.LANTIRN_Targeting_Pod, "LAU3_HE151": Weapons.LAU3_HE151, "LAU3_HE5": Weapons.LAU3_HE5, @@ -3636,6 +3657,7 @@ class Weapons: "{FAB_250_DUAL_R}": Weapons._2_x_FAB_250_, "{FAB_500_DUAL_L}": Weapons._2_x_FAB_500, "{FAB_500_DUAL_R}": Weapons._2_x_FAB_500_, + "{CHAP_AIM92}": Weapons._2_x_FIM_92C_Stinger, "{HOT3_L2_M}": Weapons._2_x_HOT_3___ATGM__SACLOS__HEAT, "{HOT3_L2}": Weapons._2_x_HOT_3___ATGM__SACLOS__HEAT_, "{HOT3_R2_M}": Weapons._2_x_HOT_3___ATGM__SACLOS__HEAT__, @@ -3777,6 +3799,7 @@ class Weapons: "{4xAN-M64_on_InvCountedAttachmentPoints}": Weapons._4_x_AN_M64___500lb_GP_Bomb_LD, "{3EA17AB0-A805-4D9E-8732-4CE00CB00F17}": Weapons._4_x_BGM_71D_TOW_ATGM, "{B8C99F40-E486-4040-B547-6639172A5D57}": Weapons._4_x_GBU_27___2000lb_Laser_Guided_Penetrator_Bombs, + "{CHAP_HOT3}": Weapons._4_x_HOT3___ATGM__SACLOS__Tandem_HEAT, "{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}": Weapons._4_x_RP_3_25lb_AP_Mk_I, "{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}": Weapons._4_x_RP_3_25lb_AP_Mk_I_, "{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}": Weapons._4_x_RP_3_60lb_F_No1_Mk_I, @@ -3862,6 +3885,7 @@ class Weapons: "{HB_F4E_MK-82AIR_2x_SWA}": Weapons._Special_Weapons_Adapter__2x_Mk_82_AIR_Ballute___500lb_GP_Bomb_HD__TER_, "{HB_F4E_MK-82_Snakeye_2x_SWA}": Weapons._Special_Weapons_Adapter__2x_Mk_82_Snakeye___500lb_GP_Bomb_HD__TER_, "{HB_F4E_MK-82_2x_SWA}": Weapons._Special_Weapons_Adapter__2x_Mk_82___500lb_GP_Bomb_LD__TER_, + "{HB_F4E_BDU-33_3x_SWA}": Weapons._Special_Weapons_Adapter__3x_BDU_33___25lb_Practice_Bomb_LD__TER_, "{HB_F4E_BLU-107B_3x_SWA}": Weapons._Special_Weapons_Adapter__3x_BLU_107_B_Durandal___219kg_Concrete_Piercing_Chute_Retarded_Bomb_w_Booster__TER_, "{AGM_12A_SWA}": Weapons._Special_Weapons_Adapter__AGM_12A_Bullpup_MCLOS_ASM__LAU_34_, "{AGM_12B_SWA}": Weapons._Special_Weapons_Adapter__AGM_12B_Bullpup_MCLOS_ASM__LAU_34_, diff --git a/tools/pydcs_export.lua b/tools/pydcs_export.lua index bdb69ed6..b4cffc3c 100644 --- a/tools/pydcs_export.lua +++ b/tools/pydcs_export.lua @@ -249,6 +249,7 @@ flyable["J-11A"] = true flyable["JF-17"] = true flyable["L-39C"] = true flyable["L-39ZA"] = true +flyable["La-7"] = true flyable["M-2000C"] = true flyable["MB-339A"] = true flyable["MB-339APAN"] = true