Clean up faction air defenses vs shorads vs SAMs.

resources/factions/allies_1944.json

@@ -38,10 +38,7 @@
     "Infantry_SMLE_No_4_Mk_1",
     "Infantry_M1_Garand"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
-  ],
-  "sams": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],

resources/factions/allies_1944_free.json

@@ -25,10 +25,7 @@
   "infantry_units": [
     "Paratrooper_AKS"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
-  ],
-  "sams": [
     "BoforsGenerator"
   ],
   "aircraft_carrier": [

resources/factions/australia_2005.json

@@ -31,10 +31,7 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "RapierGenerator"
-  ],
-  "sams": [
     "HawkGenerator",
     "RapierGenerator"
   ],

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"

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"

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"

resources/factions/bluefor_modern.json

@@ -56,10 +56,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
     "PatriotGenerator"
   ],

resources/factions/canada_2005.json

@@ -31,12 +31,9 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
+    "HawkGenerator"
-  "sams": [
-    "HawkGenerator",
-    "AvengerGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/china_2010.json

@@ -37,18 +37,16 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA9Generator",
-    "SA13Generator",
-    "ZSU23Generator",
-    "ZU23Generator"
-  ],
-  "sams": [
     "HQ7Generator",
     "SA6Generator",
+    "SA9Generator",
     "SA10Generator",
+    "SA11Generator",
+    "SA13Generator",
     "Tier2SA10Generator",
-    "SA11Generator"
+    "ZSU23Generator",
+    "ZU23Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator",

resources/factions/france_1995.json

@@ -37,11 +37,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
     "HQ7Generator",
-    "RolandGenerator"
-  ],
-  "sams": [
     "RolandGenerator",
     "HawkGenerator"
   ],

resources/factions/france_2005_frenchpack.json

@@ -45,11 +45,8 @@
     "Soldier_M249",
     "Stinger_MANPADS"
   ],
-  "shorads": [
+  "air_defenses": [
     "HQ7Generator",
-    "RolandGenerator"
-  ],
-  "sams": [
     "RolandGenerator",
     "HawkGenerator"
   ],

resources/factions/france_2005_modded.json

@@ -47,11 +47,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
     "HQ7Generator",
-    "RolandGenerator"
-  ],
-  "sams": [
     "RolandGenerator",
     "HawkGenerator"
   ],

resources/factions/georgia_2008.json

@@ -32,13 +32,11 @@
     "Paratrooper_AKS",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA13Generator",
-    "SA8Generator"
-  ],
-  "sams": [
     "SA6Generator",
-    "SA11Generator"
+    "SA8Generator",
+    "SA11Generator",
+    "SA13Generator"
   ],
   "requirements": {},
   "has_jtac": true,

resources/factions/germany_1942.json

@@ -27,12 +27,9 @@
   "infantry_units": [
     "Infantry_Mauser_98"
   ],
