diff --git a/game/factions/faction.py b/game/factions/faction.py index a7079595..05fc024f 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -300,6 +300,8 @@ class Faction: self.remove_aircraft("Su-57") if not mod_settings.ov10a_bronco: self.remove_aircraft("Bronco-OV-10A") + if not mod_settings.superhornet: + self.remove_aircraft("Super-Hornet") # frenchpack if not mod_settings.frenchpack: self.remove_vehicle("AMX10RCR") diff --git a/game/theater/start_generator.py b/game/theater/start_generator.py index bbade7eb..63aec2f0 100644 --- a/game/theater/start_generator.py +++ b/game/theater/start_generator.py @@ -66,6 +66,7 @@ class ModSettings: frenchpack: bool = False high_digit_sams: bool = False ov10a_bronco: bool = False + superhornet: bool = False def save_player_settings(self) -> None: """Saves the player's global settings to the user directory.""" diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 6e567efd..1a10111b 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -204,6 +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"), ) mod_settings.save_player_settings() @@ -826,6 +827,10 @@ class GeneratorOptions(QtWidgets.QWizardPage): high_digit_sams.setChecked(mod_settings.high_digit_sams) self.registerField("high_digit_sams", high_digit_sams) + superhornet = QtWidgets.QCheckBox() + superhornet.setChecked(mod_settings.superhornet) + self.registerField("superhornet", superhornet) + modHelpText = QtWidgets.QLabel( "

Select the mods you have installed. If your chosen factions support them, you'll be able to use these mods in your campaign.

" ) @@ -877,6 +882,11 @@ class GeneratorOptions(QtWidgets.QWizardPage): modLayout.addWidget(QtWidgets.QLabel("High Digit SAMs"), modLayout_row, 0) 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(superhornet, modLayout_row, 1) + modSettingsGroup.setLayout(modLayout) + modLayout_row += 1 mlayout = QVBoxLayout() mlayout.addWidget(generatorSettingsGroup) diff --git a/resources/factions/australia_2005.yaml b/resources/factions/australia_2005.yaml index 2eb4caef..63b2ad8b 100644 --- a/resources/factions/australia_2005.yaml +++ b/resources/factions/australia_2005.yaml @@ -11,6 +11,9 @@ aircrafts: - 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: diff --git a/resources/factions/usn_2005.yaml b/resources/factions/usn_2005.yaml index b46aa617..3d97b723 100644 --- a/resources/factions/usn_2005.yaml +++ b/resources/factions/usn_2005.yaml @@ -13,6 +13,9 @@ aircrafts: - 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: diff --git a/resources/ui/units/aircrafts/banners/EA-18G.jpg b/resources/ui/units/aircrafts/banners/EA-18G.jpg new file mode 100644 index 00000000..8c049927 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/EA-18G.jpg differ diff --git a/resources/ui/units/aircrafts/banners/FA-18E.jpeg b/resources/ui/units/aircrafts/banners/FA-18E.jpeg new file mode 100644 index 00000000..1837267f Binary files /dev/null and b/resources/ui/units/aircrafts/banners/FA-18E.jpeg differ diff --git a/resources/ui/units/aircrafts/banners/FA-18F.jpeg b/resources/ui/units/aircrafts/banners/FA-18F.jpeg new file mode 100644 index 00000000..fe2ffbb0 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/FA-18F.jpeg differ diff --git a/resources/ui/units/aircrafts/icons/EA-18G_24.png b/resources/ui/units/aircrafts/icons/EA-18G_24.png new file mode 100644 index 00000000..d79c3469 Binary files /dev/null and b/resources/ui/units/aircrafts/icons/EA-18G_24.png differ diff --git a/resources/ui/units/aircrafts/icons/FA-18E_24.png b/resources/ui/units/aircrafts/icons/FA-18E_24.png new file mode 100644 index 00000000..eab1b9f4 Binary files /dev/null and b/resources/ui/units/aircrafts/icons/FA-18E_24.png differ diff --git a/resources/ui/units/aircrafts/icons/FA-18F_24.png b/resources/ui/units/aircrafts/icons/FA-18F_24.png new file mode 100644 index 00000000..3ec1c309 Binary files /dev/null and b/resources/ui/units/aircrafts/icons/FA-18F_24.png differ diff --git a/resources/units/aircraft/EA-18G_growler.yaml b/resources/units/aircraft/EA-18G_growler.yaml new file mode 100644 index 00000000..69ff996b --- /dev/null +++ b/resources/units/aircraft/EA-18G_growler.yaml @@ -0,0 +1,47 @@ +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 diff --git a/resources/units/aircraft/FA-18E_super-hornet.yaml b/resources/units/aircraft/FA-18E_super-hornet.yaml new file mode 100644 index 00000000..e69de29b diff --git a/resources/units/aircraft/FA-18F_super-hornet.yaml b/resources/units/aircraft/FA-18F_super-hornet.yaml new file mode 100644 index 00000000..e69de29b