diff --git a/changelog.md b/changelog.md index 8b9c30a9..1da75f08 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,7 @@ * **[Flight Planner]** Added anti-ship missions. * **[Flight Planner]** Differentiated BARCAP and TARCAP. TARCAP is now for hostile areas and will arrive before the package. * **[Modding]** Possible to setup liveries overrides for factions +* **[Units]** Added support for F-14A-135-GR # 2.2.1 diff --git a/game/db.py b/game/db.py index a1794764..c73f7dbf 100644 --- a/game/db.py +++ b/game/db.py @@ -2,9 +2,7 @@ from datetime import datetime from enum import Enum from typing import Dict, List, Optional, Tuple, Type, Union -from dcs import Mission from dcs.countries import country_dict -from dcs.country import Country from dcs.helicopters import ( AH_1W, AH_64A, @@ -46,6 +44,7 @@ from dcs.planes import ( FW_190A8, FW_190D9, F_117A, + F_14A_135_GR, F_14B, F_15C, F_15E, @@ -105,7 +104,7 @@ from dcs.planes import ( Tu_95MS, WingLoong_I, Yak_40, - plane_map, + plane_map ) from dcs.ships import ( Armed_speedboat, @@ -155,7 +154,6 @@ from dcs.vehicles import ( ) import pydcs_extensions.frenchpack.frenchpack as frenchpack -from game.factions.faction import Faction # PATCH pydcs data with MODS from game.factions.faction_loader import FactionLoader from pydcs_extensions.a4ec.a4ec import A_4E_C @@ -204,7 +202,6 @@ vehicle_map["Toyota_vert"] = frenchpack.DIM__TOYOTA_GREEN vehicle_map["Toyota_desert"] = frenchpack.DIM__TOYOTA_DESERT vehicle_map["Kamikaze"] = frenchpack.DIM__KAMIKAZE - """ ---------- BEGINNING OF CONFIGURATION SECTION """ @@ -273,6 +270,7 @@ PRICES = { F_15E: 24, F_16C_50: 20, F_16A: 14, + F_14A_135_GR: 20, F_14B: 24, Tornado_IDS: 20, Tornado_GR4: 20, @@ -401,20 +399,20 @@ PRICES = { Unarmed.Transport_M818: 3, # WW2 - Armor.MT_Pz_Kpfw_V_Panther_Ausf_G:24, - Armor.MT_Pz_Kpfw_IV_Ausf_H:16, - Armor.HT_Pz_Kpfw_VI_Tiger_I:24, - Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II:26, + Armor.MT_Pz_Kpfw_V_Panther_Ausf_G: 24, + Armor.MT_Pz_Kpfw_IV_Ausf_H: 16, + Armor.HT_Pz_Kpfw_VI_Tiger_I: 24, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II: 26, Armor.TD_Jagdpanther_G1: 18, Armor.TD_Jagdpanzer_IV: 11, Armor.Sd_Kfz_184_Elefant: 18, - Armor.APC_Sd_Kfz_251:4, - Armor.AC_Sd_Kfz_234_2_Puma:8, - Armor.MT_M4_Sherman:12, - Armor.MT_M4A4_Sherman_Firefly:16, - Armor.CT_Cromwell_IV:12, - Armor.M30_Cargo_Carrier:2, - Armor.APC_M2A1:4, + Armor.APC_Sd_Kfz_251: 4, + Armor.AC_Sd_Kfz_234_2_Puma: 8, + Armor.MT_M4_Sherman: 12, + Armor.MT_M4A4_Sherman_Firefly: 16, + Armor.CT_Cromwell_IV: 12, + Armor.M30_Cargo_Carrier: 2, + Armor.APC_M2A1: 4, Armor.CT_Centaur_IV: 10, Armor.HIT_Churchill_VII: 16, Armor.LAC_M8_Greyhound: 8, @@ -577,6 +575,7 @@ UNIT_BY_TASK = { MiG_31, FA_18C_hornet, F_15C, + F_14A_135_GR, F_14B, F_16A, F_16C_50, @@ -902,7 +901,6 @@ SAM_CONVERT = { } } - """ Units that will always be spawned in the air """ @@ -913,7 +911,7 @@ TAKEOFF_BAN: List[Type[FlyingType]] = [ Units that will be always spawned in the air if launched from the carrier """ CARRIER_TAKEOFF_BAN: List[Type[FlyingType]] = [ - Su_33, # Kuznecow is bugged in a way that only 2 aircraft could be spawned + Su_33, # Kuznecow is bugged in a way that only 2 aircraft could be spawned ] """ @@ -924,6 +922,7 @@ FACTIONS = FactionLoader() CARRIER_TYPE_BY_PLANE = { FA_18C_hornet: CVN_74_John_C__Stennis, + F_14A_135_GR: CVN_74_John_C__Stennis, F_14B: CVN_74_John_C__Stennis, Ka_50: LHA_1_Tarawa, SA342M: LHA_1_Tarawa, @@ -997,6 +996,7 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { AV8BNA: COMMON_OVERRIDE, C_101CC: COMMON_OVERRIDE, F_5E_3: COMMON_OVERRIDE, + F_14A_135_GR: COMMON_OVERRIDE, F_14B: COMMON_OVERRIDE, F_15C: COMMON_OVERRIDE, F_16C_50: COMMON_OVERRIDE, @@ -1006,14 +1006,14 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { MiG_19P: COMMON_OVERRIDE, MiG_21Bis: COMMON_OVERRIDE, AJS37: COMMON_OVERRIDE, - Su_25T:COMMON_OVERRIDE, - Su_25:COMMON_OVERRIDE, - Su_27:COMMON_OVERRIDE, - Su_33:COMMON_OVERRIDE, - MiG_29A:COMMON_OVERRIDE, - MiG_29G:COMMON_OVERRIDE, - MiG_29S:COMMON_OVERRIDE, - Su_24M:COMMON_OVERRIDE, + Su_25T: COMMON_OVERRIDE, + Su_25: COMMON_OVERRIDE, + Su_27: COMMON_OVERRIDE, + Su_33: COMMON_OVERRIDE, + MiG_29A: COMMON_OVERRIDE, + MiG_29G: COMMON_OVERRIDE, + MiG_29S: COMMON_OVERRIDE, + Su_24M: COMMON_OVERRIDE, Su_30: COMMON_OVERRIDE, Su_34: COMMON_OVERRIDE, Su_57: COMMON_OVERRIDE, @@ -1022,21 +1022,21 @@ PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = { Tornado_GR4: COMMON_OVERRIDE, Tornado_IDS: COMMON_OVERRIDE, Mirage_2000_5: COMMON_OVERRIDE, - MiG_31:COMMON_OVERRIDE, - SA342M:COMMON_OVERRIDE, - SA342L:COMMON_OVERRIDE, - SA342Mistral:COMMON_OVERRIDE, - Mi_8MT:COMMON_OVERRIDE, - Mi_24V:COMMON_OVERRIDE, - Mi_28N:COMMON_OVERRIDE, - Ka_50:COMMON_OVERRIDE, - L_39ZA:COMMON_OVERRIDE, - L_39C:COMMON_OVERRIDE, + MiG_31: COMMON_OVERRIDE, + SA342M: COMMON_OVERRIDE, + SA342L: COMMON_OVERRIDE, + SA342Mistral: COMMON_OVERRIDE, + Mi_8MT: COMMON_OVERRIDE, + Mi_24V: COMMON_OVERRIDE, + Mi_28N: COMMON_OVERRIDE, + Ka_50: COMMON_OVERRIDE, + L_39ZA: COMMON_OVERRIDE, + L_39C: COMMON_OVERRIDE, Su_17M4: COMMON_OVERRIDE, F_4E: COMMON_OVERRIDE, - P_47D_30:COMMON_OVERRIDE, - P_47D_30bl1:COMMON_OVERRIDE, - P_47D_40:COMMON_OVERRIDE, + P_47D_30: COMMON_OVERRIDE, + P_47D_30bl1: COMMON_OVERRIDE, + P_47D_40: COMMON_OVERRIDE, B_17G: COMMON_OVERRIDE, P_51D: COMMON_OVERRIDE, P_51D_30_NA: COMMON_OVERRIDE, @@ -1129,6 +1129,7 @@ PLAYER_BUDGET_BASE = 20 CARRIER_CAPABLE = [ FA_18C_hornet, + F_14A_135_GR, F_14B, AV8BNA, Su_33, @@ -1164,7 +1165,6 @@ LHA_CAPABLE = [ SA342Mistral ] - """ ---------- END OF CONFIGURATION SECTION """ @@ -1216,16 +1216,20 @@ def find_unittype(for_task: Task, country_name: str) -> List[UnitType]: def find_infantry(country_name: str) -> List[UnitType]: inf = [ - Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, + Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, + Infantry.Paratrooper_AKS, Infantry.Soldier_RPG, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Infantry_M4, Infantry.Soldier_M249, Infantry.Soldier_AK, Infantry.Soldier_AK, Infantry.Soldier_AK, Infantry.Soldier_AK, Infantry.Soldier_AK, Infantry.Paratrooper_RPG_16, - Infantry.Georgian_soldier_with_M4, Infantry.Georgian_soldier_with_M4, Infantry.Georgian_soldier_with_M4, Infantry.Georgian_soldier_with_M4, - Infantry.Infantry_Soldier_Rus, Infantry.Infantry_Soldier_Rus, Infantry.Infantry_Soldier_Rus, Infantry.Infantry_Soldier_Rus, + Infantry.Georgian_soldier_with_M4, Infantry.Georgian_soldier_with_M4, Infantry.Georgian_soldier_with_M4, + Infantry.Georgian_soldier_with_M4, + Infantry.Infantry_Soldier_Rus, Infantry.Infantry_Soldier_Rus, Infantry.Infantry_Soldier_Rus, + Infantry.Infantry_Soldier_Rus, Infantry.Infantry_SMLE_No_4_Mk_1, Infantry.Infantry_SMLE_No_4_Mk_1, Infantry.Infantry_SMLE_No_4_Mk_1, - Infantry.Infantry_Mauser_98, Infantry.Infantry_Mauser_98, Infantry.Infantry_Mauser_98, Infantry.Infantry_Mauser_98, + Infantry.Infantry_Mauser_98, Infantry.Infantry_Mauser_98, Infantry.Infantry_Mauser_98, + Infantry.Infantry_Mauser_98, Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand, Infantry.Infantry_Soldier_Insurgents, Infantry.Infantry_Soldier_Insurgents, Infantry.Infantry_Soldier_Insurgents ] @@ -1356,7 +1360,7 @@ def unitdict_from(fd: AssignedUnitsDict) -> Dict: def country_id_from_name(name): - for k,v in country_dict.items(): + for k, v in country_dict.items(): if v.name == name: return k return -1 @@ -1374,8 +1378,10 @@ def _validate_db(): for unit_type in total_set: assert unit_type in PRICES, "{} not in prices".format(unit_type) + _validate_db() + class DefaultLiveries: class Default(Enum): af_standard = "" @@ -1385,4 +1391,4 @@ OH_58D.Liveries = DefaultLiveries F_16C_50.Liveries = DefaultLiveries P_51D_30_NA.Liveries = DefaultLiveries Ju_88A4.Liveries = DefaultLiveries -B_17G.Liveries = DefaultLiveries \ No newline at end of file +B_17G.Liveries = DefaultLiveries diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index a8cc03f5..084aa851 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -27,6 +27,7 @@ from dcs.planes import ( FW_190A8, FW_190D9, F_117A, + F_14A_135_GR, F_14B, F_15C, F_15E, @@ -104,6 +105,7 @@ INTERCEPT_CAPABLE = [ Mirage_2000_5, Rafale_M, + F_14A_135_GR, F_14B, F_15C, @@ -135,6 +137,7 @@ CAP_CAPABLE = [ F_86F_Sabre, F_4E, F_5E_3, + F_14A_135_GR, F_14B, F_15C, F_15E, @@ -183,6 +186,7 @@ CAP_PREFERRED = [ Mirage_2000_5, F_86F_Sabre, + F_14A_135_GR, F_14B, F_15C, @@ -226,6 +230,7 @@ CAS_CAPABLE = [ F_86F_Sabre, F_5E_3, + F_14A_135_GR, F_14B, F_15E, F_16A, @@ -390,6 +395,7 @@ STRIKE_CAPABLE = [ F_86F_Sabre, F_5E_3, + F_14A_135_GR, F_14B, F_15E, F_16A, diff --git a/resources/customized_payloads/F-14A-135-GR.lua b/resources/customized_payloads/F-14A-135-GR.lua new file mode 100644 index 00000000..9926af41 --- /dev/null +++ b/resources/customized_payloads/F-14A-135-GR.lua @@ -0,0 +1,343 @@ +local unitPayloads = { + ["name"] = "F-14A", + ["payloads"] = { + [1] = { + ["name"] = "CAP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{SHOULDER AIM_54C_Mk47 L}", + ["num"] = 2, + }, + [4] = { + ["CLSID"] = "{SHOULDER AIM_54C_Mk47 R}", + ["num"] = 9, + }, + [5] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [7] = { + ["CLSID"] = "{AIM_54C_Mk47}", + ["num"] = 7, + }, + [8] = { + ["CLSID"] = "{AIM_54C_Mk47}", + ["num"] = 4, + }, + [9] = { + ["CLSID"] = "{AIM_54C_Mk47}", + ["num"] = 6, + }, + [10] = { + ["CLSID"] = "{AIM_54C_Mk47}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + [2] = { + ["name"] = "CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{F14-LANTIRN-TP}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{PHXBRU3242_2*LAU10 LS}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [7] = { + ["CLSID"] = "{BRU-32 MK-82}", + ["num"] = 7, + }, + [8] = { + ["CLSID"] = "{BRU-32 MK-82}", + ["num"] = 4, + }, + [9] = { + ["CLSID"] = "{BRU-32 MK-82}", + ["num"] = 6, + }, + [10] = { + ["CLSID"] = "{BRU-32 MK-82}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + [3] = { + ["name"] = "SEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{SHOULDER AIM_54C_Mk47 R}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{SHOULDER AIM_54C_Mk47 L}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [7] = { + ["CLSID"] = "{BRU3242_ADM141}", + ["num"] = 7, + }, + [8] = { + ["CLSID"] = "{BRU3242_ADM141}", + ["num"] = 4, + }, + [9] = { + ["CLSID"] = "{BRU3242_ADM141}", + ["num"] = 6, + }, + [10] = { + ["CLSID"] = "{BRU3242_ADM141}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + [4] = { + ["name"] = "DEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{F14-LANTIRN-TP}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{PHXBRU3242_2*LAU10 LS}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [7] = { + ["CLSID"] = "{BRU-32 GBU-12}", + ["num"] = 7, + }, + [8] = { + ["CLSID"] = "{BRU-32 GBU-12}", + ["num"] = 4, + }, + [9] = { + ["CLSID"] = "{BRU-32 GBU-12}", + ["num"] = 6, + }, + [10] = { + ["CLSID"] = "{BRU-32 GBU-12}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + [5] = { + ["name"] = "STRIKE", + ["pylons"] = { + [1] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{F14-LANTIRN-TP}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{SHOULDER AIM-7MH}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [7] = { + ["CLSID"] = "{BRU-32 GBU-16}", + ["num"] = 7, + }, + [8] = { + ["CLSID"] = "{BRU-32 GBU-16}", + ["num"] = 4, + }, + [9] = { + ["CLSID"] = "{BRU-32 GBU-16}", + ["num"] = 6, + }, + [10] = { + ["CLSID"] = "{BRU-32 GBU-16}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + [6] = { + ["name"] = "BAI", + ["pylons"] = { + [1] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{F14-LANTIRN-TP}", + ["num"] = 9, + }, + [4] = { + ["CLSID"] = "{PHXBRU3242_2*LAU10 LS}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [7] = { + ["CLSID"] = "{BRU-32 MK-82}", + ["num"] = 7, + }, + [8] = { + ["CLSID"] = "{BRU-32 MK-82}", + ["num"] = 4, + }, + [9] = { + ["CLSID"] = "{BRU-32 MK-20}", + ["num"] = 6, + }, + [10] = { + ["CLSID"] = "{BRU-32 MK-20}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + [7] = { + ["name"] = "ANTISHIP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{F14-LANTIRN-TP}", + ["num"] = 9, + }, + [2] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 10, + }, + [3] = { + ["CLSID"] = "{LAU-138 wtip - AIM-9M}", + ["num"] = 1, + }, + [4] = { + ["CLSID"] = "{PHXBRU3242_2*LAU10 LS}", + ["num"] = 2, + }, + [5] = { + ["CLSID"] = "{BRU-32 GBU-16}", + ["num"] = 7, + }, + [6] = { + ["CLSID"] = "{BRU-32 GBU-16}", + ["num"] = 4, + }, + [7] = { + ["CLSID"] = "{BRU3242_ADM141}", + ["num"] = 6, + }, + [8] = { + ["CLSID"] = "{BRU3242_ADM141}", + ["num"] = 5, + }, + [9] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 3, + }, + [10] = { + ["CLSID"] = "{F14-300gal}", + ["num"] = 8, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + }, + ["unitType"] = "F-14A-135-GR", +} +return unitPayloads diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index dd711747..b06ad1fb 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -4,6 +4,7 @@ "authors": "Khopa", "description": "

