diff --git a/game/db.py b/game/db.py index 7e1fccc7..f76bbb42 100644 --- a/game/db.py +++ b/game/db.py @@ -14,6 +14,7 @@ from dcs.planes import ( B_17G, FA_18C_hornet, F_16C_50, + F_14A, Ju_88A4, P_51D_30_NA, plane_map, @@ -262,6 +263,7 @@ is livery name as found in mission editor. """ PLANE_LIVERY_OVERRIDES: dict[Type[FlyingType], str] = { FA_18C_hornet: "VFA-34", # default livery for the hornet is blue angels one + F_14A: "vf-142 `ghost riders`", # default livery for the AI F-14A is the black demo scheme } """ diff --git a/game/missiongenerator/aircraft/flightgroupspawner.py b/game/missiongenerator/aircraft/flightgroupspawner.py index 720795e4..217069d6 100644 --- a/game/missiongenerator/aircraft/flightgroupspawner.py +++ b/game/missiongenerator/aircraft/flightgroupspawner.py @@ -5,7 +5,7 @@ from typing import Any, Union from dcs import Mission, Point from dcs.country import Country from dcs.mission import StartType as DcsStartType -from dcs.planes import Su_33 +from dcs.planes import Su_33, F_14A from dcs.point import PointAction from dcs.ships import KUZNECOW from dcs.terrain import Airport, NoParkingSlotError @@ -251,7 +251,9 @@ class FlightGroupSpawner: # Setting Su-33s starting from the non-supercarrier Kuznetsov to take off from # runway to work around a DCS AI issue preventing Su-33s from taking off when # set to "Takeoff from ramp" (#1352) - if ( + # Also setting the F-14A AI variant to start from cats since they are reported + # to have severe pathfinding problems when doing ramp starts (#1927) + if self.flight.unit_type.dcs_unit_type == F_14A or ( self.flight.unit_type.dcs_unit_type == Su_33 and group_units[0] is not None and group_units[0].type == KUZNECOW.id diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index 75e3522a..14abf2ec 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -43,6 +43,7 @@ from dcs.planes import ( FW_190A8, FW_190D9, F_117A, + F_14A, F_14A_135_GR, F_14B, F_15C, @@ -131,6 +132,7 @@ CAP_CAPABLE = [ F_15C, F_14B, F_14A_135_GR, + F_14A, Su_33, J_11A, Su_30, diff --git a/resources/customized_payloads/F-14A.lua b/resources/customized_payloads/F-14A.lua new file mode 100644 index 00000000..b4b3dae5 --- /dev/null +++ b/resources/customized_payloads/F-14A.lua @@ -0,0 +1,55 @@ +local unitPayloads = { + ["name"] = "F-14A", + ["payloads"] = { + [1] = { + ["name"] = "CAP", + ["pylons"] = { + [1] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}", + ["num"] = 5, + }, + [5] = { + ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}", + ["num"] = 8, + }, + [6] = { + ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}", + ["num"] = 9, + }, + [7] = { + ["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}", + ["num"] = 11, + }, + [8] = { + ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", + ["num"] = 12, + }, + [9] = { + ["CLSID"] = "{82364E69-5564-4043-A866-E13032926C3E}", + ["num"] = 10, + }, + [10] = { + ["CLSID"] = "{82364E69-5564-4043-A866-E13032926C3E}", + ["num"] = 3, + }, + }, + ["tasks"] = { + [1] = 10, + }, + }, + }, + ["unitType"] = "F-14A", +} +return unitPayloads diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json index 47c6fb1b..a6cdcc54 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -12,6 +12,7 @@ "C-130", "C-130J-30 Super Hercules", "F-117A Nighthawk", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-14B Tomcat", "F-15C Eagle", diff --git a/resources/factions/NATO_OIF.json b/resources/factions/NATO_OIF.json index 975b3c8d..bb1a3063 100644 --- a/resources/factions/NATO_OIF.json +++ b/resources/factions/NATO_OIF.json @@ -12,6 +12,7 @@ "C-130", "C-130J-30 Super Hercules", "F-117A Nighthawk", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-14B Tomcat", "F-15C Eagle", diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index 50e97b5d..27d7815c 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -10,6 +10,7 @@ "B-52H Stratofortress", "C-130", "C-130J-30 Super Hercules", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-14B Tomcat", "F-4E Phantom II", diff --git a/resources/factions/iran_1988.json b/resources/factions/iran_1988.json index 159d328d..54590869 100644 --- a/resources/factions/iran_1988.json +++ b/resources/factions/iran_1988.json @@ -8,6 +8,7 @@ ], "aircrafts": [ "AH-1J SeaCobra", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-4E Phantom II", "F-5E Tiger II", diff --git a/resources/factions/iran_2015.json b/resources/factions/iran_2015.json index 9bef9922..d41119f5 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -7,6 +7,7 @@ "fa_IR" ], "aircrafts": [ + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-4E Phantom II", "F-5E Tiger II", diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index 3ca253a3..5299e209 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -9,6 +9,7 @@ "C-130", "CH-47D", "CH-53E", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-4E Phantom II", "F-5E Tiger II", diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index deda3324..17e12a36 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -17,6 +17,7 @@ "CH-47D", "CH-53E", "F-117A Nighthawk", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-14B Tomcat", "F-15C Eagle", diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index 435c9567..bb3d446c 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -9,6 +9,7 @@ "aircrafts": [ "AH-1W SuperCobra", "A-4E Skyhawk", + "F-14A Tomcat (AI)", "F-14A Tomcat (Block 135-GR Late)", "F-14B Tomcat", "F-4E Phantom II", diff --git a/resources/ui/units/aircrafts/banners/F-14A_24.jpg b/resources/ui/units/aircrafts/banners/F-14A_24.jpg new file mode 100644 index 00000000..61ddecfb Binary files /dev/null and b/resources/ui/units/aircrafts/banners/F-14A_24.jpg differ diff --git a/resources/ui/units/aircrafts/icons/F-14A-135-GR_24.jpg b/resources/ui/units/aircrafts/icons/F-14A-135-GR_24.jpg index 6ff978cb..6e41dcab 100644 Binary files a/resources/ui/units/aircrafts/icons/F-14A-135-GR_24.jpg and b/resources/ui/units/aircrafts/icons/F-14A-135-GR_24.jpg differ diff --git a/resources/ui/units/aircrafts/icons/F-14A_24.jpg b/resources/ui/units/aircrafts/icons/F-14A_24.jpg index 6ff978cb..af92fe9c 100644 Binary files a/resources/ui/units/aircrafts/icons/F-14A_24.jpg and b/resources/ui/units/aircrafts/icons/F-14A_24.jpg differ diff --git a/resources/units/aircraft/F-14A.yaml b/resources/units/aircraft/F-14A.yaml new file mode 100644 index 00000000..c85d08bd --- /dev/null +++ b/resources/units/aircraft/F-14A.yaml @@ -0,0 +1,25 @@ +carrier_capable: true +description: + "The Grumman F-14 Tomcat is a two-crew, variable wing-geometry, maritime\ + \ air superiority fighter that served with the US Navy for 32 years and continues\ + \ to serve with the IRIAF in Iran. The F-14 was the US Navy's frontline fighter\ + \ from the 1970s to the mid-2000s. Over the course of its long service it also became\ + \ the US Navy\u2019s lone airborne reconnaissance asset.\n\n\ + \ Noteworthy features of the Tomcat are its swing-wing\ + \ configuration, two-man crew, and the powerful AN/AWG-9 Weapons Control System\ + \ (WCS) and radar. The AWG-9 allows employment of the long-range AIM-54 Phoenix\ + \ air-to-air missile. The F-14 Tomcat was present in several historic events\ + \ that include the two Gulf of Sidra incidents, Operations Desert Storm Iraqi Freedom,\ + \ the Yugoslavian conflict, and Operation Enduring Freedom over Afghanistan. It\ + \ was also immortalized in the iconic motion picture, Top Gun, and starred in several\ + \ other feature films including The Final Countdown, Executive Decision, and others.\n\ + \nThe Tomcat was also played a vital role in the Iran-Iraq war of the 1980s, where\ + \ is flew for the Islamic Republic of Iran Air Force." +introduced: 1974 +manufacturer: Grumman +origin: USA +price: 20 +role: Carrier-based Air-Superiority Fighter/Fighter Bomber +max_range: 350 +variants: + F-14A Tomcat (AI): {} \ No newline at end of file