FA18EFG mod support Patch 4 (#3340)

- Corrected banner file types.
- Corrected australia_2005.yaml and usn_2005.yaml
- Added australia_2009.yaml and usn_2009.yaml

game/factions/faction.py

@@ -300,8 +300,11 @@ class Faction:
             self.remove_aircraft("Su-57")
         if not mod_settings.ov10a_bronco:
             self.remove_aircraft("Bronco-OV-10A")
-        if not mod_settings.superhornet:
+        if not mod_settings.fa18efg:
-            self.remove_aircraft("Super-Hornet")
+            self.remove_aircraft("FA_18E")
+            self.remove_aircraft("FA_18F")
+            self.remove_aircraft("EA_18G")
+
         # frenchpack
         if not mod_settings.frenchpack:
             self.remove_vehicle("AMX10RCR")

game/theater/start_generator.py

@@ -66,7 +66,7 @@ class ModSettings:
     frenchpack: bool = False
     high_digit_sams: bool = False
     ov10a_bronco: bool = False
-    superhornet: bool = False
+    fa18efg: bool = False
 
     def save_player_settings(self) -> None:
         """Saves the player's global settings to the user directory."""

pydcs_extensions/__init__.py

@@ -9,6 +9,7 @@ from .jas39 import *
 from .ov10a import *
 from .su57 import *
 from .uh60l import *
+from .fa18efg import *
 
 
 def load_mods() -> None:

pydcs_extensions/fa18efg/__init__.py

@@ -0,0 +1 @@
+from .fa18efg import *

qt_ui/windows/newgame/QNewGameWizard.py

@@ -204,7 +204,7 @@ class NewGameWizard(QtWidgets.QWizard):
             ov10a_bronco=self.field("ov10a_bronco"),
             frenchpack=self.field("frenchpack"),
             high_digit_sams=self.field("high_digit_sams"),
-            superhornet=self.field("superhornet"),
+            fa18efg=self.field("fa18efg"),
         )
         mod_settings.save_player_settings()
 
@@ -827,9 +827,9 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         high_digit_sams.setChecked(mod_settings.high_digit_sams)
         self.registerField("high_digit_sams", high_digit_sams)
 
