From 6cd3043b6024c8bbd2891dd4b38bc2dd21ca13a6 Mon Sep 17 00:00:00 2001
From: zhexu14 <64713351+zhexu14@users.noreply.github.com>
Date: Fri, 22 Nov 2024 22:12:12 +1100
Subject: [PATCH] Add CBU52B and Mk20 Rockeye weapons data, update CBU-87
 fallback. Bump Versions in Github Issue Template, config. (#3465)

---
 resources/weapons/bombs/CBU-52B-2X.yaml |  6 ++++++
 resources/weapons/bombs/CBU-52B-3X.yaml |  6 ++++++
 resources/weapons/bombs/CBU-52B-6X.yaml |  5 +++++
 resources/weapons/bombs/CBU-52B.yaml    |  6 ++++++
 resources/weapons/bombs/CBU-87-2X.yaml  |  4 +++-
 resources/weapons/bombs/CBU-87-3X.yaml  |  6 +++++-
 resources/weapons/bombs/CBU-87-6X.yaml  |  7 +++++++
 resources/weapons/bombs/CBU-87.yaml     |  3 ++-
 resources/weapons/bombs/Mk-20-2X.yaml   | 10 ++++++++++
 resources/weapons/bombs/Mk-20-3X.yaml   |  8 ++++++++
 resources/weapons/bombs/Mk-20-6X.yaml   |  9 +++++++++
 resources/weapons/bombs/Mk-20.yaml      |  6 ++++++
 resources/weapons/bombs/Mk-82-2X.yaml   |  2 ++
 resources/weapons/bombs/Mk-82-3X.yaml   |  1 +
 resources/weapons/bombs/Mk-82-6X.yaml   |  4 ++++
 resources/weapons/bombs/Mk-82.yaml      |  1 +
 16 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 resources/weapons/bombs/CBU-52B-2X.yaml
 create mode 100644 resources/weapons/bombs/CBU-52B-3X.yaml
 create mode 100644 resources/weapons/bombs/CBU-52B-6X.yaml
 create mode 100644 resources/weapons/bombs/CBU-52B.yaml
 create mode 100644 resources/weapons/bombs/CBU-87-6X.yaml
 create mode 100644 resources/weapons/bombs/Mk-20-2X.yaml
 create mode 100644 resources/weapons/bombs/Mk-20-3X.yaml
 create mode 100644 resources/weapons/bombs/Mk-20-6X.yaml
 create mode 100644 resources/weapons/bombs/Mk-20.yaml
 create mode 100644 resources/weapons/bombs/Mk-82-6X.yaml

diff --git a/resources/weapons/bombs/CBU-52B-2X.yaml b/resources/weapons/bombs/CBU-52B-2X.yaml
new file mode 100644
index 000000000..fc5e9027d
--- /dev/null
+++ b/resources/weapons/bombs/CBU-52B-2X.yaml
@@ -0,0 +1,6 @@
+name: 2xCBU-52B
+year: 1972
+fallback: 2xMk 20 Rockeye
+clsids:
+  - "{HB_F4E_CBU-52B_2x}"
+  - "{HB_F4E_CBU-52B_2x_SWA}"
diff --git a/resources/weapons/bombs/CBU-52B-3X.yaml b/resources/weapons/bombs/CBU-52B-3X.yaml
new file mode 100644
index 000000000..65ef2d0b9
--- /dev/null
+++ b/resources/weapons/bombs/CBU-52B-3X.yaml
@@ -0,0 +1,6 @@
+name: 3xCBU-52B
+year: 1972
+fallback: 3xMk 20 Rockeye
+clsids:
+  - "{HB_F4E_CBU-52B_MER_3x_Left}"
+  - "{HB_F4E_CBU-52B_MER_3x_Right}"
diff --git a/resources/weapons/bombs/CBU-52B-6X.yaml b/resources/weapons/bombs/CBU-52B-6X.yaml
new file mode 100644
index 000000000..073906c77
--- /dev/null
+++ b/resources/weapons/bombs/CBU-52B-6X.yaml
@@ -0,0 +1,5 @@
+name: 6xCBU-52B
+year: 1972
+fallback: 6xMk 20 Rockeye
+clsids:
+  - "{HB_F4E_CBU-52B_MER_6x}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/CBU-52B.yaml b/resources/weapons/bombs/CBU-52B.yaml
new file mode 100644
index 000000000..7ac302deb
--- /dev/null
+++ b/resources/weapons/bombs/CBU-52B.yaml
@@ -0,0 +1,6 @@
+name: CBU-52B
+year: 1972
+fallback: Mk 20 Rockeye
+clsids:
+  - "{CBU-52B}"
+  - "{HB_CBU-52B_SWA}"
diff --git a/resources/weapons/bombs/CBU-87-2X.yaml b/resources/weapons/bombs/CBU-87-2X.yaml
index 7bfc28408..74bae48e9 100644
--- a/resources/weapons/bombs/CBU-87-2X.yaml
+++ b/resources/weapons/bombs/CBU-87-2X.yaml
@@ -1,6 +1,8 @@
 name: 2xCBU-87
 year: 1986
-fallback: 2xMk 82
+fallback: 2xCBU-52B
 clsids:
   - "{TER_9A_2L*CBU-87}"
   - "{TER_9A_2R*CBU-87}"
+  - "{HB_F4E_CBU-87_2x}"
+  - "{HB_F4E_CBU-87_2x_SWA}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/CBU-87-3X.yaml b/resources/weapons/bombs/CBU-87-3X.yaml
index 34fab5c3b..65a79804c 100644
--- a/resources/weapons/bombs/CBU-87-3X.yaml
+++ b/resources/weapons/bombs/CBU-87-3X.yaml
@@ -1,5 +1,9 @@
 name: 3xCBU-87
 year: 1986
-fallback: 3xMk 82
+fallback: 3xCBU-52B
 clsids:
   - "{TER_9A_3*CBU-87}"
+  - "{CFT_L_CBU_87_x_3}"
+  - "{CFT_R_CBU_87_x_3}"
+  - "{HB_F4E_CBU-87_MER_3x_Left}"
+  - "{HB_F4E_CBU-87_MER_3x_Right}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/CBU-87-6X.yaml b/resources/weapons/bombs/CBU-87-6X.yaml
new file mode 100644
index 000000000..13af24352
--- /dev/null
+++ b/resources/weapons/bombs/CBU-87-6X.yaml
@@ -0,0 +1,7 @@
+name: 6xCBU-87
+year: 1986
+fallback: 6xCBU-52B
+clsids:
+  - "{CFT_L_CBU_87_x_6}"
+  - "{CFT_R_CBU_87_x_6}"
+  - "{HB_F4E_CBU-87_MER_4x}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/CBU-87.yaml b/resources/weapons/bombs/CBU-87.yaml
index 1f7257dc5..a425fbd88 100644
--- a/resources/weapons/bombs/CBU-87.yaml
+++ b/resources/weapons/bombs/CBU-87.yaml
@@ -1,5 +1,6 @@
 name: CBU-87
 year: 1986
-fallback: Mk 82
+fallback: CBU-52B
 clsids:
   - "{CBU-87}"
+  - "{HB_CBU-87_SWA}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/Mk-20-2X.yaml b/resources/weapons/bombs/Mk-20-2X.yaml
new file mode 100644
index 000000000..e4c0694f8
--- /dev/null
+++ b/resources/weapons/bombs/Mk-20-2X.yaml
@@ -0,0 +1,10 @@
+name: 2xMk 20 Rockeye
+year: 1968
+fallback: 2xMk 82
+clsids:
+  - "{BRU33_2X_ROCKEYE}"
+  - "{0B9ABA77-93B8-45FC-9C63-82AFB2CB50A4}"
+  - "{HB_F4E_ROCKEYE_2x}"
+  - "{BRU-42_2*MK-20_LEFT}"
+  - "{BRU-42_2*MK-20_RIGHT}"
+  - "{HB_F4E_ROCKEYE_2x_SWA}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/Mk-20-3X.yaml b/resources/weapons/bombs/Mk-20-3X.yaml
new file mode 100644
index 000000000..02e65664e
--- /dev/null
+++ b/resources/weapons/bombs/Mk-20-3X.yaml
@@ -0,0 +1,8 @@
+name: 3xMk 20 Rockeye
+year: 1968
+fallback: 3xMk 82
+clsids:
+  - "{B83CB620-5BBE-4BEA-910C-EB605A327EF9}"
+  - "{CFT_L_CBU_100_x_3}"
+  - "{CFT_R_CBU_100_x_3}"
+  - "{HB_F4E_ROCKEYE_3x}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/Mk-20-6X.yaml b/resources/weapons/bombs/Mk-20-6X.yaml
new file mode 100644
index 000000000..3ef018acf
--- /dev/null
+++ b/resources/weapons/bombs/Mk-20-6X.yaml
@@ -0,0 +1,9 @@
+name: 6xMk 20 Rockeye
+year: 1968
+fallback: 6xMk 82
+clsids:
+  - "{3C7CD675-7D39-41C5-8735-0F4F537818A8}"
+  - "{CFT_L_CBU_100_x_6}"
+  - "{CFT_R_CBU_100_x_6}"
+  - "{HB_F4E_ROCKEYE_6x}"
+  - "{E79759F7-C622-4AA4-B1EF-37639A34D924}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/Mk-20.yaml b/resources/weapons/bombs/Mk-20.yaml
new file mode 100644
index 000000000..40eea452d
--- /dev/null
+++ b/resources/weapons/bombs/Mk-20.yaml
@@ -0,0 +1,6 @@
+name: Mk 20 Rockeye
+year: 1968
+fallback: Mk 82
+clsids:
+  - "{HB_ROCKEYE_SWA}"
+  - "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}"
diff --git a/resources/weapons/bombs/Mk-82-2X.yaml b/resources/weapons/bombs/Mk-82-2X.yaml
index 3a3d7ea7c..3cf808db6 100644
--- a/resources/weapons/bombs/Mk-82-2X.yaml
+++ b/resources/weapons/bombs/Mk-82-2X.yaml
@@ -16,3 +16,5 @@ clsids:
   - "{BRU42_2*MK82 LS}"
   - "{BRU3242_2*MK82 LS}"
   - "{PHXBRU3242_2*MK82 LS}"
+  - "{HB_F4E_MK-82_2x_SWA}"
+  - "{HB_F4E_MK-82_2x}"
diff --git a/resources/weapons/bombs/Mk-82-3X.yaml b/resources/weapons/bombs/Mk-82-3X.yaml
index f9e691ba5..4be44f1ac 100644
--- a/resources/weapons/bombs/Mk-82-3X.yaml
+++ b/resources/weapons/bombs/Mk-82-3X.yaml
@@ -2,3 +2,4 @@ name: 3xMk 82
 fallback: 2xMk 82
 clsids:
   - "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}"
+  - "{HB_F4E_MK-82_3x}"
diff --git a/resources/weapons/bombs/Mk-82-6X.yaml b/resources/weapons/bombs/Mk-82-6X.yaml
new file mode 100644
index 000000000..bc5a3f528
--- /dev/null
+++ b/resources/weapons/bombs/Mk-82-6X.yaml
@@ -0,0 +1,4 @@
+name: 6xMk 82
+fallback: Mk 82
+clsids:
+  - "{HB_F4E_MK-82_6x}"
\ No newline at end of file
diff --git a/resources/weapons/bombs/Mk-82.yaml b/resources/weapons/bombs/Mk-82.yaml
index 70733a5b8..6ab10dc41 100644
--- a/resources/weapons/bombs/Mk-82.yaml
+++ b/resources/weapons/bombs/Mk-82.yaml
@@ -9,3 +9,4 @@ clsids:
   - "{Mk_82SP}"
   - "{Mk_82YT}"
   - "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}"
+  - "{HB_MK-82_SWA}"