Clean up faction air defenses vs shorads vs SAMs.

2025-11-10 15:41:24 +00:00 · 2020-11-27 18:10:13 -08:00 · 2020-11-27 18:10:13 -08:00 · fdf571c016
commit fdf571c016
parent bd60760f9d
67 changed files with 172 additions and 339 deletions
--- 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"
  ],
--- 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": [
--- 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"
  ],
--- 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"
--- 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"
--- 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"
--- 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"
  ],
--- 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"
--- 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",
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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,
--- 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": [
  ],
--- 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"
  ],
--- 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": [
--- 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"
  ],
--- 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"
--- 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"
  ]
 }
--- 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"
  }
--- 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"
--- 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": [
  ],
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
  ],
--- 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",
--- 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": [
--- 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",
--- 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",
--- 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"
  ]
 }
--- 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,
--- 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": {
--- 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": [
--- 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"
--- 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"
--- 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"
  ],
--- 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",
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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": [
--- 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"
--- 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": [
--- 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": [
--- 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"
  ],
--- 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"
  ],
--- 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"
--- 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"
--- 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",
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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"
  ],
--- 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",
--- 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"
 }
--- 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"
--- 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"
--- 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": [
--- 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": [
--- 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"
  ],
--- 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"