-        superhornet = QtWidgets.QCheckBox()
+        fa18efg = QtWidgets.QCheckBox()
-        superhornet.setChecked(mod_settings.superhornet)
+        fa18efg.setChecked(mod_settings.fa18efg)
-        self.registerField("superhornet", superhornet)
+        self.registerField("fa18efg", fa18efg)
 
         modHelpText = QtWidgets.QLabel(
             "<p>Select the mods you have installed. If your chosen factions support them, you'll be able to use these mods in your campaign.</p>"
@@ -883,8 +883,10 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         modLayout.addWidget(high_digit_sams, modLayout_row, 1)
         modSettingsGroup.setLayout(modLayout)
         modLayout_row += 1
-        modLayout.addWidget(QtWidgets.QLabel("Super Hornet"), modLayout_row, 0)
+        modLayout.addWidget(
-        modLayout.addWidget(superhornet, modLayout_row, 1)
+            QtWidgets.QLabel("F/A-18EFG Super Hornet (version 2.2.5)"), modLayout_row, 0
+        )
+        modLayout.addWidget(fa18efg, modLayout_row, 1)
         modSettingsGroup.setLayout(modLayout)
         modLayout_row += 1
 

resources/factions/australia_2005.yaml

@@ -1,19 +1,15 @@
----
 country: Australia
 name: Australia 2005
-authors: Khopa, SpaceEnthusiast
+authors: 'Khopa, SpaceEnthusiast'
-description:
+description: >-
-  <p>The Australian army in 2005.</p><p>Some units might not be accurate,
+  <p>The Australian army in 2005.</p><p>Some units might not be accurate, but
-  but were picked to represent at best this army.</p>
+  were picked to represent at best this army.</p>
 aircrafts:
   - AH-1W SuperCobra
   - C-130J-30 Super Hercules
   - F/A-18C Hornet (Lot 20)
   - SH-60B Seahawk
   - UH-1H Iroquois
-  - F/A-18E Super Hornet
-  - F/A-18F Super Hornet
-  - EA-18G Growler
 awacs:
   - E-3A
 tankers:
@@ -42,7 +38,7 @@ missiles: []
 air_defense_units:
   - SAM Hawk SR (AN/MPQ-50)
 requirements:
-  C-130J-30 Super Hercules Mod by Anubis: https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/
+  C-130J-30 Super Hercules Mod by Anubis: 'https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/'
 carrier_names: []
 helicopter_carrier_names:
   - HMAS Canberra

resources/factions/australia_2009.yaml

@@ -0,0 +1,54 @@
+country: Australia
+name: Australia 2009
+authors: 'Khopa, SpaceEnthusiast, Chilli'
+description: >-
+  <p>The Australian army in 2005.</p><p>Some units might not be accurate, but
+  were picked to represent at best this army.</p>
+aircrafts:
+  - AH-1W SuperCobra
+  - C-130J-30 Super Hercules
+  - F/A-18C Hornet (Lot 20)
+  - F/A-18F Super Hornet
+  - EA-18G Growler
+  - SH-60B Seahawk
+  - UH-1H Iroquois
+awacs:
+  - E-3A
+tankers:
+  - KC-130
+  - KC-135 Stratotanker
+frontline_units:
+  - FV510 Warrior
+  - LAV-25
+  - Leopard 1A3
+  - M113
+  - M1A2 Abrams
+artillery_units: []
+logistics_units:
+  - Truck M818 6x6
+infantry_units:
+  - Infantry M249
+  - Infantry M4
+  - MANPADS Stinger
+preset_groups:
+  - Hawk
+  - Rapier
+naval_units:
+  - DDG Arleigh Burke IIa
+  - LHA-1 Tarawa
+missiles: []
+air_defense_units:
+  - SAM Hawk SR (AN/MPQ-50)
+requirements:
+  C-130J-30 Super Hercules Mod by Anubis: 'https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/'
+carrier_names: []
+helicopter_carrier_names:
+  - HMAS Canberra
+  - HMAS Adelaide
+has_jtac: true
+jtac_unit: MQ-9 Reaper
+liveries_overrides:
+  F/A-18C Hornet (Lot 20):
+    - Australian 75th Squadron
+    - Australian 77th Squadron
+unrestricted_satnav: true

resources/factions/usn_2005.yaml

@@ -1,4 +1,3 @@
----
 country: USA
 name: US Navy 2005
 authors: Fuzzle
@@ -8,14 +7,13 @@ locales:
 aircrafts:
   - F-14B Tomcat
   - F/A-18C Hornet (Lot 20)
+  - F/A-18E Super Hornet
+  - F/A-18F Super Hornet
   - AV-8B Harrier II Night Attack
   - AH-1W SuperCobra
   - S-3B Viking
   - SH-60B Seahawk
   - UH-1H Iroquois
-  - F/A-18E Super Hornet
-  - F/A-18F Super Hornet
-  - EA-18G Growler
 awacs:
   - E-2C Hawkeye
 tankers:

resources/factions/usn_2009.yaml

@@ -0,0 +1,76 @@
+country: USA
+name: US Navy 2009
+authors: Fuzzle, Chili
+description: <p>A modern representation of the US Navy/Marine Corps.</p>
+locales:
+  - en_US
+aircrafts:
+  - F/A-18C Hornet (Lot 20)
+  - F/A-18E Super Hornet
+  - F/A-18F Super Hornet
+  - EA-18G Growler
+  - AV-8B Harrier II Night Attack
+  - AH-1W SuperCobra
+  - S-3B Viking
+  - SH-60B Seahawk
+  - UH-1H Iroquois
+awacs:
+  - E-2C Hawkeye
+tankers:
+  - S-3B Tanker
+frontline_units:
+  - M113
+  - M1043 HMMWV (M2 HMG)
+  - M1045 HMMWV (BGM-71 TOW)
+  - M1A2 Abrams
+  - LAV-25
+  - M163 Vulcan Air Defense System
+artillery_units:
+  - M270 Multiple Launch Rocket System
+logistics_units:
+  - Truck M818 6x6
+infantry_units:
+  - Infantry M4
+  - Infantry M249
+  - MANPADS Stinger
+preset_groups:
+  - Hawk
+  - Patriot
+naval_units:
+  - FFG Oliver Hazard Perry
+  - DDG Arleigh Burke IIa
+  - CG Ticonderoga
+  - LHA-1 Tarawa
+  - CVN-74 John C. Stennis
+missiles: []
+air_defense_units:
+  - SAM Hawk SR (AN/MPQ-50)
+  - M163 Vulcan Air Defense System
+  - M48 Chaparral
+requirements: {}
+carrier_names:
+  - CVN-71 Theodore Roosevelt
+  - CVN-72 Abraham Lincoln
+  - CVN-73 George Washington
+  - CVN-74 John C. Stennis
+  - CVN-75 Harry S. Truman
+helicopter_carrier_names:
+  - LHA-1 Tarawa
+  - LHA-2 Saipan
+  - LHA-3 Belleau Wood
+  - LHA-4 Nassau
+  - LHA-5 Peleliu
+has_jtac: true
+jtac_unit: MQ-9 Reaper
+doctrine: modern
+liveries_overrides:
+  F-14B Tomcat:
+    - VF-142 Ghostriders
+  F/A-18C Hornet (Lot 20):
+    - VMFA-251 high visibility
+  AV-8B Harrier II Night Attack:
+    - VMAT-542
+  AH-1W SuperCobra:
+    - Marines
+  UH-1H Iroquois:
+    - US NAVY

resources/tools/dcs

@@ -1 +0,0 @@
-../../submodules/dcs/dcs

resources/tools/dcs

@@ -0,0 +1 @@
+../../submodules/dcs/dcs

resources/units/aircraft/EA-18G.yaml

@@ -0,0 +1,42 @@
+carrier_capable: true
+description:
+  "The Boeing EA-18G Growler is an American carrier-based electronic warfare aircraft,
+  a specialized version of the two-seat F/A-18F Super Hornet. The EA-18G replaced the
+  Northrop Grumman EA-6B Prowlers in service with the United States Navy."
+introduced: 1999
+manufacturer: McDonnell Douglas
+origin: USA
+price: 25
+role: Carrier-based Multirole Fighter
+fuel:
+  # Parking A1 to RWY 32 at Akrotiri.
+  taxi: 170
+  # AB takeoff to 350/0.85, reduce to MIL and maintain 350 to 25k ft.
+  climb_ppm: 44.25
+  # 0.85 mach for 100NM.
+  cruise_ppm: 22.1
+  # ~0.9 mach for 100NM. Occasional AB use.
+  combat_ppm: 27.5
+  min_safe: 2000
+variants:
+  EA-18G Growler: {}
+radios:
+  intra_flight: AN/ARC-210
+  inter_flight: AN/ARC-210
+  channels:
+    type: common
+    # DCS will clobber channel 1 of the first radio compatible with the flight's
+    # assigned frequency. Since the F/A-18's two radios are both AN/ARC-210s,
+    # radio 1 will be compatible regardless of which frequency is assigned, so
+    # we must use radio 1 for the intra-flight radio.
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 2
+utc_kneeboard: true
+# default_overrides:
+#   HelmetMountedDevice: 1
+#   InnerBoard: 0
+#   OuterBoard: 0
+tasks:
+  DEAD: 500
+  SEAD: 600
+hit_points: 20

resources/units/aircraft/EA-18G_growler.yaml

@@ -1,47 +0,0 @@
-carrier_capable: true
-description:
-  'The EA-18G Growler is twin engine, supersonic Electronic Warfare Aircraft that is flown
-  by a pilot and a WSO (Weapon Systems Officer) in a "glass cockpit". It combines extreme maneuverability , a
-  deadly arsenal of weapons, and the ability to operate from an aircraft carrier.
-  Operated by several nations, this multi-role fighter has been instrumental in conflicts
-  from 2009 to today.
-  
-  The flight capabilities of the Growler closely mirror those of the F/A-18E/F. 
-  This characteristic allows the Growler to excel in both escort jamming and the conventional standoff jamming mission,
-  which involves radar jamming and deception. Growlers can seamlessly accompany F/A-18s throughout
-  all stages of an attack mission. To enhance the Growler's stability during electronic warfare operations, 
-  Boeing made modifications to the leading edge fairings and wing fold hinge fairings, incorporating wing fences and
-  aileron "tripper strips".'
-
-introduced: 1999
-manufacturer: Boeing Defense, Space & Security
-origin: USA
-price: 32
-role: Carrier-based Electronic Warfare Aircraft
-
-default_livery: "VAQ-139"
-fuel:
-
-variants:
-
-radios:
-  intra_flight: AN/ARC-210
-  inter_flight: AN/ARC-210
-  channels:
-    type: common
-    # DCS will clobber channel 1 of the first radio compatible with the flight's
-    # assigned frequency. Since the EA-18's two radios are both AN/ARC-210s,
-    # radio 1 will be compatible regardless of which frequency is assigned, so
-    # we must use radio 1 for the intra-flight radio.
-    intra_flight_radio_index: 1
-    inter_flight_radio_index: 2
-utc_kneeboard: true
-# default_overrides:
-#   HelmetMountedDevice: 1
-#   InnerBoard: 0
-#   OuterBoard: 0
-tasks:
-  DEAD: 600
-  SEAD: 500
-  EA: 750
-hit_points: 20

resources/units/aircraft/FA-18E.yaml

@@ -0,0 +1,78 @@
+carrier_capable: true
+description:
+  "The F/A-18E Super Hornet is a single-seat, twin engine, carrier-capable, multirole
+  fighter aircraft. The Super Hornets are larger and more advanced derivatives of the
+  McDonnell Douglas F/A-18C and D Hornets, also known as legacy Hornets.
+
+
+  The Super Hornet is equipped with a large suite of sensors that includes a radar, targeting
+  pod, and a helmet mounted sight. In addition to its internal 20mm cannon, the Super Hornet
+  can be armed with a large assortment of unguided bombs and rockets, laser and GPS-guided
+  bombs, air-to-surface missiles of all sorts, and both radar and infrared-guided
+  air-to-air missiles.
+
+
+  The Super Hornet is also known for its extreme, slow-speed maneuverability in a dogfight.
+  Although incredibly deadly, the Super Hornet is also a very easy aircraft to fly."
+introduced: 1999
+manufacturer: McDonnell Douglas
+origin: USA
+price: 25
+role: Carrier-based Multirole Fighter
+fuel:
+  # Parking A1 to RWY 32 at Akrotiri.
+  taxi: 170
+  # AB takeoff to 350/0.85, reduce to MIL and maintain 350 to 25k ft.
+  climb_ppm: 44.25
+  # 0.85 mach for 100NM.
+  cruise_ppm: 22.1
+  # ~0.9 mach for 100NM. Occasional AB use.
+  combat_ppm: 27.5
+  min_safe: 2000
+variants:
+  F/A-18E Super Hornet: {}
+radios:
+  intra_flight: AN/ARC-210
+  inter_flight: AN/ARC-210
+  channels:
+    type: common
+    # DCS will clobber channel 1 of the first radio compatible with the flight's
+    # assigned frequency. Since the F/A-18's two radios are both AN/ARC-210s,
+    # radio 1 will be compatible regardless of which frequency is assigned, so
+    # we must use radio 1 for the intra-flight radio.
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 2
+utc_kneeboard: true
+# default_overrides:
+#   HelmetMountedDevice: 1
+#   InnerBoard: 0
+#   OuterBoard: 0
+tasks:
+  Anti-ship: 150
+  BAI: 740
+  BARCAP: 450
+  CAS: 740
+  DEAD: 440
+  Escort: 450
+  Fighter sweep: 450
+  Intercept: 450
+  OCA/Aircraft: 740
+  OCA/Runway: 600
+  SEAD: 430
+  SEAD Escort: 430
+  Strike: 600
+  TARCAP: 450
+weapon_injections: # AGM-154B only works for AI
+  2:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+  3:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+  7:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+  8:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+hit_points: 20

resources/units/aircraft/FA-18F.yaml

@@ -0,0 +1,78 @@
+carrier_capable: true
+description:
+  "The F/A-18F Super Hornet is a tandem-seat, twin engine, carrier-capable, multirole
+  fighter aircraft. The Super Hornets are larger and more advanced derivatives of the
+  McDonnell Douglas F/A-18C and D Hornets, also known as legacy Hornets.
+
+
+  The Super Hornet is equipped with a large suite of sensors that includes a radar, targeting
+  pod, and a helmet mounted sight. In addition to its internal 20mm cannon, the Super Hornet
+  can be armed with a large assortment of unguided bombs and rockets, laser and GPS-guided
+  bombs, air-to-surface missiles of all sorts, and both radar and infrared-guided
+  air-to-air missiles.
+
+
+  The Super Hornet is also known for its extreme, slow-speed maneuverability in a dogfight.
+  Although incredibly deadly, the Super Hornet is also a very easy aircraft to fly."
+introduced: 2006
+manufacturer: Boeing
+origin: USA
+price: 25
+role: Carrier-based Multirole Fighter
+fuel:
+  # Parking A1 to RWY 32 at Akrotiri.
+  taxi: 170
+  # AB takeoff to 350/0.85, reduce to MIL and maintain 350 to 25k ft.
+  climb_ppm: 44.25
+  # 0.85 mach for 100NM.
+  cruise_ppm: 22.1
+  # ~0.9 mach for 100NM. Occasional AB use.
+  combat_ppm: 27.5
+  min_safe: 2000
+variants:
+  F/A-18F Super Hornet: {}
+radios:
+  intra_flight: AN/ARC-210
+  inter_flight: AN/ARC-210
+  channels:
+    type: common
+    # DCS will clobber channel 1 of the first radio compatible with the flight's
+    # assigned frequency. Since the F/A-18's two radios are both AN/ARC-210s,
+    # radio 1 will be compatible regardless of which frequency is assigned, so
+    # we must use radio 1 for the intra-flight radio.
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 2
+utc_kneeboard: true
+# default_overrides:
+#   HelmetMountedDevice: 1
+#   InnerBoard: 0
+#   OuterBoard: 0
+tasks:
+  Anti-ship: 150
+  BAI: 740
+  BARCAP: 450
+  CAS: 740
+  DEAD: 440
+  Escort: 450
+  Fighter sweep: 450
+  Intercept: 450
+  OCA/Aircraft: 740
+  OCA/Runway: 600
+  SEAD: 430
+  SEAD Escort: 430
+  Strike: 600
+  TARCAP: 450
+weapon_injections: # AGM-154B only works for AI
+  2:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+  3:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+  7:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+  8:
+    - "{AGM-154B}"
+    - "{BRU57_2*AGM-154B}"
+hit_points: 20