-  "shorads": [
+  "air_defenses": [
-    "FlakGenerator"
+    "FlakGenerator",
-  ],
+    "FreyaGenerator"
-  "sams": [
-    "FreyaGenerator",
-    "FlakGenerator"
   ],
   "aircraft_carrier": [
   ],

resources/factions/germany_1944.json

@@ -32,10 +32,7 @@
   "infantry_units": [
     "Infantry_Mauser_98"
   ],
-  "shorads": [
+  "air_defenses": [
-    "FlakGenerator"
-  ],
-  "sams": [
     "FlakGenerator",
     "FreyaGenerator"
   ],

resources/factions/germany_1944_free.json

@@ -20,10 +20,7 @@
   "infantry_units": [
     "Infantry_Soldier_Rus"
   ],
-  "shorads": [
+  "air_defenses": [
-    "Flak18Generator"
-  ],
-  "sams": [
     "Flak18Generator"
   ],
   "aircraft_carrier": [

resources/factions/germany_1990.json

@@ -33,10 +33,7 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "RolandGenerator"
-  ],
-  "sams": [
     "HawkGenerator",
     "RolandGenerator"
   ],

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"

resources/factions/insurgents.json

@@ -23,13 +23,9 @@
     "Infantry_Soldier_Insurgents",
     "Soldier_RPG"
   ],
-  "shorads": [
+  "air_defenses": [
     "SA9Generator",
     "ZU23Generator",
     "ZSU23Generator"
-  ],
-  "sams": [
-    "ZU23Generator",
-    "ZSU23Generator"
   ]
 }

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"
   }

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",
+    "ZSU23Generator"
-    "HQ7Generator"
   ],
   "ewrs": [
     "TallRackGenerator"

resources/factions/israel_1948.json

@@ -25,12 +25,9 @@
   "infantry_units": [
     "Infantry_SMLE_No_4_Mk_1"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
+    "BoforsGenerator",
-  ],
+    "EarlyColdWarFlakGenerator"
-  "sams": [
-    "EarlyColdWarFlakGenerator",
-    "BoforsGenerator"
   ],
   "aircraft_carrier": [
   ],

resources/factions/israel_1973.json

@@ -30,12 +30,10 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
+    "BoforsGenerator",
-  ],
+    "ChaparralGenerator",
-  "sams": [
+    "HawkGenerator"
-    "HawkGenerator",
-    "ChaparralGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/israel_1982.json

@@ -33,12 +33,9 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "ChaparralGenerator"
+    "ChaparralGenerator",
-  ],
+    "HawkGenerator"
-  "sams": [
-    "HawkGenerator",
-    "ChaparralGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/israel_2000.json

@@ -36,12 +36,9 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "ChaparralGenerator"
+    "ChaparralGenerator",
-  ],
+    "HawkGenerator"
-  "sams": [
-    "HawkGenerator",
-    "ChaparralGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/italy_1990.json

@@ -30,12 +30,9 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
+    "HawkGenerator"
-  "sams": [
-    "HawkGenerator",
-    "AvengerGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/italy_1990_mb339.json

@@ -31,12 +31,9 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
+    "HawkGenerator"
-  "sams": [
-    "HawkGenerator",
-    "AvengerGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/japan_2005.json

@@ -36,10 +36,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "GepardGenerator"
+    "GepardGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
     "PatriotGenerator"
   ],

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",

resources/factions/netherlands_1990.json

@@ -28,10 +28,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator"
   ],
   "ewrs": [

resources/factions/north_korea_2000.json

@@ -40,16 +40,14 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA9Generator",
-    "SA13Generator",
-    "ZSU23Generator",
-    "ZU23Generator"
-  ],
-  "sams": [
     "SA2Generator",
     "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "SA9Generator",
+    "SA13Generator",
+    "ZU23Generator",
+    "ZSU23Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator",

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",

resources/factions/pmc_russian.json

@@ -26,11 +26,8 @@
     "Paratrooper_AKS",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA13Generator",
+    "SA9Generator",
-    "SA9Generator"
-  ],
-  "sams": [
     "SA13Generator"
   ]
 }

resources/factions/pmc_us.json

@@ -22,10 +22,7 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
-  ],
-  "sams": [
     "AvengerGenerator"
   ],
   "has_jtac": true,

resources/factions/pmc_us_with_mb339.json

@@ -23,10 +23,7 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
-  ],
-  "sams": [
     "AvengerGenerator"
   ],
   "requirements": {

resources/factions/russia_1955.json

@@ -30,10 +30,7 @@
     "Infantry_Soldier_Rus",
     "Soldier_RPG"
   ],
