diff --git a/game/db.py b/game/db.py index 432d23dc..bc221df2 100644 --- a/game/db.py +++ b/game/db.py @@ -43,6 +43,7 @@ from dcs.planes import ( FA_18C_hornet, FW_190A8, FW_190D9, + F_117A, F_14B, F_15C, F_15E, @@ -97,6 +98,9 @@ from dcs.planes import ( Su_34, Tornado_GR4, Tornado_IDS, + Tu_160, + Tu_22M3, + Tu_95MS, WingLoong_I, Yak_40, plane_map, @@ -365,6 +369,10 @@ PRICES = { # Bombers B_52H: 35, B_1B: 50, + F_117A: 100, + Tu_160: 50, + Tu_22M3: 40, + Tu_95MS: 35, # special IL_76MD: 30, @@ -645,49 +653,53 @@ UNIT_BY_TASK = { SA342Mistral ], CAS: [ - F_15E, - F_86F_Sabre, - MiG_15bis, - L_39ZA, - AV8BNA, + AH_1W, + AH_64A, + AH_64D, AJS37, + AV8BNA, A_10A, A_10C, A_10C_2, - Su_17M4, - Su_25, - Su_25T, - Su_34, - Ka_50, - SA342M, - SA342L, - SA342Minigun, - Su_24M, - Su_24MR, - AH_64A, - AH_64D, - OH_58D, - B_52H, - B_1B, - Tornado_IDS, - Tornado_GR4, - UH_1H, - Mi_8MT, - Mi_28N, - Mi_24V, - MiG_27K, A_20G, + B_17G, + B_1B, + B_52H, + F_117A, + F_15E, + F_86F_Sabre, + Ju_88A4, + Ka_50, + L_39ZA, + MB_339PAN, + MQ_9_Reaper, + MiG_15bis, + MiG_27K, + Mi_24V, + Mi_28N, + Mi_8MT, + OH_58D, P_47D_30, P_47D_30bl1, P_47D_40, - Ju_88A4, - B_17G, - MB_339PAN, - Rafale_A_S, - WingLoong_I, - MQ_9_Reaper, RQ_1A_Predator, - AH_1W + Rafale_A_S, + SA342L, + SA342M, + SA342Minigun, + Su_17M4, + Su_24M, + Su_24MR, + Su_25, + Su_25T, + Su_34, + Tornado_GR4, + Tornado_IDS, + Tu_160, + Tu_22M3, + Tu_95MS, + UH_1H, + WingLoong_I, ], Transport: [ IL_76MD, @@ -1095,6 +1107,23 @@ COMMON_OVERRIDE = { PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { + B_1B: { + CAS: "GBU-38*16, CBU-97*20", + PinpointStrike: "GBU-31*8, GBU-38*32", + GroundAttack: "GBU-31*8, GBU-38*32", + }, + B_52H: { + PinpointStrike: "AGM-86C*20", + GroundAttack: "Mk 82*51", + }, + F_117A: { + PinpointStrike: "GBU-10*2", + }, + F_15E: { + CAS: "AIM-120B*2,AIM-9M*2,FUEL,GBU-12*4,GBU-38*4,AGM-65D*2", + GroundAttack: "AIM-120B*2,AIM-9M*2,FUEL*3,CBU-97*12", + PinpointStrike: "AIM-120B*2,AIM-9M*2,FUEL,GBU-31*4,AGM-154C*2", + }, FA_18C_hornet: { CAP: "CAP HEAVY", Intercept: "CAP HEAVY", @@ -1115,6 +1144,15 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { GroundAttack: "STRIKE", Escort: "CAP HEAVY", }, + Tu_160: { + PinpointStrike: "Kh-65*12", + }, + Tu_22M3: { + GroundAttack: "FAB-500*33, FAB-250*36", + }, + Tu_95MS: { + PinpointStrike: "Kh-65*6", + }, A_10A: COMMON_OVERRIDE, A_10C: COMMON_OVERRIDE, A_10C_2: COMMON_OVERRIDE, @@ -1123,7 +1161,6 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { F_5E_3: COMMON_OVERRIDE, F_14B: COMMON_OVERRIDE, F_15C: COMMON_OVERRIDE, - F_15E: COMMON_OVERRIDE, F_16C_50: COMMON_OVERRIDE, JF_17: COMMON_OVERRIDE, M_2000C: COMMON_OVERRIDE, diff --git a/game/factions/bluefor_coldwar.py b/game/factions/bluefor_coldwar.py index c241bbae..b2a4a494 100644 --- a/game/factions/bluefor_coldwar.py +++ b/game/factions/bluefor_coldwar.py @@ -6,6 +6,7 @@ from dcs.helicopters import ( from dcs.planes import ( AJS37, A_10A, + B_52H, C_130, E_3A, F_14B, @@ -37,6 +38,8 @@ BLUEFOR_COLDWAR = { A_10A, AJS37, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/bluefor_coldwar_a4.py b/game/factions/bluefor_coldwar_a4.py index ce6cf016..1244ffbd 100644 --- a/game/factions/bluefor_coldwar_a4.py +++ b/game/factions/bluefor_coldwar_a4.py @@ -6,6 +6,7 @@ from dcs.helicopters import ( from dcs.planes import ( AJS37, A_10A, + B_52H, C_130, E_3A, F_14B, @@ -41,6 +42,8 @@ BLUEFOR_COLDWAR_A4 = { AJS37, A_4E_C, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/bluefor_coldwar_mods.py b/game/factions/bluefor_coldwar_mods.py index a395fc48..2eed5f31 100644 --- a/game/factions/bluefor_coldwar_mods.py +++ b/game/factions/bluefor_coldwar_mods.py @@ -6,6 +6,7 @@ from dcs.helicopters import ( from dcs.planes import ( AJS37, A_10A, + B_52H, C_130, E_3A, F_14B, @@ -43,6 +44,8 @@ BLUEFOR_COLDWAR_MODS = { A_4E_C, MB_339PAN, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/bluefor_modern.py b/game/factions/bluefor_modern.py index 9f97827b..0798f02f 100644 --- a/game/factions/bluefor_modern.py +++ b/game/factions/bluefor_modern.py @@ -11,11 +11,14 @@ from dcs.planes import ( A_10A, A_10C, A_10C_2, + B_1B, + B_52H, C_130, E_3A, FA_18C_hornet, F_14B, F_15C, + F_15E, F_16C_50, F_5E_3, JF_17, @@ -47,6 +50,7 @@ BLUEFOR_MODERN = { "units": [ F_15C, + F_15E, F_14B, FA_18C_hornet, F_16C_50, @@ -62,6 +66,9 @@ BLUEFOR_MODERN = { AV8BNA, AJS37, + B_1B, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/russia_1955.py b/game/factions/russia_1955.py index 5730bd9d..98624ad5 100644 --- a/game/factions/russia_1955.py +++ b/game/factions/russia_1955.py @@ -1,4 +1,12 @@ -from dcs.planes import An_26B, An_30M, IL_76MD, IL_78M, MiG_15bis, Yak_40 +from dcs.planes import ( + An_26B, + An_30M, + IL_76MD, + IL_78M, + MiG_15bis, + Tu_95MS, + Yak_40, +) from dcs.ships import ( Bulk_cargo_ship_Yakushev, CV_1143_5_Admiral_Kuznetsov, @@ -19,6 +27,8 @@ Russia_1955 = { An_30M, Yak_40, + Tu_95MS, + AirDefence.AAA_ZU_23_Closed, AirDefence.AAA_ZU_23_on_Ural_375, Armor.ARV_BRDM_2, diff --git a/game/factions/russia_1965.py b/game/factions/russia_1965.py index 9d88d251..cb5d298a 100644 --- a/game/factions/russia_1965.py +++ b/game/factions/russia_1965.py @@ -8,6 +8,7 @@ from dcs.planes import ( MiG_15bis, MiG_19P, MiG_21Bis, + Tu_95MS, Yak_40, ) from dcs.ships import ( @@ -32,6 +33,8 @@ Russia_1965 = { An_30M, Yak_40, + Tu_95MS, + A_50, Mi_8MT, diff --git a/game/factions/russia_1975.py b/game/factions/russia_1975.py index b8a75437..b12d28d4 100644 --- a/game/factions/russia_1975.py +++ b/game/factions/russia_1975.py @@ -15,6 +15,8 @@ from dcs.planes import ( Su_17M4, Su_24M, Su_25, + Tu_22M3, + Tu_95MS, Yak_40, ) from dcs.ships import ( @@ -41,6 +43,9 @@ Russia_1975 = { Su_24M, Su_25, + Tu_22M3, + Tu_95MS, + IL_76MD, IL_78M, An_26B, diff --git a/game/factions/russia_1990.py b/game/factions/russia_1990.py index 747024a8..71e4c494 100644 --- a/game/factions/russia_1990.py +++ b/game/factions/russia_1990.py @@ -17,6 +17,9 @@ from dcs.planes import ( Su_24M, Su_25, Su_27, + Tu_160, + Tu_22M3, + Tu_95MS, Yak_40, ) from dcs.ships import ( @@ -51,6 +54,10 @@ Russia_1990 = { Su_25, Ka_50, + Tu_160, + Tu_22M3, + Tu_95MS, + IL_76MD, IL_78M, An_26B, diff --git a/game/factions/russia_2010.py b/game/factions/russia_2010.py index 13adefb6..852871f6 100644 --- a/game/factions/russia_2010.py +++ b/game/factions/russia_2010.py @@ -20,6 +20,9 @@ from dcs.planes import ( Su_30, Su_33, Su_34, + Tu_160, + Tu_22M3, + Tu_95MS, Yak_40, ) from dcs.ships import ( @@ -55,6 +58,10 @@ Russia_2010 = { Su_24M, L_39ZA, + Tu_160, + Tu_22M3, + Tu_95MS, + IL_76MD, IL_78M, An_26B, diff --git a/game/factions/russia_2020.py b/game/factions/russia_2020.py index 6cc60bc1..5df17da7 100644 --- a/game/factions/russia_2020.py +++ b/game/factions/russia_2020.py @@ -20,6 +20,9 @@ from dcs.planes import ( Su_30, Su_33, Su_34, + Tu_160, + Tu_22M3, + Tu_95MS, Yak_40, ) from dcs.ships import ( @@ -58,6 +61,10 @@ Russia_2020 = { Su_24M, L_39ZA, + Tu_160, + Tu_22M3, + Tu_95MS, + IL_76MD, IL_78M, An_26B, diff --git a/game/factions/us_aggressors.py b/game/factions/us_aggressors.py index 650c09cd..4e2cce11 100644 --- a/game/factions/us_aggressors.py +++ b/game/factions/us_aggressors.py @@ -6,10 +6,13 @@ from dcs.helicopters import ( UH_1H, ) from dcs.planes import ( + B_1B, + B_52H, C_130, E_3A, FA_18C_hornet, F_15C, + F_15E, F_16C_50, F_5E_3, KC130, @@ -38,11 +41,15 @@ US_Aggressors = { "units": [ F_15C, + F_15E, F_5E_3, FA_18C_hornet, F_16C_50, Su_27, + B_1B, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/usa_1955.py b/game/factions/usa_1955.py index 1943544b..bbafc9c4 100644 --- a/game/factions/usa_1955.py +++ b/game/factions/usa_1955.py @@ -1,4 +1,5 @@ from dcs.planes import ( + B_52H, C_130, E_3A, F_86F_Sabre, @@ -25,6 +26,8 @@ USA_1955 = { F_86F_Sabre, P_51D, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/usa_1960.py b/game/factions/usa_1960.py index ee162d04..b87ec470 100644 --- a/game/factions/usa_1960.py +++ b/game/factions/usa_1960.py @@ -2,6 +2,7 @@ from dcs.helicopters import ( UH_1H, ) from dcs.planes import ( + B_52H, C_130, E_3A, F_86F_Sabre, @@ -28,6 +29,8 @@ USA_1960 = { F_86F_Sabre, P_51D, + B_52H, + KC_135, KC130, C_130, diff --git a/game/factions/usa_1990.py b/game/factions/usa_1990.py index 4014237a..7413d956 100644 --- a/game/factions/usa_1990.py +++ b/game/factions/usa_1990.py @@ -5,9 +5,12 @@ from dcs.helicopters import ( from dcs.planes import ( AV8BNA, A_10A, + B_1B, + B_52H, C_130, E_3A, FA_18C_hornet, + F_117A, F_14B, F_15C, F_15E, @@ -43,6 +46,10 @@ USA_1990 = { A_10A, AV8BNA, + B_1B, + B_52H, + F_117A, + KC_135, KC130, C_130, diff --git a/game/factions/usa_2005.py b/game/factions/usa_2005.py index 5b9e03ca..5a40aa8b 100644 --- a/game/factions/usa_2005.py +++ b/game/factions/usa_2005.py @@ -6,9 +6,12 @@ from dcs.planes import ( AV8BNA, A_10C, A_10C_2, + B_1B, + B_52H, C_130, E_3A, FA_18C_hornet, + F_117A, F_14B, F_15C, F_15E, @@ -46,6 +49,10 @@ USA_2005 = { AV8BNA, MQ_9_Reaper, + B_1B, + B_52H, + F_117A, + KC_135, KC130, C_130, diff --git a/gen/aircraft.py b/gen/aircraft.py index 0c4aa97c..0a8c1cf7 100644 --- a/gen/aircraft.py +++ b/gen/aircraft.py @@ -579,7 +579,6 @@ class AircraftConflictGenerator: unit_type = group.units[0].unit_type if unit_type in db.PLANE_PAYLOAD_OVERRIDES: - override_loadout = db.PLANE_PAYLOAD_OVERRIDES[unit_type] # Clear pylons for p in group.units: p.pylons.clear() diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index 02b21f40..fbc2b257 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -19,11 +19,14 @@ from dcs.planes import ( A_10C_2, A_20G, B_17G, + B_1B, + B_52H, Bf_109K_4, C_101CC, FA_18C_hornet, FW_190A8, FW_190D9, + F_117A, F_14B, F_15C, F_15E, @@ -71,6 +74,9 @@ from dcs.planes import ( Su_34, Tornado_GR4, Tornado_IDS, + Tu_160, + Tu_22M3, + Tu_95MS, WingLoong_I, ) @@ -226,6 +232,8 @@ CAS_CAPABLE = [ F_16C_50, FA_18C_hornet, + B_1B, + Tornado_IDS, Tornado_GR4, @@ -367,6 +375,10 @@ STRIKE_CAPABLE = [ Su_25T, Su_34, + Tu_160, + Tu_22M3, + Tu_95MS, + JF_17, M_2000C, @@ -384,6 +396,10 @@ STRIKE_CAPABLE = [ F_16C_50, FA_18C_hornet, + B_1B, + B_52H, + F_117A, + Tornado_IDS, Tornado_GR4, @@ -413,11 +429,16 @@ STRIKE_CAPABLE = [ STRIKE_PREFERRED = [ AJS37, - F_15E, - Tornado_GR4, - A_20G, B_17G, + B_1B, + B_52H, + F_117A, + F_15E, + Tornado_GR4, + Tu_160, + Tu_22M3, + Tu_95MS, ] ANTISHIP_CAPABLE = [