Merge branch 'develop' into ITAHawkmoon-update-db

2025-11-10 15:41:24 +00:00 · 2020-12-13 16:25:52 +01:00
parent 4b0fc637eb 1848338ef7
commit 95db2aa14f
359 changed files with 15717 additions and 13979 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
@@ -29,12 +29,10 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "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
@@ -54,12 +54,11 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "AvengerGenerator",
    "HawkGenerator",
    "PatriotGenerator"
  ],
@@ -96,5 +95,6 @@
    "ArleighBurkeGroupGenerator"
  ],
  "has_jtac": true,
-  "jtac_unit": "MQ_9_Reaper"
+  "jtac_unit": "MQ_9_Reaper",
+  "unrestricted_satnav": true
 }
--- a/resources/factions/canada_2005.json
+++ b/resources/factions/canada_2005.json
@@ -29,14 +29,12 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
-    "HawkGenerator",
-    "AvengerGenerator"
+  "air_defenses": [
+    "AvengerGenerator",
+    "HawkGenerator"
  ],
  "ewrs": [
    "HawkEwrGenerator"
--- a/resources/factions/china_2010.json
+++ b/resources/factions/china_2010.json
@@ -35,18 +35,21 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA9Generator",
-    "SA13Generator",
-    "ZSU23Generator",
-    "ZU23Generator"
-  ],
-  "sams": [
+  "air_defenses": [
    "HQ7Generator",
+    "SA2Generator",
+    "SA6Generator",
+    "SA9Generator",
    "SA10Generator",
-    "SA6Generator"
+    "SA11Generator",
+    "SA13Generator",
+    "Tier2SA10Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -35,13 +35,10 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "HQ7Generator",
-    "RolandGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
    "RolandGenerator",
    "HawkGenerator"
  ],
--- a/resources/factions/france_2005_frenchpack.json
+++ b/resources/factions/france_2005_frenchpack.json
@@ -45,11 +45,7 @@
    "Soldier_M249",
    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "HQ7Generator",
-    "RolandGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
    "RolandGenerator",
    "HawkGenerator"
  ],
@@ -69,13 +65,14 @@
    "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"
  ],
-  "helicopter_carrier_names": [
-    "Jeanne d'Arc"
-  ],
  "navy_generators": [
    "ArleighBurkeGroupGenerator"
  ],
--- a/resources/factions/france_2005_modded.json
+++ b/resources/factions/france_2005_modded.json
@@ -8,6 +8,7 @@
    "Mirage_2000_5",
    "Rafale_M",
    "Rafale_A_S",
+    "Rafale_B",
    "SA342M",
    "SA342L",
    "SA342Mistral"
@@ -44,13 +45,10 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "HQ7Generator",
-    "RolandGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
    "RolandGenerator",
    "HawkGenerator"
  ],
@@ -71,16 +69,17 @@
  ],
  "requirements": {
    "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974",
-    "RAFALE 2.5.5": "https://www.digitalcombatsimulator.com/fr/files/3307478/"
+    "RAFALE 2.5.6": "https://forums.eagle.ru/forum/english/dcs-world-topics/mods-and-apps/dcs-mods/7135261-download-rafales-pack-2-5-6-55960-and-openbeta-2-5-6-57530-by-cuesta-brothers"
  },
  "carrier_names": [
+    "R91 Charles de Gaulle"
+  ],
+  "helicopter_carrier_names": [
+    "R97 Jeanne d'Arc",
    "L9013 Mistral",
    "L9014 Tonerre",
    "L9015 Dixmude"
  ],
-  "helicopter_carrier_names": [
-    "Jeanne d'Arc"
-  ],
  "navy_generators": [
    "ArleighBurkeGroupGenerator"
  ],
--- a/resources/factions/georgia_2008.json
+++ b/resources/factions/georgia_2008.json
@@ -20,7 +20,7 @@
    "MBT_T_55"
  ],
  "artillery_units": [
-    "MLRS_BM21_Grad",
+    "MLRS_BM_21_Grad",
    "SPH_2S1_Gvozdika",
    "SPH_2S3_Akatsia"
  ],
