From f10f792c4b40d0a94130ab656047e8cee313460b Mon Sep 17 00:00:00 2001 From: RndName Date: Sat, 29 Jan 2022 00:43:51 +0100 Subject: [PATCH] Update Factions --- .../Israel-USN_2005_Allied_Sword.json | 42 ++--- resources/factions/NATO_Desert_Storm.json | 40 ++--- resources/factions/NATO_OIF.json | 42 ++--- .../Syria-Lebanon_2005_Allied_Sword.json | 84 +++++---- resources/factions/allies_1940.json | 21 +-- resources/factions/allies_1944.json | 21 +-- resources/factions/allies_1944_free.json | 15 +- resources/factions/australia_2005.json | 24 +-- resources/factions/bluefor_coldwar.json | 34 ++-- resources/factions/bluefor_modern.json | 36 ++-- resources/factions/canada_2005.json | 24 +-- resources/factions/china_2010.json | 63 +++---- resources/factions/dprk_1950_fictional.json | 14 +- resources/factions/france_1985.json | 157 ++++++++--------- resources/factions/france_1995.json | 32 ++-- resources/factions/france_2005.json | 159 +++++++++--------- resources/factions/gdr_1985.json | 39 ++--- resources/factions/georgia_2008.json | 27 +-- resources/factions/germany_1940.json | 19 +-- resources/factions/germany_1942.json | 21 +-- resources/factions/germany_1944.json | 21 +-- resources/factions/germany_1944_free.json | 13 +- resources/factions/germany_1990.json | 30 ++-- resources/factions/greece_2005.json | 25 +-- resources/factions/india_2010.json | 51 +++--- resources/factions/insurgents.json | 15 +- resources/factions/insurgents_hard.json | 14 +- resources/factions/iran_1988.json | 51 +++--- resources/factions/iran_2015.json | 61 +++---- resources/factions/iraq_1991.json | 43 +++-- resources/factions/israel_1948.json | 15 +- resources/factions/israel_1973.json | 21 +-- resources/factions/israel_1982.json | 21 +-- resources/factions/israel_2000.json | 25 ++- resources/factions/israel_2012.json | 25 ++- resources/factions/italy_1990.json | 31 ++-- resources/factions/japan_1944.json | 15 +- resources/factions/japan_2005.json | 29 ++-- resources/factions/libya_2011.json | 56 +++--- resources/factions/netherlands_1990.json | 27 ++- resources/factions/north_korea_2000.json | 45 +++-- resources/factions/pakistan_2015.json | 32 ++-- resources/factions/pmc_russian.json | 11 +- resources/factions/pmc_us.json | 7 +- resources/factions/poland_2010.json | 29 ++-- resources/factions/redfor_china_2010.json | 77 ++++----- resources/factions/redfor_russia_2010.json | 77 ++++----- resources/factions/russia_1955.json | 13 +- resources/factions/russia_1965.json | 27 ++- .../factions/russia_1970_limited_air.json | 44 +++-- resources/factions/russia_1975 (Mi-24P).json | 45 +++-- resources/factions/russia_1975.json | 47 +++--- resources/factions/russia_1990.json | 58 +++---- resources/factions/russia_2010.json | 60 +++---- resources/factions/russia_2020.json | 60 +++---- resources/factions/soviet_union_1943.json | 15 +- resources/factions/spain_1990.json | 34 ++-- resources/factions/sweden_1970.json | 19 ++- resources/factions/sweden_1990.json | 15 +- resources/factions/sweden_2002.json | 103 ++++++------ resources/factions/syria_1948.json | 16 +- resources/factions/syria_1967.json | 29 ++-- .../factions/syria_1967_with_ww2_weapons.json | 31 ++-- resources/factions/syria_1973.json | 39 ++--- resources/factions/syria_1982.json | 49 +++--- resources/factions/syria_2011.json | 59 +++---- resources/factions/syria_2012.json | 61 +++---- resources/factions/turkey_2005.json | 21 +-- resources/factions/uae_2005.json | 17 +- resources/factions/uae_2015.json | 19 ++- resources/factions/uk_1944.json | 21 +-- resources/factions/uk_1990.json | 34 ++-- resources/factions/ukraine_2010.json | 47 +++--- resources/factions/unc_1950_fictional.json | 12 +- resources/factions/us_aggressors.json | 19 ++- resources/factions/usa_1944.json | 19 +-- resources/factions/usa_1945.json | 150 +++++++++-------- resources/factions/usa_1955.json | 10 +- resources/factions/usa_1960.json | 10 +- resources/factions/usa_1965.json | 16 +- resources/factions/usa_1975.json | 53 ++++-- resources/factions/usa_1990.json | 37 ++-- resources/factions/usa_2005.json | 38 ++--- resources/factions/usn_1985.json | 28 ++- resources/factions/usn_2005.json | 78 ++++++--- 85 files changed, 1494 insertions(+), 1740 deletions(-) diff --git a/resources/factions/Israel-USN_2005_Allied_Sword.json b/resources/factions/Israel-USN_2005_Allied_Sword.json index 63a8e8f4..d0769c51 100644 --- a/resources/factions/Israel-USN_2005_Allied_Sword.json +++ b/resources/factions/Israel-USN_2005_Allied_Sword.json @@ -46,30 +46,24 @@ "Infantry M249", "MANPADS Stinger" ], - "air_defenses": [ - "ChaparralGenerator", - "HawkGenerator", - "VulcanGenerator", - "PatriotGenerator" + "preset_groups": [ + "Hawk", + "Patriot" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa", - "PERRY" - ], - "cruisers": [ - "TICONDEROG" - ], - "requirements": { - }, + "requirements": {}, "carrier_names": [ "CVN-71 Theodore Roosevelt", "CVN-72 Abraham Lincoln", @@ -84,10 +78,6 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "doctrine": "modern", @@ -109,4 +99,4 @@ ] }, "unrestricted_satnav": true -} +} \ No newline at end of file diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json index a6cdcc54..8f172045 100644 --- a/resources/factions/NATO_Desert_Storm.json +++ b/resources/factions/NATO_Desert_Storm.json @@ -66,29 +66,24 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "ChaparralGenerator", - "VulcanGenerator", - "RolandGenerator", - "HawkGenerator", - "PatriotGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier", + "Roland", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M163 Vulcan Air Defense System", + "M1097 Heavy HMMWV Avenger", + "M48 Chaparral" ], "requirements": {}, "carrier_names": [ @@ -98,9 +93,6 @@ "LHA-1 Tarawa", "LHA-4 Nassau" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/NATO_OIF.json b/resources/factions/NATO_OIF.json index 50c0890f..66b047a2 100644 --- a/resources/factions/NATO_OIF.json +++ b/resources/factions/NATO_OIF.json @@ -67,29 +67,25 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "ChaparralGenerator", - "VulcanGenerator", - "RolandGenerator", - "HawkGenerator", - "PatriotGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier", + "Roland", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M163 Vulcan Air Defense System", + "M1097 Heavy HMMWV Avenger", + "M48 Chaparral" ], "requirements": {}, "carrier_names": [ @@ -99,10 +95,6 @@ "LHA-1 Tarawa", "LHA-4 Nassau" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json b/resources/factions/Syria-Lebanon_2005_Allied_Sword.json index d04ecbb0..65e3c3d8 100644 --- a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json +++ b/resources/factions/Syria-Lebanon_2005_Allied_Sword.json @@ -19,8 +19,12 @@ "SA 342L Gazelle", "IL-76MD" ], - "awacs": ["A-50"], - "tankers": ["IL-78M"], + "awacs": [ + "A-50" + ], + "tankers": [ + "IL-78M" + ], "frontline_units": [ "BMP-1", "BMP-2", @@ -32,47 +36,53 @@ "T-90A", "ZSU-57-2 'Sparka'" ], - "artillery_units": ["BM-21 Grad", "2S1 Gvozdika"], - "logistics_units": ["Truck Ural-375", "LUV UAZ-469 Jeep"], + "artillery_units": [ + "BM-21 Grad", + "2S1 Gvozdika" + ], + "logistics_units": [ + "Truck Ural-375", + "LUV UAZ-469 Jeep" + ], "infantry_units": [ "Paratrooper AKS", "Infantry AK-74 Rus", "Paratrooper RPG-16", "MANPADS SA-18 Igla-S \"Grouse\"" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA19Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator", - "ZSU57Generator" + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "SA-11", + "SA-10/S-300PS", + "Silkworm", + "Cold-War-Flak", + "Russian Navy" + ], + "naval_units": [ + "Corvette 1124.4 Grish", + "Corvette 1241.1 Molniya", + "FAC La Combattante IIa", + "Frigate 1135M Rezky" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "EWR 1L13", + "EWR 55G6", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-19 Grison (2K22 Tunguska)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" + ], + "missiles": [ + "SSM SS-1C Scud-B" ], - "ewrs": ["BoxSpringGenerator", "TallRackGenerator"], - "missiles": ["ScudGenerator"], - "missiles_group_count": 2, - "coastal_defenses": ["SilkwormGenerator"], - "coastal_group_count": 4, - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": ["REZKY", "MOLNIYA"], - "cruisers": [], "requirements": {}, - "carrier_names": [], - "coastal_group_count": 8, - "navy_generators": [ - "GrishaGroupGenerator", - "MolniyaGroupGenerator", - "RussianNavyGroupGenerator", - "LaCombattanteIIGroupGenerator" - ] -} + "carrier_names": [] +} \ No newline at end of file diff --git a/resources/factions/allies_1940.json b/resources/factions/allies_1940.json index 564d5cc2..74a79587 100644 --- a/resources/factions/allies_1940.json +++ b/resources/factions/allies_1940.json @@ -26,24 +26,21 @@ "Infantry M1 Garand", "Infantry SMLE No.4 Mk-1" ], - "air_defenses": [ - "AllyWW2FlakGenerator", - "BoforsGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [ + "Ally Flak", + "WW2LST" + ], + "naval_units": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "WW2LSTGroupGenerator" - ], - "navy_group_count": 1, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally" -} +} \ No newline at end of file diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json index 6ee06263..1b79fb4c 100644 --- a/resources/factions/allies_1944.json +++ b/resources/factions/allies_1944.json @@ -40,24 +40,21 @@ "Infantry M1 Garand", "Infantry SMLE No.4 Mk-1" ], - "air_defenses": [ - "AllyWW2FlakGenerator", - "BoforsGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [ + "Ally Flak", + "WW2LST" + ], + "naval_units": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "WW2LSTGroupGenerator" - ], - "navy_group_count": 1, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally" -} +} \ No newline at end of file diff --git a/resources/factions/allies_1944_free.json b/resources/factions/allies_1944_free.json index 07ca9710..24c70ef9 100644 --- a/resources/factions/allies_1944_free.json +++ b/resources/factions/allies_1944_free.json @@ -26,19 +26,16 @@ "infantry_units": [ "Paratrooper AKS" ], - "air_defenses": [ - "BoforsGenerator" + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [], + "naval_units": [], + "missiles": [], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], - "navy_group_count": 0, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2free" -} +} \ No newline at end of file diff --git a/resources/factions/australia_2005.json b/resources/factions/australia_2005.json index 104daf0d..76003058 100644 --- a/resources/factions/australia_2005.json +++ b/resources/factions/australia_2005.json @@ -33,21 +33,18 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "HawkGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa", + "LHA-1 Tarawa" ], - "aircraft_carrier": [], - "helicopter_carrier": [ - "LHA_Tarawa" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)" ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [], "requirements": { "C-130J-30 Super Hercules Mod by Anubis": "https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/" }, @@ -56,9 +53,6 @@ "HMAS Canberra", "HMAS Adelaide" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index 27d7815c..5a2e5fce 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -42,26 +42,21 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "ChaparralGenerator", - "EarlyColdWarFlakGenerator", - "HawkGenerator", - "VulcanGenerator" + "missiles": [], + "preset_groups": [ + "Hawk", + "Cold-War-Flak" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], "requirements": { "Community A-4E": "https://heclak.github.io/community-a4e-c/" @@ -79,9 +74,6 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "doctrine": "coldwar" diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json index c6206c38..e5cc3a76 100644 --- a/resources/factions/bluefor_modern.json +++ b/resources/factions/bluefor_modern.json @@ -68,26 +68,21 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator", - "PatriotGenerator", - "NasamCGenerator" + "preset_groups": [ + "Hawk", + "Patriot", + "NASAMS AIM-120C" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M1097 Heavy HMMWV Avenger" ], "requirements": {}, "carrier_names": [ @@ -103,10 +98,7 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "unrestricted_satnav": true -} +} \ No newline at end of file diff --git a/resources/factions/canada_2005.json b/resources/factions/canada_2005.json index 73521e75..9533da2c 100644 --- a/resources/factions/canada_2005.json +++ b/resources/factions/canada_2005.json @@ -38,29 +38,23 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator" + "preset_groups": [ + "Hawk" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa", + "CG Ticonderoga" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M1097 Heavy HMMWV Avenger" ], "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": [], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json index 1fad3a7b..4a72c7af 100644 --- a/resources/factions/china_2010.json +++ b/resources/factions/china_2010.json @@ -15,7 +15,7 @@ "Mi-24P Hind-F", "Mi-8MTV2 Hip", "Su-30MKK Flanker-G", - "H-6J Badger" + "H-6J Badger" ], "awacs": [ "KJ-2000" @@ -45,39 +45,38 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "HQ7Generator", - "SA2Generator", - "SA6Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA20BGenerator", - "Tier2SA10Generator", - "ZSU23Generator", - "ZSU57Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-6", + "SA-11", + "HQ-7", + "SA-10/S-300PS", + "SA-20B/S-300PMU-2", + "Silkworm", + "Chinese Navy" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator" + "naval_units": [ + "Type 052B Destroyer", + "Type 052C Destroyer", + "Type 054A Frigate", + "CV 1143.5 Admiral Kuznetsov", + "Type 071 Amphibious Transport Dock" ], - "coastal_defenses": [ - "SilkwormGenerator" - ], - "coastal_group_count": 2, - "aircraft_carrier": [ - "KUZNECOW" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "carrier_names": [ "001 Liaoning", "002 Shandong" ], - "helicopter_carrier": [ - "Type_071" - ], "helicopter_carrier_names": [ "Kunlun Shan", "Jinggang Shan", @@ -87,17 +86,7 @@ "Wuzhi Shan", "Wudang Shan" ], - "destroyers": [ - "Type_052B", - "Type_052C" - ], - "cruiser": [ - "Type_054A" - ], "requirements": {}, - "navy_generators": [ - "ChineseNavyGroupGenerator" - ], "has_jtac": true, "jtac_unit": "WingLoong-I" } \ No newline at end of file diff --git a/resources/factions/dprk_1950_fictional.json b/resources/factions/dprk_1950_fictional.json index 7b224904..4decfdae 100644 --- a/resources/factions/dprk_1950_fictional.json +++ b/resources/factions/dprk_1950_fictional.json @@ -31,20 +31,18 @@ "Infantry AK-74 Rus", "Infantry RPG" ], - "air_defenses": [ - "FlakGenerator", - "EarlyColdWarFlakGenerator" + "missiles": [], + "air_defense_units": [], + "preset_groups": [ + "Cold-War-Flak", + "Flak" ], - "aircraft_carrier": [], - "helicopter_carrier": [], + "naval_units": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], - "navy_generators": [], "has_jtac": false, "doctrine": "ww2" } \ No newline at end of file diff --git a/resources/factions/france_1985.json b/resources/factions/france_1985.json index c1b77dbc..8cd45a1f 100644 --- a/resources/factions/france_1985.json +++ b/resources/factions/france_1985.json @@ -1,84 +1,75 @@ { - "country": "France", - "name": "France 1985", - "authors": "Colonel Panic", - "description": "

France 1985. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", - "locales": [ - "fr_FR" - ], - "doctrine": "coldwar", - "aircrafts": [ - "C-130", - "Mirage 2000C", - "SA 342L Gazelle", - "SA 342M Gazelle", - "SA 342M Gazelle Mistral" - ], - "awacs": [ - "E-3A" - ], - "tankers": [ - "KC-130", - "KC-135 Stratotanker" - ], - "frontline_units": [ - "AMX.30B2", - "Leclerc S\u00e9ries 2", - "Leclerc S\u00e9ries 2", - "Pamela", - "Panhard", - "Roland 2 (Marder Chassis)", - "VAB .50", - "VAB Mephisto", - "VAB T20/13", - "VBL .50", - "VBL AANF1", - "AMX-13 75mm", - "AMX-13 90mm", - "VBL AANF1" - ], - "artillery_units": [ - "M109A6 Paladin", - "M270 Multiple Launch Rocket System" - ], - "logistics_units": [ - "Truck M818 6x6" - ], - "infantry_units": [ - "Infantry M249", - "Infantry M4", - "MANPADS Stinger" - ], - "air_defenses": [ - "RolandGenerator", - "HawkGenerator" - ], - "aircraft_carrier": [], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" - ], - "requirements": { - "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974" - }, - "carrier_names": [ - "R91 Charles de Gaulle" - ], - "helicopter_carrier_names": [ - "R97 Jeanne d'Arc", - "L9013 Mistral", - "L9014 Tonerre", - "L9015 Dixmude" - ], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], - "has_jtac": true, - "jtac_unit": "MQ-9 Reaper" - } - + "country": "France", + "name": "France 1985", + "authors": "Colonel Panic", + "description": "

France 1985. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", + "locales": [ + "fr_FR" + ], + "doctrine": "coldwar", + "aircrafts": [ + "C-130", + "Mirage 2000C", + "SA 342L Gazelle", + "SA 342M Gazelle", + "SA 342M Gazelle Mistral" + ], + "awacs": [ + "E-3A" + ], + "tankers": [ + "KC-130", + "KC-135 Stratotanker" + ], + "frontline_units": [ + "AMX.30B2", + "Leclerc S\u00e9ries 2", + "Pamela", + "Panhard", + "Roland 2 (Marder Chassis)", + "VAB .50", + "VAB Mephisto", + "VAB T20/13", + "VBL .50", + "VBL AANF1", + "AMX-13 75mm", + "AMX-13 90mm" + ], + "artillery_units": [ + "M109A6 Paladin", + "M270 Multiple Launch Rocket System" + ], + "logistics_units": [ + "Truck M818 6x6" + ], + "infantry_units": [ + "Infantry M249", + "Infantry M4", + "MANPADS Stinger" + ], + "air_defense_units": [], + "preset_groups": [ + "Hawk", + "Roland" + ], + "naval_units": [ + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa" + ], + "missiles": [], + "requirements": { + "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974" + }, + "carrier_names": [ + "R91 Charles de Gaulle" + ], + "helicopter_carrier_names": [ + "R97 Jeanne d'Arc", + "L9013 Mistral", + "L9014 Tonerre", + "L9015 Dixmude" + ], + "has_jtac": true, + "jtac_unit": "MQ-9 Reaper" +} \ No newline at end of file diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json index 761b12c6..0c89d282 100644 --- a/resources/factions/france_1995.json +++ b/resources/factions/france_1995.json @@ -49,33 +49,25 @@ "MANPADS Stinger", "Mortar 2B11 120mm" ], - "air_defenses": [ - "RolandGenerator", - "HawkGenerator" + "preset_groups": [ + "Hawk", + "Roland" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa" ], - "aircraft_carrier": [], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa", - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)" ], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [ "Jeanne d'Arc" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" -} +} \ No newline at end of file diff --git a/resources/factions/france_2005.json b/resources/factions/france_2005.json index 18a079b8..d7917e26 100644 --- a/resources/factions/france_2005.json +++ b/resources/factions/france_2005.json @@ -1,84 +1,77 @@ { - "country": "France", - "name": "France 2005", - "authors": "HerrTom", - "description": "

France 2005. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", - "locales": [ - "fr_FR" - ], - "aircrafts": [ - "C-130", - "Mirage 2000-5", - "Mirage 2000C", - "SA 342L Gazelle", - "SA 342M Gazelle", - "SA 342M Gazelle Mistral" - ], - "awacs": [ - "E-2C Hawkeye", - "E-3A" - ], - "tankers": [ - "KC-130", - "KC-135 Stratotanker" - ], - "frontline_units": [ - "AMX-10RCR SEPAR", - "Leclerc S\u00e9ries 2", - "Leclerc_XXI", - "Pamela", - "Panhard", - "Roland 2 (Marder Chassis)", - "VAB .50", - "VAB Mephisto", - "VAB T20/13", - "VBL .50", - "VBL AANF1", - "VBCI" - ], - "artillery_units": [ - "M109A6 Paladin", - "M270 Multiple Launch Rocket System" - ], - "logistics_units": [ - "Truck M818 6x6" - ], - "infantry_units": [ - "Infantry M249", - "Infantry M4", - "MANPADS Stinger" - ], - "air_defenses": [ - "RolandGenerator", - "HawkGenerator" - ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" - ], - "requirements": { - "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974" - }, - "carrier_names": [ - "R91 Charles de Gaulle" - ], - "helicopter_carrier_names": [ - "R97 Jeanne d'Arc", - "L9013 Mistral", - "L9014 Tonerre", - "L9015 Dixmude" - ], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], - "has_jtac": true, - "jtac_unit": "MQ-9 Reaper" - } + "country": "France", + "name": "France 2005", + "authors": "HerrTom", + "description": "

France 2005. Frenchpack 4.6+ mod is recommended to enable most of the ground units of this faction available.

", + "locales": [ + "fr_FR" + ], + "aircrafts": [ + "C-130", + "Mirage 2000-5", + "Mirage 2000C", + "SA 342L Gazelle", + "SA 342M Gazelle", + "SA 342M Gazelle Mistral" + ], + "awacs": [ + "E-2C Hawkeye", + "E-3A" + ], + "tankers": [ + "KC-130", + "KC-135 Stratotanker" + ], + "frontline_units": [ + "AMX-10RCR SEPAR", + "Leclerc S\u00e9ries 2", + "Leclerc_XXI", + "Pamela", + "Panhard", + "Roland 2 (Marder Chassis)", + "VAB .50", + "VAB Mephisto", + "VAB T20/13", + "VBL .50", + "VBL AANF1", + "VBCI" + ], + "artillery_units": [ + "M109A6 Paladin", + "M270 Multiple Launch Rocket System" + ], + "logistics_units": [ + "Truck M818 6x6" + ], + "infantry_units": [ + "Infantry M249", + "Infantry M4", + "MANPADS Stinger" + ], + "air_defense_units": [], + "preset_groups": [ + "Hawk", + "Roland" + ], + "naval_units": [ + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" + ], + "missiles": [], + "requirements": { + "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974" + }, + "carrier_names": [ + "R91 Charles de Gaulle" + ], + "helicopter_carrier_names": [ + "R97 Jeanne d'Arc", + "L9013 Mistral", + "L9014 Tonerre", + "L9015 Dixmude" + ], + "has_jtac": true, + "jtac_unit": "MQ-9 Reaper" +} \ No newline at end of file diff --git a/resources/factions/gdr_1985.json b/resources/factions/gdr_1985.json index 638bb8e1..52628a65 100644 --- a/resources/factions/gdr_1985.json +++ b/resources/factions/gdr_1985.json @@ -39,32 +39,29 @@ "Infantry RPG", "Mortar 2B11 120mm" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZSU57Generator", - "ZU23Generator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator", - "TinShieldGenerator" + "naval_units": [ + "CG Ticonderoga" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [ - "TICONDEROG" + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZSU-23-4 Shilka" ], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], "has_jtac": true, "jtac_unit": "Mi-8MTV2 Hip" -} +} \ No newline at end of file diff --git a/resources/factions/georgia_2008.json b/resources/factions/georgia_2008.json index a2f0bbac..c2d699b3 100644 --- a/resources/factions/georgia_2008.json +++ b/resources/factions/georgia_2008.json @@ -35,19 +35,22 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "air_defense_units": [ + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "navy_generators": [ - "LaCombattanteIIGroupGenerator" + "preset_groups": [ + "SA-3/S-125", + "SA-6", + "SA-11" + ], + "naval_units": [ + "FAC La Combattante IIa" ], "requirements": {}, "has_jtac": true, diff --git a/resources/factions/germany_1940.json b/resources/factions/germany_1940.json index 034558a1..f02ac91c 100644 --- a/resources/factions/germany_1940.json +++ b/resources/factions/germany_1940.json @@ -26,23 +26,20 @@ "infantry_units": [ "Infantry Mauser 98" ], - "air_defenses": [ - "FlakGenerator" + "missiles": [], + "air_defense_units": [], + "preset_groups": [ + "Flak" + ], + "naval_units": [ + "Boat Schnellboot type S130", + "U-boat VIIC U-flak" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "UBoatGroupGenerator", - "SchnellbootGroupGenerator" - ], - "navy_group_count": 2, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2germany" diff --git a/resources/factions/germany_1942.json b/resources/factions/germany_1942.json index f1cfc419..26b9a794 100644 --- a/resources/factions/germany_1942.json +++ b/resources/factions/germany_1942.json @@ -28,24 +28,21 @@ "infantry_units": [ "Infantry Mauser 98" ], - "air_defenses": [ - "FlakGenerator", - "FreyaGenerator" + "missiles": [], + "air_defense_units": [], + "preset_groups": [ + "Flak", + "Freya" + ], + "naval_units": [ + "Boat Schnellboot type S130", + "U-boat VIIC U-flak" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "UBoatGroupGenerator", - "SchnellbootGroupGenerator" - ], - "navy_group_count": 2, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2germany" diff --git a/resources/factions/germany_1944.json b/resources/factions/germany_1944.json index 535ec070..d93b97c3 100644 --- a/resources/factions/germany_1944.json +++ b/resources/factions/germany_1944.json @@ -38,27 +38,22 @@ "infantry_units": [ "Infantry Mauser 98" ], - "air_defenses": [ - "FlakGenerator", - "FreyaGenerator" + "air_defense_units": [], + "preset_groups": [ + "Flak", + "Freya" + ], + "naval_units": [ + "Boat Schnellboot type S130" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "SchnellbootGroupGenerator" - ], - "navy_group_count": 2, "missiles": [ - "V1GroupGenerator" + "V-1 Launch Ramp" ], - "missiles_group_count": 1, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2germany" diff --git a/resources/factions/germany_1944_free.json b/resources/factions/germany_1944_free.json index 14b487b0..96ce583f 100644 --- a/resources/factions/germany_1944_free.json +++ b/resources/factions/germany_1944_free.json @@ -23,20 +23,15 @@ "infantry_units": [ "Infantry AK-74 Rus" ], - "air_defenses": [ - "Flak18Generator" + "air_defense_units": [ + "8.8 cm Flak 18" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [], + "naval_units": [], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], - "navy_group_count": 0, "missiles": [], - "missiles_group_count": 0, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2free" diff --git a/resources/factions/germany_1990.json b/resources/factions/germany_1990.json index e239c83b..66ffdfd7 100644 --- a/resources/factions/germany_1990.json +++ b/resources/factions/germany_1990.json @@ -39,30 +39,24 @@ "MANPADS Stinger", "Mortar 2B11 120mm" ], - "air_defenses": [ - "GepardGenerator", - "HawkGenerator", - "RolandGenerator", - "PatriotGenerator" + "preset_groups": [ + "Hawk", + "Roland", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "FAC La Combattante IIa", + "CG Ticonderoga" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [ - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "Flakpanzer Gepard" ], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "OliverHazardPerryGroupGenerator", - "LaCombattanteIIGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/greece_2005.json b/resources/factions/greece_2005.json index 4cb550d5..b7290a7b 100644 --- a/resources/factions/greece_2005.json +++ b/resources/factions/greece_2005.json @@ -43,20 +43,21 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "HawkGenerator", - "PatriotGenerator", - "SA8Generator", - "SA10Generator", - "SA15Generator", - "SA20Generator", - "ZU23Generator" + "missiles": [], + "preset_groups": [ + "Hawk", + "Patriot", + "SA-10/S-300PS", + "SA-20/S-300PMU-1" ], - "ewrs": [ - "FlatFaceGenerator" + "naval_units": [ + "FAC La Combattante IIa" ], - "navy_generators": [ - "LaCombattanteIIGroupGenerator" + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-15 Tor", + "AAA ZU-23 Closed Emplacement" ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json index accf47bc..6bfc7eec 100644 --- a/resources/factions/india_2010.json +++ b/resources/factions/india_2010.json @@ -42,41 +42,36 @@ "MANPADS SA-18 Igla-S \"Grouse\"", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA19Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-3/S-125", + "SA-6", + "SA-11", + "SA-10/S-300PS" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator", - "TinShieldGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "Corvette 1241.1 Molniya", + "Frigate 1135M Rezky", + "CV 1143.5 Admiral Kuznetsov" ], - "aircraft_carrier": [ - "KUZNECOW" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [ - "REZKY" - ], - "cruisers": [], "requirements": {}, "carrier_names": [ "INS Vikramaditya" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator", - "MolniyaGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" -} +} \ No newline at end of file diff --git a/resources/factions/insurgents.json b/resources/factions/insurgents.json index d2663f8c..446a44f0 100644 --- a/resources/factions/insurgents.json +++ b/resources/factions/insurgents.json @@ -29,10 +29,13 @@ "MANPADS SA-18 Igla \"Grouse\"", "Mortar 2B11 120mm" ], - "air_defenses": [ - "SA9Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralInsurgentGenerator" - ] + "missiles": [], + "air_defense_units": [ + "SA-9 Strela", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" + ], + "preset_groups": [], + "naval_units": [] } \ No newline at end of file diff --git a/resources/factions/insurgents_hard.json b/resources/factions/insurgents_hard.json index cf378a1c..bef867ae 100644 --- a/resources/factions/insurgents_hard.json +++ b/resources/factions/insurgents_hard.json @@ -34,13 +34,15 @@ "MANPADS SA-18 Igla \"Grouse\"", "Mortar 2B11 120mm" ], - "air_defenses": [ - "SA9Generator", - "ZSU57Generator", - "ZU23Generator", - "ZU23UralInsurgentGenerator" + "air_defense_units": [ + "SA-9 Strela", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375" ], + "preset_groups": [], + "naval_units": [], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ] } \ No newline at end of file diff --git a/resources/factions/iran_1988.json b/resources/factions/iran_1988.json index 54590869..8fd12589 100644 --- a/resources/factions/iran_1988.json +++ b/resources/factions/iran_1988.json @@ -44,44 +44,33 @@ "Insurgent AK-74", "MANPADS SA-18 Igla \"Grouse\" Ins" ], - "air_defenses": [ - "HawkGenerator", - "RapierGenerator", - "SA2Generator", - "ZSU23Generator", - "ZU23InsurgentGenerator", - "ZU23UralInsurgentGenerator", - "ZSU57Generator", - "ColdWarFlakGenerator" + "preset_groups": [ + "Hawk", + "SA-2/S-75", + "Rapier", + "Silkworm", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator", - "HawkEwrGenerator" + "naval_units": [ + "Corvette 1241.1 Molniya", + "FAC La Combattante IIa", + "Frigate 1135M Rezky" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM Hawk SR (AN/MPQ-50)", + "ZSU-57-2 'Sparka'", + "ZU-23 on Ural-375", + "AAA ZU-23 Insurgent Closed Emplacement", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [ - "REZKY" - ], - "cruisers": [ - "MOLNIYA" - ], "requirements": {}, "carrier_names": [], "missiles": [ - "ScudGenerator" - ], - "missiles_group_count": 1, - "coastal_defenses": [ - "SilkwormGenerator" - ], - "coastal_group_count": 2, - "navy_generators": [ - "LaCombattanteIIGroupGenerator", - "MolniyaGroupGenerator" + "SSM SS-1C Scud-B" ], "has_jtac": true, "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 d41119f5..66fdc186 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -53,48 +53,37 @@ "Insurgent AK-74", "MANPADS SA-18 Igla \"Grouse\" Ins" ], - "air_defenses": [ - "HawkGenerator", - "RapierGenerator", - "SA2Generator", - "SA5FlatFaceGenerator", - "SA6Generator", - "SA11Generator", - "SA15Generator", - "SA17Generator", - "ZSU23Generator", - "ZU23InsurgentGenerator", - "ZU23UralInsurgentGenerator", - "ZSU57Generator" + "preset_groups": [ + "Hawk", + "SA-5/S-200", + "SA-2/S-75", + "SA-6", + "SA-11", + "Rapier", + "SA-17", + "Silkworm" ], - "ewrs": [ - "FlatFaceGenerator", - "HawkEwrGenerator" + "naval_units": [ + "Corvette 1124.4 Grish", + "Corvette 1241.1 Molniya", + "FAC La Combattante IIa", + "Frigate 1135M Rezky" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM Hawk SR (AN/MPQ-50)", + "SA-15 Tor", + "ZSU-57-2 'Sparka'", + "ZU-23 on Ural-375", + "AAA ZU-23 Insurgent Closed Emplacement", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [ - "REZKY" - ], - "cruisers": [ - "MOLNIYA" - ], "requirements": {}, "carrier_names": [], "missiles": [ - "ScudGenerator" - ], - "missiles_group_count": 1, - "coastal_defenses": [ - "SilkwormGenerator" - ], - "coastal_group_count": 3, - "navy_generators": [ - "GrishaGroupGenerator", - "MolniyaGroupGenerator", - "LaCombattanteIIGroupGenerator" + "SSM SS-1C Scud-B" ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" -} +} \ No newline at end of file diff --git a/resources/factions/iraq_1991.json b/resources/factions/iraq_1991.json index bee74c48..12fb49e3 100644 --- a/resources/factions/iraq_1991.json +++ b/resources/factions/iraq_1991.json @@ -19,7 +19,7 @@ "Su-24M Fencer-D", "Su-25 Frogfoot", "Tu-22M3 Backfire-C", - "H-6J Badger" + "H-6J Badger" ], "awacs": [ "A-50" @@ -53,35 +53,30 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "EarlyColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Cold-War-Flak" ], - "ewrs": [ - "BoxSpringGenerator" + "naval_units": [ + "Corvette 1124.4 Grish" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "EWR 1L13", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator" - ], "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/israel_1948.json b/resources/factions/israel_1948.json index 0d40cb1d..fb94cfd1 100644 --- a/resources/factions/israel_1948.json +++ b/resources/factions/israel_1948.json @@ -28,20 +28,19 @@ "infantry_units": [ "Infantry SMLE No.4 Mk-1" ], - "air_defenses": [ - "BoforsGenerator", - "EarlyColdWarFlakGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [ + "Cold-War-Flak" + ], + "naval_units": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], "has_jtac": false, "doctrine": "ww2" } \ No newline at end of file diff --git a/resources/factions/israel_1973.json b/resources/factions/israel_1973.json index f2e05b05..de06d524 100644 --- a/resources/factions/israel_1973.json +++ b/resources/factions/israel_1973.json @@ -33,25 +33,22 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "BoforsGenerator", - "ChaparralGenerator", - "HawkGenerator", - "VulcanGenerator" + "preset_groups": [ + "Hawk" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [], + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral", + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": { "Community A-4E": "https://heclak.github.io/community-a4e-c/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], "has_jtac": false, "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/israel_1982.json b/resources/factions/israel_1982.json index b343271d..0e38c3dc 100644 --- a/resources/factions/israel_1982.json +++ b/resources/factions/israel_1982.json @@ -35,24 +35,21 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "ChaparralGenerator", - "HawkGenerator", - "VulcanGenerator" + "preset_groups": [ + "Hawk" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [], + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": { "Community A-4E": "https://heclak.github.io/community-a4e-c/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" -} +} \ No newline at end of file diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json index c9edbb19..ca808916 100644 --- a/resources/factions/israel_2000.json +++ b/resources/factions/israel_2000.json @@ -43,25 +43,22 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "ChaparralGenerator", - "HawkGenerator", - "PatriotGenerator", - "VulcanGenerator" + "preset_groups": [ + "Hawk", + "Patriot" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa" + ], + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "unrestricted_satnav": true diff --git a/resources/factions/israel_2012.json b/resources/factions/israel_2012.json index 7a9f2bf3..1a3b4d9a 100644 --- a/resources/factions/israel_2012.json +++ b/resources/factions/israel_2012.json @@ -44,25 +44,22 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "ChaparralGenerator", - "HawkGenerator", - "PatriotGenerator", - "VulcanGenerator" + "preset_groups": [ + "Hawk", + "Patriot" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa" + ], + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { diff --git a/resources/factions/italy_1990.json b/resources/factions/italy_1990.json index 3c87320c..20ae409b 100644 --- a/resources/factions/italy_1990.json +++ b/resources/factions/italy_1990.json @@ -9,8 +9,8 @@ "aircrafts": [ "AH-1W SuperCobra", "AV-8B Harrier II Night Attack", - "F-104S Starfighter", - "F-104S Starfighter A/G", + "F-104S Starfighter", + "F-104S Starfighter A/G", "C-130", "Tornado IDS", "UH-1H Iroquois" @@ -38,22 +38,18 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator" + "preset_groups": [ + "Hawk" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "CG Ticonderoga", + "LHA-1 Tarawa" ], - "aircraft_carrier": [], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M1097 Heavy HMMWV Avenger" ], "requirements": {}, "carrier_names": [], @@ -61,9 +57,6 @@ "Giuseppe Garibaldi", "Cavour" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/japan_1944.json b/resources/factions/japan_1944.json index e1d86e55..b8c45ec6 100644 --- a/resources/factions/japan_1944.json +++ b/resources/factions/japan_1944.json @@ -24,20 +24,15 @@ "infantry_units": [ "Infantry AK-74 Rus" ], - "air_defenses": [ - "Flak18Generator" + "air_defense_units": [ + "8.8 cm Flak 18" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [], + "naval_units": [], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], - "navy_group_count": 0, "missiles": [], - "missiles_group_count": 0, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2free", @@ -47,7 +42,7 @@ "Fictional IJN Carrier Akagi AI-103", "Fictional IJN Carrier Akagi AI-151", "Fictional IJN Carrier Soryu BI-112", - "Fictional IJN OTU Tsukuba Tsu-102" + "Fictional IJN OTU Tsukuba Tsu-102" ], "I-16 Ishak": [ "Japan" diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json index ddc82208..9281ce28 100644 --- a/resources/factions/japan_2005.json +++ b/resources/factions/japan_2005.json @@ -43,23 +43,19 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "GepardGenerator", - "HawkGenerator", - "PatriotGenerator" + "preset_groups": [ + "Hawk", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa" ], - "aircraft_carrier": [], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "Flakpanzer Gepard" ], "requirements": {}, "carrier_names": [], @@ -67,9 +63,6 @@ "Hyuga", "Ise" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/libya_2011.json b/resources/factions/libya_2011.json index 3fd05dba..242abf69 100644 --- a/resources/factions/libya_2011.json +++ b/resources/factions/libya_2011.json @@ -40,41 +40,33 @@ "MANPADS SA-18 Igla \"Grouse\"", "Paratrooper RPG-16" ], - "air_defenses": [ - "HQ7Generator", - "RapierGenerator", - "SA2Generator", - "SA3Generator", - "SA5FlatFaceGenerator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA13Generator", - "ZSU23Generator" + "preset_groups": [ + "SA-5/S-200", + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Rapier", + "HQ-7" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1124.4 Grish", + "Corvette 1241.1 Molniya", + "FAC La Combattante IIa", + "Frigate 1135M Rezky" + ], + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], "missiles": [ - "ScudGenerator" - ], - "missiles_group_count": 1, - "destroyers": [ - "REZKY" - ], - "cruisers": [ - "MOLNIYA" + "SSM SS-1C Scud-B" ], "requirements": {}, - "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator", - "MolniyaGroupGenerator", - "LaCombattanteIIGroupGenerator" - ] -} + "carrier_names": [] +} \ No newline at end of file diff --git a/resources/factions/netherlands_1990.json b/resources/factions/netherlands_1990.json index a18aa2f9..16fe2f95 100644 --- a/resources/factions/netherlands_1990.json +++ b/resources/factions/netherlands_1990.json @@ -34,26 +34,23 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "GepardGenerator", - "HawkGenerator", - "PatriotGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" + ], + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M1097 Heavy HMMWV Avenger", + "Flakpanzer Gepard" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "unrestricted_satnav": true diff --git a/resources/factions/north_korea_2000.json b/resources/factions/north_korea_2000.json index 9d780323..be127bb6 100644 --- a/resources/factions/north_korea_2000.json +++ b/resources/factions/north_korea_2000.json @@ -45,36 +45,31 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA2Generator", - "SA3Generator", - "SA5Generator", - "SA6Generator", - "SA9Generator", - "SA13Generator", - "ZU23Generator", - "ZSU23Generator", - "ZSU57Generator" + "preset_groups": [ + "SA-5/S-200", + "SA-2/S-75", + "SA-3/S-125", + "SA-6" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1124.4 Grish", + "Corvette 1241.1 Molniya" + ], + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], "missiles": [ - "ScudGenerator" - ], - "missiles_group_count": 1, - "navy_generators": [ - "GrishaGroupGenerator", - "MolniyaGroupGenerator" + "SSM SS-1C Scud-B" ], "has_jtac": false -} +} \ No newline at end of file diff --git a/resources/factions/pakistan_2015.json b/resources/factions/pakistan_2015.json index 570bf52e..e43cbddf 100644 --- a/resources/factions/pakistan_2015.json +++ b/resources/factions/pakistan_2015.json @@ -40,29 +40,27 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "HQ7Generator", - "SA2Generator", - "SA10Generator", - "SA11Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-11", + "HQ-7", + "SA-10/S-300PS" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "Type 054A Frigate" + ], + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375" ], - "aircraft_carrier": [], "carrier_names": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], "cruiser": [], "requirements": {}, - "navy_generators": [ - "Type54GroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "WingLoong-I" } \ No newline at end of file diff --git a/resources/factions/pmc_russian.json b/resources/factions/pmc_russian.json index df108c39..b4447b3e 100644 --- a/resources/factions/pmc_russian.json +++ b/resources/factions/pmc_russian.json @@ -31,8 +31,11 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA9Generator", - "SA13Generator" - ] + "air_defense_units": [ + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)" + ], + "preset_groups": [], + "naval_units": [], + "missiles": [] } \ No newline at end of file diff --git a/resources/factions/pmc_us.json b/resources/factions/pmc_us.json index 30f87336..9fec0f28 100644 --- a/resources/factions/pmc_us.json +++ b/resources/factions/pmc_us.json @@ -25,9 +25,12 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator" + "air_defense_units": [ + "M1097 Heavy HMMWV Avenger" ], + "preset_groups": [], + "naval_units": [], + "missiles": [], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/poland_2010.json b/resources/factions/poland_2010.json index f01ba92e..e8ddaa72 100644 --- a/resources/factions/poland_2010.json +++ b/resources/factions/poland_2010.json @@ -43,22 +43,23 @@ "MANPADS SA-18 Igla-S \"Grouse\"", "Paratrooper AKS" ], - "air_defenses": [ - "SA5FlatFaceGenerator", - "SA6Generator", - "SA8Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-5/S-200", + "SA-6" ], - "ewrs": [ - "BigBirdGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "Corvette 1241.1 Molniya" + ], + "air_defense_units": [ + "SAM SA-10 S-300 \"Grumble\" Big Bird SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "requirements": {}, "carrier_names": [], - "navy_generators": [ - "MolniyaGroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "unrestricted_satnav": true -} +} \ No newline at end of file diff --git a/resources/factions/redfor_china_2010.json b/resources/factions/redfor_china_2010.json index d0b534c9..2153eb8d 100644 --- a/resources/factions/redfor_china_2010.json +++ b/resources/factions/redfor_china_2010.json @@ -24,7 +24,7 @@ "Su-30MKK Flanker-G", "Su-34 Fullback", "Tu-22M3 Backfire-C", - "H-6J Badger" + "H-6J Badger" ], "awacs": [ "KJ-2000" @@ -64,43 +64,46 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "HQ7Generator", - "SA2Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "SA17Generator", - "SA19Generator", - "Tier2SA10Generator", - "Tier3SA10Generator", - "SA10BGenerator", - "SA12Generator", - "SA20Generator", - "SA20BGenerator", - "SA23Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-6", + "SA-11", + "HQ-7", + "SA-10/S-300PS", + "SA-10B/S-300PS", + "SA-17", + "SA-12/S-300V", + "SA-20/S-300PMU-1", + "SA-20B/S-300PMU-2", + "SA-23/S-300VM", + "Chinese Navy" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator" + "naval_units": [ + "Frigate 1135M Rezky", + "Type 052B Destroyer", + "Type 052C Destroyer", + "Corvette 1241.1 Molniya", + "Type 054A Frigate", + "CV 1143.5 Admiral Kuznetsov", + "Type 071 Amphibious Transport Dock" ], - "aircraft_carrier": [ - "KUZNECOW" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "carrier_names": [ "001 Liaoning", "002 Shandong" ], - "helicopter_carrier": [ - "Type_071" - ], "helicopter_carrier_names": [ "Kunlun Shan", "Jinggang Shan", @@ -110,19 +113,7 @@ "Wuzhi Shan", "Wudang Shan" ], - "destroyers": [ - "REZKY", - "Type_052B", - "Type_052C" - ], - "cruiser": [ - "MOLNIYA", - "Type_054A" - ], "requirements": {}, - "navy_generators": [ - "ChineseNavyGroupGenerator" - ], "has_jtac": true, "jtac_unit": "WingLoong-I" } \ No newline at end of file diff --git a/resources/factions/redfor_russia_2010.json b/resources/factions/redfor_russia_2010.json index bd1af0d4..d38e1e90 100644 --- a/resources/factions/redfor_russia_2010.json +++ b/resources/factions/redfor_russia_2010.json @@ -66,60 +66,51 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "HQ7Generator", - "SA2Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "SA17Generator", - "SA19Generator", - "Tier2SA10Generator", - "Tier3SA10Generator", - "SA10BGenerator", - "SA12Generator", - "SA20Generator", - "SA20BGenerator", - "SA23Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-6", + "SA-11", + "HQ-7", + "SA-10/S-300PS", + "SA-10B/S-300PS", + "SA-17", + "SA-12/S-300V", + "SA-20/S-300PMU-1", + "SA-20B/S-300PMU-2", + "SA-23/S-300VM", + "Russian Navy" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator" + "naval_units": [ + "SSK 877V Kilo", + "Frigate 1135M Rezky", + "Type 052B Destroyer", + "Type 052C Destroyer", + "Corvette 1241.1 Molniya", + "Type 054A Frigate", + "CV 1143.5 Admiral Kuznetsov", + "Type 071 Amphibious Transport Dock" ], - "aircraft_carrier": [ - "KUZNECOW" - ], - "helicopter_carrier": [ - "Type_071" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "helicopter_carrier_names": [ "Ivan Rogov", "Mitrofan Moskalenko" ], - "destroyers": [ - "REZKY", - "Type_052B", - "Type_052C" - ], - "cruisers": [ - "MOLNIYA", - "Type_054A" - ], "requirements": {}, "carrier_names": [ "Admiral Kuznetsov" ], - "navy_generators": [ - "RussianNavyGroupGenerator", - "KiloSubGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json index a08f2a3a..c566fdfe 100644 --- a/resources/factions/russia_1955.json +++ b/resources/factions/russia_1955.json @@ -37,17 +37,16 @@ "Infantry AK-74 Rus", "Infantry RPG" ], - "air_defenses": [ - "EarlyColdWarFlakGenerator" + "missiles": [], + "air_defense_units": [], + "preset_groups": [ + "KS-19", + "Cold-War-Flak" ], - "aircraft_carrier": [], - "helicopter_carrier": [], + "naval_units": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], - "navy_generators": [], "has_jtac": false, "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/russia_1965.json b/resources/factions/russia_1965.json index 72100e25..85b26401 100644 --- a/resources/factions/russia_1965.json +++ b/resources/factions/russia_1965.json @@ -42,26 +42,23 @@ "Infantry AK-74 Rus", "Infantry RPG" ], - "air_defenses": [ - "EarlyColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "ZSU23Generator", - "ZSU57Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator" + "naval_units": [], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], - "navy_generators": [], "has_jtac": false, "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/russia_1970_limited_air.json b/resources/factions/russia_1970_limited_air.json index 45f8c938..c6cd39f8 100644 --- a/resources/factions/russia_1970_limited_air.json +++ b/resources/factions/russia_1970_limited_air.json @@ -34,37 +34,31 @@ "Infantry AK-74 Rus", "Infantry RPG" ], - "air_defenses": [ - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA11Generator", - "ColdWarFlakGenerator", - "ZSU23Generator", - "ZSU57Generator", - "ZU23Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "SA-11", + "Cold-War-Flak", + "Russian Navy" ], - "ewrs": [ - "FlatFaceGenerator", - "TinShieldGenerator" + "naval_units": [], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, "requirements": {}, "carrier_names": [], - "navy_generators": [ - "RussianNavyGroupGenerator" - ], "has_jtac": false, "doctrine": "coldwar" -} +} \ No newline at end of file diff --git a/resources/factions/russia_1975 (Mi-24P).json b/resources/factions/russia_1975 (Mi-24P).json index 5272b589..a3a30c44 100644 --- a/resources/factions/russia_1975 (Mi-24P).json +++ b/resources/factions/russia_1975 (Mi-24P).json @@ -49,37 +49,32 @@ "Infantry RPG", "Mortar 2B11 120mm" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZSU57Generator", - "ZU23Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1241.1 Molniya" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, "requirements": {}, "carrier_names": [], - "navy_generators": [ - "MolniyaGroupGenerator" - ], "has_jtac": false, "doctrine": "coldwar" -} +} \ No newline at end of file diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json index 39f4a1f9..2608a204 100644 --- a/resources/factions/russia_1975.json +++ b/resources/factions/russia_1975.json @@ -49,38 +49,33 @@ "Infantry RPG", "Mortar 2B11 120mm" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA5Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZSU57Generator", - "ZU23Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-5/S-200", + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1241.1 Molniya" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, "requirements": {}, "carrier_names": [], - "navy_generators": [ - "MolniyaGroupGenerator" - ], "has_jtac": false, "doctrine": "coldwar" -} +} \ No newline at end of file diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json index 0f3ead54..4975d325 100644 --- a/resources/factions/russia_1990.json +++ b/resources/factions/russia_1990.json @@ -54,47 +54,39 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "SA19Generator", - "Tier2SA10Generator", - "Tier3SA10Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "SA-11", + "SA-10/S-300PS", + "Russian Navy" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator", - "TinShieldGenerator" + "naval_units": [ + "Frigate 1135M Rezky", + "Corvette 1241.1 Molniya", + "CV 1143.5 Admiral Kuznetsov" ], - "aircraft_carrier": [ - "KUZNECOW" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [ - "REZKY" - ], - "cruisers": [ - "MOLNIYA" - ], "requirements": {}, "carrier_names": [ "Admiral Kuznetsov", "Admiral Gorshkov" ], - "navy_generators": [ - "RussianNavyGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" -} +} \ No newline at end of file diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json index 1d7a519d..eaa45fec 100644 --- a/resources/factions/russia_2010.json +++ b/resources/factions/russia_2010.json @@ -60,48 +60,40 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "SA17Generator", - "SA19Generator", - "Tier2SA10Generator", - "Tier3SA10Generator", - "SA10BGenerator", - "SA12Generator", - "SA20Generator", - "SA20BGenerator", - "SA23Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-11", + "SA-10/S-300PS", + "SA-10B/S-300PS", + "SA-17", + "SA-12/S-300V", + "SA-20/S-300PMU-1", + "SA-20B/S-300PMU-2", + "SA-23/S-300VM", + "Russian Navy" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator" + "naval_units": [ + "Frigate 1135M Rezky", + "Corvette 1241.1 Molniya", + "CV 1143.5 Admiral Kuznetsov" ], - "aircraft_carrier": [ - "KUZNECOW" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [ - "REZKY" - ], - "cruisers": [ - "MOLNIYA" - ], "requirements": {}, "carrier_names": [ "Admiral Kuznetsov" ], - "navy_generators": [ - "RussianNavyGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json index 49026f60..84f9523b 100644 --- a/resources/factions/russia_2020.json +++ b/resources/factions/russia_2020.json @@ -57,50 +57,42 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "SA17Generator", - "SA19Generator", - "Tier2SA10Generator", - "Tier3SA10Generator", - "SA10BGenerator", - "SA12Generator", - "SA20Generator", - "SA20BGenerator", - "SA23Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-11", + "SA-10/S-300PS", + "SA-10B/S-300PS", + "SA-17", + "SA-12/S-300V", + "SA-20/S-300PMU-1", + "SA-20B/S-300PMU-2", + "SA-23/S-300VM", + "Russian Navy" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator" + "naval_units": [ + "Frigate 1135M Rezky", + "Corvette 1241.1 Molniya", + "CV 1143.5 Admiral Kuznetsov" ], - "aircraft_carrier": [ - "KUZNECOW" + "air_defense_units": [ + "EWR 1L13", + "EWR 55G6", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [ - "REZKY" - ], - "cruisers": [ - "MOLNIYA" - ], "requirements": { "SU-57 Felon By CubanAce Simulations": "https://www.digitalcombatsimulator.com/fr/files/2539621/" }, "carrier_names": [ "Admiral Kuznetsov" ], - "navy_generators": [ - "RussianNavyGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/soviet_union_1943.json b/resources/factions/soviet_union_1943.json index 20d95dad..4cb5933e 100644 --- a/resources/factions/soviet_union_1943.json +++ b/resources/factions/soviet_union_1943.json @@ -27,20 +27,19 @@ "infantry_units": [ "Infantry SMLE No.4 Mk-1" ], - "air_defenses": [ - "AllyWW2FlakGenerator", - "BoforsGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [ + "Ally Flak" + ], + "naval_units": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [], "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally" diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json index 6031faab..d26b26ea 100644 --- a/resources/factions/spain_1990.json +++ b/resources/factions/spain_1990.json @@ -35,26 +35,21 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator", - "PatriotGenerator", - "RolandGenerator" + "preset_groups": [ + "Hawk", + "Roland", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M1097 Heavy HMMWV Avenger" ], "requirements": {}, "carrier_names": [ @@ -63,9 +58,6 @@ "helicopter_carrier_names": [ "Juan Carlos I" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { diff --git a/resources/factions/sweden_1970.json b/resources/factions/sweden_1970.json index dbef6f47..32dd828d 100644 --- a/resources/factions/sweden_1970.json +++ b/resources/factions/sweden_1970.json @@ -32,17 +32,18 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "ChaparralGenerator", - "EarlyColdWarFlakGenerator", - "HawkGenerator", - "VulcanGenerator" + "missiles": [], + "preset_groups": [ + "Hawk", + "Cold-War-Flak" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], "has_jtac": false, "doctrine": "coldwar" diff --git a/resources/factions/sweden_1990.json b/resources/factions/sweden_1990.json index 7a4ade3b..b9179fda 100644 --- a/resources/factions/sweden_1990.json +++ b/resources/factions/sweden_1990.json @@ -32,15 +32,16 @@ "Infantry M4", "MANPADS Stinger" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator" + "preset_groups": [ + "Hawk" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M1097 Heavy HMMWV Avenger" ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" diff --git a/resources/factions/sweden_2002.json b/resources/factions/sweden_2002.json index a3efd379..089b9d95 100644 --- a/resources/factions/sweden_2002.json +++ b/resources/factions/sweden_2002.json @@ -1,52 +1,53 @@ { - "country": "Sweden", - "name": "Sweden 2002", - "authors": "Khopa (updated with Gripen by bgreman)", - "description": "

Sweden in 2002 after the addition of the Gripen-C.

", - "locales": [ - "sv_SE" - ], - "aircrafts": [ - "AJS-37 Viggen", - "JAS 39 Gripen", - "JAS 39 Gripen A/G", - "UH-1H Iroquois" - ], - "awacs": [ - "E-3A" - ], - "tankers": [ - "KC-130", - "KC-135 Stratotanker" - ], - "frontline_units": [ - "FV510 Warrior", - "Leopard 2A4", - "M1097 Heavy HMMWV Avenger", - "M1126 Stryker ICV (M2 HMG)" - ], - "artillery_units": [], - "logistics_units": [ - "Truck M818 6x6" - ], - "infantry_units": [ - "Infantry M249", - "Infantry M4", - "MANPADS Stinger" - ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator" - ], - "ewrs": [ - "HawkEwrGenerator" - ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], - "requirements": { - "JAS39 Gripen Mod by Community": "https://github.com/whisky-actual/Community-JAS-39-C" - }, - "has_jtac": true, - "jtac_unit": "MQ-9 Reaper" - } \ No newline at end of file + "country": "Sweden", + "name": "Sweden 2002", + "authors": "Khopa (updated with Gripen by bgreman)", + "description": "

Sweden in 2002 after the addition of the Gripen-C.

", + "locales": [ + "sv_SE" + ], + "aircrafts": [ + "AJS-37 Viggen", + "JAS 39 Gripen", + "JAS 39 Gripen A/G", + "UH-1H Iroquois" + ], + "awacs": [ + "E-3A" + ], + "tankers": [ + "KC-130", + "KC-135 Stratotanker" + ], + "frontline_units": [ + "FV510 Warrior", + "Leopard 2A4", + "M1097 Heavy HMMWV Avenger", + "M1126 Stryker ICV (M2 HMG)" + ], + "artillery_units": [], + "logistics_units": [ + "Truck M818 6x6" + ], + "infantry_units": [ + "Infantry M249", + "Infantry M4", + "MANPADS Stinger" + ], + "preset_groups": [ + "Hawk" + ], + "naval_units": [ + "FFG Oliver Hazard Perry" + ], + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M1097 Heavy HMMWV Avenger" + ], + "requirements": { + "JAS39 Gripen Mod by Community": "https://github.com/whisky-actual/Community-JAS-39-C" + }, + "has_jtac": true, + "jtac_unit": "MQ-9 Reaper" +} \ No newline at end of file diff --git a/resources/factions/syria_1948.json b/resources/factions/syria_1948.json index 7ced06e0..95b101e6 100644 --- a/resources/factions/syria_1948.json +++ b/resources/factions/syria_1948.json @@ -22,18 +22,16 @@ "infantry_units": [ "Infantry SMLE No.4 Mk-1" ], - "air_defenses": [ - "FlakGenerator" + "missiles": [], + "air_defense_units": [], + "preset_groups": [ + "Flak" + ], + "naval_units": [ + "Boat Schnellboot type S130" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "carrier_names": [], - "navy_generators": [ - "SchnellbootGroupGenerator" - ], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, diff --git a/resources/factions/syria_1967.json b/resources/factions/syria_1967.json index af738f84..861eceaa 100644 --- a/resources/factions/syria_1967.json +++ b/resources/factions/syria_1967.json @@ -37,26 +37,23 @@ "Infantry RPG", "Paratrooper AKS" ], - "air_defenses": [ - "SA2Generator", - "SA3Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator", - "ZSU57Generator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125" ], - "ewrs": [ - "FlatFaceGenerator" + "naval_units": [ + "Corvette 1124.4 Grish" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator" - ], "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/syria_1967_with_ww2_weapons.json b/resources/factions/syria_1967_with_ww2_weapons.json index aeaaa789..27f6c6b3 100644 --- a/resources/factions/syria_1967_with_ww2_weapons.json +++ b/resources/factions/syria_1967_with_ww2_weapons.json @@ -38,27 +38,24 @@ "Infantry RPG", "Paratrooper AKS" ], - "air_defenses": [ - "EarlyColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "ZSU23Generator", - "ZU23Generator", - "ZSU57Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator" + "naval_units": [ + "Corvette 1124.4 Grish" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator" - ], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, diff --git a/resources/factions/syria_1973.json b/resources/factions/syria_1973.json index dfedce53..6a5e894e 100644 --- a/resources/factions/syria_1973.json +++ b/resources/factions/syria_1973.json @@ -37,34 +37,29 @@ "Infantry RPG", "Paratrooper AKS" ], - "air_defenses": [ - "EarlyColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "ZSU23Generator", - "ZU23Generator", - "ZSU57Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Cold-War-Flak" ], - "ewrs": [ - "FlatFaceGenerator" + "naval_units": [ + "Corvette 1124.4 Grish" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator" - ], "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/syria_1982.json b/resources/factions/syria_1982.json index 0c782bc2..48ed7517 100644 --- a/resources/factions/syria_1982.json +++ b/resources/factions/syria_1982.json @@ -39,36 +39,31 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "EarlyColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator", - "ZSU57Generator" + "preset_groups": [ + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "Cold-War-Flak" ], - "ewrs": [ - "BoxSpringGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1124.4 Grish" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "EWR 1L13", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "ZSU-57-2 'Sparka'", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, - "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator" - ] -} + "carrier_names": [] +} \ No newline at end of file diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json index b6612e56..cf5ed6ca 100644 --- a/resources/factions/syria_2011.json +++ b/resources/factions/syria_2011.json @@ -53,41 +53,36 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA5Generator", - "SA6Generator", - "SA8Generator", - "SA8Generator", - "SA9Generator", - "SA11Generator", - "SA13Generator", - "SA17Generator", - "SA19Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-5/S-200", + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "SA-11", + "SA-17", + "Cold-War-Flak" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1124.4 Grish", + "Corvette 1241.1 Molniya" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "EWR 1L13", + "EWR 55G6", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, - "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator", - "MolniyaGroupGenerator" - ] -} + "carrier_names": [] +} \ No newline at end of file diff --git a/resources/factions/syria_2012.json b/resources/factions/syria_2012.json index 76b83cfd..df54bada 100644 --- a/resources/factions/syria_2012.json +++ b/resources/factions/syria_2012.json @@ -54,42 +54,37 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "ColdWarFlakGenerator", - "SA2Generator", - "SA3Generator", - "SA5Generator", - "SA6Generator", - "SA8Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA17Generator", - "SA19Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "preset_groups": [ + "SA-5/S-200", + "SA-2/S-75", + "SA-3/S-125", + "SA-6", + "SA-11", + "SA-10/S-300PS", + "SA-17", + "Cold-War-Flak" ], - "ewrs": [ - "BoxSpringGenerator", - "TallRackGenerator", - "TinShieldGenerator" + "naval_units": [ + "Corvette 1124.4 Grish", + "Corvette 1241.1 Molniya" + ], + "air_defense_units": [ + "SAM P19 \"Flat Face\" SR (SA-2/3)", + "EWR 1L13", + "EWR 55G6", + "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "missiles": [ - "ScudGenerator" + "SSM SS-1C Scud-B" ], - "missiles_group_count": 1, - "aircraft_carrier": [], - "helicopter_carrier": [], "helicopter_carrier_names": [], - "destroyers": [], - "cruisers": [], "requirements": {}, - "carrier_names": [], - "navy_generators": [ - "GrishaGroupGenerator", - "MolniyaGroupGenerator" - ] -} + "carrier_names": [] +} \ No newline at end of file diff --git a/resources/factions/turkey_2005.json b/resources/factions/turkey_2005.json index 3432f1c0..8688d872 100644 --- a/resources/factions/turkey_2005.json +++ b/resources/factions/turkey_2005.json @@ -46,18 +46,19 @@ "MANPADS SA-18 Igla-S \"Grouse\"", "Paratrooper AKS" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator", - "RapierGenerator", - "SA3Generator", - "ZSU23Generator" + "missiles": [], + "preset_groups": [ + "Hawk", + "SA-3/S-125", + "Rapier" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M1097 Heavy HMMWV Avenger", + "ZSU-23-4 Shilka" ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", diff --git a/resources/factions/uae_2005.json b/resources/factions/uae_2005.json index 4fcd9123..d1f07f59 100644 --- a/resources/factions/uae_2005.json +++ b/resources/factions/uae_2005.json @@ -31,18 +31,19 @@ "Infantry M4", "MANPADS SA-18 Igla-S \"Grouse\"" ], - "air_defenses": [ - "HawkGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" + ], + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)" ], "requirements": {}, "carrier_names": [], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "WingLoong-I", "unrestricted_satnav": true diff --git a/resources/factions/uae_2015.json b/resources/factions/uae_2015.json index 54fdcb07..9e553c4a 100644 --- a/resources/factions/uae_2015.json +++ b/resources/factions/uae_2015.json @@ -36,19 +36,20 @@ "Infantry M4", "MANPADS SA-18 Igla-S \"Grouse\"" ], - "air_defenses": [ - "HawkGenerator", - "PatriotGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" + ], + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR" ], "requirements": {}, "carrier_names": [], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "WingLoong-I", "unrestricted_satnav": true diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json index 51c34c98..979943b6 100644 --- a/resources/factions/uk_1944.json +++ b/resources/factions/uk_1944.json @@ -37,24 +37,21 @@ "infantry_units": [ "Infantry SMLE No.4 Mk-1" ], - "air_defenses": [ - "AllyWW2FlakGenerator", - "BoforsGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [ + "Ally Flak", + "WW2LST" + ], + "naval_units": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "WW2LSTGroupGenerator" - ], - "navy_group_count": 1, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally" -} +} \ No newline at end of file diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json index b7780622..2e12cd7d 100644 --- a/resources/factions/uk_1990.json +++ b/resources/factions/uk_1990.json @@ -43,25 +43,21 @@ "MANPADS Stinger", "Mortar 2B11 120mm" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator", - "RapierGenerator" + "preset_groups": [ + "Hawk", + "Rapier" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M1097 Heavy HMMWV Avenger" ], "requirements": {}, "carrier_names": [], @@ -70,10 +66,6 @@ "HMS Illustrious", "HMS Ark Royal" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator", - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper" } \ No newline at end of file diff --git a/resources/factions/ukraine_2010.json b/resources/factions/ukraine_2010.json index 32614005..092dbe40 100644 --- a/resources/factions/ukraine_2010.json +++ b/resources/factions/ukraine_2010.json @@ -41,34 +41,33 @@ "Paratrooper AKS", "Paratrooper RPG-16" ], - "air_defenses": [ - "SA3Generator", - "SA5Generator", - "SA6Generator", - "SA8Generator", - "SA9Generator", - "SA10Generator", - "SA11Generator", - "SA13Generator", - "SA15Generator", - "SA17Generator", - "SA19Generator", - "SA20Generator", - "Tier2SA10Generator", - "Tier3SA10Generator", - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "missiles": [], + "preset_groups": [ + "SA-5/S-200", + "SA-3/S-125", + "SA-6", + "SA-11", + "SA-10/S-300PS", + "SA-17", + "SA-20/S-300PMU-1" ], - "ewrs": [ - "BigBirdGenerator" + "naval_units": [ + "Corvette 1124.4 Grish" + ], + "air_defense_units": [ + "SAM SA-10 S-300 \"Grumble\" Big Bird SR", + "SAM SA-8 Osa \"Gecko\" TEL", + "SA-9 Strela", + "SA-13 Gopher (9K35 Strela-10M3)", + "SA-15 Tor", + "SA-19 Grison (2K22 Tunguska)", + "AAA ZU-23 Closed Emplacement", + "ZU-23 on Ural-375", + "ZSU-23-4 Shilka" ], "requirements": {}, "carrier_names": [ "Admiral Kuznetsov", "Admiral Gorshkov" - ], - "navy_generators": [ - "GrishaGroupGenerator" ] -} +} \ No newline at end of file diff --git a/resources/factions/unc_1950_fictional.json b/resources/factions/unc_1950_fictional.json index 22fe3170..e3fd6313 100644 --- a/resources/factions/unc_1950_fictional.json +++ b/resources/factions/unc_1950_fictional.json @@ -27,11 +27,15 @@ "infantry_units": [ "Infantry M4" ], - "air_defenses": [ - "AllyWW2FlakGenerator", - "BoforsGenerator", - "EarlyColdWarFlakGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], + "preset_groups": [ + "Cold-War-Flak", + "Ally Flak" + ], + "naval_units": [], "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally", diff --git a/resources/factions/us_aggressors.json b/resources/factions/us_aggressors.json index 83a98be8..5a0d59c7 100644 --- a/resources/factions/us_aggressors.json +++ b/resources/factions/us_aggressors.json @@ -58,18 +58,19 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "AvengerGenerator", - "HawkGenerator", - "PatriotGenerator" + "preset_groups": [ + "Hawk", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry" + ], + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M1097 Heavy HMMWV Avenger" ], "requirements": {}, - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { diff --git a/resources/factions/usa_1944.json b/resources/factions/usa_1944.json index 7237b9e0..2c231775 100644 --- a/resources/factions/usa_1944.json +++ b/resources/factions/usa_1944.json @@ -33,23 +33,20 @@ "infantry_units": [ "Infantry M1 Garand" ], - "air_defenses": [ - "AllyWW2FlakGenerator", - "BoforsGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], - "aircraft_carrier": [], - "helicopter_carrier": [], - "destroyers": [], - "cruisers": [], + "preset_groups": [ + "Ally Flak", + "WW2LST" + ], + "naval_units": [], "requirements": { "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" }, "carrier_names": [], "helicopter_carrier_names": [], - "navy_generators": [ - "WW2LSTGroupGenerator" - ], - "navy_group_count": 1, "has_jtac": false, "doctrine": "ww2", "building_set": "ww2ally" diff --git a/resources/factions/usa_1945.json b/resources/factions/usa_1945.json index ceffb291..e031202b 100644 --- a/resources/factions/usa_1945.json +++ b/resources/factions/usa_1945.json @@ -28,93 +28,97 @@ "infantry_units": [ "Infantry M4" ], - "air_defenses": [ - "BoforsGenerator", - "EarlyColdWarFlakGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], + "preset_groups": [ + "Cold-War-Flak" + ], + "naval_units": [], "doctrine": "ww2", "building_set": "ww2free", "requirements": {}, "liveries_overrides": { - "A-20G Havoc": [ + "A-20G Havoc": [ "USAF 645th BS", - "USAF 668th BS" + "USAF 668th BS" ], - "P-47D-30 Thunderbolt (Early)": [ + "P-47D-30 Thunderbolt (Early)": [ "53rd_FS_9th_Air_Force", - "61st_FS_8th_AF_HVZ", - "61st_FS_1944", - "61st_FS_D_day", - "79thFG 86thFS The Trojan Warhorse", - "Lt_Col_Benjamin_Mayo", - "Lt_Col_Gabreski_1944", - "Lt_Col_Gabreski_D_day", - "Maj_Howard_Park_1945", - "TONY 5th Emergency Rescue Squadron", - "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D28", - "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D40", - "USAF Standard", - "WarChief" + "61st_FS_8th_AF_HVZ", + "61st_FS_1944", + "61st_FS_D_day", + "79thFG 86thFS The Trojan Warhorse", + "Lt_Col_Benjamin_Mayo", + "Lt_Col_Gabreski_1944", + "Lt_Col_Gabreski_D_day", + "Maj_Howard_Park_1945", + "TONY 5th Emergency Rescue Squadron", + "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D28", + "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D40", + "USAF Standard", + "WarChief" ], - "P-47D-30 Thunderbolt (Late)": [ + "P-47D-30 Thunderbolt (Late)": [ "53rd_FS_9th_Air_Force", - "61st_FS_8th_AF_HVZ", - "61st_FS_1944", - "61st_FS_D_day", - "79thFG 86thFS The Trojan Warhorse", - "Lt_Col_Benjamin_Mayo", - "Lt_Col_Gabreski_1944", - "Lt_Col_Gabreski_D_day", - "Maj_Howard_Park_1945", - "TONY 5th Emergency Rescue Squadron", - "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D28", - "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D40", - "USAF Standard", - "WarChief" + "61st_FS_8th_AF_HVZ", + "61st_FS_1944", + "61st_FS_D_day", + "79thFG 86thFS The Trojan Warhorse", + "Lt_Col_Benjamin_Mayo", + "Lt_Col_Gabreski_1944", + "Lt_Col_Gabreski_D_day", + "Maj_Howard_Park_1945", + "TONY 5th Emergency Rescue Squadron", + "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D28", + "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D40", + "USAF Standard", + "WarChief" ], - "P-47D-40 Thunderbolt": [ + "P-47D-40 Thunderbolt": [ "53rd_FS_9th_Air_Force", - "61st_FS_8th_AF_HVZ", - "61st_FS_1944", - "61st_FS_D_day", - "79thFG 86thFS The Trojan Warhorse", - "Lt_Col_Benjamin_Mayo", - "Lt_Col_Gabreski_1944", - "Lt_Col_Gabreski_D_day", - "Maj_Howard_Park_1945", - "TONY 5th Emergency Rescue Squadron", - "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D28", - "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D40", - "USAF Standard", - "WarChief" + "61st_FS_8th_AF_HVZ", + "61st_FS_1944", + "61st_FS_D_day", + "79thFG 86thFS The Trojan Warhorse", + "Lt_Col_Benjamin_Mayo", + "Lt_Col_Gabreski_1944", + "Lt_Col_Gabreski_D_day", + "Maj_Howard_Park_1945", + "TONY 5th Emergency Rescue Squadron", + "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D28", + "USAAF 509th FS, 405th FG, ETO 1944, Chief Ski-U-Mah D40", + "USAF Standard", + "WarChief" ], - "P-51D-25-NA Mustang": [ - "USAF 302nd FS, RED TAILS", - "USAF 344th FS, IRON ASS", - "USAF 363rd FS", - "USAF 363rd FS, 357th FG DESERT RAT", - "USAF 364th FS", - "USAF 364th FS, HURRY HOME HONEY", - "USAF 375th FS", - "USAF 84th FS", - "USAF Big Beautiful Doll", - "USAF Ferocious Frankie", - "USAF Gentleman Jim", - "USAF Miss Velma" + "P-51D-25-NA Mustang": [ + "USAF 302nd FS, RED TAILS", + "USAF 344th FS, IRON ASS", + "USAF 363rd FS", + "USAF 363rd FS, 357th FG DESERT RAT", + "USAF 364th FS", + "USAF 364th FS, HURRY HOME HONEY", + "USAF 375th FS", + "USAF 84th FS", + "USAF Big Beautiful Doll", + "USAF Ferocious Frankie", + "USAF Gentleman Jim", + "USAF Miss Velma" ], - "P-51D-30-NA Mustang": [ - "USAF 302nd FS, RED TAILS", - "USAF 344th FS, IRON ASS", - "USAF 363rd FS", - "USAF 363rd FS, 357th FG DESERT RAT", - "USAF 364th FS", - "USAF 364th FS, HURRY HOME HONEY", - "USAF 375th FS", - "USAF 84th FS", - "USAF Big Beautiful Doll", - "USAF Ferocious Frankie", - "USAF Gentleman Jim", - "USAF Miss Velma" + "P-51D-30-NA Mustang": [ + "USAF 302nd FS, RED TAILS", + "USAF 344th FS, IRON ASS", + "USAF 363rd FS", + "USAF 363rd FS, 357th FG DESERT RAT", + "USAF 364th FS", + "USAF 364th FS, HURRY HOME HONEY", + "USAF 375th FS", + "USAF 84th FS", + "USAF Big Beautiful Doll", + "USAF Ferocious Frankie", + "USAF Gentleman Jim", + "USAF Miss Velma" ] } } \ No newline at end of file diff --git a/resources/factions/usa_1955.json b/resources/factions/usa_1955.json index 7fb38cbb..cb908ee6 100644 --- a/resources/factions/usa_1955.json +++ b/resources/factions/usa_1955.json @@ -28,10 +28,14 @@ "infantry_units": [ "Infantry M4" ], - "air_defenses": [ - "BoforsGenerator", - "EarlyColdWarFlakGenerator" + "missiles": [], + "air_defense_units": [ + "Bofors 40 mm Gun" ], + "preset_groups": [ + "Cold-War-Flak" + ], + "naval_units": [], "doctrine": "ww2", "building_set": "ww2ally", "requirements": { diff --git a/resources/factions/usa_1960.json b/resources/factions/usa_1960.json index ed8b1a74..33241cd1 100644 --- a/resources/factions/usa_1960.json +++ b/resources/factions/usa_1960.json @@ -26,10 +26,14 @@ "infantry_units": [ "Infantry M4" ], - "air_defenses": [ - "EarlyColdWarFlakGenerator", - "VulcanGenerator" + "missiles": [], + "air_defense_units": [ + "M163 Vulcan Air Defense System" ], + "preset_groups": [ + "Cold-War-Flak" + ], + "naval_units": [], "requirements": {}, "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/usa_1965.json b/resources/factions/usa_1965.json index ac220f8d..d220b623 100644 --- a/resources/factions/usa_1965.json +++ b/resources/factions/usa_1965.json @@ -36,14 +36,16 @@ "Infantry M249", "Infantry M4" ], - "air_defenses": [ - "ChaparralGenerator", - "EarlyColdWarFlakGenerator", - "HawkGenerator", - "VulcanGenerator" + "missiles": [], + "preset_groups": [ + "Hawk", + "Cold-War-Flak" ], - "ewrs": [ - "HawkEwrGenerator" + "naval_units": [], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], "requirements": {}, "doctrine": "coldwar" diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index 5299e209..e31596d8 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -3,7 +3,9 @@ "name": "USA 1975", "authors": "Khopa", "description": "

US army in the 70s at the end of the war in Vietnam.

", - "locales": ["en_US"], + "locales": [ + "en_US" + ], "aircrafts": [ "B-52H Stratofortress", "C-130", @@ -16,27 +18,46 @@ "S-3B Viking", "UH-1H Iroquois" ], - "awacs": ["E-2C Hawkeye"], - "tankers": ["KC-130", "KC-135 Stratotanker"], + "awacs": [ + "E-2C Hawkeye" + ], + "tankers": [ + "KC-130", + "KC-135 Stratotanker" + ], "frontline_units": [ "M113", "M163 Vulcan Air Defense System", "M48 Chaparral", "M60A3 \"Patton\"" ], - "artillery_units": ["M109A6 Paladin"], - "logistics_units": ["Truck M818 6x6"], - "infantry_units": ["Infantry M249", "Infantry M4"], - "air_defenses": [ - "ChaparralGenerator", - "EarlyColdWarFlakGenerator", - "HawkGenerator", - "VulcanGenerator" + "artillery_units": [ + "M109A6 Paladin" + ], + "logistics_units": [ + "Truck M818 6x6" + ], + "infantry_units": [ + "Infantry M249", + "Infantry M4" + ], + "missiles": [], + "preset_groups": [ + "Hawk", + "Cold-War-Flak" + ], + "naval_units": [ + "FFG Oliver Hazard Perry", + "CV-59 Forrestal" + ], + "air_defense_units": [ + "SAM Hawk SR (AN/MPQ-50)", + "M163 Vulcan Air Defense System", + "M48 Chaparral" + ], + "carrier_names": [ + "CVN-59 Forrestal" ], - "ewrs": ["HawkEwrGenerator"], - "aircraft_carrier": ["Forrestal"], - "carrier_names": ["CVN-59 Forrestal"], - "navy_generators": ["OliverHazardPerryGroupGenerator"], "requirements": {}, "doctrine": "coldwar" -} +} \ No newline at end of file diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index 8cc2340c..5b813064 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -63,27 +63,22 @@ "MANPADS Stinger", "Mortar 2B11 120mm" ], - "air_defenses": [ - "AvengerGenerator", - "ChaparralGenerator", - "HawkGenerator", - "PatriotGenerator" + "preset_groups": [ + "Hawk", + "Patriot" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "PERRY", - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M1097 Heavy HMMWV Avenger", + "M48 Chaparral" ], "requirements": {}, "carrier_names": [ @@ -100,10 +95,6 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator", - "ArleighBurkeGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json index 1d6de10e..9a1351a5 100644 --- a/resources/factions/usa_2005.json +++ b/resources/factions/usa_2005.json @@ -67,26 +67,22 @@ "MANPADS Stinger", "Mortar 2B11 120mm" ], - "air_defenses": [ - "AvengerGenerator", - "LinebackerGenerator", - "PatriotGenerator", - "NasamCGenerator" + "preset_groups": [ + "Patriot", + "NASAMS AIM-120C" ], - "ewrs": [ - "PatriotEwrGenerator" + "naval_units": [ + "FFG Oliver Hazard Perry", + "DDG Arleigh Burke IIa", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], - "aircraft_carrier": [ - "Stennis" - ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "USS_Arleigh_Burke_IIa" - ], - "cruisers": [ - "TICONDEROG" + "missiles": [], + "air_defense_units": [ + "SAM Patriot STR", + "M1097 Heavy HMMWV Avenger", + "M6 Linebacker" ], "requirements": {}, "carrier_names": [ @@ -103,10 +99,6 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "has_jtac": true, "jtac_unit": "MQ-9 Reaper", "liveries_overrides": { @@ -129,4 +121,4 @@ "VMFA-323" ] } -} +} \ No newline at end of file diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index bb3d446c..b7fc743c 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -42,23 +42,20 @@ "MANPADS Stinger", "Mortar 2B11 120mm" ], - "air_defenses": [ - "ChaparralGenerator", - "HawkGenerator", - "VulcanGenerator" + "air_defense_units": [ + "M163 Vulcan Air Defense System", + "M48 Chaparral" ], - "aircraft_carrier": [ - "Stennis" + "preset_groups": [ + "Hawk" ], - "helicopter_carrier": [ - "LHA_Tarawa" - ], - "destroyers": [ - "PERRY" - ], - "cruisers": [ - "TICONDEROG" + "naval_units": [ + "FFG Oliver Hazard Perry", + "CG Ticonderoga", + "LHA-1 Tarawa", + "CVN-74 John C. Stennis" ], + "missiles": [], "carrier_names": [ "CVN-71 Theodore Roosevelt", "CVN-72 Abraham Lincoln", @@ -73,9 +70,6 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], "requirements": {}, "doctrine": "coldwar", "liveries_overrides": { diff --git a/resources/factions/usn_2005.json b/resources/factions/usn_2005.json index 52f4c939..e13159ec 100644 --- a/resources/factions/usn_2005.json +++ b/resources/factions/usn_2005.json @@ -3,7 +3,9 @@ "name": "US Navy 2005", "authors": "Fuzzle", "description": "

A modern representation of the US Navy/Marine Corps.

", - "locales": ["en_US"], + "locales": [ + "en_US" + ], "aircrafts": [ "F-14B Tomcat", "F/A-18C Hornet (Lot 20)", @@ -13,8 +15,12 @@ "SH-60B Seahawk", "UH-1H Iroquois" ], - "awacs": ["E-2C Hawkeye"], - "tankers": ["S-3B Tanker"], + "awacs": [ + "E-2C Hawkeye" + ], + "tankers": [ + "S-3B Tanker" + ], "frontline_units": [ "M113", "M1043 HMMWV (M2 HMG)", @@ -23,20 +29,34 @@ "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"], - "air_defenses": [ - "ChaparralGenerator", - "HawkGenerator", - "VulcanGenerator", - "PatriotGenerator" + "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" ], - "ewrs": ["HawkEwrGenerator"], - "aircraft_carrier": ["Stennis"], - "helicopter_carrier": ["LHA_Tarawa"], - "destroyers": ["USS_Arleigh_Burke_IIa"], - "cruisers": ["TICONDEROG"], "requirements": {}, "carrier_names": [ "CVN-71 Theodore Roosevelt", @@ -52,18 +72,24 @@ "LHA-4 Nassau", "LHA-5 Peleliu" ], - "navy_generators": [ - "ArleighBurkeGroupGenerator", - "OliverHazardPerryGroupGenerator" - ], "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"] + "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" + ] } -} +} \ No newline at end of file