From d24e765049f9edce492622ab7ea888448206f8b3 Mon Sep 17 00:00:00 2001 From: zhexu14 <64713351+zhexu14@users.noreply.github.com> Date: Sat, 21 Jun 2025 23:21:17 +1000 Subject: [PATCH] DCS 2.9.17 export --- dcs/countries.py | 413 +++++++++++++++++++++++++++++++++ dcs/planes.py | 505 +++++++++++++++++++++++++++++++++++++++++ dcs/ships.py | 12 + dcs/vehicles.py | 68 +++++- dcs/weapons_data.py | 26 ++- tools/pydcs_export.lua | 1 + 6 files changed, 1018 insertions(+), 7 deletions(-) diff --git a/dcs/countries.py b/dcs/countries.py index e0719cf1..b486ce9d 100644 --- a/dcs/countries.py +++ b/dcs/countries.py @@ -244,6 +244,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -325,6 +327,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -767,6 +771,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -840,6 +846,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -1162,6 +1170,8 @@ class Plane: Falcon_Gyrocopter = planes.Falcon_Gyrocopter F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW I_16 = planes.I_16 M_2000C = planes.M_2000C MB_339A = planes.MB_339A @@ -1243,6 +1253,8 @@ class Plane: Plane.Falcon_Gyrocopter, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.I_16, Plane.M_2000C, Plane.MB_339A, @@ -1321,6 +1333,7 @@ class Ship: CVN_75 = ships.CVN_75 HandyWind = ships.HandyWind Seawise_Giant = ships.Seawise_Giant + Essex = ships.Essex HarborTug = ships.HarborTug Ship_Tilde_Supply = ships.Ship_Tilde_Supply Santafe = ships.Santafe @@ -1594,6 +1607,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -1654,6 +1669,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -1996,6 +2013,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -2055,6 +2074,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -2394,6 +2415,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -2458,6 +2481,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -2872,6 +2897,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -2933,6 +2960,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -3263,6 +3292,10 @@ class AirDefence: HQ_7_STR_SP = vehicles.AirDefence.HQ_7_STR_SP HQ_7_LN_SP = vehicles.AirDefence.HQ_7_LN_SP HQ_7_LN_P = vehicles.AirDefence.HQ_7_LN_P + Type_3_80mm_AA = vehicles.AirDefence.Type_3_80mm_AA + Type_88_75mm_AA = vehicles.AirDefence.Type_88_75mm_AA + Type_96_25mm_AA = vehicles.AirDefence.Type_96_25mm_AA + Type_94_25mm_AA_Truck = vehicles.AirDefence.Type_94_25mm_AA_Truck M6_Linebacker = vehicles.AirDefence.M6_Linebacker class Fortification: @@ -3336,6 +3369,8 @@ class Unarmed: Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 GD_20 = vehicles.Unarmed.GD_20 + Type_94_Truck = vehicles.Unarmed.Type_94_Truck + Type_98_So_Da = vehicles.Unarmed.Type_98_So_Da class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -3406,6 +3441,8 @@ class Armor: M1126_Stryker_ICV = vehicles.Armor.M1126_Stryker_ICV Leopard_2A4_trs = vehicles.Armor.Leopard_2A4_trs Challenger2 = vehicles.Armor.Challenger2 + Type_98_Ke_Ni = vehicles.Armor.Type_98_Ke_Ni + Type_89_I_Go = vehicles.Armor.Type_89_I_Go M1128_Stryker_MGS = vehicles.Armor.M1128_Stryker_MGS M1134_Stryker_ATGM = vehicles.Armor.M1134_Stryker_ATGM M1A2C_SEP_V3 = vehicles.Armor.M1A2C_SEP_V3 @@ -3484,6 +3521,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -3616,6 +3655,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -3813,6 +3854,7 @@ class Ship: CVN_72 = ships.CVN_72 CVN_73 = ships.CVN_73 CVN_75 = ships.CVN_75 + Essex = ships.Essex Forrestal = ships.Forrestal CastleClass_01 = ships.CastleClass_01 Hms_invincible = ships.Hms_invincible @@ -4092,6 +4134,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 @@ -4147,6 +4191,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.FA_18C_hornet, Plane.I_16, @@ -4464,6 +4510,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A FA_18C_hornet = planes.FA_18C_hornet Hawk = planes.Hawk @@ -4525,6 +4573,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.FA_18C_hornet, Plane.Hawk, @@ -4876,6 +4926,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -4935,6 +4987,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -5264,6 +5318,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -5321,6 +5377,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -5629,6 +5687,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -5686,6 +5746,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -5992,6 +6054,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -6049,6 +6113,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -6373,6 +6439,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -6433,6 +6501,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -6802,6 +6872,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -6859,6 +6931,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -7183,6 +7257,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -7234,6 +7310,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -7493,6 +7571,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -7548,6 +7628,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -7791,6 +7873,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -7841,6 +7925,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -8073,6 +8159,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -8134,6 +8222,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -8460,6 +8550,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 L_39C = planes.L_39C @@ -8515,6 +8607,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.FA_18C_hornet, Plane.I_16, Plane.L_39C, @@ -8810,6 +8904,8 @@ class Plane: F_5E = planes.F_5E F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 @@ -8862,6 +8958,8 @@ class Plane: Plane.F_5E, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.FA_18C_hornet, Plane.I_16, @@ -9136,6 +9234,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -9187,6 +9287,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -9568,6 +9670,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -9630,6 +9734,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -9924,6 +10030,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -9983,6 +10091,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -10312,6 +10422,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -10368,6 +10480,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -10704,6 +10818,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -10766,6 +10882,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -10973,6 +11091,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -11024,6 +11144,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -11391,6 +11513,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -11448,6 +11572,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -11813,6 +11939,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A FA_18C_hornet = planes.FA_18C_hornet L_39C = planes.L_39C @@ -11864,6 +11992,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.FA_18C_hornet, Plane.L_39C, @@ -12197,6 +12327,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -12255,6 +12387,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -12629,6 +12763,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -12684,6 +12820,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -13005,6 +13143,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -13064,6 +13204,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -13418,6 +13560,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_14B = planes.F_14B F_14A_135_GR = planes.F_14A_135_GR + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -13479,6 +13623,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_14B, Plane.F_14A_135_GR, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -13834,6 +13980,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -13894,6 +14042,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -14109,6 +14259,10 @@ class AirDefence: Patriot_str = vehicles.AirDefence.Patriot_str Soldier_stinger = vehicles.AirDefence.Soldier_stinger Stinger_comm = vehicles.AirDefence.Stinger_comm + Type_3_80mm_AA = vehicles.AirDefence.Type_3_80mm_AA + Type_88_75mm_AA = vehicles.AirDefence.Type_88_75mm_AA + Type_96_25mm_AA = vehicles.AirDefence.Type_96_25mm_AA + Type_94_25mm_AA_Truck = vehicles.AirDefence.Type_94_25mm_AA_Truck HL_ZU_23 = vehicles.AirDefence.HL_ZU_23 Tt_ZU_23 = vehicles.AirDefence.Tt_ZU_23 Flak18 = vehicles.AirDefence.Flak18 @@ -14140,6 +14294,8 @@ class Fortification: class Unarmed: M_818 = vehicles.Unarmed.M_818 Hummer = vehicles.Unarmed.Hummer + Type_94_Truck = vehicles.Unarmed.Type_94_Truck + Type_98_So_Da = vehicles.Unarmed.Type_98_So_Da TugHarlan_drivable = vehicles.Unarmed.TugHarlan_drivable B600_drivable = vehicles.Unarmed.B600_drivable MJ_1_drivable = vehicles.Unarmed.MJ_1_drivable @@ -14154,6 +14310,8 @@ class Unarmed: Horch_901_typ_40_kfz_21 = vehicles.Unarmed.Horch_901_typ_40_kfz_21 class Armor: + Type_98_Ke_Ni = vehicles.Armor.Type_98_Ke_Ni + Type_89_I_Go = vehicles.Armor.Type_89_I_Go HL_DSHK = vehicles.Armor.HL_DSHK HL_KORD = vehicles.Armor.HL_KORD Tt_DSHK = vehicles.Armor.Tt_DSHK @@ -14227,6 +14385,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -14280,6 +14440,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -14676,6 +14838,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -14739,6 +14903,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -15050,6 +15216,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -15103,6 +15271,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -15412,6 +15582,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -15470,6 +15642,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -15829,6 +16003,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -15890,6 +16066,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -16247,6 +16425,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -16303,6 +16483,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -16618,6 +16800,8 @@ class Plane: Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -16675,6 +16859,8 @@ class Plane: Plane.Christen_Eagle_II, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -17015,6 +17201,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -17070,6 +17258,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -17386,6 +17576,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -17441,6 +17633,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -17750,6 +17944,8 @@ class Plane: Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -17806,6 +18002,8 @@ class Plane: Plane.Christen_Eagle_II, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -18096,6 +18294,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -18150,6 +18350,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -18499,6 +18701,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -18557,6 +18761,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -18869,6 +19075,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -18923,6 +19131,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -19255,6 +19465,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -19311,6 +19523,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -19619,6 +19833,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -19672,6 +19888,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -19950,6 +20168,8 @@ class Plane: Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -20001,6 +20221,8 @@ class Plane: Plane.Christen_Eagle_II, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -20291,6 +20513,8 @@ class Plane: Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -20345,6 +20569,8 @@ class Plane: Plane.Christen_Eagle_II, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -20647,6 +20873,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -20702,6 +20930,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -20976,6 +21206,8 @@ class Plane: Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -21029,6 +21261,8 @@ class Plane: Plane.Christen_Eagle_II, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -21331,6 +21565,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -21386,6 +21622,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -21670,6 +21908,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -21722,6 +21962,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -22015,6 +22257,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -22067,6 +22311,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -22381,6 +22627,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -22437,6 +22685,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -22740,6 +22990,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -22795,6 +23047,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -23125,6 +23379,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -23183,6 +23439,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -23463,6 +23721,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -23514,6 +23774,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -23819,6 +24081,8 @@ class Plane: Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE F_4E_45MC = planes.F_4E_45MC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -23873,6 +24137,8 @@ class Plane: Plane.Christen_Eagle_II, Plane.F_15ESE, Plane.F_4E_45MC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -24169,6 +24435,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -24226,6 +24494,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -24536,6 +24806,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -24588,6 +24860,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -24889,6 +25163,8 @@ class Plane: F_4E_45MC = planes.F_4E_45MC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -24939,6 +25215,8 @@ class Plane: Plane.F_4E_45MC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -25241,6 +25519,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -25292,6 +25572,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -25607,6 +25889,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -25660,6 +25944,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -26000,6 +26286,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -26076,6 +26364,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -26306,6 +26596,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -26356,6 +26648,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -26742,6 +27036,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -26809,6 +27105,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -27129,6 +27427,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A FA_18C_hornet = planes.FA_18C_hornet I_16 = planes.I_16 @@ -27182,6 +27482,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.FA_18C_hornet, Plane.I_16, @@ -27472,6 +27774,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -27526,6 +27830,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -27836,6 +28142,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -27889,6 +28197,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -28203,6 +28513,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -28258,6 +28570,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -28546,6 +28860,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -28601,6 +28917,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -28946,6 +29264,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -29007,6 +29327,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -29301,6 +29623,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -29357,6 +29681,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -29694,6 +30020,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -29750,6 +30078,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -30054,6 +30384,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -30106,6 +30438,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -30435,6 +30769,10 @@ class AirDefence: HQ_7_STR_SP = vehicles.AirDefence.HQ_7_STR_SP HQ_7_LN_SP = vehicles.AirDefence.HQ_7_LN_SP HQ_7_LN_P = vehicles.AirDefence.HQ_7_LN_P + Type_3_80mm_AA = vehicles.AirDefence.Type_3_80mm_AA + Type_88_75mm_AA = vehicles.AirDefence.Type_88_75mm_AA + Type_96_25mm_AA = vehicles.AirDefence.Type_96_25mm_AA + Type_94_25mm_AA_Truck = vehicles.AirDefence.Type_94_25mm_AA_Truck M6_Linebacker = vehicles.AirDefence.M6_Linebacker class Fortification: @@ -30508,6 +30846,8 @@ class Unarmed: Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 GD_20 = vehicles.Unarmed.GD_20 + Type_94_Truck = vehicles.Unarmed.Type_94_Truck + Type_98_So_Da = vehicles.Unarmed.Type_98_So_Da class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -30578,6 +30918,8 @@ class Armor: M1126_Stryker_ICV = vehicles.Armor.M1126_Stryker_ICV Leopard_2A4_trs = vehicles.Armor.Leopard_2A4_trs Challenger2 = vehicles.Armor.Challenger2 + Type_98_Ke_Ni = vehicles.Armor.Type_98_Ke_Ni + Type_89_I_Go = vehicles.Armor.Type_89_I_Go M1128_Stryker_MGS = vehicles.Armor.M1128_Stryker_MGS M1134_Stryker_ATGM = vehicles.Armor.M1134_Stryker_ATGM M1A2C_SEP_V3 = vehicles.Armor.M1A2C_SEP_V3 @@ -30655,6 +30997,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -30787,6 +31131,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -30985,6 +31331,7 @@ class Ship: CVN_72 = ships.CVN_72 CVN_73 = ships.CVN_73 CVN_75 = ships.CVN_75 + Essex = ships.Essex Forrestal = ships.Forrestal CastleClass_01 = ships.CastleClass_01 Hms_invincible = ships.Hms_invincible @@ -31271,6 +31618,10 @@ class AirDefence: HQ_7_STR_SP = vehicles.AirDefence.HQ_7_STR_SP HQ_7_LN_SP = vehicles.AirDefence.HQ_7_LN_SP HQ_7_LN_P = vehicles.AirDefence.HQ_7_LN_P + Type_3_80mm_AA = vehicles.AirDefence.Type_3_80mm_AA + Type_88_75mm_AA = vehicles.AirDefence.Type_88_75mm_AA + Type_96_25mm_AA = vehicles.AirDefence.Type_96_25mm_AA + Type_94_25mm_AA_Truck = vehicles.AirDefence.Type_94_25mm_AA_Truck M6_Linebacker = vehicles.AirDefence.M6_Linebacker class Fortification: @@ -31344,6 +31695,8 @@ class Unarmed: Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 GD_20 = vehicles.Unarmed.GD_20 + Type_94_Truck = vehicles.Unarmed.Type_94_Truck + Type_98_So_Da = vehicles.Unarmed.Type_98_So_Da class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -31414,6 +31767,8 @@ class Armor: M1126_Stryker_ICV = vehicles.Armor.M1126_Stryker_ICV Leopard_2A4_trs = vehicles.Armor.Leopard_2A4_trs Challenger2 = vehicles.Armor.Challenger2 + Type_98_Ke_Ni = vehicles.Armor.Type_98_Ke_Ni + Type_89_I_Go = vehicles.Armor.Type_89_I_Go M1128_Stryker_MGS = vehicles.Armor.M1128_Stryker_MGS M1134_Stryker_ATGM = vehicles.Armor.M1134_Stryker_ATGM M1A2C_SEP_V3 = vehicles.Armor.M1A2C_SEP_V3 @@ -31491,6 +31846,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -31623,6 +31980,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -31821,6 +32180,7 @@ class Ship: CVN_72 = ships.CVN_72 CVN_73 = ships.CVN_73 CVN_75 = ships.CVN_75 + Essex = ships.Essex Forrestal = ships.Forrestal CastleClass_01 = ships.CastleClass_01 Hms_invincible = ships.Hms_invincible @@ -32107,6 +32467,10 @@ class AirDefence: HQ_7_STR_SP = vehicles.AirDefence.HQ_7_STR_SP HQ_7_LN_SP = vehicles.AirDefence.HQ_7_LN_SP HQ_7_LN_P = vehicles.AirDefence.HQ_7_LN_P + Type_3_80mm_AA = vehicles.AirDefence.Type_3_80mm_AA + Type_88_75mm_AA = vehicles.AirDefence.Type_88_75mm_AA + Type_96_25mm_AA = vehicles.AirDefence.Type_96_25mm_AA + Type_94_25mm_AA_Truck = vehicles.AirDefence.Type_94_25mm_AA_Truck M6_Linebacker = vehicles.AirDefence.M6_Linebacker class Fortification: @@ -32180,6 +32544,8 @@ class Unarmed: Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 GD_20 = vehicles.Unarmed.GD_20 + Type_94_Truck = vehicles.Unarmed.Type_94_Truck + Type_98_So_Da = vehicles.Unarmed.Type_98_So_Da class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -32250,6 +32616,8 @@ class Armor: M1126_Stryker_ICV = vehicles.Armor.M1126_Stryker_ICV Leopard_2A4_trs = vehicles.Armor.Leopard_2A4_trs Challenger2 = vehicles.Armor.Challenger2 + Type_98_Ke_Ni = vehicles.Armor.Type_98_Ke_Ni + Type_89_I_Go = vehicles.Armor.Type_89_I_Go M1128_Stryker_MGS = vehicles.Armor.M1128_Stryker_MGS M1134_Stryker_ATGM = vehicles.Armor.M1134_Stryker_ATGM M1A2C_SEP_V3 = vehicles.Armor.M1A2C_SEP_V3 @@ -32327,6 +32695,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -32459,6 +32829,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -32657,6 +33029,7 @@ class Ship: CVN_72 = ships.CVN_72 CVN_73 = ships.CVN_73 CVN_75 = ships.CVN_75 + Essex = ships.Essex Forrestal = ships.Forrestal CastleClass_01 = ships.CastleClass_01 Hms_invincible = ships.Hms_invincible @@ -32900,6 +33273,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -32952,6 +33327,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -33258,6 +33635,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -33309,6 +33688,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -33602,6 +33983,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -33654,6 +34037,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -33949,6 +34334,8 @@ class Plane: F_5E = planes.F_5E F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -34003,6 +34390,8 @@ class Plane: Plane.F_5E, Plane.F_5E_3, Plane.F_5E_3_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -34281,6 +34670,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -34332,6 +34723,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -34624,6 +35017,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -34676,6 +35071,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -34978,6 +35375,8 @@ class Plane: F_5E_3 = planes.F_5E_3 F_5E_3_FC = planes.F_5E_3_FC F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -35035,6 +35434,8 @@ class Plane: Plane.F_5E_3, Plane.F_5E_3_FC, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -35323,6 +35724,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -35375,6 +35778,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -35696,6 +36101,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -35750,6 +36157,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, @@ -36055,6 +36464,8 @@ class Plane: F_5E_3_FC = planes.F_5E_3_FC F_86F_Sabre = planes.F_86F_Sabre F_86F_FC = planes.F_86F_FC + F4U_1D = planes.F4U_1D + F4U_1D_CW = planes.F4U_1D_CW F_A_18A = planes.F_A_18A F_A_18C = planes.F_A_18C FA_18C_hornet = planes.FA_18C_hornet @@ -36107,6 +36518,8 @@ class Plane: Plane.F_5E_3_FC, Plane.F_86F_Sabre, Plane.F_86F_FC, + Plane.F4U_1D, + Plane.F4U_1D_CW, Plane.F_A_18A, Plane.F_A_18C, Plane.FA_18C_hornet, diff --git a/dcs/planes.py b/dcs/planes.py index 11b38f3c..59429552 100644 --- a/dcs/planes.py +++ b/dcs/planes.py @@ -14347,6 +14347,509 @@ class Pylon10: task_default = task.Intercept +class F4U_1D(PlaneType): + id = "F4U-1D" + flyable = True + height = 4.5 + width = 12.49 + length = 10.31 + fuel_max = 662 + max_speed = 662.4 + chaff = 0 + flare = 0 + charge_total = 0 + chaff_charge_size = 0 + flare_charge_size = 0 + radio_frequency = 124 + + panel_radio = { + 1: { + "channels": { + 1: 124, + 2: 121, + 4: 123, + 3: 122 + }, + }, + 2: { + "channels": { + 6: 125, + 2: 121, + 3: 122, + 1: 124, + 4: 123, + 5: 124 + }, + }, + } + + property_defaults: Dict[str, Any] = { + "F4U_CustomGunsFiringPattern": False, + "F4U_GunsConvergence_Inner": 2, + "F4U_GunsConvergence_Mid": 2, + "F4U_GunsConvergence_Outer": 2, + } + + class Properties: + + class F4U_CustomGunsFiringPattern: + id = "F4U_CustomGunsFiringPattern" + + class F4U_GunsConvergence_Inner: + id = "F4U_GunsConvergence_Inner" + + class Values: + x_300 = 0 + x_400 = 1 + x_500 = 2 + x_600 = 3 + x_700 = 4 + x_800 = 5 + + class F4U_GunsConvergence_Mid: + id = "F4U_GunsConvergence_Mid" + + class Values: + x_300 = 0 + x_400 = 1 + x_500 = 2 + x_600 = 3 + x_700 = 4 + x_800 = 5 + + class F4U_GunsConvergence_Outer: + id = "F4U_GunsConvergence_Outer" + + class Values: + x_300 = 0 + x_400 = 1 + x_500 = 2 + x_600 = 3 + x_700 = 4 + x_800 = 5 + + properties = { + "F4U_CustomGunsFiringPattern": UnitPropertyDescription( + identifier="F4U_CustomGunsFiringPattern", + control="checkbox", + label="Custom guns firing pattern", + default=False, + ), + "F4U_GunsConvergence_Inner": UnitPropertyDescription( + identifier="F4U_GunsConvergence_Inner", + control="comboList", + label="Inner guns convergence", + default=2, + values={ + 0: "300", + 1: "400", + 2: "500", + 3: "600", + 4: "700", + 5: "800", + }, + ), + "F4U_GunsConvergence_Mid": UnitPropertyDescription( + identifier="F4U_GunsConvergence_Mid", + control="comboList", + label="Mid guns convergence", + default=2, + values={ + 0: "300", + 1: "400", + 2: "500", + 3: "600", + 4: "700", + 5: "800", + }, + ), + "F4U_GunsConvergence_Outer": UnitPropertyDescription( + identifier="F4U_GunsConvergence_Outer", + control="comboList", + label="Outer guns distance", + default=2, + values={ + 0: "300", + 1: "400", + 2: "500", + 3: "600", + 4: "700", + 5: "800", + }, + ), + } + + livery_name = "F4U-1D" # from livery_entry + + class Pylon1: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (1, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon2: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (2, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon3: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (3, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon4: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (4, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon5: + Mk5_Universal_Drop_Tank_150_Corsair = (5, Weapons.Mk5_Universal_Drop_Tank_150_Corsair) + Mk_6_Lockheed_Drop_Tank_150_U_S__Gal = (5, Weapons.Mk_6_Lockheed_Drop_Tank_150_U_S__Gal) + Tiny_Tim__Corsair____569_kg__unguided_rocket = (5, Weapons.Tiny_Tim__Corsair____569_kg__unguided_rocket) + AN_M30A1___100lb_GP_Bomb_LD = (5, Weapons.AN_M30A1___100lb_GP_Bomb_LD) + AN_M57___250lb_GP_Bomb_LD = (5, Weapons.AN_M57___250lb_GP_Bomb_LD) + AN_M64___500lb_GP_Bomb_LD = (5, Weapons.AN_M64___500lb_GP_Bomb_LD) + AN_M65___1000lb_GP_Bomb_LD = (5, Weapons.AN_M65___1000lb_GP_Bomb_LD) + + class Pylon6: + Auxiliary_Drop_Tank_175_U_S__Gal = (6, Weapons.Auxiliary_Drop_Tank_175_U_S__Gal) + AN_M64___500lb_GP_Bomb_LD = (6, Weapons.AN_M64___500lb_GP_Bomb_LD) + AN_M65___1000lb_GP_Bomb_LD = (6, Weapons.AN_M65___1000lb_GP_Bomb_LD) + ASM_N_2_Bat___1000lb_Radar_Guided_Glide_Bomb = (6, Weapons.ASM_N_2_Bat___1000lb_Radar_Guided_Glide_Bomb) + + class Pylon7: + Mk5_Universal_Drop_Tank_150_Corsair = (7, Weapons.Mk5_Universal_Drop_Tank_150_Corsair) + Mk_6_Lockheed_Drop_Tank_150_U_S__Gal = (7, Weapons.Mk_6_Lockheed_Drop_Tank_150_U_S__Gal) + Tiny_Tim__Corsair____569_kg__unguided_rocket_ = (7, Weapons.Tiny_Tim__Corsair____569_kg__unguided_rocket_) + AN_M30A1___100lb_GP_Bomb_LD = (7, Weapons.AN_M30A1___100lb_GP_Bomb_LD) + AN_M57___250lb_GP_Bomb_LD = (7, Weapons.AN_M57___250lb_GP_Bomb_LD) + AN_M64___500lb_GP_Bomb_LD = (7, Weapons.AN_M64___500lb_GP_Bomb_LD) + AN_M65___1000lb_GP_Bomb_LD = (7, Weapons.AN_M65___1000lb_GP_Bomb_LD) + + class Pylon8: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (8, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon9: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (9, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon10: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (10, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon11: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (11, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon12: + Smoke_Generator___white_ = (12, Weapons.Smoke_Generator___white_) + Smoke_Generator___red_ = (12, Weapons.Smoke_Generator___red_) + Smoke_Generator___green_ = (12, Weapons.Smoke_Generator___green_) + Smoke_Generator___blue_ = (12, Weapons.Smoke_Generator___blue_) + Smoke_Generator___orange_ = (12, Weapons.Smoke_Generator___orange_) + Smoke_Generator___yellow_ = (12, Weapons.Smoke_Generator___yellow_) + + pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} + + tasks = [task.Intercept, task.CAP, task.Escort, task.CAS, task.GroundAttack, task.Reconnaissance, task.AntishipStrike, task.FighterSweep] + task_default = task.Intercept + + +class F4U_1D_CW(PlaneType): + id = "F4U-1D_CW" + height = 4.5 + width = 12.49 + length = 10.31 + fuel_max = 662 + max_speed = 662.4 + chaff = 0 + flare = 0 + charge_total = 0 + chaff_charge_size = 0 + flare_charge_size = 0 + radio_frequency = 124 + + panel_radio = { + 1: { + "channels": { + 1: 124, + 2: 121, + 4: 123, + 3: 122 + }, + }, + 2: { + "channels": { + 6: 125, + 2: 121, + 3: 122, + 1: 124, + 4: 123, + 5: 124 + }, + }, + } + + property_defaults: Dict[str, Any] = { + "F4U_CustomGunsFiringPattern": False, + "F4U_GunsConvergence_Inner": 2, + "F4U_GunsConvergence_Mid": 2, + "F4U_GunsConvergence_Outer": 2, + "F4U_CW_number": True, + "F4U_CW_number_1": 0, + "F4U_CW_number_2": 9, + "F4U_CW_number_3": 2, + } + + class Properties: + + class F4U_CustomGunsFiringPattern: + id = "F4U_CustomGunsFiringPattern" + + class F4U_GunsConvergence_Inner: + id = "F4U_GunsConvergence_Inner" + + class Values: + x_300 = 0 + x_400 = 1 + x_500 = 2 + x_600 = 3 + x_700 = 4 + x_800 = 5 + + class F4U_GunsConvergence_Mid: + id = "F4U_GunsConvergence_Mid" + + class Values: + x_300 = 0 + x_400 = 1 + x_500 = 2 + x_600 = 3 + x_700 = 4 + x_800 = 5 + + class F4U_GunsConvergence_Outer: + id = "F4U_GunsConvergence_Outer" + + class Values: + x_300 = 0 + x_400 = 1 + x_500 = 2 + x_600 = 3 + x_700 = 4 + x_800 = 5 + + class F4U_CW_number: + id = "F4U_CW_number" + + class F4U_CW_number_1: + id = "F4U_CW_number_1" + + class Values: + x_0 = 0 + x_1 = 1 + x_2 = 2 + x_3 = 3 + x_4 = 4 + x_5 = 5 + x_6 = 6 + x_7 = 7 + x_8 = 8 + x_9 = 9 + + class F4U_CW_number_2: + id = "F4U_CW_number_2" + + class Values: + x_0 = 0 + x_1 = 1 + x_2 = 2 + x_3 = 3 + x_4 = 4 + x_5 = 5 + x_6 = 6 + x_7 = 7 + x_8 = 8 + x_9 = 9 + + class F4U_CW_number_3: + id = "F4U_CW_number_3" + + class Values: + x_0 = 0 + x_1 = 1 + x_2 = 2 + x_3 = 3 + x_4 = 4 + x_5 = 5 + x_6 = 6 + x_7 = 7 + x_8 = 8 + x_9 = 9 + + properties = { + "F4U_CustomGunsFiringPattern": UnitPropertyDescription( + identifier="F4U_CustomGunsFiringPattern", + control="checkbox", + label="Custom guns firing pattern", + default=False, + ), + "F4U_GunsConvergence_Inner": UnitPropertyDescription( + identifier="F4U_GunsConvergence_Inner", + control="comboList", + label="Inner guns convergence", + default=2, + values={ + 0: "300", + 1: "400", + 2: "500", + 3: "600", + 4: "700", + 5: "800", + }, + ), + "F4U_GunsConvergence_Mid": UnitPropertyDescription( + identifier="F4U_GunsConvergence_Mid", + control="comboList", + label="Mid guns convergence", + default=2, + values={ + 0: "300", + 1: "400", + 2: "500", + 3: "600", + 4: "700", + 5: "800", + }, + ), + "F4U_GunsConvergence_Outer": UnitPropertyDescription( + identifier="F4U_GunsConvergence_Outer", + control="comboList", + label="Outer guns distance", + default=2, + values={ + 0: "300", + 1: "400", + 2: "500", + 3: "600", + 4: "700", + 5: "800", + }, + ), + "F4U_CW_number": UnitPropertyDescription( + identifier="F4U_CW_number", + control="checkbox", + label="Royal Navy Build Numbers", + default=True, + ), + "F4U_CW_number_1": UnitPropertyDescription( + identifier="F4U_CW_number_1", + control="comboList", + label="1st number", + default=0, + values={ + 0: "0", + 1: "1", + 2: "2", + 3: "3", + 4: "4", + 5: "5", + 6: "6", + 7: "7", + 8: "8", + 9: "9", + }, + ), + "F4U_CW_number_2": UnitPropertyDescription( + identifier="F4U_CW_number_2", + control="comboList", + label="2nd number", + default=9, + values={ + 0: "0", + 1: "1", + 2: "2", + 3: "3", + 4: "4", + 5: "5", + 6: "6", + 7: "7", + 8: "8", + 9: "9", + }, + ), + "F4U_CW_number_3": UnitPropertyDescription( + identifier="F4U_CW_number_3", + control="comboList", + label="3rd number", + default=2, + values={ + 0: "0", + 1: "1", + 2: "2", + 3: "3", + 4: "4", + 5: "5", + 6: "6", + 7: "7", + 8: "8", + 9: "9", + }, + ), + } + + livery_name = "F4U-1D_CW" # from livery_entry + + class Pylon1: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (1, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon2: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (2, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon3: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (3, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon4: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (4, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon5: + Mk5_Universal_Drop_Tank_150_Corsair = (5, Weapons.Mk5_Universal_Drop_Tank_150_Corsair) + Mk_6_Lockheed_Drop_Tank_150_U_S__Gal = (5, Weapons.Mk_6_Lockheed_Drop_Tank_150_U_S__Gal) + Tiny_Tim__Corsair____569_kg__unguided_rocket = (5, Weapons.Tiny_Tim__Corsair____569_kg__unguided_rocket) + AN_M30A1___100lb_GP_Bomb_LD = (5, Weapons.AN_M30A1___100lb_GP_Bomb_LD) + AN_M57___250lb_GP_Bomb_LD = (5, Weapons.AN_M57___250lb_GP_Bomb_LD) + AN_M64___500lb_GP_Bomb_LD = (5, Weapons.AN_M64___500lb_GP_Bomb_LD) + AN_M65___1000lb_GP_Bomb_LD = (5, Weapons.AN_M65___1000lb_GP_Bomb_LD) + + class Pylon6: + Auxiliary_Drop_Tank_175_U_S__Gal = (6, Weapons.Auxiliary_Drop_Tank_175_U_S__Gal) + AN_M64___500lb_GP_Bomb_LD = (6, Weapons.AN_M64___500lb_GP_Bomb_LD) + AN_M65___1000lb_GP_Bomb_LD = (6, Weapons.AN_M65___1000lb_GP_Bomb_LD) + ASM_N_2_Bat___1000lb_Radar_Guided_Glide_Bomb = (6, Weapons.ASM_N_2_Bat___1000lb_Radar_Guided_Glide_Bomb) + + class Pylon7: + Mk5_Universal_Drop_Tank_150_Corsair = (7, Weapons.Mk5_Universal_Drop_Tank_150_Corsair) + Mk_6_Lockheed_Drop_Tank_150_U_S__Gal = (7, Weapons.Mk_6_Lockheed_Drop_Tank_150_U_S__Gal) + Tiny_Tim__Corsair____569_kg__unguided_rocket_ = (7, Weapons.Tiny_Tim__Corsair____569_kg__unguided_rocket_) + AN_M30A1___100lb_GP_Bomb_LD = (7, Weapons.AN_M30A1___100lb_GP_Bomb_LD) + AN_M57___250lb_GP_Bomb_LD = (7, Weapons.AN_M57___250lb_GP_Bomb_LD) + AN_M64___500lb_GP_Bomb_LD = (7, Weapons.AN_M64___500lb_GP_Bomb_LD) + AN_M65___1000lb_GP_Bomb_LD = (7, Weapons.AN_M65___1000lb_GP_Bomb_LD) + + class Pylon8: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (8, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon9: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (9, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon10: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (10, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon11: + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = (11, Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket) + + class Pylon12: + Smoke_Generator___white_ = (12, Weapons.Smoke_Generator___white_) + Smoke_Generator___red_ = (12, Weapons.Smoke_Generator___red_) + Smoke_Generator___green_ = (12, Weapons.Smoke_Generator___green_) + Smoke_Generator___blue_ = (12, Weapons.Smoke_Generator___blue_) + Smoke_Generator___orange_ = (12, Weapons.Smoke_Generator___orange_) + Smoke_Generator___yellow_ = (12, Weapons.Smoke_Generator___yellow_) + + pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12} + + tasks = [task.Intercept, task.CAP, task.Escort, task.CAS, task.GroundAttack, task.Reconnaissance, task.AntishipStrike, task.FighterSweep] + task_default = task.Intercept + + class F_A_18A(PlaneType): id = "F/A-18A" height = 4.66 @@ -32036,6 +32539,8 @@ class C_47(PlaneType): "F-86F_FC": F_86F_FC, "F-14B": F_14B, "F-14A-135-GR": F_14A_135_GR, + "F4U-1D": F4U_1D, + "F4U-1D_CW": F4U_1D_CW, "F/A-18A": F_A_18A, "F/A-18C": F_A_18C, "FA-18C_hornet": FA_18C_hornet, diff --git a/dcs/ships.py b/dcs/ships.py index 73fbeffa..83649074 100644 --- a/dcs/ships.py +++ b/dcs/ships.py @@ -174,6 +174,17 @@ class CV_1143_5(unittype.ShipType): air_weapon_dist = 12000 +class Essex(unittype.ShipType): + id = "Essex" + name = "Essex Class Carrier 1944" + plane_num = 90 + helicopter_num = 1 + parking = 32 + detection_range = 15000 + threat_range = 4000 + air_weapon_dist = 4000 + + class CastleClass_01(unittype.ShipType): id = "CastleClass_01" name = "Castle Class" @@ -527,6 +538,7 @@ class Schnellboot_type_S130(unittype.ShipType): "IMPROVED_KILO": IMPROVED_KILO, "SOM": SOM, "CV_1143_5": CV_1143_5, + "Essex": Essex, "CastleClass_01": CastleClass_01, "HarborTug": HarborTug, "hms_invincible": Hms_invincible, diff --git a/dcs/vehicles.py b/dcs/vehicles.py index 17c8bbab..9049f230 100644 --- a/dcs/vehicles.py +++ b/dcs/vehicles.py @@ -314,8 +314,8 @@ class SA_11_Buk_LN_9A310M1(unittype.VehicleType): id = "SA-11 Buk LN 9A310M1" name = "SAM SA-11 Buk \"Gadfly\" Fire Dome TEL" detection_range = 50000 - threat_range = 35000 - air_weapon_dist = 35000 + threat_range = 50000 + air_weapon_dist = 50000 class Osa_9A33_ln(unittype.VehicleType): id = "Osa 9A33 ln" @@ -703,6 +703,34 @@ class S_300PS_40B6MD_sr(unittype.VehicleType): threat_range = 0 air_weapon_dist = 0 + class Type_3_80mm_AA(unittype.VehicleType): + id = "Type_3_80mm_AA" + name = "AAA 80mm Type 3 Flak" + detection_range = 10000 + threat_range = 3200 + air_weapon_dist = 3200 + + class Type_88_75mm_AA(unittype.VehicleType): + id = "Type_88_75mm_AA" + name = "AAA 75mm Type 88 Flak" + detection_range = 10000 + threat_range = 3500 + air_weapon_dist = 3500 + + class Type_96_25mm_AA(unittype.VehicleType): + id = "Type_96_25mm_AA" + name = "AAA 25mm x 2 Type 96" + detection_range = 10000 + threat_range = 3500 + air_weapon_dist = 3500 + + class Type_94_25mm_AA_Truck(unittype.VehicleType): + id = "Type_94_25mm_AA_Truck" + name = "AAA 25mm x 2 Type 94 Truck" + detection_range = 10000 + threat_range = 3500 + air_weapon_dist = 3500 + class KS_19(unittype.VehicleType): id = "KS-19" name = "AAA KS-19 100mm" @@ -1315,6 +1343,20 @@ class KrAZ6322(unittype.VehicleType): threat_range = 0 air_weapon_dist = 0 + class Type_94_Truck(unittype.VehicleType): + id = "Type_94_Truck" + name = "Truck Type 94" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + + class Type_98_So_Da(unittype.VehicleType): + id = "Type_98_So_Da" + name = "APC Type 98 So Da" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + class TugHarlan_drivable(unittype.VehicleType): id = "TugHarlan_drivable" name = "M92 Tug Harlan drivable" @@ -1727,6 +1769,20 @@ class MaxxPro_MRAP(unittype.VehicleType): air_weapon_dist = 1200 eplrs = True + class Type_98_Ke_Ni(unittype.VehicleType): + id = "Type_98_Ke_Ni" + name = "Tk Type 98 Ke Ni" + detection_range = 5000 + threat_range = 3000 + air_weapon_dist = 3000 + + class Type_89_I_Go(unittype.VehicleType): + id = "Type_89_I_Go" + name = "Tk Type 89 I Go" + detection_range = 5000 + threat_range = 3000 + air_weapon_dist = 3000 + class HL_DSHK(unittype.VehicleType): id = "HL_DSHK" name = "Scout HL with DSHK 12.7mm" @@ -2339,6 +2395,14 @@ class German_tank_wagon(unittype.VehicleType): "M1A2C_SEP_V3": Armor.M1A2C_SEP_V3, "M-1 Abrams": Armor.M_1_Abrams, "MaxxPro_MRAP": Armor.MaxxPro_MRAP, + "Type_3_80mm_AA": AirDefence.Type_3_80mm_AA, + "Type_88_75mm_AA": AirDefence.Type_88_75mm_AA, + "Type_94_Truck": Unarmed.Type_94_Truck, + "Type_96_25mm_AA": AirDefence.Type_96_25mm_AA, + "Type_94_25mm_AA_Truck": AirDefence.Type_94_25mm_AA_Truck, + "Type_98_Ke_Ni": Armor.Type_98_Ke_Ni, + "Type_98_So_Da": Unarmed.Type_98_So_Da, + "Type_89_I_Go": Armor.Type_89_I_Go, "TugHarlan_drivable": Unarmed.TugHarlan_drivable, "B600_drivable": Unarmed.B600_drivable, "MJ-1_drivable": Unarmed.MJ_1_drivable, diff --git a/dcs/weapons_data.py b/dcs/weapons_data.py index e4f8d1ea..05944131 100644 --- a/dcs/weapons_data.py +++ b/dcs/weapons_data.py @@ -130,15 +130,15 @@ class Weapons: AN_AVQ_23_Pave_Spike___Targeting_Pod = {"clsid": "{HB_PAVE_SPIKE}", "name": "AN/AVQ-23 Pave Spike - Targeting Pod", "weight": 192} AN_AVQ_23_Pave_Spike___Targeting_Pod_Rack = {"clsid": "{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}", "name": "AN/AVQ-23 Pave Spike - Targeting Pod Rack", "weight": 217.9} AN_AXQ_14_Data_Link_Pod = {"clsid": "{AN_AXQ_14}", "name": "AN/AXQ-14 Data Link Pod", "weight": 300} - AN_M30A1___100lb_GP_Bomb_LD = {"clsid": "{AN_M30A1}", "name": "AN-M30A1 - 100lb GP Bomb LD", "weight": 45.8} + AN_M30A1___100lb_GP_Bomb_LD = {"clsid": "{AN_M30A1}", "name": "AN-M30A1 - 100lb GP Bomb LD", "weight": 56.5} AN_M3_Gunpod_Left = {"clsid": "{MB339_ANM3_L}", "name": "AN/M3 Gunpod Left", "weight": 75} AN_M3_Gunpod_Right = {"clsid": "{MB339_ANM3_R}", "name": "AN/M3 Gunpod Right", "weight": 75} AN_M3___2_Browning_Machine_Guns_12_7mm = {"clsid": "{AN-M3}", "name": "AN-M3 - 2*Browning Machine Guns 12.7mm", "weight": 218} - AN_M57___250lb_GP_Bomb_LD = {"clsid": "{AN_M57}", "name": "AN-M57 - 250lb GP Bomb LD", "weight": 113} - AN_M64___500lb_GP_Bomb_LD = {"clsid": "{AN-M64}", "name": "AN-M64 - 500lb GP Bomb LD", "weight": 227} + AN_M57___250lb_GP_Bomb_LD = {"clsid": "{AN_M57}", "name": "AN-M57 - 250lb GP Bomb LD", "weight": 123.5} + AN_M64___500lb_GP_Bomb_LD = {"clsid": "{AN-M64}", "name": "AN-M64 - 500lb GP Bomb LD", "weight": 254.5} AN_M64___500lb_GP_Bomb_LD_ = {"clsid": "{F86ANM64}", "name": "AN-M64 - 500lb GP Bomb LD", "weight": 227} - AN_M65___1000lb_GP_Bomb_LD = {"clsid": "{AN_M65}", "name": "AN-M65 - 1000lb GP Bomb LD", "weight": 475} - AN_M66___2000lb_GP_Bomb_LD = {"clsid": "{AN_M66}", "name": "AN-M66 - 2000lb GP Bomb LD", "weight": 977} + AN_M65___1000lb_GP_Bomb_LD = {"clsid": "{AN_M65}", "name": "AN-M65 - 1000lb GP Bomb LD", "weight": 500.8} + AN_M66___2000lb_GP_Bomb_LD = {"clsid": "{AN_M66}", "name": "AN-M66 - 2000lb GP Bomb LD", "weight": 996.3} APK_9_Datalink_Pod = {"clsid": "{APK_9}", "name": "APK-9 Datalink Pod", "weight": 260} APU_13MT_with_R_13M1__AA_2_Atoll_D____IR_AAM = {"clsid": "{R-13M1}", "name": "APU-13MT with R-13M1 (AA-2 Atoll-D) - IR AAM", "weight": 146.8} APU_13MT_with_R_13M__AA_2_Atoll_D____IR_AAM = {"clsid": "{R-13M}", "name": "APU-13MT with R-13M (AA-2 Atoll-D) - IR AAM", "weight": 143.9} @@ -164,6 +164,7 @@ class Weapons: ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT = {"clsid": "{ARAKM70BAP}", "name": "ARAK M/70B AP 6x 135mm UnGd Rkts, Pshu70 HEAT", "weight": 372.2} ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT__Zonar_m_70 = {"clsid": "{ARAKM70BAPPX}", "name": "ARAK M/70B AP 6x 135mm UnGd Rkts, Pshu70 HEAT, Zonar m/70", "weight": 411.8} ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG = {"clsid": "{ARAKM70BHE}", "name": "ARAK M/70B HE 6x 135mm UnGd Rkts, Shu70 HE/FRAG", "weight": 372.2} + ASM_N_2_Bat___1000lb_Radar_Guided_Glide_Bomb = {"clsid": "{ASM_N_2}", "name": "ASM-N-2 Bat - 1000lb Radar Guided Glide Bomb", "weight": 727} ASO_2___countermeasures_pod = {"clsid": "{ASO-2}", "name": "ASO-2 - countermeasures pod", "weight": 22} ATAM___1_x_Mistral = {"clsid": "{SA342_Mistral_R1}", "name": "ATAM - 1 x Mistral", "weight": 88.7} ATAM___1_x_Mistral_ = {"clsid": "{SA342_Mistral_L1}", "name": "ATAM - 1 x Mistral", "weight": 88.7} @@ -187,6 +188,7 @@ class Weapons: AUF_2___2_x_SAMP_125___125_kg_GP_Bomb_LD = {"clsid": "{AUF2_SAMP125LD}", "name": "AUF 2 - 2 x SAMP-125 - 125 kg GP Bomb LD", "weight": 320} AUF_2___2_x_SAMP_250___250_kg_GP_Bomb_LD = {"clsid": "{AUF2_SAMP250HD}", "name": "AUF 2 - 2 x SAMP-250 - 250 kg GP Bomb LD", "weight": 570} AUF_2___2_x_SAMP_250___250_kg_GP_Chute_Retarded_Bomb_HD = {"clsid": "{AUF2_SAMP250LD}", "name": "AUF 2 - 2 x SAMP-250 - 250 kg GP Chute Retarded Bomb HD", "weight": 618} + Auxiliary_Drop_Tank_175_U_S__Gal = {"clsid": "{175_USgal_Corsair_droptank_aux}", "name": "Auxiliary Drop Tank 175 U.S. Gal", "weight": 546} AWW_13_DATALINK_POD = {"clsid": "{AWW-13}", "name": "AWW-13 DATALINK POD", "weight": 200} A_A_Training = {"clsid": "{M2KC_AAF}", "name": "A/A Training", "weight": 0} A_G_Training = {"clsid": "{M2KC_AGF}", "name": "A/G Training", "weight": 0} @@ -631,6 +633,7 @@ class Weapons: HSAB_with_9_x_Mk_82___500lb_GP_Bombs_LD = {"clsid": "{585D626E-7F42-4073-AB70-41E728C333E2}", "name": "HSAB with 9 x Mk-82 - 500lb GP Bombs LD", "weight": 3140.6} HVAR_SMOKE__UnGd_Rkt = {"clsid": "{HVAR_SMOKE_2}", "name": "HVAR SMOKE, UnGd Rkt", "weight": 100} HVAR_Smoke_Generator = {"clsid": "{HVAR_SMOKE_GENERATOR}", "name": "HVAR Smoke Generator", "weight": 64} + HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket = {"clsid": "{HVAR_USN_Mk28_Mod4_Corsair}", "name": "HVAR USN Mk28 Mod4 (Corsair) - 64 kg, unguided rocket", "weight": 64} HVAR__UnGd_Rkt = {"clsid": "{HVAR}", "name": "HVAR, UnGd Rkt", "weight": 64} I16_DROP_FUEL_TANK = {"clsid": "I16_DROP_FUEL_TANK", "name": "I-16 External Fuel Tank", "weight": 73} I16_FAB_100SV = {"clsid": "I16_FAB_100SV", "name": "FAB-100SV", "weight": 100} @@ -1030,12 +1033,14 @@ class Weapons: Missile_Launcher_Rack__Empty_ = {"clsid": "{9M114 Shturm-V-2 Rack}", "name": "Missile Launcher Rack (Empty)", "weight": 13} MK_82_28 = {"clsid": "MK_82*28", "name": "28 x Mk-82 - 500lb GP Bombs LD", "weight": 7819.4} MK_84___2 = {"clsid": "{CFT_R_MK84LD_x_2}", "name": "MK-84 * 2", "weight": 1788} + Mk5_Universal_Drop_Tank_150_Corsair = {"clsid": "{150_USgal_Corsair_droptank_mk5}", "name": "Mk5 Universal Drop Tank 150 Corsair", "weight": 469} Mk_20 = {"clsid": "{BRU-32 MK-20}", "name": "Mk-20", "weight": 279.38} Mk_20_Rockeye___3 = {"clsid": "{CFT_L_CBU_100_x_3}", "name": "Mk-20 Rockeye * 3", "weight": 666} Mk_20_Rockeye___3_ = {"clsid": "{CFT_R_CBU_100_x_3}", "name": "Mk-20 Rockeye * 3", "weight": 666} Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {"clsid": "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", "name": "Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets", "weight": 222} Mk_20_Rockeye___6 = {"clsid": "{CFT_L_CBU_100_x_6}", "name": "Mk-20 Rockeye * 6", "weight": 1332} Mk_20_Rockeye___6_ = {"clsid": "{CFT_R_CBU_100_x_6}", "name": "Mk-20 Rockeye * 6", "weight": 1332} + Mk_6_Lockheed_Drop_Tank_150_U_S__Gal = {"clsid": "{150_USgal_Corsair_droptank_mk6}", "name": "Mk.6 Lockheed Drop Tank 150 U.S. Gal", "weight": 471} Mk_81___250lb_GP_Bomb_LD = {"clsid": "{90321C8E-7ED1-47D4-A160-E074D5ABD902}", "name": "Mk-81 - 250lb GP Bomb LD", "weight": 118} Mk_82 = {"clsid": "{BRU-32 MK-82}", "name": "Mk-82", "weight": 298.38} Mk_82AIR = {"clsid": "{BRU-32 MK-82AIR}", "name": "Mk-82AIR", "weight": 298.38} @@ -1214,6 +1219,7 @@ class Weapons: Smokewinder___white = {"clsid": "{A4BCC903-06C8-47bb-9937-A30FEDB4E744}", "name": "Smokewinder - white", "weight": 92.1} Smokewinder___yellow = {"clsid": "{A4BCC903-06C8-47bb-9937-A30FEDB4E745}", "name": "Smokewinder - yellow", "weight": 92.1} Smoke_for_Christen_Eagle_II__white = {"clsid": "{CE2_SMOKE_WHITE}", "name": "Smoke for Christen Eagle II, white", "weight": 7} + Smoke_for_F4U_1D__white = {"clsid": "{F4U1D_SMOKE_WHITE}", "name": "Smoke for F4U-1D, white", "weight": 7} Smoke_Generator___blue = {"clsid": "{D3F65166-1AB8-490f-AF2F-2FB6E22568B3}", "name": "Smoke Generator - blue", "weight": 220} Smoke_Generator___blue_ = {"clsid": "{INV-SMOKE-BLUE}", "name": "Smoke Generator - blue", "weight": 0} Smoke_Generator___green = {"clsid": "{D3F65166-1AB8-490f-AF2F-2FB6E22568B2}", "name": "Smoke Generator - green", "weight": 220} @@ -1305,6 +1311,8 @@ class Weapons: Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_257_H1_HE_Frag_Lg_Whd = {"clsid": "{TELSON8_SNEBT257}", "name": "Telson 8 - 8 x UnGd Rkts, 68 mm SNEB Type 257 H1 HE/Frag Lg Whd", "weight": 93.04} Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_259E_H1_IL = {"clsid": "{TELSON8_SNEBT259E}", "name": "Telson 8 - 8 x UnGd Rkts, 68 mm SNEB Type 259E H1 IL", "weight": 91.28} TGM_65H = {"clsid": "TGM_65H", "name": "TGM-65H - Trg Round for Mav H (CCD)", "weight": 208} + Tiny_Tim__Corsair____569_kg__unguided_rocket = {"clsid": "{Tiny_Tim_Corsair_L}", "name": "Tiny Tim (Corsair) - 569 kg, unguided rocket", "weight": 569} + Tiny_Tim__Corsair____569_kg__unguided_rocket_ = {"clsid": "{Tiny_Tim_Corsair_R}", "name": "Tiny Tim (Corsair) - 569 kg, unguided rocket", "weight": 569} TORNADO_Fuel_tank = {"clsid": "{EF124821-F9BB-4314-A153-E0E2FE1162C4}", "name": "TORNADO Fuel tank", "weight": 1275} TYPE_200A = {"clsid": "{DIS_TYPE200A}", "name": "TYPE-200A", "weight": 200} U22_A_Jammer = {"clsid": "{U22A}", "name": "U22/A Jammer", "weight": 348} @@ -1907,6 +1915,7 @@ class Weapons: "{ARAKM70BAP}": Weapons.ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT, "{ARAKM70BAPPX}": Weapons.ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT__Zonar_m_70, "{ARAKM70BHE}": Weapons.ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG, + "{ASM_N_2}": Weapons.ASM_N_2_Bat___1000lb_Radar_Guided_Glide_Bomb, "{ASO-2}": Weapons.ASO_2___countermeasures_pod, "{SA342_Mistral_R1}": Weapons.ATAM___1_x_Mistral, "{SA342_Mistral_L1}": Weapons.ATAM___1_x_Mistral_, @@ -1930,6 +1939,7 @@ class Weapons: "{AUF2_SAMP125LD}": Weapons.AUF_2___2_x_SAMP_125___125_kg_GP_Bomb_LD, "{AUF2_SAMP250HD}": Weapons.AUF_2___2_x_SAMP_250___250_kg_GP_Bomb_LD, "{AUF2_SAMP250LD}": Weapons.AUF_2___2_x_SAMP_250___250_kg_GP_Chute_Retarded_Bomb_HD, + "{175_USgal_Corsair_droptank_aux}": Weapons.Auxiliary_Drop_Tank_175_U_S__Gal, "{AWW-13}": Weapons.AWW_13_DATALINK_POD, "{M2KC_AAF}": Weapons.A_A_Training, "{M2KC_AGF}": Weapons.A_G_Training, @@ -2374,6 +2384,7 @@ class Weapons: "{585D626E-7F42-4073-AB70-41E728C333E2}": Weapons.HSAB_with_9_x_Mk_82___500lb_GP_Bombs_LD, "{HVAR_SMOKE_2}": Weapons.HVAR_SMOKE__UnGd_Rkt, "{HVAR_SMOKE_GENERATOR}": Weapons.HVAR_Smoke_Generator, + "{HVAR_USN_Mk28_Mod4_Corsair}": Weapons.HVAR_USN_Mk28_Mod4__Corsair____64_kg__unguided_rocket, "{HVAR}": Weapons.HVAR__UnGd_Rkt, "I16_DROP_FUEL_TANK": Weapons.I16_DROP_FUEL_TANK, "I16_FAB_100SV": Weapons.I16_FAB_100SV, @@ -2773,12 +2784,14 @@ class Weapons: "{9M114 Shturm-V-2 Rack}": Weapons.Missile_Launcher_Rack__Empty_, "MK_82*28": Weapons.MK_82_28, "{CFT_R_MK84LD_x_2}": Weapons.MK_84___2, + "{150_USgal_Corsair_droptank_mk5}": Weapons.Mk5_Universal_Drop_Tank_150_Corsair, "{BRU-32 MK-20}": Weapons.Mk_20, "{CFT_L_CBU_100_x_3}": Weapons.Mk_20_Rockeye___3, "{CFT_R_CBU_100_x_3}": Weapons.Mk_20_Rockeye___3_, "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}": Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, "{CFT_L_CBU_100_x_6}": Weapons.Mk_20_Rockeye___6, "{CFT_R_CBU_100_x_6}": Weapons.Mk_20_Rockeye___6_, + "{150_USgal_Corsair_droptank_mk6}": Weapons.Mk_6_Lockheed_Drop_Tank_150_U_S__Gal, "{90321C8E-7ED1-47D4-A160-E074D5ABD902}": Weapons.Mk_81___250lb_GP_Bomb_LD, "{BRU-32 MK-82}": Weapons.Mk_82, "{BRU-32 MK-82AIR}": Weapons.Mk_82AIR, @@ -2957,6 +2970,7 @@ class Weapons: "{A4BCC903-06C8-47bb-9937-A30FEDB4E744}": Weapons.Smokewinder___white, "{A4BCC903-06C8-47bb-9937-A30FEDB4E745}": Weapons.Smokewinder___yellow, "{CE2_SMOKE_WHITE}": Weapons.Smoke_for_Christen_Eagle_II__white, + "{F4U1D_SMOKE_WHITE}": Weapons.Smoke_for_F4U_1D__white, "{D3F65166-1AB8-490f-AF2F-2FB6E22568B3}": Weapons.Smoke_Generator___blue, "{INV-SMOKE-BLUE}": Weapons.Smoke_Generator___blue_, "{D3F65166-1AB8-490f-AF2F-2FB6E22568B2}": Weapons.Smoke_Generator___green, @@ -3048,6 +3062,8 @@ class Weapons: "{TELSON8_SNEBT257}": Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_257_H1_HE_Frag_Lg_Whd, "{TELSON8_SNEBT259E}": Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_259E_H1_IL, "TGM_65H": Weapons.TGM_65H, + "{Tiny_Tim_Corsair_L}": Weapons.Tiny_Tim__Corsair____569_kg__unguided_rocket, + "{Tiny_Tim_Corsair_R}": Weapons.Tiny_Tim__Corsair____569_kg__unguided_rocket_, "{EF124821-F9BB-4314-A153-E0E2FE1162C4}": Weapons.TORNADO_Fuel_tank, "{DIS_TYPE200A}": Weapons.TYPE_200A, "{U22A}": Weapons.U22_A_Jammer, diff --git a/tools/pydcs_export.lua b/tools/pydcs_export.lua index b6f2ec74..645b9e81 100644 --- a/tools/pydcs_export.lua +++ b/tools/pydcs_export.lua @@ -268,6 +268,7 @@ flyable["Su-33"] = true -- Piston engine flyable["Bf-109K-4"] = true flyable["Christen Eagle II"] = true +flyable["F4U-1D"] = true flyable["FW-190A8"] = true flyable["FW-190D9"] = true flyable["I-16"] = true