-  "shorads": [
+  "air_defenses": [
-    "EarlyColdWarFlakGenerator"
-  ],
-  "sams": [
     "EarlyColdWarFlakGenerator"
   ],
   "aircraft_carrier": [

resources/factions/russia_1965.json

@@ -34,15 +34,13 @@
     "Infantry_Soldier_Rus",
     "Soldier_RPG"
   ],
-  "shorads": [
+  "air_defenses": [
-    "ZSU23Generator",
     "EarlyColdWarFlakGenerator",
-    "ZU23Generator"
-  ],
-  "sams": [
     "SA2Generator",
     "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "ZSU23Generator",
+    "ZU23Generator"
   ],
   "ewrs": [
     "FlatFaceGenerator"

resources/factions/russia_1970_limited_air.json

@@ -29,17 +29,15 @@
     "Infantry_Soldier_Rus",
     "Soldier_RPG"
   ],
-  "shorads": [
+  "air_defenses": [
-    "ColdWarFlakGenerator",
-    "ZSU23Generator",
-    "ZU23Generator",
-	"SA13Generator",
-    "SA8Generator"
-  ],
-  "sams": [
     "SA3Generator",
     "SA6Generator",
-	"SA11Generator"
+    "SA8Generator",
+	"SA11Generator",
+	"SA13Generator",
+    "ColdWarFlakGenerator",
+    "ZSU23Generator",
+    "ZU23Generator"
   ],
   "ewrs": [
     "FlatFaceGenerator"

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"
   ],

resources/factions/russia_1990.json

@@ -44,13 +44,11 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA13Generator",
-    "SA8Generator"
-  ],
-  "sams": [
     "SA6Generator",
-    "SA11Generator"
+    "SA8Generator",
+    "SA11Generator",
+    "SA13Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator",

resources/factions/russia_2010.json

@@ -48,15 +48,13 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA19Generator",
-    "SA13Generator"
-  ],
-  "sams": [
     "SA6Generator",
     "SA8Generator",
     "SA10Generator",
     "SA11Generator",
+    "SA13Generator",
+    "SA19Generator",
     "Tier2SA10Generator",
     "Tier3SA10Generator"
   ],

resources/factions/russia_2020.json

@@ -47,13 +47,11 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA19Generator"
-  ],
-  "sams": [
     "SA8Generator",
     "SA10Generator",
     "SA11Generator",
+    "SA19Generator",
     "Tier2SA10Generator",
     "Tier3SA10Generator"
   ],

resources/factions/soviet_union_1943.json

@@ -23,10 +23,7 @@
   "infantry_units": [
     "Infantry_SMLE_No_4_Mk_1"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
-  ],
-  "sams": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],

resources/factions/spain_1990.json

@@ -31,10 +31,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator"
   ],
   "ewrs": [

resources/factions/sweden_1970.json

@@ -29,14 +29,12 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator",
+	"ChaparralGenerator",
 	"EarlyColdWarFlakGenerator",
-    "VulcanGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
-	"ChaparralGenerator"
+    "VulcanGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

resources/factions/sweden_1990.json

@@ -28,10 +28,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator"
   ],
   "ewrs": [

resources/factions/syria_1948.json

@@ -22,10 +22,7 @@
   "infantry_units": [
     "Infantry_SMLE_No_4_Mk_1"
   ],
-  "shorads": [
+  "air_defenses": [
-    "FlakGenerator"
-  ],
-  "sams": [
     "FlakGenerator"
   ],
   "aircraft_carrier": [

resources/factions/syria_1967.json

@@ -33,13 +33,11 @@
     "Infantry_Soldier_Rus",
     "Soldier_RPG"
   ],
-  "shorads": [
+  "air_defenses": [
+    "SA2Generator",
     "ZU23Generator",
     "ZU23UralGenerator"
   ],
-  "sams": [
-    "SA2Generator"
-  ],
   "ewrs": [
     "FlatFaceGenerator"
   ],

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"
   ],

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"

resources/factions/syria_1982.json

@@ -35,15 +35,13 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "ZU23Generator",
+    "ColdWarFlakGenerator",
     "EarlyColdWarFlakGenerator",
-    "ColdWarFlakGenerator"
-  ],
-  "sams": [
     "SA2Generator",
     "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "ZU23Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator"

resources/factions/syria_2011.json

@@ -48,23 +48,21 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA8Generator",
+    "ColdWarFlakGenerator",
-    "SA9Generator",
-    "SA13Generator",
-    "SA19Generator",
-    "ZSU23Generator",
-    "ColdWarFlakGenerator"
-  ],
-  "sams": [
     "SA2Generator",
     "SA3Generator",
     "SA6Generator",
     "SA8Generator",
+    "SA8Generator",
+    "SA9Generator",
     "SA10Generator",
     "SA11Generator",
+    "SA13Generator",
+    "SA19Generator",
     "Tier2SA10Generator",
-    "Tier3SA10Generator"
+    "Tier3SA10Generator",
+    "ZSU23Generator"
   ],
   "ewrs": [
     "BoxSpringGenerator",

resources/factions/turkey_2005.json

@@ -34,13 +34,11 @@
     "Soldier_M249",
     "Paratrooper_AKS"
   ],
-  "shorads": [
+  "air_defenses": [
     "AvengerGenerator",
+    "HawkGenerator",
     "ZSU23Generator"
   ],
-  "sams": [
-    "HawkGenerator"
-  ],
   "ewrs": [
     "HawkEwrGenerator"
   ],

resources/factions/uae_2005.json

@@ -30,12 +30,10 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
+    "HawkGenerator",
     "RapierGenerator"
   ],
-  "sams": [
-    "HawkGenerator"
-  ],
   "ewrs": [
     "HawkEwrGenerator"
   ],

resources/factions/uk_1944.json

@@ -33,10 +33,7 @@
   "infantry_units": [
     "Infantry_SMLE_No_4_Mk_1"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
-  ],
-  "sams": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],

