Revert "Remove front line minimum distance."

This reverts commit dbe9691d

changelog.md

@@ -18,6 +18,7 @@ Saves from 5.0.0 are compatible with 5.1.0
 * **[Mission Generation]** Fixed mission scripting error when using a dedicated server.
 * **[Mission Generation]** Fixed an issue where empty convoys lead to an index error when a point capture made a pending transfer of units not completable anymore.
 * **[Mission Generation]** Corrected Viggen FR22 & FR24 preset channels for the DCS 2.7.9 update
+* **[Mission Generation]** Fixed the SA-5 Generator to use the P-19 FlatFace SR as a Fallback radar if the faction does not have access to the TinShield SR.
 * **[UI]** Enable / Disable the settings, save and stats actions if no game is loaded to prevent an error as these functions can only be used on a valid game.
 
 # 5.0.0

game/theater/conflicttheater.py

@@ -325,8 +325,8 @@ class NevadaTheater(ConflictTheater):
     terrain = nevada.Nevada()
     overview_image = "nevada.gif"
     reference_points = (
-        ReferencePoint(nevada.Mina_Airport_3Q0.position, Point(252, 295)),
-        ReferencePoint(nevada.Laughlin_Airport.position, Point(844, 909)),
+        ReferencePoint(nevada.Mina.position, Point(252, 295)),
+        ReferencePoint(nevada.Laughlin.position, Point(844, 909)),
     )
     landmap = load_landmap(Path("resources/nevlandmap.p"))
     daytime_map = {

gen/airfields.py

@@ -1058,20 +1058,20 @@ AIRFIELD_DATA = {
             "8": ("IGZP", MHz(108, 500)),
         },
     ),
-    # NTTR
-    "Mina Airport 3Q0": AirfieldData(
-        theater="NTTR",
+    # Nevada
+    "Mina": AirfieldData(
+        theater="Nevada",
         elevation=4562,
         runway_length=4222,
     ),
-    "Tonopah Airport": AirfieldData(
-        theater="NTTR",
+    "Tonopah": AirfieldData(
+        theater="Nevada",
         icao="KTPH",
         elevation=5394,
         runway_length=6715,
     ),
-    "Tonopah Test Range Airfield": AirfieldData(
-        theater="NTTR",
+    "Tonopah Test Range": AirfieldData(
+        theater="Nevada",
         icao="KTNX",
         elevation=5534,
         runway_length=11633,
@@ -1083,19 +1083,19 @@ AIRFIELD_DATA = {
             "14": ("I-RVP", MHz(108, 300)),
         },
     ),
-    "Beatty Airport": AirfieldData(
-        theater="NTTR",
+    "Beatty": AirfieldData(
+        theater="Nevada",
         icao="KBTY",
         elevation=3173,
         runway_length=5380,
     ),
-    "Pahute Mesa Airstrip": AirfieldData(
-        theater="NTTR",
+    "Pahute Mesa": AirfieldData(
+        theater="Nevada",
         elevation=5056,
         runway_length=5420,
     ),
-    "Groom Lake AFB": AirfieldData(
-        theater="NTTR",
+    "Groom Lake": AirfieldData(
+        theater="Nevada",
         icao="KXTA",
         elevation=4494,
         runway_length=11008,
@@ -1107,18 +1107,18 @@ AIRFIELD_DATA = {
         },
     ),
     "Lincoln County": AirfieldData(
-        theater="NTTR",
+        theater="Nevada",
         elevation=4815,
         runway_length=4408,
     ),
     "Mesquite": AirfieldData(
-        theater="NTTR",
+        theater="Nevada",
         icao="67L",
         elevation=1858,
         runway_length=4937,
     ),
-    "Creech AFB": AirfieldData(
-        theater="NTTR",
+    "Creech": AirfieldData(
+        theater="Nevada",
         icao="KINS",
         elevation=3126,
         runway_length=6100,
@@ -1130,7 +1130,7 @@ AIRFIELD_DATA = {
         },
     ),
     "Echo Bay": AirfieldData(
-        theater="NTTR",
+        theater="Nevada",
         icao="OL9",
         elevation=3126,
         runway_length=6100,
@@ -1138,8 +1138,8 @@ AIRFIELD_DATA = {
         tacan_callsign="INS",
         atc=AtcData(MHz(3, 825), MHz(118, 300), MHz(38, 550), MHz(360, 600)),
     ),
-    "Nellis AFB": AirfieldData(
-        theater="NTTR",
+    "Nellis": AirfieldData(
+        theater="Nevada",
         icao="KLSV",
         elevation=1841,
         runway_length=9454,
@@ -1151,14 +1151,14 @@ AIRFIELD_DATA = {
         },
     ),
     "North Las Vegas": AirfieldData(
-        theater="NTTR",
+        theater="Nevada",
         icao="KVGT",
         elevation=2228,
         runway_length=4734,
         atc=AtcData(MHz(3, 775), MHz(125, 700), MHz(38, 450), MHz(360, 750)),
     ),
-    "McCarran International Airport": AirfieldData(
-        theater="NTTR",
+    "McCarran International": AirfieldData(
+        theater="Nevada",
         icao="KLAS",
         elevation=2169,
         runway_length=10377,
@@ -1169,26 +1169,26 @@ AIRFIELD_DATA = {
             "25": ("I-LAS", MHz(110, 300)),
         },
     ),
-    "Henderson Executive Airport": AirfieldData(
-        theater="NTTR",
+    "Henderson Executive": AirfieldData(
+        theater="Nevada",
         icao="KHND",
         elevation=2491,
         runway_length=5999,
         atc=AtcData(MHz(3, 925), MHz(125, 100), MHz(38, 750), MHz(250, 100)),
     ),
-    "Boulder City Airport": AirfieldData(
-        theater="NTTR",
+    "Boulder City": AirfieldData(
+        theater="Nevada",
         icao="KBVU",
         elevation=2121,
         runway_length=4612,
     ),
-    "Jean Airport": AirfieldData(
-        theater="NTTR",
+    "Jean": AirfieldData(
+        theater="Nevada",
         elevation=2824,
         runway_length=4053,
     ),
-    "Laughlin Airport": AirfieldData(
-        theater="NTTR",
+    "Laughlin": AirfieldData(
+        theater="Nevada",
         icao="KIFP",
         elevation=656,
         runway_length=7139,

gen/sam/sam_group_generator.py

@@ -49,7 +49,7 @@ from gen.sam.sam_sa17 import SA17Generator
 from gen.sam.sam_sa19 import SA19Generator
 from gen.sam.sam_sa2 import SA2Generator
 from gen.sam.sam_sa3 import SA3Generator
-from gen.sam.sam_sa5 import SA5Generator
+from gen.sam.sam_sa5 import SA5Generator, SA5FlatFaceGenerator
 from gen.sam.sam_sa6 import SA6Generator
 from gen.sam.sam_sa8 import SA8Generator
 from gen.sam.sam_sa9 import SA9Generator
@@ -79,6 +79,7 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = {
     "SA2Generator": SA2Generator,
     "SA3Generator": SA3Generator,
     "SA5Generator": SA5Generator,
+    "SA5FlatFaceGenerator": SA5FlatFaceGenerator,
     "SA6Generator": SA6Generator,
     "SA8Generator": SA8Generator,
     "SA9Generator": SA9Generator,

gen/sam/sam_sa5.py

@@ -1,5 +1,10 @@
+from typing import Type
+
+from dcs.unittype import VehicleType
 from dcs.vehicles import AirDefence, Unarmed
 
+from game import Game
+from game.theater import SamGroundObject
 from gen.sam.airdefensegroupgenerator import (
     AirDefenseRange,
     AirDefenseGroupGenerator,
@@ -8,15 +13,18 @@ from gen.sam.airdefensegroupgenerator import (
 
 class SA5Generator(AirDefenseGroupGenerator):
     """
-    This generate a SA-5 group
+    This generate a SA-5 group using the TinShield SR
     """
 
     name = "SA-5/S-200 Site"
 
-    def generate(self) -> None:
+    def __init__(self, game: Game, ground_object: SamGroundObject):
+        super().__init__(game, ground_object)
+        self.sr: Type[VehicleType] = AirDefence.RLS_19J6
 
+    def generate(self) -> None:
         self.add_unit(
-            AirDefence.RLS_19J6,
+            self.sr,
             "SR",
             self.position.x,
             self.position.y,
@@ -54,3 +62,14 @@ class SA5Generator(AirDefenseGroupGenerator):
     @classmethod
     def range(cls) -> AirDefenseRange:
         return AirDefenseRange.Long
+
+
+# TODO Replace this legacy handling once the Generators can be faction sensitive #1903
+class SA5FlatFaceGenerator(SA5Generator):
+    """
+    This generate a SA-5 group using the P-19 FlatFace SR
+    """
+
+    def __init__(self, game: Game, ground_object: SamGroundObject):
+        super().__init__(game, ground_object)
+        self.sr: Type[VehicleType] = AirDefence.P_19_s_125_sr

requirements.txt

@@ -24,7 +24,7 @@ Pillow==8.3.2
 pluggy==0.13.1
 pre-commit==2.10.1
 py==1.10.0
--e git://github.com/pydcs/dcs@92e3046d476781bd617a6c1abd6853cccf97d57c#egg=pydcs
+-e git://github.com/pydcs/dcs@5d1f581b260fdc6091744ab927a58cdee586e681#egg=pydcs
 pyinstaller==4.3
 pyinstaller-hooks-contrib==2021.1
 pyparsing==2.4.7

resources/campaigns/exercise_vegas_nerve.yaml

@@ -4,7 +4,7 @@ theater: Nevada
 authors: Starfire
 recommended_player_faction: USA 2005
 recommended_enemy_faction: Redfor (China) 2010
-description: <p>This is an asymmetrical Red Flag Exercise scenario for the NTTR comprising 4 control points. You start off in control of the two Tonopah airports, and will push south to capture Groom Lake and Nellis AFBs. Taking down Nellis AFB's IADS and striking their resource sites ASAP once Groom Lake has been captured is recommended to offset their substantial resource advantage.</p>
+description: <p>Welcome to Vegas Nerve, an asymmetrical Red Flag Exercise scenario. You start off in control of the two Tonopah airports, and will push south from there. For the duration of this exercise, Creech AFB has been cleared of all fixed wing aircraft and will function as a FARP. OPFOR has a substantial resource advantage and reducing that advantage will be key to your success. Good luck, Commander.</p>
 miz: exercise_vegas_nerve.miz
 performance: 1
 recommended_start_date: 2011-04-24
@@ -12,12 +12,12 @@ version: "9.1"
 squadrons:
 # Tonopah Airport
   17:
-    - primary: BARCAP
+    - primary: TARCAP
       secondary: air-to-air
       aircraft:
         - F-15C Eagle
     - primary: BARCAP
-      secondary: air-to-air
+      secondary: any
       aircraft:
         - F-14B Tomcat
     - primary: AEW&C
@@ -42,12 +42,16 @@ squadrons:
       secondary: air-to-ground
       aircraft:
         - A-10C Thunderbolt II (Suite 7)
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - AH-64D Apache Longbow
     - primary: SEAD
-      secondary: any
+      secondary: air-to-ground
       aircraft:
         - F/A-18C Hornet (Lot 20)
     - primary: DEAD
-      secondary: any
+      secondary: air-to-ground
       aircraft:
         - F-16CM Fighting Falcon (Block 50)
     - primary: BAI
@@ -57,23 +61,31 @@ squadrons:
 # Groom Lake
   2:
     - primary: BARCAP
-      secondary: any
+      secondary: air-to-air
       aircraft:
         - J-11A Flanker-L
     - primary: BAI
       secondary: air-to-ground
       aircraft:
         - Su-34 Fullback
+# Creech
+  Creech FARP:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
 # Nellis AFB
   4:
-    - primary: DEAD
+    - primary: SEAD
       secondary: any
       aircraft:
-        - Su-30MKK Flanker-G
+        - FC-1 Fierce Dragon
     - primary: Strike
       secondary: air-to-ground
       aircraft:
         - H-6J Badger
+# Boulder City Airport
+  6:
     - primary: AEW&C
       aircraft:
         - KJ-2000

resources/campaigns/pacific_repartee.yaml

@@ -102,9 +102,9 @@ squadrons:
         - FC-1 Fierce Dragon
   # Tinian Intl
   3:
-    - primary: AEW&C
+    - primary: Refueling
       aircraft:
-        - KJ-2000
+        - IL-78M
   # Andersen AFB
   6:
     - primary: TARCAP
@@ -122,9 +122,6 @@ squadrons:
     - primary: Transport
       aircraft:
         - IL-76MD
-    - primary: Refueling
-      aircraft:
-        - IL-78M
   # Antonio B. Won Pat Intl
   4:
     - primary: TARCAP

resources/campaigns/scenic_inland.yaml

@@ -0,0 +1,248 @@
+---
+name: Persian Gulf - Scenic Route 2 - Dust To Dust
+theater: Persian Gulf
+authors: Fuzzle
+description: <p>A continuation of Scenic Route. A NATO coalition pushes inland along a protracted axis of advance. Built with helicopters/FOB-based gameplay in mind. <p><strong>Backstory:</strong> With Iran's coastal defences pacified and their forces pushed inland, a beleaguered US Navy is reinforced by a NATO coalition task force. The going will not be easy however; Iran has assembled the full might of its armoured and mechanized divisions alongside rotary support to defend their heartland. The conflict intensifies.</p>
+version: "9.1"
+advanced_iads: true
+recommended_player_faction: NATO OIF
+recommended_enemy_faction: Iran 2015
+miz: scenic_inland.miz
+performance: 2
+recommended_start_date: 2005-06-29
+squadrons:
+  # Bandar Abbas Intl
+  2:
+    - primary: TARCAP
+      secondary: air-to-air
+      aircraft:
+        - Escadron de chasse 1/30
+        #French Mirage2000C
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - 77th FS
+        #USAF F-16C
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - No. 12 Squadron
+        #RAF Tornado GR.4
+    - primary: Transport
+      secondary: air-to-ground
+      aircraft:
+        - 101st Combat Aviation Brigade
+        #US Army UH-60
+  # Havadarya
+  9:
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+      - 493rd FS
+      #USAF F-15C 
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+      - 81st FS
+      #USAF A-10CI
+  #BLUFOR CVN
+  BLUFOR CVN:
+    - primary: BARCAP
+      secondary: air-to-air
+      aircraft:
+        - VF-143
+    - primary: TARCAP
+      secondary: any
+      aircraft:
+        - VMFA-251
+    - primary: AEW&C
+      aircraft:
+        - VAW-125
+    - primary: Refueling
+      aircraft:
+        - VS-35 (Tanker)
+  # BLUFOR LHA
+  BLUFOR LHA:
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - VMA-223
+    - primary: Transport
+      secondary: air-to-ground
+      aircraft:
+        - HMLA-169 (UH-1H)
+  # BLUFOR Start FOB
+  FOB Anguran:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - SA 342M Gazelle
+        #French Gazelle
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - 229th Aviation Battalion
+        #US Army Apache AH-64D
+  # OPFOR L1F1
+  FOB Tang-e Dalan:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L1F2
+  FOB Fars Border:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L1F2 split
+  FOB Bikuyeh:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-28N Havoc
+  # Lar 
+  11:
+    - primary: BARCAP
+      secondary: air-to-air
+      aircraft:
+        - MiG-21bis Fishbed-N
+  # OPFOR L2F1
+  FOB Mansurabad:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L2F2
+  FOB Jahrom:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L2F3
+  FOB Tower:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L2F3 split
+  FOB Nouderan:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-28N Havoc
+  # Shiraz Intl
+  19:
+    - primary: AEW&C
+      aircraft:
+        - A-50
+    - primary: Refueling
+      aircraft:
+        - IL-78M
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+        - F-4E Phantom II
+    - primary: TARCAP
+      secondary: air-to-air
+      aircraft:
+        - MiG-29A Fulcrum-A
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - Su-22M4 Fitter-K
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+    - primary: SEAD
+      secondary: air-to-ground
+      aircraft:
+        - Su-25T Frogfoot
+  # OPFOR L3F1
+  FOB Kherameh:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F2
+  FOB Tashk:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F3
+  FOB Chahak:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F4
+  FOB Plainhold:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F4 split
+  FOB Robat:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F5
+  FOB Plainguard:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F6
+  FOB Hasanabad:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F6 split
+  FOB Najafabad:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-28N Havoc
+  # OPFOR L3F7
+  FOB Kabutarkhan:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # OPFOR L3F8
+  FOB Sa'di:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F
+  # Kerman
+  18:
+    - primary: AEW&C
+      aircraft:
+        - A-50
+    - primary: Refueling
+      aircraft:
+        - IL-78M
+    - primary: Transport
+      aircraft:
+        - IL-78MD
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+        - F-14A Tomcat (Block 135-GR Late)
+    - primary: TARCAP
+      secondary: air-to-air
+      aircraft:
+        - MiG-29A Fulcrum-A
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - Su-24MK Fencer-D
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Mi-24P Hind-F

resources/factions/NATO_OIF.json

@@ -0,0 +1,105 @@
+{
+  "country": "Combined Joint Task Forces Blue",
+  "name": "NATO OIF",
+  "authors": "Fuzzle",
+  "description": "<p>A more modern NATO mixed faction reflecting the units involved in Operation Iraqi Freedom.</p>",
+  "aircrafts": [
+    "A-10C Thunderbolt II (Suite 3)",
+    "AH-64D Apache Longbow",
+    "AV-8B Harrier II Night Attack",
+    "B-1B Lancer",
+    "B-52H Stratofortress",
+    "C-130",
+    "C-130J-30 Super Hercules",
+    "F-117A Nighthawk",
+    "F-14A Tomcat (Block 135-GR Late)",
+    "F-14B Tomcat",
+    "F-15C Eagle",
+    "F-15E Strike Eagle",
+    "F-16CM Fighting Falcon (Block 50)",
+	"F-22A Raptor",
+    "F/A-18C Hornet (Lot 20)",
+    "Mirage 2000C",
+    "OH-58D Kiowa Warrior",
+    "S-3B Viking",
+    "SA 342L Gazelle",
+    "SA 342M Gazelle",
+    "SA 342M Gazelle Mistral",
+    "Tornado GR4",
+    "UH-1H Iroquois",
+	"UH-60A"
+  ],
+  "awacs": [
+    "E-2C Hawkeye",
+    "E-3A"
+  ],
+  "tankers": [
+    "KC-130",
+    "KC-135 Stratotanker",
+    "S-3B Tanker"
+  ],
+  "frontline_units": [
+    "FV4034 Challenger 2",
+    "FV510 Warrior",
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1097 Heavy HMMWV Avenger",
+    "M1134 Stryker ATGM (BGM-71 TOW)",
+    "M1A2 Abrams",
+    "M2A2 Bradley",
+	"M6 Linebacker",
+    "Marder 1A3",
+    "VAB Mephisto"
+  ],
+  "artillery_units": [
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System"
+  ],
+  "logistics_units": [
+    "Truck M818 6x6"
+  ],
+  "infantry_units": [
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger"
+  ],
+  "air_defenses": [
+    "AvengerGenerator",
+    "ChaparralGenerator",
+    "VulcanGenerator",
+    "RolandGenerator",
+    "HawkGenerator",
+    "PatriotGenerator",
+    "RapierGenerator"
+  ],
+  "ewrs": [
+    "PatriotEwrGenerator"
+  ],
+  "aircraft_carrier": [
+    "Stennis"
+  ],
+  "helicopter_carrier": [
+    "LHA_Tarawa"
+  ],
+  "destroyers": [
+    "USS_Arleigh_Burke_IIa"
+  ],
+  "cruisers": [
+    "TICONDEROG"
+  ],
+  "requirements": {},
+  "carrier_names": [
+    "CVN-71 Theodore Roosevelt"
+  ],
+  "helicopter_carrier_names": [
+    "LHA-1 Tarawa",
+    "LHA-4 Nassau"
+  ],
+  "navy_generators": [
+    "ArleighBurkeGroupGenerator",
+	"OliverHazardPerryGroupGenerator"
+  ],
+  "has_jtac": true,
+  "jtac_unit": "MQ-9 Reaper"
+}

resources/factions/iran_1988.json

@@ -26,11 +26,11 @@
     "M113",
     "M60A3 \"Patton\"",
     "ZSU-23-4 Shilka",
-    "ZSU-57-2 'Sparka'",
     "ZU-23 on Ural-375"
   ],
   "artillery_units": [
     "2S1 Gvozdika",
+    "M109A6 Paladin",
     "BM-21 Grad"
   ],
   "logistics_units": [
@@ -40,21 +40,20 @@
   "infantry_units": [
     "Infantry RPG",
     "Insurgent AK-74",
-    "MANPADS SA-18 Igla-S \"Grouse\"",
-    "Paratrooper AKS"
+    "MANPADS SA-18 Igla \"Grouse\" Ins"
   ],
   "air_defenses": [
     "HawkGenerator",
     "RapierGenerator",
     "SA2Generator",
-    "ZSU57Generator",
     "ZSU23Generator",
-    "ZU23Generator",
+    "ZU23InsurgentGenerator",
+    "ZU23UralInsurgentGenerator",
     "ColdWarFlakGenerator"
   ],
   "ewrs": [
-    "TallRackGenerator",
-    "TinShieldGenerator"
+    "FlatFaceGenerator",
+    "HawkEwrGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],

resources/factions/iran_2015.json

@@ -30,15 +30,16 @@
   "frontline_units": [
     "Chieftain Mk.3",
     "BMP-1",
+    "BMP-2",
     "BTR-80",
     "M113",
     "M60A3 \"Patton\"",
     "T-72B with Kontakt-1 ERA",
-    "ZSU-23-4 Shilka",
-    "ZSU-57-2 'Sparka'"
+    "ZSU-23-4 Shilka"
   ],
   "artillery_units": [
-    "2S19 Msta-S",
+    "2S1 Gvozdika",
+    "M109A6 Paladin",
     "BM-21 Grad"
   ],
   "logistics_units": [
@@ -46,28 +47,25 @@
     "Truck Ural-375"
   ],
   "infantry_units": [
+    "Infantry RPG",
     "Insurgent AK-74",
-    "MANPADS SA-18 Igla-S \"Grouse\"",
-    "Paratrooper AKS",
-    "Paratrooper RPG-16"
+    "MANPADS SA-18 Igla \"Grouse\" Ins"
   ],
   "air_defenses": [
     "HawkGenerator",
     "RapierGenerator",
     "SA2Generator",
-    "SA5Generator",
+    "SA5FlatFaceGenerator",
     "SA6Generator",
     "SA11Generator",
     "SA15Generator",
-    "SA17Generator",
-    "VulcanGenerator",
     "ZSU23Generator",
-    "ZU23Generator",
-    "ZU23UralGenerator"
+    "ZU23InsurgentGenerator",
+    "ZU23UralInsurgentGenerator"
   ],
   "ewrs": [
-    "TallRackGenerator",
-    "TinShieldGenerator"
+    "FlatFaceGenerator",
+    "HawkEwrGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],

resources/factions/libya_2011.json

@@ -45,7 +45,7 @@
     "RapierGenerator",
     "SA2Generator",
     "SA3Generator",
-    "SA5Generator",
+    "SA5FlatFaceGenerator",
     "SA6Generator",
     "SA8Generator",
     "SA9Generator",

resources/factions/poland_2010.json

@@ -44,7 +44,7 @@
     "Paratrooper AKS"
   ],
   "air_defenses": [
-    "SA5Generator",
+    "SA5FlatFaceGenerator",
     "SA6Generator",
     "SA8Generator",
     "ZSU23Generator",

resources/squadrons/AH-64D/US Army 229th Aviation Battalion.yaml

@@ -0,0 +1,11 @@
+---
+name: 229th Aviation Battalion
+nickname: Serpents
+country: USA
+role: Attack Helicopter
+aircraft: AH-64D Apache Longbow
+livery: standard
+mission_types:
+  - CAS
+  - BAI
+  - OCA/Aircraft

resources/squadrons/Tornado/RAF No12 Squadron.yaml

@@ -0,0 +1,15 @@
+---
+name: No. 12 Squadron
+nickname: Shiny Twelve
+country: UK
+role: Strike Fighter
+aircraft: Tornado GR4
+livery: HAF_341_Arrow
+mission_types:
+  - BAI
+  - CAS
+  - DEAD
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike

resources/squadrons/UH-60/US Army 101st Combat Aviation Brigade.yaml

@@ -0,0 +1,11 @@
+---
+name: 101st Combat Aviation Brigade
+nickname: Bearcats
+country: USA
+role: Transport/Light Attack
+aircraft: UH-60A
+livery: standard
+mission_types:
+  - CAS
+  - OCA/Aircraft
+  - Transport

resources/units/ground_units/Igla manpad INS.yaml

@@ -0,0 +1,5 @@
+class: MANPADS
+spawn_weight: 1
+price: 0
+variants:
+  MANPADS SA-18 Igla "Grouse" Ins: null