Update and generalize Anti Air Layouts

resources/groups/HQ-2.yaml

@@ -6,4 +6,5 @@ units:
   - SAM SA-2 S-75 "Fan Song" TR
   - SAM HQ-2 LN SM-90
 layouts:
-  - 4 Launcher Site
+  - 4 Launcher Site (Semicircle)
+  - 4 Launcher Site (Circle)

resources/groups/HQ-7.yaml

@@ -5,4 +5,4 @@ units:
   - HQ-7 Self-Propelled STR
   - HQ-7 Launcher
 layouts:
-  - 4 Launcher Site
+  - 4 Launcher Site (Semicircle)

resources/groups/Hawk.yaml

@@ -7,4 +7,4 @@ units:
   - SAM Hawk TR (AN/MPQ-46)
   - SAM Hawk LN M192
 layouts:
-  - 6 Launcher Site
+  - 6 Launcher Site (Semicircle)

resources/groups/KS-19.yaml

@@ -5,4 +5,4 @@ units:
   - AAA SON-9 Fire Can
   - AAA 100mm KS-19
 layouts:
-  - AAA Radar Site
+  - AAA Site

resources/groups/NASAMS-B.yaml

@@ -6,4 +6,4 @@ units:
   - SAM NASAMS SR MPQ64F1
   - SAM NASAMS LN AIM-120B
 layouts:
-  - 4 Launcher Circle
+  - 4 Launcher Site (Circle)

resources/groups/NASAMS-C.yaml

@@ -6,4 +6,4 @@ units:
   - SAM NASAMS SR MPQ64F1
   - SAM NASAMS LN AIM-120C
 layouts:
-  - 4 Launcher Circle
+  - 4 Launcher Site (Circle)

resources/groups/Rapier.yaml

@@ -6,4 +6,4 @@ units:
   - SAM Rapier Tracker
   - SAM Rapier LN
 layouts:
-  - Short Range Anti Air Group
+  - 2 Launcher Site

resources/groups/Roland.yaml

@@ -5,4 +5,4 @@ units:
   - SAM Roland EWR
   - Roland 2 (Marder Chassis)
 layouts:
-  - Short Range Anti Air Group
+  - 2 Launcher Site

resources/groups/SA-11.yaml

@@ -6,4 +6,4 @@ units:
   - SAM SA-11 Buk "Gadfly" C2
   - SAM SA-11 Buk "Gadfly" Fire Dome TEL
 layouts:
-  - 4 Launcher Site
+  - 4 Launcher Site (Semicircle)

resources/groups/SA-17.yaml

@@ -6,4 +6,4 @@ units:
   - SAM SA-11 Buk "Gadfly" C2
   - SAM SA-17 Buk M1-2 LN 9A310M1-2
 layouts:
-  - 4 Launcher Site
+  - 4 Launcher Site (Semicircle)

resources/groups/SA-2.yaml

@@ -6,4 +6,5 @@ units:
   - SAM SA-2 S-75 "Fan Song" TR
   - SAM SA-2 S-75 "Guideline" LN
 layouts:
-  - 6 Launcher Site
+  - 6 Launcher Site (Semicircle)
+  - 6 Launcher Site (Circle)

resources/groups/SA-2_high_digit_sam.yaml

@@ -6,4 +6,5 @@ units:
   - SAM SA-2 S-75 "Fan Song" TR
   - SAM SA-2 (V759) LN SM-90
 layouts:
-  - 6 Launcher Site
+  - 6 Launcher Site (Semicircle)
+  - 6 Launcher Site (Circle)

resources/groups/SA-3.yaml

@@ -6,4 +6,5 @@ units:
   - SAM SA-3 S-125 "Low Blow" TR
   - SAM SA-3 S-125 "Goa" LN
 layouts:
-  - 4 Launcher Site
+  - 4 Launcher Site (Semicircle) 
+  - 4 Launcher Site (Circle)

resources/groups/SA-3_high_digit_sam.yaml

@@ -6,4 +6,5 @@ units:
   - SAM SA-3 S-125 "Low Blow" TR
   - SAM SA-3 (V-601P) LN 5P73
 layouts:
-  - 4 Launcher Site
+  - 4 Launcher Site (Semicircle)
+  - 4 Launcher Site (Circle)

resources/groups/SA-5.yaml

@@ -6,4 +6,4 @@ units:
   - SAM SA-5 S-200 "Square Pair" TR"
   - SAM SA-5 S-200 "Gammon" LN"
 layouts:
-  - SA-5/S-200 Site
+  - 6 Launcher Site (Circle)

resources/groups/SA-6.yaml

@@ -5,4 +5,4 @@ units:
   - SAM SA-6 Kub "Straight Flush" STR
   - SAM SA-6 Kub "Gainful" TEL
 layouts:
