From 0613c8f42332b1d42280716faf6d0038487fa1cc Mon Sep 17 00:00:00 2001 From: Druss99 <42724070+Druss99@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:38:26 -0500 Subject: [PATCH] Minor Asset pack fixes (#460) --- game/data/radar_db.py | 2 + resources/groups/BUK_M3.yaml | 2 +- resources/groups/HQ-22.yaml | 1 + resources/layouts/anti_air/BUK_M3_Site.yaml | 61 ------------------- resources/layouts/anti_air/HQ-22_Battery.yaml | 50 ++++++++------- resources/units/ground_units/CH_DF21D.yaml | 2 +- resources/units/ground_units/CH_HQ22_STR.yaml | 1 + resources/units/ground_units/CH_YJ12B.yaml | 2 +- 8 files changed, 36 insertions(+), 85 deletions(-) delete mode 100644 resources/layouts/anti_air/BUK_M3_Site.yaml diff --git a/game/data/radar_db.py b/game/data/radar_db.py index 31dd4482..9172f2c7 100644 --- a/game/data/radar_db.py +++ b/game/data/radar_db.py @@ -154,6 +154,8 @@ UNITS_WITH_RADAR = { rmap.CH_S350_50N6, rmap.CH_BukM3_9S18M13, rmap.CH_BukM3_9S36M, + rmap.CH_BukM3_9A317M, + rmap.CH_BukM3_9A317MA, # Ships ALBATROS, CVN_71, diff --git a/resources/groups/BUK_M3.yaml b/resources/groups/BUK_M3.yaml index f50fac65..cfc39790 100644 --- a/resources/groups/BUK_M3.yaml +++ b/resources/groups/BUK_M3.yaml @@ -8,4 +8,4 @@ units: - "[CH] Buk M3 9A317M TELAR" - "[CH] Buk M3 9A317MA TELAR" layouts: - - BUK M3 Site \ No newline at end of file + - 4 Launcher Site (Semicircle) \ No newline at end of file diff --git a/resources/groups/HQ-22.yaml b/resources/groups/HQ-22.yaml index cfd9d4d1..3e11ff5d 100644 --- a/resources/groups/HQ-22.yaml +++ b/resources/groups/HQ-22.yaml @@ -5,5 +5,6 @@ units: - "[CH] HQ-22 JSG-100 SR" - "[CH] HQ-22 H-200 STR" - "[CH] HQ-22 LN" + - "[CH] SX2190 Truck" layouts: - HQ-22 Battery \ No newline at end of file diff --git a/resources/layouts/anti_air/BUK_M3_Site.yaml b/resources/layouts/anti_air/BUK_M3_Site.yaml deleted file mode 100644 index b5b08deb..00000000 --- a/resources/layouts/anti_air/BUK_M3_Site.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: BUK M3 Site -tasks: - - MERAD -groups: - - S-300: - - name: S-300 Site SR1 - unit_count: - - 1 - unit_types: - - CH_BukM3_9S18M13 - - name: S-300 Site SR2 - unit_count: - - 1 - unit_types: - - CH_BukM3_9S18M13 - - name: S-300 Site CP - unit_count: - - 1 - unit_types: - - CH_BukM3_9S510M - - name: S-300 Site TR - unit_count: - - 1 - unit_types: - - CH_BukM3_9S36M - - name: S-300 Site LN1 - unit_count: - - 3 - unit_types: - - CH_BukM3_9A317M - - name: S-300 Site LN2 - unit_count: - - 3 - unit_types: - - CH_BukM3_9A317MA - - PD: - - name: S-300 Site SHORAD1 - optional: true - sub_task: PointDefense - unit_count: - - 0 - - 2 - unit_classes: - - SHORAD - - name: S-300 Site SHORAD2 - optional: true - sub_task: PointDefense - unit_count: - - 0 - - 1 - unit_types: - - TorM2M - - name: S-300 Site AAA - sub_task: AAA - optional: true - unit_count: - - 1 - - 2 - unit_classes: - - AAA -layout_file: resources/layouts/anti_air/S-300_Site.miz \ No newline at end of file diff --git a/resources/layouts/anti_air/HQ-22_Battery.yaml b/resources/layouts/anti_air/HQ-22_Battery.yaml index 7b29c770..cc97d54e 100644 --- a/resources/layouts/anti_air/HQ-22_Battery.yaml +++ b/resources/layouts/anti_air/HQ-22_Battery.yaml @@ -2,47 +2,55 @@ name: HQ-22 Battery tasks: - LORAD groups: - - Patriot: - - name: Patriot Battery 0 - unit_count: - - 2 - unit_types: - - CH_HQ22_SR - - name: Patriot Battery 1 + - S-300: + - name: S-300 Site SR1 unit_count: - 1 unit_types: - - CH_HQ22_LN - - name: Patriot Battery 2 + - CH_HQ22_SR + - name: S-300 Site SR2 + unit_count: + - 1 + unit_types: + - CH_HQ22_SR + - name: S-300 Site CP + unit_count: + - 1 + unit_types: + - CH_SX2190 + - name: S-300 Site TR unit_count: - 1 unit_types: - CH_HQ22_STR - - name: Patriot Battery 3 + - name: S-300 Site LN1 unit_count: - - 1 + - 3 unit_types: - CH_HQ22_LN - - name: Patriot Battery 4 - unit_count: - - 1 - unit_types: - - CH_HQ22_LN - - name: Patriot Battery 5 + - name: S-300 Site LN2 unit_count: - 3 unit_types: - CH_HQ22_LN - PD: - - name: Patriot Battery 7 + - name: S-300 Site SHORAD1 optional: true sub_task: PointDefense unit_count: - - 1 + - 0 - 2 unit_classes: - SHORAD - - name: Patriot Battery 6 + - name: S-300 Site SHORAD2 + optional: true + sub_task: PointDefense + unit_count: + - 0 + - 1 + unit_types: + - HQ17A + - name: S-300 Site AAA sub_task: AAA optional: true unit_count: @@ -50,4 +58,4 @@ groups: - 2 unit_classes: - AAA -layout_file: resources/layouts/anti_air/Patriot_Battery.miz \ No newline at end of file +layout_file: resources/layouts/anti_air/S-300_Site.miz \ No newline at end of file diff --git a/resources/units/ground_units/CH_DF21D.yaml b/resources/units/ground_units/CH_DF21D.yaml index 17971ce6..95234cee 100644 --- a/resources/units/ground_units/CH_DF21D.yaml +++ b/resources/units/ground_units/CH_DF21D.yaml @@ -1,4 +1,4 @@ -class: Missile +class: AntiShipMissile price: 0 variants: "[CH] DF-21D LBASBM": null \ No newline at end of file diff --git a/resources/units/ground_units/CH_HQ22_STR.yaml b/resources/units/ground_units/CH_HQ22_STR.yaml index d94ba4b6..8a74b048 100644 --- a/resources/units/ground_units/CH_HQ22_STR.yaml +++ b/resources/units/ground_units/CH_HQ22_STR.yaml @@ -1,4 +1,5 @@ class: SearchTrackRadar +reversed_heading: true description: "The HQ-22 (simplified Chinese: \u7ea2\u65d7\u002d\u0032\u0032; traditional Chinese: \u7d05\u65d7\u002d\u0032\u0032; pinyin: \u0048\u00f3\u006e\u0067\u0020\u0051\u00ed\u002d\u0032\u0032; lit. 'Red Banner-22') is a medium- to long-range semi-active radar homing/radio-command diff --git a/resources/units/ground_units/CH_YJ12B.yaml b/resources/units/ground_units/CH_YJ12B.yaml index 7f2c4a7c..950e1250 100644 --- a/resources/units/ground_units/CH_YJ12B.yaml +++ b/resources/units/ground_units/CH_YJ12B.yaml @@ -1,4 +1,4 @@ -class: Missile +class: AntiShipMissile price: 0 variants: "[CH] YJ-12B LBASM": null \ No newline at end of file