@@ -30,15 +30,19 @@
  ],
  "infantry_units": [
    "Paratrooper_AKS",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA13Generator",
-    "SA8Generator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "SA3Generator",
    "SA6Generator",
-    "SA11Generator"
+    "SA8Generator",
+    "SA11Generator",
+    "SA13Generator",
+    "SA15Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "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
@@ -31,17 +31,17 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "RolandGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "GepardGenerator",
    "HawkGenerator",
-    "RolandGenerator"
+    "RolandGenerator",
+    "PatriotGenerator"
  ],
  "ewrs": [
-    "HawkEwrGenerator"
+    "PatriotEwrGenerator"
  ],
  "aircraft_carrier": [
  ],
--- a/resources/factions/india_2010.json
+++ b/resources/factions/india_2010.json
@@ -34,17 +34,21 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
+  "air_defenses": [
+    "SA3Generator",
+    "SA6Generator",
    "SA8Generator",
+    "SA9Generator",
+    "SA10Generator",
+    "SA11Generator",
    "SA13Generator",
    "SA19Generator",
-    "ZSU23Generator"
-  ],
-  "sams": [
-    "SA6Generator",
-    "SA3Generator"
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/insurgents.json
+++ b/resources/factions/insurgents.json
@@ -21,15 +21,13 @@
  ],
  "infantry_units": [
    "Infantry_Soldier_Insurgents",
-    "Soldier_RPG"
+    "Soldier_RPG",
+    "SAM_SA_18_Igla_MANPADS"
  ],
-  "shorads": [
+  "air_defenses": [
    "SA9Generator",
+    "ZSU23Generator",
    "ZU23Generator",
-    "ZSU23Generator"
-  ],
-  "sams": [
-    "ZU23Generator",
-    "ZSU23Generator"
+    "ZU23UralInsurgentGenerator"
  ]
 }
--- a/resources/factions/insurgents_modded.json
+++ b/resources/factions/insurgents_modded.json
@@ -22,17 +22,14 @@
  ],
  "infantry_units": [
    "Infantry_Soldier_Insurgents",
-    "Soldier_RPG"
+    "Soldier_RPG",
+    "SAM_SA_18_Igla_MANPADS"
  ],
-  "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
@@ -40,18 +40,20 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Insurgents",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "HQ7Generator",
-    "ZSU23Generator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "HawkGenerator",
+    "RapierGenerator",
    "SA2Generator",
    "SA6Generator",
    "SA11Generator",
-    "HawkGenerator",
-    "HQ7Generator"
+    "SA15Generator",
+    "VulcanGenerator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "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,11 @@
    "Infantry_M4",
    "Soldier_M249"
  ],
-  "shorads": [
-    "BoforsGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "BoforsGenerator",
+    "ChaparralGenerator",
    "HawkGenerator",
-    "ChaparralGenerator"
+    "VulcanGenerator"
  ],
  "ewrs": [
    "HawkEwrGenerator"
--- a/resources/factions/israel_1982.json
+++ b/resources/factions/israel_1982.json
@@ -33,12 +33,10 @@
    "Infantry_M4",
    "Soldier_M249"
  ],
-  "shorads": [
-    "ChaparralGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "ChaparralGenerator",
    "HawkGenerator",
-    "ChaparralGenerator"
+    "VulcanGenerator"
  ],
  "ewrs": [
    "HawkEwrGenerator"
--- a/resources/factions/israel_2000.json
+++ b/resources/factions/israel_2000.json
@@ -34,14 +34,14 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "ChaparralGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "ChaparralGenerator",
    "HawkGenerator",
-    "ChaparralGenerator"
+    "PatriotGenerator",
+    "VulcanGenerator"
  ],
  "ewrs": [
    "HawkEwrGenerator"
--- a/resources/factions/italy_1990.json
+++ b/resources/factions/italy_1990.json
@@ -28,14 +28,12 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "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
@@ -29,14 +29,12 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
-    "HawkGenerator",
-    "AvengerGenerator"
+  "air_defenses": [
+    "AvengerGenerator",
+    "HawkGenerator"
  ],
  "ewrs": [
    "HawkEwrGenerator"
--- a/resources/factions/japan_2005.json
+++ b/resources/factions/japan_2005.json
@@ -27,7 +27,8 @@
  ],
  "artillery_units": [
    "SPH_M109_Paladin",
-    "MLRS_M270"
+    "MLRS_M270",
+    "Stinger_MANPADS"
  ],
  "logistics_units": [
    "Transport_M818"
@@ -36,10 +37,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
@@ -31,17 +31,19 @@
  ],
  "infantry_units": [
    "Infantry_Soldier_Insurgents",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_MANPADS"
  ],
-  "shorads": [
+  "air_defenses": [
    "HQ7Generator",
-    "SA8Generator",
-    "ZSU23Generator"
-  ],
-  "sams": [
+    "RapierGenerator",
    "SA2Generator",
    "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "SA8Generator",
+    "SA9Generator",
+    "SA13Generator",
+    "ZSU23Generator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/netherlands_1990.json
+++ b/resources/factions/netherlands_1990.json
@@ -26,16 +26,18 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
-    "HawkGenerator"
+  "air_defenses": [
+    "AvengerGenerator",
+    "GepardGenerator",
+    "HawkGenerator",
+    "PatriotGenerator",
+    "RapierGenerator"
  ],
  "ewrs": [
-    "HawkEwrGenerator"
+    "PatriotEwrGenerator"
  ],
  "aircraft_carrier": [
  ],
--- a/resources/factions/north_korea_2000.json
+++ b/resources/factions/north_korea_2000.json
@@ -38,18 +38,17 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "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
@@ -36,16 +36,16 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
+  "air_defenses": [
    "HQ7Generator",
-    "ZU23UralGenerator",
-    "ZU23Generator"
-  ],
-  "sams": [
+    "SA2Generator",
    "SA10Generator",
-    "SA2Generator"
+    "SA11Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/pmc_russian.json
+++ b/resources/factions/pmc_russian.json
@@ -24,13 +24,11 @@
  ],
  "infantry_units": [
    "Paratrooper_AKS",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA13Generator",
-    "SA9Generator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "SA9Generator",
    "SA13Generator"
  ]
 }
--- a/resources/factions/pmc_us.json
+++ b/resources/factions/pmc_us.json
@@ -20,12 +20,10 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "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
@@ -21,12 +21,10 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "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"
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "FlatFaceGenerator"
--- a/resources/factions/russia_1970_limited_air.json
+++ b/resources/factions/russia_1970_limited_air.json
@@ -0,0 +1,69 @@
+{
+  "country": "Russia",
+  "name": "Russia 1970 Limited Air",
+  "authors": "Starfire",
+  "description": "<p>1970 Soviet Russia, with limited air units intended for a Viggen campaign.</p>",
+  "aircrafts": [
+    "MiG_19P",
+	"MiG_21Bis",
+	"Mi_8MT",
+    "Mi_24V"
+  ],
+  "frontline_units": [
+    "ARV_BRDM_2",
+    "APC_BTR_80",
+    "IFV_BMD_1",
+    "IFV_BMP_1",
+    "MBT_T_55"
+  ],
+  "artillery_units": [
+    "MLRS_BM_21_Grad",
+    "SPH_2S9_Nona",
+    "SPH_2S1_Gvozdika"
+  ],
+  "logistics_units": [
+    "Transport_Ural_375",
+    "Transport_UAZ_469"
+  ],
+  "infantry_units": [
+    "Infantry_Soldier_Rus",
+    "Soldier_RPG"
+  ],
+  "air_defenses": [
+    "SA2Generator",
+    "SA3Generator",
+    "SA6Generator",
+    "SA8Generator",
+    "SA9Generator",
+    "SA11Generator",
+    "ColdWarFlakGenerator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
+  ],
+  "ewrs": [
+    "FlatFaceGenerator"
+  ],
+  "aircraft_carrier": [
+  ],
+  "helicopter_carrier": [
+  ],
+  "helicopter_carrier_names": [
+  ],
+  "destroyers": [
+  ],
+  "cruisers": [
+  ],
+  "missiles": [
+    "ScudGenerator"
+  ],
+  "missiles_group_count": 1,
+  "requirements": {},
+  "carrier_names": [
+  ],
+  "navy_generators": [
+	"RussianNavyGroupGenerator"
+  ],
+  "has_jtac": false,
+  "doctrine": "coldwar"
+}
--- a/resources/factions/russia_1975.json
+++ b/resources/factions/russia_1975.json
@@ -40,14 +40,17 @@
    "Infantry_Soldier_Rus",
    "Soldier_RPG"
  ],
-  "shorads": [
+  "air_defenses": [
    "ColdWarFlakGenerator",
-    "ZSU23Generator",
-    "ZU23Generator"
-  ],
-  "sams": [
+    "SA2Generator",
    "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "SA8Generator",
+    "SA9Generator",
+    "SA13Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "FlatFaceGenerator"
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -42,15 +42,25 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA13Generator",
-    "SA8Generator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "SA2Generator",
+    "SA3Generator",
    "SA6Generator",
-    "SA11Generator"
+    "SA8Generator",
+    "SA9Generator",
+    "SA10Generator",
+    "SA11Generator",
+    "SA13Generator",
+    "SA15Generator",
+    "SA19Generator",
+    "Tier2SA10Generator",
+    "Tier3SA10Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/russia_2010.json
+++ b/resources/factions/russia_2010.json
@@ -46,17 +46,22 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_MANPADS"
  ],
-  "shorads": [
-    "SA19Generator",
-    "SA13Generator"
-  ],
-  "sams": [
-    "SA11Generator",
+  "air_defenses": [
+    "SA8Generator",
+    "SA9Generator",
    "SA10Generator",
-    "SA6Generator",
-    "SA19Generator"
+    "SA11Generator",
+    "SA13Generator",
+    "SA15Generator",
+    "SA19Generator",
+    "Tier2SA10Generator",
+    "Tier3SA10Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/russia_2020.json
+++ b/resources/factions/russia_2020.json
@@ -45,15 +45,21 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA19Generator"
-  ],
-  "sams": [
-    "SA11Generator",
+  "air_defenses": [
+    "SA8Generator",
+    "SA9Generator",
    "SA10Generator",
-    "SA19Generator"
+    "SA11Generator",
+    "SA13Generator",
+    "SA15Generator",
+    "SA19Generator",
+    "Tier2SA10Generator",
+    "Tier3SA10Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/soviet_union_1943.json
+++ b/resources/factions/soviet_union_1943.json
@@ -0,0 +1,50 @@
+{
+  "country": "USSR",
+  "name": "Soviet Union 1943",
+  "authors": "Khopa",
+  "description": "<p>Soviet Union in 1943. Featuring the I16, and using some allies units to represent either lend leased vehicles or soviet equivalent vehicles. BM-21 is used to represent BM-13</p>",
+  "aircrafts": [
+    "SpitfireLFMkIX",
+    "I_16"
+  ],
+  "frontline_units": [
+    "MT_M4_Sherman",
+    "APC_M2A1",
+    "Daimler_Armoured_Car",
+    "LT_Mk_VII_Tetrarch"
+  ],
+  "artillery_units": [
+    "MLRS_BM_21_Grad"
+  ],
+  "logistics_units": [
+    "Bedford_MWD",
+    "CCKW_353"
+  ],
+  "infantry_units": [
+    "Infantry_SMLE_No_4_Mk_1"
+  ],
+  "air_defenses": [
+    "AllyWW2FlakGenerator",
+    "BoforsGenerator"
+  ],
+  "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": [
+  ],
+  "has_jtac": false,
+  "doctrine": "ww2",
+  "building_set": "ww2ally"
+}
--- a/resources/factions/spain_1990.json
+++ b/resources/factions/spain_1990.json
@@ -31,14 +31,14 @@
    "Infantry_M4",
    "Soldier_M249"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
-    "HawkGenerator"
+  "air_defenses": [
+    "AvengerGenerator",
+    "HawkGenerator",
+    "PatriotGenerator",
+    "RolandGenerator"
  ],
  "ewrs": [
-    "HawkEwrGenerator"
+    "PatriotEwrGenerator"
  ],
  "aircraft_carrier": [
    "CVN_74_John_C__Stennis"
--- a/resources/factions/sweden_1970.json
+++ b/resources/factions/sweden_1970.json
@@ -0,0 +1,47 @@
+{
+  "country": "Sweden",
+  "name": "Sweden 1970s Alternate Universe",
+  "authors": "Starfire",
+  "description": "<p>Sweden 1970</p><p>Since we do not yet have Heatblur's AI Draken, this faction includes the Mirage 2000C in order to provide Sweden with some form of A2A capability.</p>",
+  "aircrafts": [
+    "AJS37",
+    "M_2000C",
+	"UH_1H"
+  ],
+  "awacs": [
+    "E_3A"
+  ],
+  "tankers": [
+    "KC_135",
+    "KC130"
+  ],
+  "frontline_units": [
+    "IFV_MCV_80",
+    "MBT_Leopard_2",
+    "APC_M1126_Stryker_ICV"
+  ],
+  "artillery_units": [
+  ],
+  "logistics_units": [
+    "Transport_M818"
+  ],
+  "infantry_units": [
+    "Infantry_M4",
+    "Soldier_M249"
+  ],
+  "air_defenses": [
+	"ChaparralGenerator",
+	"EarlyColdWarFlakGenerator",
+    "AvengerGenerator",
+    "HawkGenerator",
+    "VulcanGenerator"
+  ],
+  "ewrs": [
+    "HawkEwrGenerator"
+  ],
+  "navy_generators": [
+    "OliverHazardPerryGroupGenerator"
+  ],
+  "has_jtac": false,
+  "doctrine": "coldwar"
+  }
--- a/resources/factions/sweden_1990.json
+++ b/resources/factions/sweden_1990.json
@@ -26,12 +26,11 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "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,13 @@
    "Infantry_Soldier_Rus",
    "Soldier_RPG"
  ],
-  "shorads": [
+  "air_defenses": [
+    "SA2Generator",
+    "SA3Generator",
+    "ZSU23Generator",
    "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,14 @@
    "Infantry_Soldier_Rus",
    "Soldier_RPG"
  ],
-  "shorads": [
+  "air_defenses": [
+    "EarlyColdWarFlakGenerator",
+    "SA2Generator",
+    "SA3Generator",
+    "ZSU23Generator",
    "ZU23Generator",
-    "EarlyColdWarFlakGenerator",
    "ZU23UralGenerator"
  ],
-  "sams": [
-    "EarlyColdWarFlakGenerator",
-    "SA2Generator"
-  ],
  "ewrs": [
    "FlatFaceGenerator"
  ],
--- a/resources/factions/syria_1973.json
+++ b/resources/factions/syria_1973.json
@@ -33,14 +33,16 @@
    "Infantry_Soldier_Rus",
    "Soldier_RPG"
  ],
-  "shorads": [
+  "air_defenses": [
    "EarlyColdWarFlakGenerator",
-    "ZU23Generator"
-  ],
-  "sams": [
    "SA2Generator",
    "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "SA8Generator",
+    "SA9Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "FlatFaceGenerator"
--- a/resources/factions/syria_1982.json
+++ b/resources/factions/syria_1982.json
@@ -35,15 +35,18 @@
    "Infantry_Soldier_Rus",
    "Paratrooper_RPG_16"
  ],
-  "shorads": [
-    "ZU23Generator",
+  "air_defenses": [
+    "ColdWarFlakGenerator",
    "EarlyColdWarFlakGenerator",
-    "ColdWarFlakGenerator"
-  ],
-  "sams": [
    "SA2Generator",
    "SA3Generator",
-    "SA6Generator"
+    "SA6Generator",
+    "SA8Generator",
+    "SA9Generator",
+    "SA13Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator"
--- a/resources/factions/syria_2011.json
+++ b/resources/factions/syria_2011.json
@@ -1,5 +1,5 @@
 {
-  "country": "Syria",
+  "country": "Combined Joint Task Forces Red",
  "name": "Syria 2011",
  "authors": "Khopa",
  "description": "<p>Syrian Arab Army at the start of the Syrian Civil War.</p>",
@@ -46,22 +46,24 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA8Generator",
-    "SA9Generator",
-    "SA13Generator",
-    "SA19Generator",
-    "ZSU23Generator",
-    "ColdWarFlakGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "ColdWarFlakGenerator",
    "SA2Generator",
    "SA3Generator",
    "SA6Generator",
+    "SA8Generator",
+    "SA8Generator",
+    "SA9Generator",
    "SA10Generator",
-    "SA11Generator"
+    "SA11Generator",
+    "SA13Generator",
+    "SA19Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BoxSpringGenerator",
--- a/resources/factions/turkey_2005.json
+++ b/resources/factions/turkey_2005.json
@@ -32,15 +32,16 @@
  "infantry_units": [
    "Infantry_M4",
    "Soldier_M249",
-    "Paratrooper_AKS"
+    "Paratrooper_AKS",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
+  "air_defenses": [
    "AvengerGenerator",
+    "HawkGenerator",
+    "RapierGenerator",
+    "SA3Generator",
    "ZSU23Generator"
  ],
-  "sams": [
-    "HawkGenerator"
-  ],
  "ewrs": [
    "HawkEwrGenerator"
  ],
--- a/resources/factions/uae_2005.json
+++ b/resources/factions/uae_2005.json
@@ -28,14 +28,13 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "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
@@ -32,15 +32,14 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
+  "air_defenses": [
    "AvengerGenerator",
+    "HawkGenerator",
    "RapierGenerator"
  ],
-  "sams": [
-    "HawkGenerator"
-  ],
  "ewrs": [
    "HawkEwrGenerator"
  ],
--- a/resources/factions/ukraine_2010.json
+++ b/resources/factions/ukraine_2010.json
@@ -36,17 +36,24 @@
  "infantry_units": [
    "Paratrooper_AKS",
    "Infantry_Soldier_Rus",
-    "Paratrooper_RPG_16"
+    "Paratrooper_RPG_16",
+    "SAM_SA_18_Igla_S_MANPADS"
  ],
-  "shorads": [
-    "SA9Generator",
-    "SA13Generator",
-    "SA19Generator"
-  ],
-  "sams": [
+  "air_defenses": [
    "SA3Generator",
+    "SA6Generator",
+    "SA8Generator",
+    "SA9Generator",
    "SA10Generator",
-    "SA11Generator"
+    "SA11Generator",
+    "SA13Generator",
+    "SA15Generator",
+    "SA19Generator",
+    "Tier2SA10Generator",
+    "Tier3SA10Generator",
+    "ZSU23Generator",
+    "ZU23Generator",
+    "ZU23UralGenerator"
  ],
  "ewrs": [
    "BigBirdGenerator"
--- 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
@@ -43,16 +43,17 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
-    "HawkGenerator"
+  "air_defenses": [
+    "AvengerGenerator",
+    "ChaparralGenerator",
+    "HawkGenerator",
+    "PatriotGenerator"
  ],
  "ewrs": [
-    "HawkEwrGenerator"
+    "PatriotEwrGenerator"
  ],
  "aircraft_carrier": [
    "CVN_74_John_C__Stennis"
@@ -72,7 +73,8 @@
    "CVN-71 Theodore Roosevelt",
    "CVN-72 Abraham Lincoln",
    "CVN-73 George Washington",
-    "CVN-74 John C. Stennis"
+    "CVN-74 John C. Stennis",
+    "CVN-75 Harry S. Truman"
  ],
  "helicopter_carrier_names": [
    "LHA-1 Tarawa",
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -43,13 +43,12 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "AvengerGenerator"
-  ],
-  "sams": [
-    "HawkGenerator",
+  "air_defenses": [
+    "AvengerGenerator",
+    "LinebackerGenerator",
    "PatriotGenerator"
  ],
  "ewrs": [
@@ -72,7 +71,8 @@
    "CVN-71 Theodore Roosevelt",
    "CVN-72 Abraham Lincoln",
    "CVN-73 George Washington",
-    "CVN-74 John C. Stennis"
+    "CVN-74 John C. Stennis",
+    "CVN-75 Harry S. Truman"
  ],
  "helicopter_carrier_names": [
    "LHA-1 Tarawa",
--- a/resources/factions/usa_2005_c130.json
+++ b/resources/factions/usa_2005_c130.json
@@ -0,0 +1,111 @@
+{
+  "country": "USA",
+  "name": "USA 2005",
+  "authors": "Khopa",
+  "description": "<p>USA in the 2000s.</p>",
+  "aircrafts": [
+    "F_15C",
+    "F_15E",
+    "F_14B",
+    "FA_18C_hornet",
+    "F_16C_50",
+    "A_10C",
+    "A_10C_2",
+    "AV8BNA",
+    "UH_1H",
+    "AH_64D",
+    "B_52H",
+    "B_1B",
+    "F_117A",
+    "Hercules"
+  ],
+  "awacs": [
+    "E_3A"
+  ],
+  "tankers": [
+    "KC_135",
+    "KC130"
+  ],
+  "frontline_units": [
+    "MBT_M1A2_Abrams",
+    "ATGM_M1134_Stryker",
+    "APC_M1126_Stryker_ICV",
+    "IFV_M2A2_Bradley",
+    "IFV_LAV_25",
+    "APC_M1043_HMMWV_Armament",
+    "ATGM_M1045_HMMWV_TOW"
+  ],
+  "artillery_units": [
+    "MLRS_M270",
+    "SPH_M109_Paladin"
+  ],
+  "logistics_units": [
+    "Transport_M818"
+  ],
+  "infantry_units": [
+    "Infantry_M4",
+    "Soldier_M249",
+    "Stinger_MANPADS"
+  ],
+  "air_defenses": [
+    "AvengerGenerator",
+    "LinebackerGenerator",
+    "PatriotGenerator"
+  ],
+  "ewrs": [
+    "PatriotEwrGenerator"
+  ],
+  "aircraft_carrier": [
+    "CVN_74_John_C__Stennis"
+  ],
+  "helicopter_carrier": [
+    "LHA_1_Tarawa"
+  ],
+  "destroyers": [
+    "USS_Arleigh_Burke_IIa"
+  ],
+  "cruisers": [
+    "Ticonderoga_class"
+  ],
+  "requirements": {},
+  "carrier_names": [
+    "CVN-71 Theodore Roosevelt",
+    "CVN-72 Abraham Lincoln",
+    "CVN-73 George Washington",
+    "CVN-74 John C. Stennis",
+    "CVN-75 Harry S. Truman"
+  ],
+  "helicopter_carrier_names": [
+    "LHA-1 Tarawa",
+    "LHA-2 Saipan",
+    "LHA-3 Belleau Wood",
+    "LHA-4 Nassau",
+    "LHA-5 Peleliu"
+  ],
+  "navy_generators": [
+    "ArleighBurkeGroupGenerator",
+    "OliverHazardPerryGroupGenerator"
+  ],
+  "has_jtac": true,
+  "jtac_unit": "MQ_9_Reaper",
+  "liveries_overrides": {
+    "FA_18C_hornet": [
+      "VFA-37",
+      "VFA-106",
+      "VFA-113",
+      "VFA-122",
+      "VFA-131",
+      "VFA-192",
+      "VFA-34",
+      "VFA-83",
+      "VFA-87",
+      "VFA-97",
+      "VMFA-122",
+      "VMFA-132",
+      "VMFA-251",
+      "VMFA-312",
+      "VMFA-314",
+      "VMFA-323"
+    ]
+  }
+}
--- a/resources/factions/usa_2005_modded.json
+++ b/resources/factions/usa_2005_modded.json
@@ -0,0 +1,113 @@
+{
+  "country": "USA",
+  "name": "USA 2005 Modded",
+  "authors": "Khopa",
+  "description": "<p>USA 2005 with the Raptor mod, with the F-22 mod by Grinelli Designs.</p>",
+  "aircrafts": [
+    "F_15C",
+    "F_15E",
+    "F_14B",
+    "FA_18C_hornet",
+    "F_16C_50",
+    "A_10C",
+    "A_10C_2",
+    "AV8BNA",
+    "UH_1H",
+    "AH_64D",
+    "B_52H",
+    "B_1B",
+    "F_117A",
+    "F_22A"
+  ],
+  "awacs": [
+    "E_3A"
+  ],
+  "tankers": [
+    "KC_135",
+    "KC130"
+  ],
+  "frontline_units": [
+    "MBT_M1A2_Abrams",
+    "ATGM_M1134_Stryker",
+    "APC_M1126_Stryker_ICV",
+    "IFV_M2A2_Bradley",
+    "IFV_LAV_25",
+    "APC_M1043_HMMWV_Armament",
+    "ATGM_M1045_HMMWV_TOW"
+  ],
+  "artillery_units": [
+    "MLRS_M270",
+    "SPH_M109_Paladin"
+  ],
+  "logistics_units": [
+    "Transport_M818"
+  ],
+  "infantry_units": [
+    "Infantry_M4",
+    "Soldier_M249",
+    "Stinger_MANPADS"
+  ],
+  "air_defenses": [
+    "AvengerGenerator",
+    "HawkGenerator",
+    "LinebackerGenerator",
+    "PatriotGenerator"
+  ],
+  "ewrs": [
+    "PatriotEwrGenerator"
+  ],
+  "aircraft_carrier": [
+    "CVN_74_John_C__Stennis"
+  ],
+  "helicopter_carrier": [
+    "LHA_1_Tarawa"
+  ],
+  "destroyers": [
+    "USS_Arleigh_Burke_IIa"
+  ],
+  "cruisers": [
+    "Ticonderoga_class"
+  ],
+  "carrier_names": [
+    "CVN-71 Theodore Roosevelt",
+    "CVN-72 Abraham Lincoln",
+    "CVN-73 George Washington",
+    "CVN-74 John C. Stennis"
+  ],
+  "helicopter_carrier_names": [
+    "LHA-1 Tarawa",
+    "LHA-2 Saipan",
+    "LHA-3 Belleau Wood",
+    "LHA-4 Nassau",
+    "LHA-5 Peleliu"
+  ],
+  "navy_generators": [
+    "ArleighBurkeGroupGenerator",
+    "OliverHazardPerryGroupGenerator"
+  ],
+  "requirements": {
+    "F-22A mod by Grinnelli Designs": "https://drive.google.com/file/d/1aLDbSvkgOnwv4C-xtdc_dfMXNROynl_c/view?usp=sharing"
+  },
+  "has_jtac": true,
+  "jtac_unit": "MQ_9_Reaper",
+  "liveries_overrides": {
+    "FA_18C_hornet": [
+      "VFA-37",
+      "VFA-106",
+      "VFA-113",
+      "VFA-122",
+      "VFA-131",
+      "VFA-192",
+      "VFA-34",
+      "VFA-83",
+      "VFA-87",
+      "VFA-97",
+      "VMFA-122",
+      "VMFA-132",
+      "VMFA-251",
+      "VMFA-312",
+      "VMFA-314",
+      "VMFA-323"
+    ]
+  }
+}
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -31,15 +31,13 @@
  ],
  "infantry_units": [
    "Infantry_M4",
-    "Soldier_M249"
+    "Soldier_M249",
+    "Stinger_MANPADS"
  ],
-  "shorads": [
-    "VulcanGenerator",
-    "ChaparralGenerator"
-  ],
-  "sams": [
+  "air_defenses": [
+    "ChaparralGenerator",
    "HawkGenerator",
-    "ChaparralGenerator"
+    "VulcanGenerator"
  ],
  "aircraft_carrier": [
    "CVN_74_John_C__Stennis"
@@ -57,7 +55,8 @@
    "CVN-71 Theodore Roosevelt",
    "CVN-72 Abraham Lincoln",
    "CVN-73 George Washington",
-    "CVN-74 John C. Stennis"
+    "CVN-74 John C. Stennis",
+    "CVN-75 Harry S. Truman"
  ],
  "helicopter_carrier_names": [
    "LHA-1 Tarawa",