Merge branch 'dev' into pr/204

resources/campaigns/RetakeTheFalklands.yaml

@@ -8,6 +8,8 @@ description: <p>Argentina and China have taken the Falklands by surprise. Curren
 miz: RetakeTheFalklands.miz
 performance: 2
 recommended_start_date: 2002-12-21
+settings:
+  squadron_start_full: true
 version: "10.7"
 squadrons:
 # Off-map spawn
@@ -22,6 +24,12 @@ squadrons:
       aircraft:
         - F-15E Strike Eagle (Suite 4+)
       size: 12
+     # Gamblers
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - 77th FS
+      size: 12
     - primary: Strike
       secondary: air-to-ground
       aircraft:
@@ -88,14 +96,6 @@ squadrons:
       size: 12
       aircraft:
         - J-15 Flanker X-2
- # Blue - San Julian
-  11:
-     # Gamblers
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - 77th FS
-      size: 9
  # RED - Punta Arenas
   9:
     - primary: CAS

resources/campaigns/scenic_merge.yaml

@@ -16,14 +16,25 @@ recommended_player_income_multiplier: 1.5
 recommended_enemy_income_multiplier: 0.7
 settings:
   airbase_threat_range: 300
+  # Set mission duration to 45 minutes
+  desired_player_mission_duration: 45
+  #  Set max frontline width to 30 km
+  max_frontline_width: 30
+  squadron_start_full: true
 squadrons:
   #BLUFOR CVN
   Naval-3:
-    # Pukin' Dogs F-14
+    # The Swordsmen F-14
     - primary: BARCAP
       secondary: air-to-air
       aircraft:
-        - VF-143
+        - VF-32
+      size: 14
+    - primary: Strike
+      secondary: air-to-air
+      aircraft:
+        - VF-213
+        - F-14B Tomcat
       size: 14
     # Golden Dragons F/A-18
     - primary: SEAD
@@ -52,13 +63,18 @@ squadrons:
     - primary: BAI
       secondary: air-to-ground
       aircraft:
-        - VMA-223
-      size: 12
-    - primary: Transport
+        - AV-8B Harrier II Night Attack
+      size: 10
+    - primary: Air Assault
       secondary: air-to-ground
       aircraft:
-        - HMLA-169 (UH-1H)
-      size: 8
+        - UH-1H Iroquois
+      size: 4
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - AH-1W SuperCobra
+      size: 6
   # Al-Dhafra AFB
   4:        
     #USAF F-16C Gamblers
@@ -92,12 +108,6 @@ squadrons:
       #USAF F-15C 
   # Al-Minhab AFB
   12:
-    - primary: Transport
-      secondary: air-to-ground
-      aircraft:
-        - 101st Combat Aviation Brigade
-        #US Army UH-60
-      size: 6
     - primary: SEAD
       secondary: any
       aircraft:
@@ -115,8 +125,30 @@ squadrons:
       #USAF A-10CI
     - primary: Transport
       aircraft:
+        - C-130J-30 Super Hercules
         - C-130
       size: 8
+  # Khasab / 12
+  10:
+    - primary: Transport
+      secondary: air-to-ground
+      aircraft:
+        - 101st Combat Aviation Brigade
+        #US Army UH-60
+      size: 4
+    - primary: BAI
+      size: 4
+      secondary: air-to-ground
+      aircraft:
+      - A-10C Thunderbolt II (Suite 7)
+      #USAF A-10CI  
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Wolfpack, 1-82 ARB
+        #US Army Apache AH-64D
+      size: 4
+### OPFOR
   # Kish Intl
   24:
     - primary: AEW&C
@@ -156,7 +188,12 @@ squadrons:
       secondary: air-to-ground
       aircraft:
         - MiG-29A Fulcrum-A
-      size: 6
+      size: 12
+    - primary: BARCAP
+      secondary: air-to-ground
+      aircraft:
+        - Mirage-F1EQ
+      size: 12
     - primary: Strike
       secondary: air-to-ground
       aircraft:

resources/campaigns/syria_TheLongRoadToH3.yaml

@@ -3,7 +3,7 @@ name: Syria - The Long Road to H3
 theater: Syria
 authors: tmz42 (original campaign by Plob)
 description: 
-  <p>From Incirlik to H-3, repel the alliance between Iraq and Syria.</p>
+  <p>From Incirlik to H-3, repel the alliance between Syria and Iraq.</p>
   <p>This campaign is based on and meant as a lighter alternative to Syria - Full Map.</p>
 recommended_player_faction: NATO OIF
 recommended_enemy_faction:
@@ -25,7 +25,6 @@ recommended_enemy_faction:
     - SA 342L Gazelle
     - Su-22M4 Fitter-K
     - Su-24M Fencer-D
-    - Tu-22M3 Backfire-C
     - Su-25 Frogfoot
     - Mirage-F1EQ
     - H-6J Badger
@@ -42,10 +41,9 @@ recommended_enemy_faction:
     - MT-LB
     - T-55A
     - T-72B with Kontakt-1 ERA
-    - T-90A
     - ZSU-57-2 'Sparka'
+    - ZSU-23-4 Shilka
   artillery_units:
-    - BM-21 Grad
     - 2S1 Gvozdika
     - 2S9 Nona-S
   logistics_units:
@@ -65,19 +63,16 @@ recommended_enemy_faction:
     - SA-6
     - SA-11
     - SA-10/S-300PS
-    - SA-12/S-300V
     - Cold-War-Flak
     - Silkworm
     - KS-19/SON-9
   naval_units:
     - Corvette 1124.4 Grish
     - Corvette 1241.1 Molniya
-    - FAC La Combattante IIa
     - Frigate 1135M Rezky
+    - LS Ropucha
   air_defense_units:
     - SAM P19 "Flat Face" SR (SA-2/3)
-    - EWR 1L13
-    - EWR 55G6
     - SAM SA-8 Osa "Gecko" TEL
     - SA-9 Strela
     - SA-13 Gopher (9K35 Strela-10M3)
@@ -102,6 +97,7 @@ settings:
   desired_player_mission_duration: 45
   #  Set max frontline width to 30 km
   max_frontline_width: 30
+  squadron_start_full: true
 squadrons:
 ####################### BLUEFOR
   Blue CV: