From fdf571c0163536cf43c6fcc3b4cbbbc9efc7091c Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 27 Nov 2020 18:10:13 -0800 Subject: [PATCH] Clean up faction air defenses vs shorads vs SAMs. --- resources/factions/allies_1944.json | 5 +---- resources/factions/allies_1944_free.json | 5 +---- resources/factions/australia_2005.json | 5 +---- resources/factions/bluefor_coldwar.json | 8 +++----- resources/factions/bluefor_coldwar_a4.json | 8 +++----- .../factions/bluefor_coldwar_a4_mb339.json | 8 +++----- resources/factions/bluefor_modern.json | 6 ++---- resources/factions/canada_2005.json | 9 +++------ resources/factions/china_2010.json | 14 ++++++-------- resources/factions/france_1995.json | 5 +---- resources/factions/france_2005_frenchpack.json | 5 +---- resources/factions/france_2005_modded.json | 5 +---- resources/factions/georgia_2008.json | 10 ++++------ resources/factions/germany_1942.json | 9 +++------ resources/factions/germany_1944.json | 5 +---- resources/factions/germany_1944_free.json | 5 +---- resources/factions/germany_1990.json | 5 +---- resources/factions/india_2010.json | 8 +++----- resources/factions/insurgents.json | 6 +----- resources/factions/insurgents_modded.json | 6 +----- resources/factions/iran_2015.json | 9 +++------ resources/factions/israel_1948.json | 9 +++------ resources/factions/israel_1973.json | 10 ++++------ resources/factions/israel_1982.json | 9 +++------ resources/factions/israel_2000.json | 9 +++------ resources/factions/italy_1990.json | 9 +++------ resources/factions/italy_1990_mb339.json | 9 +++------ resources/factions/japan_2005.json | 6 ++---- resources/factions/libya_2011.json | 10 ++++------ resources/factions/netherlands_1990.json | 6 ++---- resources/factions/north_korea_2000.json | 14 ++++++-------- resources/factions/pakistan_2015.json | 10 ++++------ resources/factions/pmc_russian.json | 7 ++----- resources/factions/pmc_us.json | 5 +---- resources/factions/pmc_us_with_mb339.json | 5 +---- resources/factions/russia_1955.json | 5 +---- resources/factions/russia_1965.json | 10 ++++------ .../factions/russia_1970_limited_air.json | 16 +++++++--------- resources/factions/russia_1975.json | 8 +++----- resources/factions/russia_1990.json | 10 ++++------ resources/factions/russia_2010.json | 8 +++----- resources/factions/russia_2020.json | 6 ++---- resources/factions/soviet_union_1943.json | 5 +---- resources/factions/spain_1990.json | 6 ++---- resources/factions/sweden_1970.json | 10 ++++------ resources/factions/sweden_1990.json | 6 ++---- resources/factions/syria_1948.json | 5 +---- resources/factions/syria_1967.json | 6 ++---- .../factions/syria_1967_with_ww2_weapons.json | 9 +++------ resources/factions/syria_1973.json | 8 +++----- resources/factions/syria_1982.json | 10 ++++------ resources/factions/syria_2011.json | 18 ++++++++---------- resources/factions/turkey_2005.json | 6 ++---- resources/factions/uae_2005.json | 6 ++---- resources/factions/uk_1944.json | 5 +---- resources/factions/uk_1990.json | 6 ++---- resources/factions/ukraine_2010.json | 10 ++++------ resources/factions/us_aggressors.json | 6 ++---- resources/factions/usa_1944.json | 5 +---- resources/factions/usa_1955.json | 6 ++---- resources/factions/usa_1960.json | 5 +---- resources/factions/usa_1965.json | 9 +++------ resources/factions/usa_1975.json | 9 +++------ resources/factions/usa_1990.json | 6 ++---- resources/factions/usa_2005.json | 6 ++---- resources/factions/usa_2005_modded.json | 6 ++---- resources/factions/usn_1985.json | 10 ++++------ 67 files changed, 172 insertions(+), 339 deletions(-) diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json index 77652519..1430b8f7 100644 --- a/resources/factions/allies_1944.json +++ b/resources/factions/allies_1944.json @@ -38,10 +38,7 @@ "Infantry_SMLE_No_4_Mk_1", "Infantry_M1_Garand" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ + "air_defenses": [ "AllyWW2FlakGenerator", "BoforsGenerator" ], diff --git a/resources/factions/allies_1944_free.json b/resources/factions/allies_1944_free.json index 56b1a781..133d3bed 100644 --- a/resources/factions/allies_1944_free.json +++ b/resources/factions/allies_1944_free.json @@ -25,10 +25,7 @@ "infantry_units": [ "Paratrooper_AKS" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ + "air_defenses": [ "BoforsGenerator" ], "aircraft_carrier": [ diff --git a/resources/factions/australia_2005.json b/resources/factions/australia_2005.json index 58f88930..d983055d 100644 --- a/resources/factions/australia_2005.json +++ b/resources/factions/australia_2005.json @@ -31,10 +31,7 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "RapierGenerator" - ], - "sams": [ + "air_defenses": [ "HawkGenerator", "RapierGenerator" ], diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index b06ad1fb..874484b4 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -37,13 +37,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ + "ChaparralGenerator", "EarlyColdWarFlakGenerator", - "VulcanGenerator" - ], - "sams": [ "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/bluefor_coldwar_a4.json b/resources/factions/bluefor_coldwar_a4.json index 78cc28fb..f5a5a56d 100644 --- a/resources/factions/bluefor_coldwar_a4.json +++ b/resources/factions/bluefor_coldwar_a4.json @@ -38,13 +38,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ + "ChaparralGenerator", "EarlyColdWarFlakGenerator", - "VulcanGenerator" - ], - "sams": [ "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/bluefor_coldwar_a4_mb339.json b/resources/factions/bluefor_coldwar_a4_mb339.json index a0c31139..57c50355 100644 --- a/resources/factions/bluefor_coldwar_a4_mb339.json +++ b/resources/factions/bluefor_coldwar_a4_mb339.json @@ -39,13 +39,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ + "ChaparralGenerator", "EarlyColdWarFlakGenerator", - "VulcanGenerator" - ], - "sams": [ "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json index eb913019..aa733bf5 100644 --- a/resources/factions/bluefor_modern.json +++ b/resources/factions/bluefor_modern.json @@ -56,10 +56,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator", "PatriotGenerator" ], diff --git a/resources/factions/canada_2005.json b/resources/factions/canada_2005.json index 32883ce3..324007b0 100644 --- a/resources/factions/canada_2005.json +++ b/resources/factions/canada_2005.json @@ -31,12 +31,9 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ - "HawkGenerator", - "AvengerGenerator" + "air_defenses": [ + "AvengerGenerator", + "HawkGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json index 010c6bd9..0daa613a 100644 --- a/resources/factions/china_2010.json +++ b/resources/factions/china_2010.json @@ -37,18 +37,16 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZU23Generator" - ], - "sams": [ + "air_defenses": [ "HQ7Generator", "SA6Generator", + "SA9Generator", "SA10Generator", + "SA11Generator", + "SA13Generator", "Tier2SA10Generator", - "SA11Generator" + "ZSU23Generator", + "ZU23Generator" ], "ewrs": [ "BoxSpringGenerator", diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json index b548eebb..80e58895 100644 --- a/resources/factions/france_1995.json +++ b/resources/factions/france_1995.json @@ -37,11 +37,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ "HQ7Generator", - "RolandGenerator" - ], - "sams": [ "RolandGenerator", "HawkGenerator" ], diff --git a/resources/factions/france_2005_frenchpack.json b/resources/factions/france_2005_frenchpack.json index 6efb6971..5a20c250 100644 --- a/resources/factions/france_2005_frenchpack.json +++ b/resources/factions/france_2005_frenchpack.json @@ -45,11 +45,8 @@ "Soldier_M249", "Stinger_MANPADS" ], - "shorads": [ + "air_defenses": [ "HQ7Generator", - "RolandGenerator" - ], - "sams": [ "RolandGenerator", "HawkGenerator" ], diff --git a/resources/factions/france_2005_modded.json b/resources/factions/france_2005_modded.json index 07243816..a8ebd52c 100644 --- a/resources/factions/france_2005_modded.json +++ b/resources/factions/france_2005_modded.json @@ -47,11 +47,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ "HQ7Generator", - "RolandGenerator" - ], - "sams": [ "RolandGenerator", "HawkGenerator" ], diff --git a/resources/factions/georgia_2008.json b/resources/factions/georgia_2008.json index 6475506c..b5ae6536 100644 --- a/resources/factions/georgia_2008.json +++ b/resources/factions/georgia_2008.json @@ -32,13 +32,11 @@ "Paratrooper_AKS", "Paratrooper_RPG_16" ], - "shorads": [ - "SA13Generator", - "SA8Generator" - ], - "sams": [ + "air_defenses": [ "SA6Generator", - "SA11Generator" + "SA8Generator", + "SA11Generator", + "SA13Generator" ], "requirements": {}, "has_jtac": true, diff --git a/resources/factions/germany_1942.json b/resources/factions/germany_1942.json index aaaeec17..fda75025 100644 --- a/resources/factions/germany_1942.json +++ b/resources/factions/germany_1942.json @@ -27,12 +27,9 @@ "infantry_units": [ "Infantry_Mauser_98" ], - "shorads": [ - "FlakGenerator" - ], - "sams": [ - "FreyaGenerator", - "FlakGenerator" + "air_defenses": [ + "FlakGenerator", + "FreyaGenerator" ], "aircraft_carrier": [ ], diff --git a/resources/factions/germany_1944.json b/resources/factions/germany_1944.json index 7d4dc7d6..273a4519 100644 --- a/resources/factions/germany_1944.json +++ b/resources/factions/germany_1944.json @@ -32,10 +32,7 @@ "infantry_units": [ "Infantry_Mauser_98" ], - "shorads": [ - "FlakGenerator" - ], - "sams": [ + "air_defenses": [ "FlakGenerator", "FreyaGenerator" ], diff --git a/resources/factions/germany_1944_free.json b/resources/factions/germany_1944_free.json index 30eb83f3..8fc2421c 100644 --- a/resources/factions/germany_1944_free.json +++ b/resources/factions/germany_1944_free.json @@ -20,10 +20,7 @@ "infantry_units": [ "Infantry_Soldier_Rus" ], - "shorads": [ - "Flak18Generator" - ], - "sams": [ + "air_defenses": [ "Flak18Generator" ], "aircraft_carrier": [ diff --git a/resources/factions/germany_1990.json b/resources/factions/germany_1990.json index 9d13533b..f67d6579 100644 --- a/resources/factions/germany_1990.json +++ b/resources/factions/germany_1990.json @@ -33,10 +33,7 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "RolandGenerator" - ], - "sams": [ + "air_defenses": [ "HawkGenerator", "RolandGenerator" ], diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json index 0735d9a3..9fdd8fb7 100644 --- a/resources/factions/india_2010.json +++ b/resources/factions/india_2010.json @@ -36,16 +36,14 @@ "Infantry_M4", "Paratrooper_RPG_16" ], - "shorads": [ + "air_defenses": [ + "SA3Generator", + "SA6Generator", "SA8Generator", "SA13Generator", "SA19Generator", "ZSU23Generator" ], - "sams": [ - "SA6Generator", - "SA3Generator" - ], "ewrs": [ "BoxSpringGenerator", "TallRackGenerator" diff --git a/resources/factions/insurgents.json b/resources/factions/insurgents.json index a124f93f..196efca2 100644 --- a/resources/factions/insurgents.json +++ b/resources/factions/insurgents.json @@ -23,13 +23,9 @@ "Infantry_Soldier_Insurgents", "Soldier_RPG" ], - "shorads": [ + "air_defenses": [ "SA9Generator", "ZU23Generator", "ZSU23Generator" - ], - "sams": [ - "ZU23Generator", - "ZSU23Generator" ] } diff --git a/resources/factions/insurgents_modded.json b/resources/factions/insurgents_modded.json index 1a199e53..f9ae046c 100644 --- a/resources/factions/insurgents_modded.json +++ b/resources/factions/insurgents_modded.json @@ -24,15 +24,11 @@ "Infantry_Soldier_Insurgents", "Soldier_RPG" ], - "shorads": [ + "air_defenses": [ "SA9Generator", "ZU23Generator", "ZSU23Generator" ], - "sams": [ - "ZU23Generator", - "ZSU23Generator" - ], "requirements": { "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974" } diff --git a/resources/factions/iran_2015.json b/resources/factions/iran_2015.json index fee95e9e..2d7344de 100644 --- a/resources/factions/iran_2015.json +++ b/resources/factions/iran_2015.json @@ -42,16 +42,13 @@ "Infantry_Soldier_Insurgents", "Paratrooper_RPG_16" ], - "shorads": [ + "air_defenses": [ + "HawkGenerator", "HQ7Generator", - "ZSU23Generator" - ], - "sams": [ "SA2Generator", "SA6Generator", "SA11Generator", - "HawkGenerator", - "HQ7Generator" + "ZSU23Generator" ], "ewrs": [ "TallRackGenerator" diff --git a/resources/factions/israel_1948.json b/resources/factions/israel_1948.json index 99685c84..b2c86e7b 100644 --- a/resources/factions/israel_1948.json +++ b/resources/factions/israel_1948.json @@ -25,12 +25,9 @@ "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ - "EarlyColdWarFlakGenerator", - "BoforsGenerator" + "air_defenses": [ + "BoforsGenerator", + "EarlyColdWarFlakGenerator" ], "aircraft_carrier": [ ], diff --git a/resources/factions/israel_1973.json b/resources/factions/israel_1973.json index 1ce2067d..7ee2620e 100644 --- a/resources/factions/israel_1973.json +++ b/resources/factions/israel_1973.json @@ -30,12 +30,10 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ - "HawkGenerator", - "ChaparralGenerator" + "air_defenses": [ + "BoforsGenerator", + "ChaparralGenerator", + "HawkGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/israel_1982.json b/resources/factions/israel_1982.json index d81462e3..3cacdc65 100644 --- a/resources/factions/israel_1982.json +++ b/resources/factions/israel_1982.json @@ -33,12 +33,9 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "ChaparralGenerator" - ], - "sams": [ - "HawkGenerator", - "ChaparralGenerator" + "air_defenses": [ + "ChaparralGenerator", + "HawkGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json index 9dd42d7d..6f3370c5 100644 --- a/resources/factions/israel_2000.json +++ b/resources/factions/israel_2000.json @@ -36,12 +36,9 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "ChaparralGenerator" - ], - "sams": [ - "HawkGenerator", - "ChaparralGenerator" + "air_defenses": [ + "ChaparralGenerator", + "HawkGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/italy_1990.json b/resources/factions/italy_1990.json index 30a05926..2a804488 100644 --- a/resources/factions/italy_1990.json +++ b/resources/factions/italy_1990.json @@ -30,12 +30,9 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ - "HawkGenerator", - "AvengerGenerator" + "air_defenses": [ + "AvengerGenerator", + "HawkGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/italy_1990_mb339.json b/resources/factions/italy_1990_mb339.json index bad67565..e76b7f0a 100644 --- a/resources/factions/italy_1990_mb339.json +++ b/resources/factions/italy_1990_mb339.json @@ -31,12 +31,9 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ - "HawkGenerator", - "AvengerGenerator" + "air_defenses": [ + "AvengerGenerator", + "HawkGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json index f3c6fcb4..1b6df9aa 100644 --- a/resources/factions/japan_2005.json +++ b/resources/factions/japan_2005.json @@ -36,10 +36,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "GepardGenerator" - ], - "sams": [ + "air_defenses": [ + "GepardGenerator", "HawkGenerator", "PatriotGenerator" ], diff --git a/resources/factions/libya_2011.json b/resources/factions/libya_2011.json index 2bc06c93..be7cf88c 100644 --- a/resources/factions/libya_2011.json +++ b/resources/factions/libya_2011.json @@ -33,15 +33,13 @@ "Infantry_Soldier_Insurgents", "Paratrooper_RPG_16" ], - "shorads": [ + "air_defenses": [ "HQ7Generator", - "SA8Generator", - "ZSU23Generator" - ], - "sams": [ "SA2Generator", "SA3Generator", - "SA6Generator" + "SA6Generator", + "SA8Generator", + "ZSU23Generator" ], "ewrs": [ "BoxSpringGenerator", diff --git a/resources/factions/netherlands_1990.json b/resources/factions/netherlands_1990.json index c102df32..390f7270 100644 --- a/resources/factions/netherlands_1990.json +++ b/resources/factions/netherlands_1990.json @@ -28,10 +28,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator" ], "ewrs": [ diff --git a/resources/factions/north_korea_2000.json b/resources/factions/north_korea_2000.json index ce1d4331..bfdfd599 100644 --- a/resources/factions/north_korea_2000.json +++ b/resources/factions/north_korea_2000.json @@ -40,16 +40,14 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA9Generator", - "SA13Generator", - "ZSU23Generator", - "ZU23Generator" - ], - "sams": [ + "air_defenses": [ "SA2Generator", "SA3Generator", - "SA6Generator" + "SA6Generator", + "SA9Generator", + "SA13Generator", + "ZU23Generator", + "ZSU23Generator" ], "ewrs": [ "BoxSpringGenerator", diff --git a/resources/factions/pakistan_2015.json b/resources/factions/pakistan_2015.json index c293b7b6..7744383d 100644 --- a/resources/factions/pakistan_2015.json +++ b/resources/factions/pakistan_2015.json @@ -38,15 +38,13 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ + "air_defenses": [ "HQ7Generator", - "ZU23UralGenerator", - "ZU23Generator" - ], - "sams": [ "SA2Generator", "SA10Generator", - "SA11Generator" + "SA11Generator", + "ZU23UralGenerator", + "ZU23Generator" ], "ewrs": [ "BoxSpringGenerator", diff --git a/resources/factions/pmc_russian.json b/resources/factions/pmc_russian.json index 57451f5d..42e914df 100644 --- a/resources/factions/pmc_russian.json +++ b/resources/factions/pmc_russian.json @@ -26,11 +26,8 @@ "Paratrooper_AKS", "Paratrooper_RPG_16" ], - "shorads": [ - "SA13Generator", - "SA9Generator" - ], - "sams": [ + "air_defenses": [ + "SA9Generator", "SA13Generator" ] } diff --git a/resources/factions/pmc_us.json b/resources/factions/pmc_us.json index 4c8c6230..bfa0b96c 100644 --- a/resources/factions/pmc_us.json +++ b/resources/factions/pmc_us.json @@ -22,10 +22,7 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ "AvengerGenerator" ], "has_jtac": true, diff --git a/resources/factions/pmc_us_with_mb339.json b/resources/factions/pmc_us_with_mb339.json index 3d42fa03..a8a05395 100644 --- a/resources/factions/pmc_us_with_mb339.json +++ b/resources/factions/pmc_us_with_mb339.json @@ -23,10 +23,7 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ "AvengerGenerator" ], "requirements": { diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json index a00d71cf..ca7e1994 100644 --- a/resources/factions/russia_1955.json +++ b/resources/factions/russia_1955.json @@ -30,10 +30,7 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ - "EarlyColdWarFlakGenerator" - ], - "sams": [ + "air_defenses": [ "EarlyColdWarFlakGenerator" ], "aircraft_carrier": [ diff --git a/resources/factions/russia_1965.json b/resources/factions/russia_1965.json index 6dcc7f1c..01ab604f 100644 --- a/resources/factions/russia_1965.json +++ b/resources/factions/russia_1965.json @@ -34,15 +34,13 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ - "ZSU23Generator", + "air_defenses": [ "EarlyColdWarFlakGenerator", - "ZU23Generator" - ], - "sams": [ "SA2Generator", "SA3Generator", - "SA6Generator" + "SA6Generator", + "ZSU23Generator", + "ZU23Generator" ], "ewrs": [ "FlatFaceGenerator" diff --git a/resources/factions/russia_1970_limited_air.json b/resources/factions/russia_1970_limited_air.json index 42b7384b..fbdf7061 100644 --- a/resources/factions/russia_1970_limited_air.json +++ b/resources/factions/russia_1970_limited_air.json @@ -29,17 +29,15 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ - "ColdWarFlakGenerator", - "ZSU23Generator", - "ZU23Generator", - "SA13Generator", - "SA8Generator" - ], - "sams": [ + "air_defenses": [ "SA3Generator", "SA6Generator", - "SA11Generator" + "SA8Generator", + "SA11Generator", + "SA13Generator", + "ColdWarFlakGenerator", + "ZSU23Generator", + "ZU23Generator" ], "ewrs": [ "FlatFaceGenerator" diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json index 337cf1bc..44c270ea 100644 --- a/resources/factions/russia_1975.json +++ b/resources/factions/russia_1975.json @@ -40,15 +40,13 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ + "air_defenses": [ "ColdWarFlakGenerator", + "SA3Generator", + "SA6Generator", "ZSU23Generator", "ZU23Generator" ], - "sams": [ - "SA3Generator", - "SA6Generator" - ], "ewrs": [ "FlatFaceGenerator" ], diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json index 01142f33..40408f9e 100644 --- a/resources/factions/russia_1990.json +++ b/resources/factions/russia_1990.json @@ -44,13 +44,11 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA13Generator", - "SA8Generator" - ], - "sams": [ + "air_defenses": [ "SA6Generator", - "SA11Generator" + "SA8Generator", + "SA11Generator", + "SA13Generator" ], "ewrs": [ "BoxSpringGenerator", diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json index 7b0362f4..4e429359 100644 --- a/resources/factions/russia_2010.json +++ b/resources/factions/russia_2010.json @@ -48,15 +48,13 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA19Generator", - "SA13Generator" - ], - "sams": [ + "air_defenses": [ "SA6Generator", "SA8Generator", "SA10Generator", "SA11Generator", + "SA13Generator", + "SA19Generator", "Tier2SA10Generator", "Tier3SA10Generator" ], diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json index 86383c37..36d9bc63 100644 --- a/resources/factions/russia_2020.json +++ b/resources/factions/russia_2020.json @@ -47,13 +47,11 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA19Generator" - ], - "sams": [ + "air_defenses": [ "SA8Generator", "SA10Generator", "SA11Generator", + "SA19Generator", "Tier2SA10Generator", "Tier3SA10Generator" ], diff --git a/resources/factions/soviet_union_1943.json b/resources/factions/soviet_union_1943.json index da2b11fa..e30a34dc 100644 --- a/resources/factions/soviet_union_1943.json +++ b/resources/factions/soviet_union_1943.json @@ -23,10 +23,7 @@ "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ + "air_defenses": [ "AllyWW2FlakGenerator", "BoforsGenerator" ], diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json index 991c929c..801711b6 100644 --- a/resources/factions/spain_1990.json +++ b/resources/factions/spain_1990.json @@ -31,10 +31,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator" ], "ewrs": [ diff --git a/resources/factions/sweden_1970.json b/resources/factions/sweden_1970.json index 83c7974a..55362275 100644 --- a/resources/factions/sweden_1970.json +++ b/resources/factions/sweden_1970.json @@ -29,14 +29,12 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator", + "air_defenses": [ + "ChaparralGenerator", "EarlyColdWarFlakGenerator", - "VulcanGenerator" - ], - "sams": [ + "AvengerGenerator", "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/sweden_1990.json b/resources/factions/sweden_1990.json index 6a844be5..86acb4af 100644 --- a/resources/factions/sweden_1990.json +++ b/resources/factions/sweden_1990.json @@ -28,10 +28,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator" ], "ewrs": [ diff --git a/resources/factions/syria_1948.json b/resources/factions/syria_1948.json index 012cb500..b8814e6e 100644 --- a/resources/factions/syria_1948.json +++ b/resources/factions/syria_1948.json @@ -22,10 +22,7 @@ "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" ], - "shorads": [ - "FlakGenerator" - ], - "sams": [ + "air_defenses": [ "FlakGenerator" ], "aircraft_carrier": [ diff --git a/resources/factions/syria_1967.json b/resources/factions/syria_1967.json index 22d1b445..3848f76f 100644 --- a/resources/factions/syria_1967.json +++ b/resources/factions/syria_1967.json @@ -33,13 +33,11 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ + "air_defenses": [ + "SA2Generator", "ZU23Generator", "ZU23UralGenerator" ], - "sams": [ - "SA2Generator" - ], "ewrs": [ "FlatFaceGenerator" ], diff --git a/resources/factions/syria_1967_with_ww2_weapons.json b/resources/factions/syria_1967_with_ww2_weapons.json index f7d95399..713e9000 100644 --- a/resources/factions/syria_1967_with_ww2_weapons.json +++ b/resources/factions/syria_1967_with_ww2_weapons.json @@ -36,15 +36,12 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ + "air_defenses": [ + "EarlyColdWarFlakGenerator", + "SA2Generator", "ZU23Generator", - "EarlyColdWarFlakGenerator", "ZU23UralGenerator" ], - "sams": [ - "EarlyColdWarFlakGenerator", - "SA2Generator" - ], "ewrs": [ "FlatFaceGenerator" ], diff --git a/resources/factions/syria_1973.json b/resources/factions/syria_1973.json index 1cd10e20..e5127c2c 100644 --- a/resources/factions/syria_1973.json +++ b/resources/factions/syria_1973.json @@ -33,14 +33,12 @@ "Infantry_Soldier_Rus", "Soldier_RPG" ], - "shorads": [ + "air_defenses": [ "EarlyColdWarFlakGenerator", - "ZU23Generator" - ], - "sams": [ "SA2Generator", "SA3Generator", - "SA6Generator" + "SA6Generator", + "ZU23Generator" ], "ewrs": [ "FlatFaceGenerator" diff --git a/resources/factions/syria_1982.json b/resources/factions/syria_1982.json index 8dbfd92d..4e8e223b 100644 --- a/resources/factions/syria_1982.json +++ b/resources/factions/syria_1982.json @@ -35,15 +35,13 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "ZU23Generator", + "air_defenses": [ + "ColdWarFlakGenerator", "EarlyColdWarFlakGenerator", - "ColdWarFlakGenerator" - ], - "sams": [ "SA2Generator", "SA3Generator", - "SA6Generator" + "SA6Generator", + "ZU23Generator" ], "ewrs": [ "BoxSpringGenerator" diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json index 29016f1e..4bde97ed 100644 --- a/resources/factions/syria_2011.json +++ b/resources/factions/syria_2011.json @@ -48,23 +48,21 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA8Generator", - "SA9Generator", - "SA13Generator", - "SA19Generator", - "ZSU23Generator", - "ColdWarFlakGenerator" - ], - "sams": [ + "air_defenses": [ + "ColdWarFlakGenerator", "SA2Generator", "SA3Generator", "SA6Generator", "SA8Generator", + "SA8Generator", + "SA9Generator", "SA10Generator", "SA11Generator", + "SA13Generator", + "SA19Generator", "Tier2SA10Generator", - "Tier3SA10Generator" + "Tier3SA10Generator", + "ZSU23Generator" ], "ewrs": [ "BoxSpringGenerator", diff --git a/resources/factions/turkey_2005.json b/resources/factions/turkey_2005.json index 22c7d023..9342a0c3 100644 --- a/resources/factions/turkey_2005.json +++ b/resources/factions/turkey_2005.json @@ -34,13 +34,11 @@ "Soldier_M249", "Paratrooper_AKS" ], - "shorads": [ + "air_defenses": [ "AvengerGenerator", + "HawkGenerator", "ZSU23Generator" ], - "sams": [ - "HawkGenerator" - ], "ewrs": [ "HawkEwrGenerator" ], diff --git a/resources/factions/uae_2005.json b/resources/factions/uae_2005.json index f7e65986..3c1a42f4 100644 --- a/resources/factions/uae_2005.json +++ b/resources/factions/uae_2005.json @@ -30,12 +30,10 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ + "HawkGenerator", "RapierGenerator" ], - "sams": [ - "HawkGenerator" - ], "ewrs": [ "HawkEwrGenerator" ], diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json index 81129848..c771db2c 100644 --- a/resources/factions/uk_1944.json +++ b/resources/factions/uk_1944.json @@ -33,10 +33,7 @@ "infantry_units": [ "Infantry_SMLE_No_4_Mk_1" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ + "air_defenses": [ "AllyWW2FlakGenerator", "BoforsGenerator" ], diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json index 39e7bedb..95ec74cc 100644 --- a/resources/factions/uk_1990.json +++ b/resources/factions/uk_1990.json @@ -34,13 +34,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ "AvengerGenerator", + "HawkGenerator", "RapierGenerator" ], - "sams": [ - "HawkGenerator" - ], "ewrs": [ "HawkEwrGenerator" ], diff --git a/resources/factions/ukraine_2010.json b/resources/factions/ukraine_2010.json index 6353ee52..68c09c6e 100644 --- a/resources/factions/ukraine_2010.json +++ b/resources/factions/ukraine_2010.json @@ -38,17 +38,15 @@ "Infantry_Soldier_Rus", "Paratrooper_RPG_16" ], - "shorads": [ - "SA9Generator", - "SA13Generator", - "SA19Generator" - ], - "sams": [ + "air_defenses": [ "SA3Generator", "SA6Generator", "SA8Generator", + "SA9Generator", "SA10Generator", "SA11Generator", + "SA13Generator", + "SA19Generator", "Tier2SA10Generator", "Tier3SA10Generator" ], diff --git a/resources/factions/us_aggressors.json b/resources/factions/us_aggressors.json index e3bf8108..eefebd9a 100644 --- a/resources/factions/us_aggressors.json +++ b/resources/factions/us_aggressors.json @@ -46,10 +46,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator", "PatriotGenerator" ], diff --git a/resources/factions/usa_1944.json b/resources/factions/usa_1944.json index 87725411..f1c78ece 100644 --- a/resources/factions/usa_1944.json +++ b/resources/factions/usa_1944.json @@ -30,10 +30,7 @@ "infantry_units": [ "Infantry_M1_Garand" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ + "air_defenses": [ "AllyWW2FlakGenerator", "BoforsGenerator" ], diff --git a/resources/factions/usa_1955.json b/resources/factions/usa_1955.json index c8a26c33..482fd683 100644 --- a/resources/factions/usa_1955.json +++ b/resources/factions/usa_1955.json @@ -23,10 +23,8 @@ "infantry_units": [ "Infantry_M4" ], - "shorads": [ - "BoforsGenerator" - ], - "sams": [ + "air_defenses": [ + "BoforsGenerator", "EarlyColdWarFlakGenerator" ], "doctrine": "ww2", diff --git a/resources/factions/usa_1960.json b/resources/factions/usa_1960.json index 34e3db33..4397748f 100644 --- a/resources/factions/usa_1960.json +++ b/resources/factions/usa_1960.json @@ -22,13 +22,10 @@ "infantry_units": [ "Infantry_M4" ], - "shorads": [ + "air_defenses": [ "EarlyColdWarFlakGenerator", "VulcanGenerator" ], - "sams": [ - "VulcanGenerator" - ], "requirements": {}, "doctrine": "coldwar" } \ No newline at end of file diff --git a/resources/factions/usa_1965.json b/resources/factions/usa_1965.json index 9b832a3d..2acd421a 100644 --- a/resources/factions/usa_1965.json +++ b/resources/factions/usa_1965.json @@ -23,14 +23,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "VulcanGenerator", + "air_defenses": [ "ChaparralGenerator", - "EarlyColdWarFlakGenerator" - ], - "sams": [ + "EarlyColdWarFlakGenerator", "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index c1d8906f..a72383d8 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -24,14 +24,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ + "air_defenses": [ + "ChaparralGenerator", "EarlyColdWarFlakGenerator", - "VulcanGenerator", - "ChaparralGenerator" - ], - "sams": [ "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "ewrs": [ "HawkEwrGenerator" diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json index c09f23cf..7fa21fa8 100644 --- a/resources/factions/usa_1990.json +++ b/resources/factions/usa_1990.json @@ -45,10 +45,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator" ], "ewrs": [ diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json index 6815a9f6..263f25a8 100644 --- a/resources/factions/usa_2005.json +++ b/resources/factions/usa_2005.json @@ -45,10 +45,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "PatriotGenerator" ], "ewrs": [ diff --git a/resources/factions/usa_2005_modded.json b/resources/factions/usa_2005_modded.json index 1d5c0361..30264c19 100644 --- a/resources/factions/usa_2005_modded.json +++ b/resources/factions/usa_2005_modded.json @@ -46,10 +46,8 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "AvengerGenerator" - ], - "sams": [ + "air_defenses": [ + "AvengerGenerator", "HawkGenerator", "PatriotGenerator" ], diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json index fabb207f..f7dcbd33 100644 --- a/resources/factions/usn_1985.json +++ b/resources/factions/usn_1985.json @@ -33,13 +33,11 @@ "Infantry_M4", "Soldier_M249" ], - "shorads": [ - "VulcanGenerator", - "ChaparralGenerator" - ], - "sams": [ + "air_defenses": [ + "ChaparralGenerator", + "ChaparralGenerator", "HawkGenerator", - "ChaparralGenerator" + "VulcanGenerator" ], "aircraft_carrier": [ "CVN_74_John_C__Stennis"