-  - 4 Launcher Circle
+  - 4 Launcher Site (Circle)

resources/layouts/anti_air/2_Launcher.yaml

@@ -1,9 +1,10 @@
-name: Short Range Anti Air Group
+name: 2 Launcher Site
 tasks:
   - SHORAD
+  - MERAD
 groups:
-  - SHORAD:
+  - SAM:
-    - name: SHORAD STR
+    - name: Search Radar
       optional: true
       fill: false # Do not fill with faction possible units
       unit_count:
@@ -11,25 +12,30 @@ groups:
       unit_classes:
         - SearchRadar
         - SearchTrackRadar
+    - name: Track Radar
+      optional: true
+      fill: false # Do not fill with faction possible units
+      unit_count:
+        - 1
+      unit_classes:
         - TrackRadar
-    - name: SHORAD OTR
+    - name: Optical Tracker
       optional: true
       fill: false # Do not fill with faction possible units
       unit_count:
         - 1
       unit_classes:
         - OpticalTracker
-    - name: SHORAD LN
+    - name: Launcher
       unit_count:
         - 2
       unit_classes:
         - SHORAD
         - Launcher
-    - name: SHORAD Logistics
+    - name: Logistics
       optional: true
       unit_count:
-        - 1
+        - 0
         - 2
       unit_classes:
         - Logistics
-layout_file: resources/layouts/anti_air/SHORAD.miz

resources/layouts/anti_air/4_Launcher_Circle.yaml

@@ -1,7 +1,7 @@
-name: 4 Launcher Circle
+name: 4 Launcher Site (Circle)
 tasks:
-  - SHORAD
   - MERAD
+  - LORAD
 groups:
   - SAM:
     - name: Search Radar
@@ -10,6 +10,13 @@ groups:
       unit_classes:
         - SearchRadar
         - SearchTrackRadar
+    - name: Track Radar
+      optional: true # Allow groups without TR
+      fill: false # Do not fill with faction possible units
+      unit_count:
+        - 1
+      unit_classes:
+        - TrackRadar
     - name: Command Post
       optional: true
       fill: false # Do not fill with faction possible units
@@ -30,3 +37,21 @@ groups:
         - 2
       unit_classes:
         - Logistics
+  - PD: # Point Defense as separate group
+    - name: PD
+      sub_task: PointDefense
+      optional: true
+      unit_count:
+        - 0
+        - 2
+      unit_classes:
+        - SHORAD
+    - name: AAA
+      sub_task: AAA
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - AAA
+layout_file: resources/layouts/anti_air/8_Launcher_Circle.miz

resources/layouts/anti_air/4_Launcher_Semicircle.yaml

@@ -1,9 +1,9 @@
-name: 4 Launcher Site
+name: 4 Launcher Site (Semicircle)
 tasks:
   - MERAD
   - LORAD
 groups:
-  - MERAD: # Main Battery as one group
+  - SAM: # Main Battery as one group
     - name: Search Radar
       unit_count:
         - 1
@@ -50,8 +50,8 @@ groups:
       sub_task: AAA
       optional: true
       unit_count:
-        - 0
+        - 1
         - 2
       unit_classes:
         - AAA
-layout_file: resources/layouts/anti_air/6_Launcher_Site.miz
+layout_file: resources/layouts/anti_air/6_Launcher_Semicircle.miz

resources/layouts/anti_air/6_Launcher_Circle.yaml

@@ -1,9 +1,9 @@
-name: 6 Launcher Site
+name: 6 Launcher Site (Circle)
 tasks:
   - MERAD
   - LORAD
 groups:
-  - MERAD: # Main Battery as one group
+  - SAM: # Main Battery as one group
     - name: Search Radar
       unit_count:
         - 1
@@ -50,7 +50,8 @@ groups:
       sub_task: AAA
       optional: true
       unit_count:
-        - 0
+        - 1
         - 2
       unit_classes:
         - AAA
+layout_file: resources/layouts/anti_air/6_Launcher_Circle.miz

resources/layouts/anti_air/6_Launcher_Semicircle.yaml

@@ -0,0 +1,57 @@
+name: 6 Launcher Site (Semicircle)
+tasks:
+  - MERAD
+  - LORAD
+groups:
+  - SAM: # Main Battery as one group
+    - name: Search Radar
+      unit_count:
+        - 1
+      unit_classes:
+        - SearchRadar
+        - SearchTrackRadar
+    - name: Track Radar
+      optional: true # Allow groups without TR
+      fill: false # Do not fill with faction possible units
+      unit_count:
+        - 1
+      unit_classes:
+        - TrackRadar
+    - name: Command Post
+      optional: true
+      fill: false # Do not fill with faction possible units
+      unit_count:
+        - 1
+      unit_classes:
+        - CommandPost
+    - name: Launcher
+      unit_count:
+        - 6
+      unit_classes:
+        - Launcher
+        - TELAR
+    - name: Logistics
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - Logistics
+  - PD: # Point Defense as separate group
+    - name: PD
+      sub_task: PointDefense
+      optional: true
+      unit_count:
+        - 0
+        - 2
+      unit_classes:
+        - SHORAD
+    - name: AAA
+      sub_task: AAA
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - AAA
+layout_file: resources/layouts/anti_air/6_Launcher_Semicircle.miz

resources/layouts/anti_air/AAA_Radar.yaml

@@ -1,26 +0,0 @@
-name: AAA Radar Site
-description: AAA Template with a Radar
-generic: false
-tasks:
-  - AAA
-groups:
-  - AAA:
-    - name: AAA Site Radar
-      unit_count:
-        - 1
-      unit_classes:
-        - SearchRadar
-    - name: AAA Site
-      unit_count:
-        - 2
-        - 6
-      unit_classes:
-        - AAA
-    - name: AAA Site Logistics
-      optional: true
-      unit_count:
-        - 1
-        - 2
-      unit_classes:
-        - Logistics
-layout_file: resources/layouts/anti_air/AAA_Site.miz

resources/layouts/anti_air/AAA_Site.yaml

@@ -5,6 +5,14 @@ tasks:
   - AAA
 groups:
   - AAA:
+    - name: AAA Site Radar
+      optional: true # Optional if the AAA Site has a Radar
+      fill: false # Do not fill if no Radar is required!
+      unit_count:
+        - 1
+      unit_classes:
+        - SearchRadar
+        - SearchTrackRadar
     - name: AAA Site
       unit_count:
         - 2

resources/layouts/anti_air/S-300_Site.yaml

@@ -61,14 +61,6 @@ groups:
         - S-300PMU1 5P85DE ln # SA-20
         - S-300PMU2 5P85SE2 ln # SA-20B
         - S-300VM 9A83ME ln # SA-23
-  - AAA:
-    - name: S-300 Site AAA
-      sub_task: AAA
-      optional: true
-      unit_count:
-        - 2
-      unit_classes:
-        - AAA
   - PD:
     - name: S-300 Site SHORAD1
       optional: true
@@ -83,6 +75,14 @@ groups:
       sub_task: PointDefense
       unit_count:
         - 0
-        - 2
+        - 1
       unit_types:
         - Tor 9A331 # Explicit TOR / SA-15 SHORAD PointDefense
+    - name: S-300 Site AAA
+      sub_task: AAA
+      optional: true
+      unit_count:
+        - 1
+        - 2
+      unit_classes:
+        - AAA

resources/layouts/anti_air/SA-5_S-200_Site.yaml

@@ -1,26 +0,0 @@
-name: SA-5/S-200 Site
-tasks:
-  - LORAD
-groups:
-  - SA-5:
-    - name: SA-5/S-200 Site 0
-      unit_count:
-        - 1
-      unit_types:
-        - RLS_19J6
-    - name: SA-5/S-200 Site 1
-      unit_count:
-        - 1
-      unit_types:
-        - RPC_5N62V
-    - name: SA-5/S-200 Site 2
-      optional: true
-      unit_count:
-        - 1
-      unit_classes:
-        - Logistics
-    - name: SA-5/S-200 Site 3
-      unit_count:
-        - 6
-      unit_types:
-        - S-200_Launcher

resources/layouts/anti_air/SHORAD.yaml

@@ -1,19 +1,19 @@
-name: SHORAD TELAR
+name: Short Range Anti Air Group
 generic: true
 tasks:
   - SHORAD
 groups:
   - SHORAD:
-    - name: SHORAD LN
+    - name: Launcher
       unit_count:
         - 2
       unit_classes:
         - SHORAD
-    - name: SHORAD Logistics
+    - name: Logistics
       optional: true
       unit_count:
-        - 1
+        - 0
         - 2
       unit_classes:
         - Logistics
-layout_file: resources/layouts/anti_air/SHORAD.miz
+layout_file: resources/layouts/anti_air/2_Launcher.miz

resources/layouts/defenses/Silkworm.yaml

@@ -30,6 +30,7 @@ groups:
     - name: SilkwormGenerator 4
       optional: true
       unit_count:
+        - 0
         - 1
       unit_classes:
         - SHORAD

resources/layouts/defenses/missile.yaml

@@ -23,6 +23,7 @@ groups:
     - name: ScudGenerator 3
       optional: true
       unit_count:
+        - 0
         - 1
       unit_classes:
         - SHORAD