From aac68436d9448c4c25e4cc08f73056ef5cc83981 Mon Sep 17 00:00:00 2001
From: Nosajthedevil <78634843+Nosajthedevil@users.noreply.github.com>
Date: Thu, 3 Nov 2022 12:35:51 -0500
Subject: [PATCH] Weapons data corrections

Remove weapon Type "ARM" to fix error in 5.2.1 and add AIM-54C-MK60
---
 resources/weapons/a2a-missiles/AIM-54C-MK60.yaml | 7 +++++++
 resources/weapons/standoff/AGM-88C.yaml          | 5 ++---
 resources/weapons/standoff/KH-25MP.yaml          | 1 -
 resources/weapons/standoff/KH-28.yaml            | 1 -
 resources/weapons/standoff/Kh-25MPU.yaml         | 1 -
 resources/weapons/standoff/Kh-31P.yaml           | 1 -
 resources/weapons/standoff/Kh-58U.yaml           | 1 -
 7 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 resources/weapons/a2a-missiles/AIM-54C-MK60.yaml

diff --git a/resources/weapons/a2a-missiles/AIM-54C-MK60.yaml b/resources/weapons/a2a-missiles/AIM-54C-MK60.yaml
new file mode 100644
index 00000000..3ef426ae
--- /dev/null
+++ b/resources/weapons/a2a-missiles/AIM-54C-MK60.yaml
@@ -0,0 +1,7 @@
+name: AIM-54C-MK60
+year: 1986
+fallback: AIM-54C-MK47
+clsids:
+  - "{SHOULDER AIM_54C_Mk60 R}"
+  - "{SHOULDER AIM_54C_Mk60 L}"
+  - "{AIM_54C_Mk60}"
diff --git a/resources/weapons/standoff/AGM-88C.yaml b/resources/weapons/standoff/AGM-88C.yaml
index fa146c9d..35cc34dd 100644
--- a/resources/weapons/standoff/AGM-88C.yaml
+++ b/resources/weapons/standoff/AGM-88C.yaml
@@ -1,8 +1,7 @@
-name: AGM-88C HARM - High Speed Anti-Radiation Missile
-type: ARM
+name: AGM-88C HARM
 # https://www.af.mil/About-Us/Fact-Sheets/Display/Article/104574/agm-88-harm/
 # 1984 is the date for the A variant but as we do not have that one we use it for C
 year: 1984
 clsids:
   - "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}"
-  - "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}"
\ No newline at end of file
+  - "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}"
diff --git a/resources/weapons/standoff/KH-25MP.yaml b/resources/weapons/standoff/KH-25MP.yaml
index c6f4f296..a67035d9 100644
--- a/resources/weapons/standoff/KH-25MP.yaml
+++ b/resources/weapons/standoff/KH-25MP.yaml
@@ -1,5 +1,4 @@
 name: KH-25MP
-type: ARM
 year: 1981
 fallback: KH-28
 clsids:
diff --git a/resources/weapons/standoff/KH-28.yaml b/resources/weapons/standoff/KH-28.yaml
index 4c44a92d..9918e80f 100644
--- a/resources/weapons/standoff/KH-28.yaml
+++ b/resources/weapons/standoff/KH-28.yaml
@@ -1,5 +1,4 @@
 name: KH-28
-type: ARM
 year: 1973
 fallback: KH-29L
 clsids:
diff --git a/resources/weapons/standoff/Kh-25MPU.yaml b/resources/weapons/standoff/Kh-25MPU.yaml
index 0e80baad..769c8286 100644
--- a/resources/weapons/standoff/Kh-25MPU.yaml
+++ b/resources/weapons/standoff/Kh-25MPU.yaml
@@ -1,5 +1,4 @@
 name: KH-25MPU
-type: ARM
 year: 1985
 fallback: KH-25MP
 clsids:
diff --git a/resources/weapons/standoff/Kh-31P.yaml b/resources/weapons/standoff/Kh-31P.yaml
index 182f0941..08ba75e4 100644
--- a/resources/weapons/standoff/Kh-31P.yaml
+++ b/resources/weapons/standoff/Kh-31P.yaml
@@ -1,6 +1,5 @@
 name: KH-31P
 year: 1988
-type: ARM
 fallback: KH-25MPU
 clsids:
   - "{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF03}"
diff --git a/resources/weapons/standoff/Kh-58U.yaml b/resources/weapons/standoff/Kh-58U.yaml
index 6bc43768..fb4165ba 100644
--- a/resources/weapons/standoff/Kh-58U.yaml
+++ b/resources/weapons/standoff/Kh-58U.yaml
@@ -1,5 +1,4 @@
 name: KH-58U
-type: ARM
 year: 1991
 fallback: KH-31P
 clsids: