Update campaign & add new faction (USA 2020) (#476)

* Add files via upload

* Add files via upload

resources/campaigns/operation_desert_aladeen.yaml

@@ -2,9 +2,10 @@
 name: Iraq - Operation Desert Aladeen
 theater: Iraq
 authors: Starfire
-recommended_player_faction: USA 2005
+recommended_player_faction: USA 2020
 recommended_enemy_faction: Republic of Wadiya 2010
 description:
+  <p><strong>This campaign is intended to be run with CurrentHill's USA Asset Pack installed, though this is not mandatory.</strong></p>
   <p>In the heart of the Middle East, the flamboyant and tyrannical Admiral-General Haffaz Aladeen, 
   supreme leader of Wadiya, has once again defied international norms. Despite mounting global concerns 
   over his nation's nuclear ambitions (rumours of weapons-grade uranium refinement swirl like smoke 
@@ -24,6 +25,8 @@ performance: 1
 recommended_start_date: 2012-05-16
 version: "10.7"
 settings:
+  usamilitaryassetspack: true
+  f22_raptor: true
   hercules: true
   squadron_start_full: true
 squadrons:
@@ -41,25 +44,16 @@ squadrons:
       aircraft:
         - KC-135 Stratotanker MPRS
       size: 1
-    - primary: Anti-ship
-      secondary: air-to-ground
-      aircraft:
-        - B-52H Stratofortress
-      size: 4
     - primary: Strike
       secondary: air-to-ground
       aircraft:
-        - B-1B Lancer
+        - "[CH] B-21"
-      size: 4
+        - F-14B Tomcat
-    - primary: Transport
+      size: 12
-      secondary: any
-      aircraft:
-        - C-130J-30 Super Hercules
-        - C-130
-      size: 4
     - primary: Escort
       secondary: any
       aircraft:
+        - F-22A Raptor
         - F-15C Eagle
       size: 16
     - primary: SEAD
@@ -104,6 +98,12 @@ squadrons:
       aircraft:
         - OH-58D(R) Kiowa Warrior
       size: 4
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 4
   #Kirkuk International Airport
   10:
     - primary: SEAD

resources/factions/blufor_current.json

@@ -2,7 +2,7 @@
   "country": "Combined Joint Task Forces Blue",
   "name": "Blufor Current",
   "authors": "Starfire",
-  "description": "<p>Combined Blufor in the 2020s intended for use with CurrentHill's USA and Sweden asset packs.</p>",
+  "description": "<p>Combined Blufor in the 2020s intended for use with Currenthill's USA and Sweden asset packs.</p>",
   "aircrafts": [
     "A-10C Thunderbolt II (Suite 7)",
     "A-10C Thunderbolt II (Suite 3)",
@@ -49,7 +49,8 @@
     "KC-130",
     "KC-135 Stratotanker",
     "KC-135 Stratotanker MPRS",
-    "S-3B Tanker"
+    "S-3B Tanker",
+    "F/A-18E Tanker"
   ],
   "frontline_units": [
     "MBT M1A2C SEP v3 Abrams",
@@ -62,7 +63,6 @@
     "M1134 Stryker ATGM (BGM-71 TOW)",
     "M1A2 Abrams",
     "M2A2 Bradley",
-    "M6 Linebacker",
     "Marder 1A3",
     "Merkava Mk IV",
     "VAB Mephisto",
@@ -179,6 +179,7 @@
     "EWR AN/FPS-117 Radar",
     "Flakpanzer Gepard",
     "M163 Vulcan Air Defense System",
+    "M6 Linebacker",
     "HEMTT C-RAM Phalanx",
     "M1097 Heavy HMMWV Avenger",
     "SAM Hawk SR (AN/MPQ-50)",

resources/factions/usa_2020.json

@@ -0,0 +1,170 @@
+{
+  "country": "USA",
+  "name": "USA 2020",
+  "authors": "Starfire",
+  "description": "<p>USA in the 2020s. Supports Currenthill's USA Asset Pack.</p>",
+  "locales": [
+    "en_US"
+  ],
+  "aircrafts": [
+    "A-10C Thunderbolt II (Suite 3)",
+    "A-10C Thunderbolt II (Suite 7)",
+    "AH-64D Apache Longbow",
+    "AH-64D Apache Longbow (AI)",
+    "AV-8B Harrier II Night Attack",
+    "AH-1W SuperCobra",
+    "B-1B Lancer",
+    "B-52H Stratofortress",
+    "C-130",
+    "C-130J-30 Super Hercules",
+    "C-17A",
+    "CH-47D",
+    "CH-47F Block I",
+    "CH-53E",
+    "F-117A Nighthawk",
+    "F-14B Tomcat",
+    "F-15C Eagle",
+    "F-15E Strike Eagle (AI)",
+    "F-15E Strike Eagle (Suite 4+)",
+    "F-16CM Fighting Falcon (Block 50)",
+    "F-16D Fighting Falcon (Block 52+)",
+    "F-16D Fighting Falcon (Block 52)",
+    "F-16D Fighting Falcon (Block 50+)",
+    "F-16D Fighting Falcon (Block 50)",
+    "F-22A Raptor",
+    "F/A-18C Hornet (Lot 20)",
+    "F/A-18E Super Hornet",
+    "F/A-18F Super Hornet",
+    "EA-6B Prowler",
+    "EA-18G Growler",
+    "OH-58D(R) Kiowa Warrior",
+    "SH-60B Seahawk",
+    "UH-1H Iroquois",
+    "UH-60A",
+    "UH-60L",
+    "[CH] B-21"
+  ],
+  "awacs": [
+    "E-2D Advanced Hawkeye",
+    "E-3A"
+  ],
+  "tankers": [
+    "KC-130",
+    "KC-135 Stratotanker",
+    "KC-135 Stratotanker MPRS",
+    "S-3B Tanker",
+    "F/A-18E Tanker"
+  ],
+  "frontline_units": [
+    "MBT M1A2C SEP v3 Abrams",
+    "APC MRAP MaxxPro",
+    "LAV-25",
+    "M1043 HMMWV (M2 HMG)",
+    "M1045 HMMWV (BGM-71 TOW)",
+    "M1097 Heavy HMMWV Avenger",
+    "M1126 Stryker ICV (M2 HMG)",
+    "M1128 Stryker Mobile Gun System",
+    "M1134 Stryker ATGM (BGM-71 TOW)",
+    "M1A2 Abrams",
+    "M2A2 Bradley",
+    "M6 Linebacker",
+    "[CH] LAV-AD SPAAGM",
+    "[CH] M10 LT",
+    "[CH] M1A2 SEPv3 MBT",
+    "[CH] M2A3 IFV",
+    "[CH] M551 LT",
+    "[CH] Oshkosh L-ATV (M2)",
+    "[CH] Oshkosh L-ATV (Mk19)",
+    "[CH] Oshkosh M-ATV MRAP (M2)",
+    "[CH] Oshkosh M-ATV MRAP (Mk19)"
+  ],
+  "artillery_units": [
+    "M109A6 Paladin",
+    "M270 Multiple Launch Rocket System",
+    "[CH] M270A1 MLRS (GMLRS)",
+    "[CH] M777 LTH M795",
+    "[CH] M777 LTH M982 Excalibur",
+    "[CH] M777 LTH M982 Excalibur (MTVR)",
+    "[CH] M777 LTH M795 (MTVR)",
+    "[CH] M270A1 MLRS (GLSDB)",
+    "[CH] M142 HIMARS (GLSDB)",
+    "[CH] M142 HIMARS (AGMLRS)"
+  ],
+  "logistics_units": [
+    "Truck M818 6x6",
+    "[CH] Oshkosh FMTV M1083",
+    "[CH] Oshkosh HEMTT M977",
+    "[CH] Oshkosh HEMTT M983",
+    "[CH] Oshkosh MTVR MK23"
+  ],
+  "infantry_units": [
+    "Infantry M249",
+    "Infantry M4",
+    "MANPADS Stinger",
+    "[CH] FGM-148 ATGM Soldier",
+    "[CH] FIM-92K Stinger Soldier",
+    "[CH] M120 120 mm Mortar",
+    "[CH] M136 AT Soldier",
+    "[CH] M2 HMG Soldier",
+    "[CH] M240 GPMG Soldier",
+    "[CH] M249 LMG Soldier",
+    "[CH] M4 AR Soldier",
+    "[CH] M4/M203 AR/GL Soldier",
+    "[CH] M82 AMR Soldier",
+    "[CH] Mk19 AGL Soldier"
+  ],
+  "preset_groups": [
+    "Patriot",
+    "NASAMS AIM-120C",
+    "MIM-104 Patriot (Mobile)",
+    "MIM-104 Patriot (Stationary)",
+    "NASAMS 3",
+    "THAAD"
+  ],
+  "naval_units": [
+    "FFG Oliver Hazard Perry",
+    "DDG Arleigh Burke IIa",
+    "CG Ticonderoga",
+    "LHA-1 Tarawa",
+    "CVN-74 John C. Stennis",
+    "[CH] Arleigh Burke Flight IIA Destroyer",
+    "[CH] Arleigh Burke Flight III Destroyer",
+    "[CH] Constellation Frigate",
+    "[CH] Ticonderoga Cruiser",
+    "[CH] Ticonderoga CMP Cruiser"
+  ],
+  "missiles": [
+    "[CH] M270A1 MLRS (ATACMS)",
+    "[CH] M142 HIMARS (ATACMS)",
+    "[CH] M142 HIMARS (PrSM)",
+    "[CH] M142 HIMARS (PrSM AShM)"
+  ],
+  "air_defense_units": [
+    "EWR AN/FPS-117 Radar",
+    "M1097 Heavy HMMWV Avenger",
+    "HEMTT C-RAM Phalanx",
+    "M6 Linebacker",
+    "[CH] Centurion C-RAM",
+    "[CH] LAV-AD SPAAGM"
+  ],
+  "requirements": {
+    "CurrentHill USA Asset Pack": "https://www.currenthill.com/usa"
+  },
+  "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"
+  ],
+  "has_jtac": true,
+  "jtac_unit": "MQ-9 Reaper",
+  "unrestricted_satnav": true
+}