A generic bluefor coldwar faction.

", "aircrafts": [ + "F_14A_135_GR", "F_14B", "F_4E", "F_5E_3", diff --git a/resources/factions/bluefor_coldwar_a4.json b/resources/factions/bluefor_coldwar_a4.json index 12fe48bf..78cc28fb 100644 --- a/resources/factions/bluefor_coldwar_a4.json +++ b/resources/factions/bluefor_coldwar_a4.json @@ -4,6 +4,7 @@ "authors": "Khopa", "description": "

A generic bluefor coldwar faction. (With the A-4E-C mod)

", "aircrafts": [ + "F_14A_135_GR", "F_14B", "F_4E", "F_5E_3", diff --git a/resources/factions/bluefor_coldwar_a4_mb339.json b/resources/factions/bluefor_coldwar_a4_mb339.json index d106c693..a0c31139 100644 --- a/resources/factions/bluefor_coldwar_a4_mb339.json +++ b/resources/factions/bluefor_coldwar_a4_mb339.json @@ -4,6 +4,7 @@ "authors": "Khopa", "description": "

A generic bluefor coldwar faction. (With the A-4E-C and the MB-339 mods)

", "aircrafts": [ + "F_14A_135_GR", "F_14B", "F_4E", "F_5E_3", diff --git a/resources/factions/iran_2015.json b/resources/factions/iran_2015.json index 6b028767..fee95e9e 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -8,7 +8,7 @@ "MiG_29A", "F_4E", "F_5E_3", - "F_14B", + "F_14A_135_GR", "Su_17M4", "Su_24M", "Su_25", diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index 77871754..c1d8906f 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -6,7 +6,7 @@ "aircrafts": [ "F_5E_3", "F_4E", - "F_14B", + "F_14A_135_GR", "B_52H", "UH_1H" ], diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index d1f1a270..c09f23cf 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -6,6 +6,7 @@ "aircrafts": [ "F_15C", "F_15E", + "F_14A_135_GR", "F_14B", "FA_18C_hornet", "F_16C_50", @@ -85,5 +86,25 @@ "ArleighBurkeGroupGenerator" ], "has_jtac": true, - "jtac_unit": "MQ_9_Reaper" + "jtac_unit": "MQ_9_Reaper", + "liveries_overrides": { + "FA_18C_hornet": [ + "VFA-37", + "VFA-106", + "VFA-113", + "VFA-122", + "VFA-131", + "VFA-192", + "VFA-34", + "VFA-83", + "VFA-87", + "VFA-97", + "VMFA-122", + "VMFA-132", + "VMFA-251", + "VMFA-312", + "VMFA-314", + "VMFA-323" + ] + } } \ No newline at end of file diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index 24d0e2ea..fabb207f 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -5,6 +5,7 @@ "description": "

Highway to the Danger Zone! For Tomcat lovers.

", "aircrafts": [ "F_4E", + "F_14A_135_GR", "F_14B", "S_3B", "UH_1H",