resources/factions/uk_1990.json

@@ -34,13 +34,11 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
     "AvengerGenerator",
+    "HawkGenerator",
     "RapierGenerator"
   ],
-  "sams": [
-    "HawkGenerator"
-  ],
   "ewrs": [
     "HawkEwrGenerator"
   ],

resources/factions/ukraine_2010.json

@@ -38,17 +38,15 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorads": [
+  "air_defenses": [
-    "SA9Generator",
-    "SA13Generator",
-    "SA19Generator"
-  ],
-  "sams": [
     "SA3Generator",
     "SA6Generator",
     "SA8Generator",
+    "SA9Generator",
     "SA10Generator",
     "SA11Generator",
+    "SA13Generator",
+    "SA19Generator",
     "Tier2SA10Generator",
     "Tier3SA10Generator"
   ],

resources/factions/us_aggressors.json

@@ -46,10 +46,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
     "PatriotGenerator"
   ],

resources/factions/usa_1944.json

@@ -30,10 +30,7 @@
   "infantry_units": [
     "Infantry_M1_Garand"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
-  ],
-  "sams": [
     "AllyWW2FlakGenerator",
     "BoforsGenerator"
   ],

resources/factions/usa_1955.json

@@ -23,10 +23,8 @@
   "infantry_units": [
     "Infantry_M4"
   ],
-  "shorads": [
+  "air_defenses": [
-    "BoforsGenerator"
+    "BoforsGenerator",
-  ],
-  "sams": [
     "EarlyColdWarFlakGenerator"
   ],
   "doctrine": "ww2",

resources/factions/usa_1960.json

@@ -22,13 +22,10 @@
   "infantry_units": [
     "Infantry_M4"
   ],
-  "shorads": [
+  "air_defenses": [
     "EarlyColdWarFlakGenerator",
     "VulcanGenerator"
   ],
-  "sams": [
-    "VulcanGenerator"
-  ],
   "requirements": {},
   "doctrine": "coldwar"
 }

resources/factions/usa_1965.json

@@ -23,14 +23,11 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "VulcanGenerator",
     "ChaparralGenerator",
-    "EarlyColdWarFlakGenerator"
+    "EarlyColdWarFlakGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
-    "ChaparralGenerator"
+    "VulcanGenerator"
   ],
   "ewrs": [
     "HawkEwrGenerator"

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"

resources/factions/usa_1990.json

@@ -45,10 +45,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator"
   ],
   "ewrs": [

resources/factions/usa_2005.json

@@ -45,10 +45,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "PatriotGenerator"
   ],
   "ewrs": [

resources/factions/usa_2005_modded.json

@@ -46,10 +46,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "AvengerGenerator"
+    "AvengerGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
     "PatriotGenerator"
   ],

resources/factions/usn_1985.json

@@ -33,13 +33,11 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorads": [
+  "air_defenses": [
-    "VulcanGenerator",
+    "ChaparralGenerator",
-    "ChaparralGenerator"
+    "ChaparralGenerator",
-  ],
-  "sams": [
     "HawkGenerator",
-    "ChaparralGenerator"
+    "VulcanGenerator"
   ],
   "aircraft_carrier": [
     "CVN_74_John_C__Stennis"