diff --git a/resources/groups/HQ-7.yaml b/resources/groups/HQ-7.yaml index 195e566d..62563e34 100644 --- a/resources/groups/HQ-7.yaml +++ b/resources/groups/HQ-7.yaml @@ -5,4 +5,4 @@ units: - HQ-7 Self-Propelled STR - HQ-7 Launcher layouts: - - HQ-7 Site \ No newline at end of file + - 4 Launcher Site \ No newline at end of file diff --git a/resources/groups/Hawk.yaml b/resources/groups/Hawk.yaml index 50ff4954..d5d22546 100644 --- a/resources/groups/Hawk.yaml +++ b/resources/groups/Hawk.yaml @@ -7,4 +7,4 @@ units: - SAM Hawk TR (AN/MPQ-46) - SAM Hawk LN M192 layouts: - - Hawk Site \ No newline at end of file + - 6 Launcher Site \ No newline at end of file diff --git a/resources/groups/NASAMS-B.yaml b/resources/groups/NASAMS-B.yaml index d626bdb6..aa9b5bad 100644 --- a/resources/groups/NASAMS-B.yaml +++ b/resources/groups/NASAMS-B.yaml @@ -6,4 +6,4 @@ units: - SAM NASAMS SR MPQ64F1 - SAM NASAMS LN AIM-120B layouts: - - NASAMS AIM-120B \ No newline at end of file + - NASAMS Site \ No newline at end of file diff --git a/resources/groups/NASAMS-C.yaml b/resources/groups/NASAMS-C.yaml index 4c0a900c..b983be98 100644 --- a/resources/groups/NASAMS-C.yaml +++ b/resources/groups/NASAMS-C.yaml @@ -6,4 +6,4 @@ units: - SAM NASAMS SR MPQ64F1 - SAM NASAMS LN AIM-120C layouts: - - NASAMS AIM-120C \ No newline at end of file + - NASAMS Site \ No newline at end of file diff --git a/resources/groups/Rapier.yaml b/resources/groups/Rapier.yaml index aaa4b0fe..cd4c8f85 100644 --- a/resources/groups/Rapier.yaml +++ b/resources/groups/Rapier.yaml @@ -6,4 +6,4 @@ units: - SAM Rapier Tracker - SAM Rapier LN layouts: - - Rapier AA Site \ No newline at end of file + - Short Range Anti Air Group \ No newline at end of file diff --git a/resources/groups/Roland.yaml b/resources/groups/Roland.yaml index ecdb6bcf..f1ac9738 100644 --- a/resources/groups/Roland.yaml +++ b/resources/groups/Roland.yaml @@ -5,4 +5,4 @@ units: - SAM Roland EWR - Roland 2 (Marder Chassis) layouts: - - Roland Site \ No newline at end of file + - Short Range Anti Air Group \ No newline at end of file diff --git a/resources/groups/SA-11.yaml b/resources/groups/SA-11.yaml index f57a8a1f..cd36e0d3 100644 --- a/resources/groups/SA-11.yaml +++ b/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: - - SA-11 Buk Battery \ No newline at end of file + - 4 Launcher Site \ No newline at end of file diff --git a/resources/groups/SA-2.yaml b/resources/groups/SA-2.yaml index 72124b7a..a6e805f0 100644 --- a/resources/groups/SA-2.yaml +++ b/resources/groups/SA-2.yaml @@ -6,4 +6,4 @@ units: - SAM SA-2 S-75 "Fan Song" TR - SAM SA-2 S-75 "Guideline" LN layouts: - - SA-2/S-75 Site \ No newline at end of file + - 6 Launcher Site \ No newline at end of file diff --git a/resources/groups/SA-3.yaml b/resources/groups/SA-3.yaml index 5e5dc8bf..9e759637 100644 --- a/resources/groups/SA-3.yaml +++ b/resources/groups/SA-3.yaml @@ -6,4 +6,4 @@ units: - SAM SA-3 S-125 "Low Blow" TR - SAM SA-3 S-125 "Goa" LN layouts: - - SA-3/S-125 Site \ No newline at end of file + - 4 Launcher Site \ No newline at end of file diff --git a/resources/layouts/anti_air/4_Launcher_Site.yaml b/resources/layouts/anti_air/4_Launcher_Site.yaml new file mode 100644 index 00000000..8748de79 --- /dev/null +++ b/resources/layouts/anti_air/4_Launcher_Site.yaml @@ -0,0 +1,53 @@ +name: 4 Launcher Site +tasks: + - MERAD + - LORAD +groups: + - MERAD: # Main Battery as one group + - name: Search Radar + unit_count: + - 1 + unit_classes: + - SearchRadar + - SearchTrackRadar + - name: Track Radar + optional: true # Allow groups without TR + unit_count: + - 1 + unit_classes: + - TrackRadar + - name: Command Post + optional: true + unit_count: + - 1 + unit_classes: + - CommandPost + - name: Launcher + unit_count: + - 4 + unit_classes: + - Launcher + - TELAR + - name: Logistics + optional: true + unit_count: + - 1 + - 2 + unit_classes: + - Logistics + - PD: # Point Defense as separate group + - name: PD + optional: true + unit_count: + - 0 + - 2 + unit_classes: + - SHORAD + - name: AAA + optional: true + unit_count: + - 0 + - 2 + unit_classes: + - AAA +layout_file: resources/layouts/anti_air/6_Launcher_Site.miz \ No newline at end of file diff --git a/resources/layouts/anti_air/6_Launcher_Site.miz b/resources/layouts/anti_air/6_Launcher_Site.miz new file mode 100644 index 00000000..3ecc8d48 Binary files /dev/null and b/resources/layouts/anti_air/6_Launcher_Site.miz differ diff --git a/resources/layouts/anti_air/6_Launcher_Site.yaml b/resources/layouts/anti_air/6_Launcher_Site.yaml new file mode 100644 index 00000000..b5ff9617 --- /dev/null +++ b/resources/layouts/anti_air/6_Launcher_Site.yaml @@ -0,0 +1,53 @@ +name: 6 Launcher Site +tasks: + - MERAD + - LORAD +groups: + - MERAD: # Main Battery as one group + - name: Search Radar + unit_count: + - 1 + unit_classes: + - SearchRadar + - SearchTrackRadar + - name: Track Radar + optional: true # Allow groups without TR + unit_count: + - 1 + unit_classes: + - TrackRadar + - name: Command Post + optional: true + 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 + optional: true + unit_count: + - 0 + - 2 + unit_classes: + - SHORAD + - name: AAA + optional: true + unit_count: + - 0 + - 2 + unit_classes: + - AAA diff --git a/resources/layouts/anti_air/HQ-7_Site.yaml b/resources/layouts/anti_air/HQ-7_Site.yaml deleted file mode 100644 index cd7597f8..00000000 --- a/resources/layouts/anti_air/HQ-7_Site.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: HQ-7 Site -tasks: - - SHORAD -groups: - - HQ-7: - - name: HQ-7 Site 0 - unit_count: - - 1 - unit_types: - - HQ-7_STR_SP - - name: HQ-7 Site 1 - unit_count: - - 2 - unit_types: - - HQ-7_LN_SP - - name: HQ-7 Site 2 - optional: true - unit_count: - - 2 - unit_classes: - - Logistics -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/Hawk_Site.yaml b/resources/layouts/anti_air/Hawk_Site.yaml deleted file mode 100644 index 60c15886..00000000 --- a/resources/layouts/anti_air/Hawk_Site.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: Hawk Site -tasks: - - MERAD -groups: - - Hawk: # Main Battery as one group - - name: Hawk Site 0 - unit_count: - - 1 - unit_types: - - Hawk sr - - name: Hawk Site 1 - unit_count: - - 1 - unit_types: - - Hawk pcp - - name: Hawk Site 2 - unit_count: - - 1 - unit_types: - - Hawk tr - - name: Hawk Site 3 - unit_count: - - 6 - unit_types: - - Hawk ln - - PD: # Point Defense as separate group - - name: Hawk Site 4 - optional: true - unit_count: - - 1 - unit_types: - - Vulcan -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/NASAMS_AIM-120C.yaml b/resources/layouts/anti_air/NASAMS_AIM-120C.yaml deleted file mode 100644 index 6403ab53..00000000 --- a/resources/layouts/anti_air/NASAMS_AIM-120C.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: NASAMS AIM-120C -tasks: - - MERAD -groups: - - NASAMS: - - name: NASAMS AIM-120C 1 - unit_count: - - 1 - unit_types: - - NASAMS_Radar_MPQ64F1 - - name: NASAMS AIM-120C 0 - unit_count: - - 1 - unit_types: - - NASAMS_Command_Post - - name: NASAMS AIM-120C 2 - unit_count: - - 4 - unit_types: - - NASAMS_LN_C -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/NASAMS_Site.miz b/resources/layouts/anti_air/NASAMS_Site.miz new file mode 100644 index 00000000..0b25d593 Binary files /dev/null and b/resources/layouts/anti_air/NASAMS_Site.miz differ diff --git a/resources/layouts/anti_air/NASAMS_AIM-120B.yaml b/resources/layouts/anti_air/NASAMS_Site.yaml similarity index 59% rename from resources/layouts/anti_air/NASAMS_AIM-120B.yaml rename to resources/layouts/anti_air/NASAMS_Site.yaml index 63351bff..e3f2d746 100644 --- a/resources/layouts/anti_air/NASAMS_AIM-120B.yaml +++ b/resources/layouts/anti_air/NASAMS_Site.yaml @@ -1,21 +1,21 @@ -name: NASAMS AIM-120B +name: NASAMS Site tasks: - MERAD groups: - NASAMS: - - name: NASAMS AIM-120B 1 + - name: SR unit_count: - 1 unit_types: - NASAMS_Radar_MPQ64F1 - - name: NASAMS AIM-120B 0 + - name: CC unit_count: - 1 unit_types: - NASAMS_Command_Post - - name: NASAMS AIM-120B 2 + - name: LN unit_count: - 4 unit_types: - NASAMS_LN_B -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz + - NASAMS_LN_C diff --git a/resources/layouts/anti_air/Rapier_AA_Site.yaml b/resources/layouts/anti_air/Rapier_AA_Site.yaml deleted file mode 100644 index ca65c374..00000000 --- a/resources/layouts/anti_air/Rapier_AA_Site.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: Rapier AA Site -tasks: - - SHORAD -groups: - - Rapier: - - name: Rapier AA Site 0 - unit_count: - - 1 - unit_types: - - rapier_fsa_blindfire_radar - - name: Rapier AA Site 1 - unit_count: - - 1 - unit_types: - - rapier_fsa_optical_tracker_unit - - name: Rapier AA Site 2 - unit_count: - - 2 - unit_types: - - rapier_fsa_launcher -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/Roland_Site.yaml b/resources/layouts/anti_air/Roland_Site.yaml deleted file mode 100644 index 43459716..00000000 --- a/resources/layouts/anti_air/Roland_Site.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: Roland Site -tasks: - - SHORAD -groups: - - Roland: - - name: Roland Site 0 - unit_count: - - 1 - unit_types: - - Roland Radar - - name: Roland Site 1 - unit_count: - - 2 - unit_types: - - Roland ADS - - name: Roland Site 2 - optional: true - unit_count: - - 1 - unit_classes: - - Logistics -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/SA-11_Buk_Battery.yaml b/resources/layouts/anti_air/SA-11_Buk_Battery.yaml deleted file mode 100644 index bd02e2fb..00000000 --- a/resources/layouts/anti_air/SA-11_Buk_Battery.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: SA-11 Buk Battery -tasks: - - MERAD -groups: - - SA-11: - - name: SA-11 Buk Battery 0 - unit_count: - - 1 - unit_types: - - SA-11 Buk SR 9S18M1 - - name: SA-11 Buk Battery 1 - unit_count: - - 1 - unit_types: - - SA-11 Buk CC 9S470M1 - - name: SA-11 Buk Battery 2 - unit_count: - - 4 - unit_types: - - SA-11 Buk LN 9A310M1 -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/SA-2_S-75_Site.yaml b/resources/layouts/anti_air/SA-2_S-75_Site.yaml deleted file mode 100644 index a34b697f..00000000 --- a/resources/layouts/anti_air/SA-2_S-75_Site.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: SA-2/S-75 Site -tasks: - - MERAD -groups: - - SA-2: - - name: SA-2/S-75 Site 0 - unit_count: - - 1 - unit_types: - - p-19 s-125 sr - - name: SA-2/S-75 Site 1 - unit_count: - - 1 - unit_types: - - SNR_75V - - name: SA-2/S-75 Site 2 - unit_count: - - 6 - unit_types: - - S_75M_Volhov -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/SA-3_S-125_Site.yaml b/resources/layouts/anti_air/SA-3_S-125_Site.yaml deleted file mode 100644 index 9478f04f..00000000 --- a/resources/layouts/anti_air/SA-3_S-125_Site.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: SA-3/S-125 Site -tasks: - - MERAD -groups: - - SA-3: - - name: SA-3/S-125 Site 0 - unit_count: - - 1 - unit_types: - - p-19 s-125 sr - - name: SA-3/S-125 Site 1 - unit_count: - - 1 - unit_types: - - snr s-125 tr - - name: SA-3/S-125 Site 2 - unit_count: - - 4 - unit_types: - - 5p73 s-125 ln -layout_file: resources/layouts/anti_air/legacy_ground_templates.miz diff --git a/resources/layouts/anti_air/Short_Range_Anti_Air.yaml b/resources/layouts/anti_air/SHORAD_TELAR.yaml similarity index 61% rename from resources/layouts/anti_air/Short_Range_Anti_Air.yaml rename to resources/layouts/anti_air/SHORAD_TELAR.yaml index 2c837522..c4d583eb 100644 --- a/resources/layouts/anti_air/Short_Range_Anti_Air.yaml +++ b/resources/layouts/anti_air/SHORAD_TELAR.yaml @@ -1,19 +1,19 @@ -name: Short Range Anti Air Group +name: SHORAD TELAR generic: true tasks: - SHORAD groups: - SHORAD: - - name: SHORAD Group 0 + - name: SHORAD LN unit_count: - 2 unit_classes: - SHORAD - - name: SHORAD Group 1 + - name: SHORAD Logistics optional: true unit_count: - 1 - 2 unit_classes: - Logistics -layout_file: resources/layouts/anti_air/shorad.miz +layout_file: resources/layouts/anti_air/SHORAD.miz diff --git a/resources/layouts/anti_air/SHORAD_TR.yaml b/resources/layouts/anti_air/SHORAD_TR.yaml new file mode 100644 index 00000000..01e1e3d8 --- /dev/null +++ b/resources/layouts/anti_air/SHORAD_TR.yaml @@ -0,0 +1,33 @@ +name: Short Range Anti Air Group +tasks: + - SHORAD +groups: + - SHORAD: + - name: SHORAD STR + optional: true + unit_count: + - 1 + unit_classes: + - SearchRadar + - SearchTrackRadar + - TrackRadar + - name: SHORAD OTR + optional: true + unit_count: + - 1 + unit_classes: + - OpticalTracker + - name: SHORAD LN + unit_count: + - 2 + unit_classes: + - SHORAD + - Launcher + - name: SHORAD Logistics + optional: true + unit_count: + - 1 + - 2 + unit_classes: + - Logistics +layout_file: resources/layouts/anti_air/SHORAD.miz diff --git a/resources/layouts/anti_air/legacy_ground_templates.miz b/resources/layouts/anti_air/legacy_ground_templates.miz index 81f53bda..bab7ef3a 100644 Binary files a/resources/layouts/anti_air/legacy_ground_templates.miz and b/resources/layouts/anti_air/legacy_ground_templates.miz differ diff --git a/resources/layouts/anti_air/shorad.miz b/resources/layouts/anti_air/shorad.miz index c68e5795..8c48b6b7 100644 Binary files a/resources/layouts/anti_air/shorad.miz and b/resources/layouts/anti_air/shorad.miz differ diff --git a/resources/units/ground_units/HQ-7_STR_SP.yaml b/resources/units/ground_units/HQ-7_STR_SP.yaml index 5682b636..4123d132 100644 --- a/resources/units/ground_units/HQ-7_STR_SP.yaml +++ b/resources/units/ground_units/HQ-7_STR_SP.yaml @@ -1,4 +1,4 @@ -class: SearchRadar +class: SearchTrackRadar price: 24 variants: HQ-7 Self-Propelled STR: null diff --git a/resources/units/ground_units/Roland Radar.yaml b/resources/units/ground_units/Roland Radar.yaml index 59840575..95aeff77 100644 --- a/resources/units/ground_units/Roland Radar.yaml +++ b/resources/units/ground_units/Roland Radar.yaml @@ -1,4 +1,4 @@ -class: EarlyWarningRadar +class: SearchTrackRadar price: 16 variants: SAM Roland EWR: null