From dba70dc6d54d678c6d019fe15940c5fae70cd77d Mon Sep 17 00:00:00 2001 From: docofmur <84192044+docofmur@users.noreply.github.com> Date: Tue, 22 Jun 2021 14:54:22 -0700 Subject: [PATCH] Faction Audit. Transports and mod aircraft added where needed cleaned up various duplicates in factions. --- resources/factions/NATO_Desert_Storm.json | 2 ++ resources/factions/bluefor_coldwar.json | 3 ++- resources/factions/bluefor_modern.json | 5 +++++ resources/factions/china_2010.json | 3 ++- resources/factions/france_1985.json | 6 ++++-- resources/factions/france_1995.json | 1 + resources/factions/france_2005.json | 1 + resources/factions/germany_1990.json | 1 + resources/factions/greece_2005.json | 1 + resources/factions/india_2010.json | 1 + resources/factions/iran_1988.json | 3 ++- resources/factions/iran_2015.json | 1 + resources/factions/iraq_1991.json | 4 +++- resources/factions/israel_2000.json | 2 ++ resources/factions/israel_2012.json | 2 ++ resources/factions/italy_1990.json | 1 + resources/factions/japan_2005.json | 2 ++ resources/factions/libya_2011.json | 2 ++ resources/factions/netherlands_1990.json | 4 +++- resources/factions/redfor_china_2010.json | 1 + resources/factions/redfor_russia_2010.json | 1 + resources/factions/russia_1955.json | 3 ++- resources/factions/russia_1975.json | 1 + resources/factions/russia_1990.json | 1 + resources/factions/russia_2010.json | 1 + resources/factions/russia_2020.json | 1 + resources/factions/spain_1990.json | 1 + resources/factions/syria_2011.json | 1 + resources/factions/syria_2012.json | 1 + resources/factions/uae_2005.json | 1 + resources/factions/uae_2015.json | 1 + resources/factions/uk_1990.json | 2 ++ resources/factions/ukraine_2010.json | 1 + resources/factions/us_aggressors.json | 2 ++ resources/factions/usa_1990.json | 2 +- 35 files changed, 57 insertions(+), 9 deletions(-) diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json index 60edc2c5..604786f0 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -9,6 +9,8 @@ "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", diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index 172ba170..50e97b5d 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -8,6 +8,8 @@ "A-4E Skyhawk", "AJS-37 Viggen", "B-52H Stratofortress", + "C-130", + "C-130J-30 Super Hercules", "F-14A Tomcat (Block 135-GR Late)", "F-14B Tomcat", "F-4E Phantom II", @@ -17,7 +19,6 @@ "UH-1H Iroquois" ], "awacs": [ - "C-130", "E-2C Hawkeye", "E-3A" ], diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json index 9a5089ab..72e5dafb 100644 --- a/resources/factions/bluefor_modern.json +++ b/resources/factions/bluefor_modern.json @@ -12,15 +12,20 @@ "AV-8B Harrier II Night Attack", "B-1B Lancer", "B-52H Stratofortress", + "C-130", + "C-130J-30 Super Hercules", "F-14B Tomcat", "F-15C Eagle", "F-15E Strike Eagle", "F-16CM Fighting Falcon (Block 50)", + "F-22A Raptor", "F-5E Tiger II", "F/A-18C Hornet (Lot 20)", "JF-17 Thunder", "Ka-50 Hokum", "Mirage 2000C", + "Mi-24P Hind-F", + "Mi-8MTV2 Hip", "SA 342L Gazelle", "SA 342M Gazelle", "Su-25T Frogfoot", diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json index bc5f0536..ef1ff28e 100644 --- a/resources/factions/china_2010.json +++ b/resources/factions/china_2010.json @@ -8,10 +8,11 @@ ], "aircrafts": [ "FC-1 Fierce Dragon", + "IL-76MD", "J-11A Flanker-L", "J-15 Flanker X-2", "J-7B", - "Mi-28N Havoc", + "Mi-24P Hind-F", "Mi-8MTV2 Hip", "Su-30MKK Flanker-G" ], diff --git a/resources/factions/france_1985.json b/resources/factions/france_1985.json index 2211d650..a23613d0 100644 --- a/resources/factions/france_1985.json +++ b/resources/factions/france_1985.json @@ -8,6 +8,7 @@ ], "doctrine": "coldwar", "aircrafts": [ + "C-130", "Mirage 2000C", "SA 342L Gazelle", "SA 342M Gazelle", @@ -75,5 +76,6 @@ "ArleighBurkeGroupGenerator" ], "has_jtac": true, - "jtac_unit": "SA 342L Gazelle" - } \ No newline at end of file + "jtac_unit": "MQ-9 Reaper" + } + diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json index 87c73a8a..1615dd24 100644 --- a/resources/factions/france_1995.json +++ b/resources/factions/france_1995.json @@ -7,6 +7,7 @@ "fr_FR" ], "aircrafts": [ + "C-130", "Mirage 2000-5", "Mirage 2000C", "SA 342L Gazelle", diff --git a/resources/factions/france_2005.json b/resources/factions/france_2005.json index 18e5ddc2..8f67e70c 100644 --- a/resources/factions/france_2005.json +++ b/resources/factions/france_2005.json @@ -7,6 +7,7 @@ "fr_FR" ], "aircrafts": [ + "C-130", "Mirage 2000-5", "Mirage 2000C", "SA 342L Gazelle", diff --git a/resources/factions/germany_1990.json b/resources/factions/germany_1990.json index 588a4a13..e239c83b 100644 --- a/resources/factions/germany_1990.json +++ b/resources/factions/germany_1990.json @@ -7,6 +7,7 @@ "de_DE" ], "aircrafts": [ + "C-130", "F-4F Phantom II", "MiG-29G Fulcrum-A", "SA 342L Gazelle", diff --git a/resources/factions/greece_2005.json b/resources/factions/greece_2005.json index ecfac7bc..59651dfc 100644 --- a/resources/factions/greece_2005.json +++ b/resources/factions/greece_2005.json @@ -9,6 +9,7 @@ "aircrafts": [ "AH-64A Apache", "C-130", + "C-130J-30 Super Hercules", "F-16CM Fighting Falcon (Block 50)", "F-4E Phantom II", "Mirage 2000-5", diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json index 9ef3630d..5deef839 100644 --- a/resources/factions/india_2010.json +++ b/resources/factions/india_2010.json @@ -8,6 +8,7 @@ ], "aircrafts": [ "AH-64A Apache", + "IL-76MD", "Mi-8MTV2 Hip", "MiG-21bis Fishbed-N", "MiG-27K Flogger-J2", diff --git a/resources/factions/iran_1988.json b/resources/factions/iran_1988.json index 3fd5e69b..67edce5b 100644 --- a/resources/factions/iran_1988.json +++ b/resources/factions/iran_1988.json @@ -79,5 +79,6 @@ "MolniyaGroupGenerator" ], "has_jtac": true, - "jtac_unit": "MQ-9 Reaper" + "jtac_unit": "MQ-9 Reaper", + "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/iran_2015.json b/resources/factions/iran_2015.json index 0f28d461..76f1d23a 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -10,6 +10,7 @@ "F-14A Tomcat (Block 135-GR Late)", "F-4E Phantom II", "F-5E Tiger II", + "IL-76MD", "Mi-24V Hind-E", "Mi-24P Hind-F", "Mi-28N Havoc", diff --git a/resources/factions/iraq_1991.json b/resources/factions/iraq_1991.json index 01f2acc6..ed735f13 100644 --- a/resources/factions/iraq_1991.json +++ b/resources/factions/iraq_1991.json @@ -4,6 +4,7 @@ "authors": "Hawkmoon", "description": "

Iraq forces during desert Storm

", "aircrafts": [ + "IL-76MD", "L-39ZA Albatros", "Mi-24V Hind-E", "Mi-24P Hind-F", @@ -80,5 +81,6 @@ "carrier_names": [], "navy_generators": [ "GrishaGroupGenerator" - ] + ], + "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json index 565a9e96..5cf66e92 100644 --- a/resources/factions/israel_2000.json +++ b/resources/factions/israel_2000.json @@ -9,6 +9,8 @@ "aircrafts": [ "AH-1W SuperCobra", "AH-64D Apache Longbow", + "C-130", + "C-130J-30 Super Hercules", "F-15C Eagle", "F-15E Strike Eagle", "F-16CM Fighting Falcon (Block 50)", diff --git a/resources/factions/israel_2012.json b/resources/factions/israel_2012.json index e9656488..18810d0e 100644 --- a/resources/factions/israel_2012.json +++ b/resources/factions/israel_2012.json @@ -9,6 +9,8 @@ "aircrafts": [ "A-10C Thunderbolt II (Suite 3)", "AH-64D Apache Longbow", + "C-130", + "C-130J-30 Super Hercules", "F-15C Eagle", "F-15E Strike Eagle", "F-16CM Fighting Falcon (Block 50)", diff --git a/resources/factions/italy_1990.json b/resources/factions/italy_1990.json index f528a81b..6af584cb 100644 --- a/resources/factions/italy_1990.json +++ b/resources/factions/italy_1990.json @@ -9,6 +9,7 @@ "aircrafts": [ "AH-1W SuperCobra", "AV-8B Harrier II Night Attack", + "C-130", "Tornado IDS", "UH-1H Iroquois" ], diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json index a3bd9fcc..ddc82208 100644 --- a/resources/factions/japan_2005.json +++ b/resources/factions/japan_2005.json @@ -9,6 +9,8 @@ "aircrafts": [ "AH-1W SuperCobra", "AH-64D Apache Longbow", + "C-130", + "C-130J-30 Super Hercules", "F-15J Eagle", "F-2A", "F-4EJ Kai Phantom II" diff --git a/resources/factions/libya_2011.json b/resources/factions/libya_2011.json index 029541ea..58454e54 100644 --- a/resources/factions/libya_2011.json +++ b/resources/factions/libya_2011.json @@ -4,8 +4,10 @@ "authors": "Khopa", "description": "

Gaddafi's Lybian forces during the 2011 international intervention

", "aircrafts": [ + "IL-76MD", "Mi-24V Hind-E", "Mi-24P Hind-F", + "Mi-8MTV2 Hip", "MiG-21bis Fishbed-N", "MiG-23MLD Flogger-K", "Su-17M4 Fitter-K", diff --git a/resources/factions/netherlands_1990.json b/resources/factions/netherlands_1990.json index 7ef783eb..71ad9553 100644 --- a/resources/factions/netherlands_1990.json +++ b/resources/factions/netherlands_1990.json @@ -8,8 +8,10 @@ ], "aircrafts": [ "AH-64A Apache", + "C-130", "F-16CM Fighting Falcon (Block 50)", - "F-5E Tiger II" + "F-5E Tiger II", + "UH-1H Iroquois" ], "awacs": [ "E-3A" diff --git a/resources/factions/redfor_china_2010.json b/resources/factions/redfor_china_2010.json index 5015a6f7..c635c89c 100644 --- a/resources/factions/redfor_china_2010.json +++ b/resources/factions/redfor_china_2010.json @@ -5,6 +5,7 @@ "description": "

Combined Redfor under China's leadership in the late 2000s, early 2010s.

", "aircrafts": [ "FC-1 Fierce Dragon", + "IL-76MD", "J-11A Flanker-L", "J-15 Flanker X-2", "J-7B", diff --git a/resources/factions/redfor_russia_2010.json b/resources/factions/redfor_russia_2010.json index e10cf308..0c36b9b7 100644 --- a/resources/factions/redfor_russia_2010.json +++ b/resources/factions/redfor_russia_2010.json @@ -7,6 +7,7 @@ "ru_RU" ], "aircrafts": [ + "IL-76MD", "J-11A Flanker-L", "JF-17 Thunder", "Ka-50 Hokum", diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json index 0416a069..a08f2a3a 100644 --- a/resources/factions/russia_1955.json +++ b/resources/factions/russia_1955.json @@ -7,7 +7,8 @@ "ru_RU" ], "aircrafts": [ - "MiG-15bis Fagot" + "MiG-15bis Fagot", + "Mi-8MTV2 Hip" ], "awacs": [ "A-50" diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json index 13beb60c..9c4dbd3a 100644 --- a/resources/factions/russia_1975.json +++ b/resources/factions/russia_1975.json @@ -7,6 +7,7 @@ "ru_RU" ], "aircrafts": [ + "IL-76MD", "Mi-24V Hind-E", "Mi-8MTV2 Hip", "MiG-21bis Fishbed-N", diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json index 22afa47f..a833f71b 100644 --- a/resources/factions/russia_1990.json +++ b/resources/factions/russia_1990.json @@ -7,6 +7,7 @@ "ru_RU" ], "aircrafts": [ + "IL-76MD", "Ka-50 Hokum", "Mi-24V Hind-E", "Mi-24P Hind-F", diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json index 3df50e56..1d7a519d 100644 --- a/resources/factions/russia_2010.json +++ b/resources/factions/russia_2010.json @@ -7,6 +7,7 @@ "ru_RU" ], "aircrafts": [ + "IL-76MD", "Ka-50 Hokum", "L-39ZA Albatros", "Mi-24V Hind-E", diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json index de104e1d..49026f60 100644 --- a/resources/factions/russia_2020.json +++ b/resources/factions/russia_2020.json @@ -7,6 +7,7 @@ "ru_RU" ], "aircrafts": [ + "IL-76MD", "Ka-50 Hokum", "L-39ZA Albatros", "Mi-24V Hind-E", diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json index 13ed6812..6031faab 100644 --- a/resources/factions/spain_1990.json +++ b/resources/factions/spain_1990.json @@ -8,6 +8,7 @@ ], "aircrafts": [ "AV-8B Harrier II Night Attack", + "C-130", "C-101CC Aviojet", "EF-18A+ Hornet", "F-5E Tiger II", diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json index d3d3cd4b..07e77af1 100644 --- a/resources/factions/syria_2011.json +++ b/resources/factions/syria_2011.json @@ -4,6 +4,7 @@ "authors": "Khopa", "description": "

Syrian Arab Army at the start of the Syrian Civil War.

", "aircrafts": [ + "IL-76MD", "L-39ZA Albatros", "Mi-24V Hind-E", "Mi-24P Hind-F", diff --git a/resources/factions/syria_2012.json b/resources/factions/syria_2012.json index 35c0eaf4..1b8c4719 100644 --- a/resources/factions/syria_2012.json +++ b/resources/factions/syria_2012.json @@ -4,6 +4,7 @@ "authors": "Headiii", "description": "

Syrian Army with more modern Imports and supported by a Russian Expeditionary Force.

", "aircrafts": [ + "IL-76MD", "L-39ZA Albatros", "Mi-24V Hind-E", "Mi-24P Hind-F", diff --git a/resources/factions/uae_2005.json b/resources/factions/uae_2005.json index b4b725b0..ecc41eb3 100644 --- a/resources/factions/uae_2005.json +++ b/resources/factions/uae_2005.json @@ -5,6 +5,7 @@ "description": "

UAR army in the 2000s.

", "aircrafts": [ "AH-64D Apache Longbow", + "C-130", "F-16CM Fighting Falcon (Block 50)", "Mirage 2000-5", "Mirage 2000C" diff --git a/resources/factions/uae_2015.json b/resources/factions/uae_2015.json index 58568c21..7786ab95 100644 --- a/resources/factions/uae_2015.json +++ b/resources/factions/uae_2015.json @@ -6,6 +6,7 @@ "aircrafts": [ "AH-64D Apache Longbow", "C-130", + "C-130J-30 Super Hercules", "C-17A", "CH-47D", "F-16CM Fighting Falcon (Block 50)", diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json index 38ae53d2..b7780622 100644 --- a/resources/factions/uk_1990.json +++ b/resources/factions/uk_1990.json @@ -9,6 +9,8 @@ "aircrafts": [ "AH-64A Apache", "AV-8B Harrier II Night Attack", + "C-130", + "C-130J-30 Super Hercules", "Gazelle AH.1", "Phantom F.3", "Tornado GR4" diff --git a/resources/factions/ukraine_2010.json b/resources/factions/ukraine_2010.json index 9dabc91b..56e6baf2 100644 --- a/resources/factions/ukraine_2010.json +++ b/resources/factions/ukraine_2010.json @@ -4,6 +4,7 @@ "authors": "Khopa", "description": "

Ukrainian army in the 2010s.

", "aircrafts": [ + "IL-76MD", "L-39ZA Albatros", "Mi-24V Hind-E", "Mi-24P Hind-F", diff --git a/resources/factions/us_aggressors.json b/resources/factions/us_aggressors.json index 7908498b..83a98be8 100644 --- a/resources/factions/us_aggressors.json +++ b/resources/factions/us_aggressors.json @@ -14,6 +14,8 @@ "AV-8B Harrier II Night Attack", "B-1B Lancer", "B-52H Stratofortress", + "C-130", + "C-130J-30 Super Hercules", "F-117A Nighthawk", "F-14B Tomcat", "F-15C Eagle", diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index 0519f175..deda3324 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -13,6 +13,7 @@ "B-1B Lancer", "B-52H Stratofortress", "C-130", + "C-130J-30 Super Hercules", "CH-47D", "CH-53E", "F-117A Nighthawk", @@ -24,7 +25,6 @@ "F/A-18C Hornet (Lot 20)", "S-3B Viking", "SH-60B Seahawk", - "SH-60B Seahawk", "UH-1H Iroquois", "UH-60A" ],