Added F-14A support

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
 

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,
@@ -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
 """
@@ -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,
@@ -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.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.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
     ]
@@ -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 = ""

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,

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

resources/factions/bluefor_coldwar.json

@@ -4,6 +4,7 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor coldwar faction.</p>",
   "aircrafts": [
+    "F_14A_135_GR",
     "F_14B",
     "F_4E",
     "F_5E_3",

resources/factions/bluefor_coldwar_a4.json

@@ -4,6 +4,7 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor coldwar faction. (With the A-4E-C mod)</p>",
   "aircrafts": [
+    "F_14A_135_GR",
     "F_14B",
     "F_4E",
     "F_5E_3",

resources/factions/bluefor_coldwar_a4_mb339.json

@@ -4,6 +4,7 @@
   "authors": "Khopa",
   "description": "<p>A generic bluefor coldwar faction. (With the A-4E-C and the MB-339 mods)</p>",
   "aircrafts": [
+    "F_14A_135_GR",
     "F_14B",
     "F_4E",
     "F_5E_3",

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",

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"
   ],

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"
+    ]
+  }
 }

resources/factions/usn_1985.json

@@ -5,6 +5,7 @@
   "description": "<p>Highway to the Danger Zone! For Tomcat lovers.</p>",
   "aircrafts": [
     "F_4E",
+    "F_14A_135_GR",
     "F_14B",
     "S_3B",
     "UH_1H",