From 4e90c724bfb086a814451d4334e487581c641206 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 26 Jun 2023 17:41:27 -0700 Subject: [PATCH] Undo addition of "(AI)" F-15E variant. This interacts badly with the built-in squadrons: https://github.com/dcs-liberation/dcs_liberation/issues/3033. Better to split the display name and "ID" (which is effectively how the key here is treated), but that's a more invasive change than I'd like to tackle in this release. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/3033. --- resources/factions/NATO_Desert_Storm.yaml | 2 +- resources/factions/NATO_OIF.yaml | 2 +- resources/factions/bluefor_modern.yaml | 2 +- resources/factions/israel_2000.yaml | 2 +- resources/factions/israel_2012.yaml | 2 +- resources/factions/us_aggressors.yaml | 2 +- resources/factions/usa_1990.yaml | 2 +- resources/factions/usa_2005.yaml | 2 +- resources/units/aircraft/F-15E.yaml | 1 - 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/resources/factions/NATO_Desert_Storm.yaml b/resources/factions/NATO_Desert_Storm.yaml index 000d0cdc..a7e98c27 100644 --- a/resources/factions/NATO_Desert_Storm.yaml +++ b/resources/factions/NATO_Desert_Storm.yaml @@ -17,7 +17,7 @@ aircrafts: - F-14A Tomcat (Block 135-GR Late) - F-14B Tomcat - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F-4E Phantom II diff --git a/resources/factions/NATO_OIF.yaml b/resources/factions/NATO_OIF.yaml index 8814fb7b..9331fff9 100644 --- a/resources/factions/NATO_OIF.yaml +++ b/resources/factions/NATO_OIF.yaml @@ -18,7 +18,7 @@ aircrafts: - F-14A Tomcat (Block 135-GR Late) - F-14B Tomcat - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F-22A Raptor diff --git a/resources/factions/bluefor_modern.yaml b/resources/factions/bluefor_modern.yaml index 97399b9a..a3fcb77b 100644 --- a/resources/factions/bluefor_modern.yaml +++ b/resources/factions/bluefor_modern.yaml @@ -23,7 +23,7 @@ aircrafts: - F-117A Nighthawk - F-14B Tomcat - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F-22A Raptor diff --git a/resources/factions/israel_2000.yaml b/resources/factions/israel_2000.yaml index c44a33f3..f467d656 100644 --- a/resources/factions/israel_2000.yaml +++ b/resources/factions/israel_2000.yaml @@ -12,7 +12,7 @@ aircrafts: - C-130 - C-130J-30 Super Hercules - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F-4E Phantom II diff --git a/resources/factions/israel_2012.yaml b/resources/factions/israel_2012.yaml index 2ab35893..59a743d6 100644 --- a/resources/factions/israel_2012.yaml +++ b/resources/factions/israel_2012.yaml @@ -12,7 +12,7 @@ aircrafts: - C-130 - C-130J-30 Super Hercules - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F/A-18C Hornet (Lot 20) diff --git a/resources/factions/us_aggressors.yaml b/resources/factions/us_aggressors.yaml index e1c34815..55a781a9 100644 --- a/resources/factions/us_aggressors.yaml +++ b/resources/factions/us_aggressors.yaml @@ -19,7 +19,7 @@ aircrafts: - F-117A Nighthawk - F-14B Tomcat - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F/A-18C Hornet (Lot 20) diff --git a/resources/factions/usa_1990.yaml b/resources/factions/usa_1990.yaml index 3d64022a..6c932409 100644 --- a/resources/factions/usa_1990.yaml +++ b/resources/factions/usa_1990.yaml @@ -19,7 +19,7 @@ aircrafts: - F-14A Tomcat (Block 135-GR Late) - F-14B Tomcat - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F/A-18C Hornet (Lot 20) diff --git a/resources/factions/usa_2005.yaml b/resources/factions/usa_2005.yaml index 37c32276..662edc46 100644 --- a/resources/factions/usa_2005.yaml +++ b/resources/factions/usa_2005.yaml @@ -21,7 +21,7 @@ aircrafts: - F-117A Nighthawk - F-14B Tomcat - F-15C Eagle - - F-15E Strike Eagle (AI) + - F-15E Strike Eagle - F-15E Strike Eagle (Suite 4+) - F-16CM Fighting Falcon (Block 50) - F-22A Raptor diff --git a/resources/units/aircraft/F-15E.yaml b/resources/units/aircraft/F-15E.yaml index 396bacc1..8abf8abf 100644 --- a/resources/units/aircraft/F-15E.yaml +++ b/resources/units/aircraft/F-15E.yaml @@ -11,7 +11,6 @@ role: Multirole Strike Fighter max_range: 300 variants: F-15E Strike Eagle: {} - F-15E Strike Eagle (AI): {} tasks: BAI: 760 BARCAP: 240