diff --git a/game/ato/ai_flight_planner_db.py b/game/ato/ai_flight_planner_db.py index 77c0c4e5..4c49b3f7 100644 --- a/game/ato/ai_flight_planner_db.py +++ b/game/ato/ai_flight_planner_db.py @@ -44,7 +44,6 @@ from dcs.planes import ( FW_190A8, FW_190D9, F_117A, - F_14A, F_14A_135_GR, F_14B, F_15C, @@ -142,7 +141,6 @@ CAP_CAPABLE = [ F_15C, F_14B, F_14A_135_GR, - F_14A, Su_33, J_11A, Su_30, diff --git a/game/missiongenerator/aircraft/flightgroupspawner.py b/game/missiongenerator/aircraft/flightgroupspawner.py index 5fdfd94a..aa124066 100644 --- a/game/missiongenerator/aircraft/flightgroupspawner.py +++ b/game/missiongenerator/aircraft/flightgroupspawner.py @@ -6,7 +6,7 @@ from dcs import Mission from dcs.country import Country from dcs.mapping import Vector2 from dcs.mission import StartType as DcsStartType -from dcs.planes import F_14A, Su_33 +from dcs.planes import Su_33 from dcs.ships import KUZNECOW from dcs.terrain import Airport, NoParkingSlotError from dcs.unitgroup import FlyingGroup, ShipGroup, StaticGroup @@ -259,9 +259,7 @@ 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) - # 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 ( + if ( 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/resources/customized_payloads/F-14A.lua b/resources/customized_payloads/F-14A.lua deleted file mode 100644 index b4b3dae5..00000000 --- a/resources/customized_payloads/F-14A.lua +++ /dev/null @@ -1,55 +0,0 @@ -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 897d665d..b3b54228 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -12,7 +12,6 @@ "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 7e8d5f81..03f1fa8d 100644 --- a/resources/factions/NATO_OIF.json +++ b/resources/factions/NATO_OIF.json @@ -13,7 +13,6 @@ "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 2e01a183..5dd956b8 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -10,7 +10,6 @@ "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 3064c581..a873dfb1 100644 --- a/resources/factions/iran_1988.json +++ b/resources/factions/iran_1988.json @@ -8,7 +8,6 @@ ], "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 c43bcb20..3076eb77 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -7,7 +7,6 @@ "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 e31596d8..191d7c90 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -11,7 +11,6 @@ "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 5b813064..19a80be2 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -17,7 +17,6 @@ "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 b7fc743c..df4f13ce 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -9,7 +9,6 @@ "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 deleted file mode 100644 index 61ddecfb..00000000 Binary files a/resources/ui/units/aircrafts/banners/F-14A_24.jpg and /dev/null 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 6e41dcab..6ff978cb 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 af92fe9c..6ff978cb 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 deleted file mode 100644 index 6d75221a..00000000 --- a/resources/units/aircraft/F-14A.yaml +++ /dev/null @@ -1,27 +0,0 @@ -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 -# DCS default livery for the AI F-14A is the black demo scheme. -default_livery: vf-142 `ghost riders` -variants: - F-14A Tomcat (AI): {}