From 805b0367619c637c90aa14d0c02911f198f3a58d Mon Sep 17 00:00:00 2001 From: zhexu14 <64713351+zhexu14@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:10:51 +1100 Subject: [PATCH] Weapons updates for F4E (#3451) This PR introduces new HB CLSIDs for F4E weapons such as AIM7, AIM9, AGM12, AGM45 and AGM65. This PR also updates README.MD to remove deprecated Patreon link. --- README.md | 2 -- changelog.md | 3 ++- resources/weapons/a2a-missiles/AIM-7E-2.yaml | 6 ++++++ resources/weapons/a2a-missiles/AIM-7E.yaml | 2 ++ resources/weapons/a2a-missiles/AIM-7F.yaml | 1 + resources/weapons/a2a-missiles/AIM-7M.yaml | 1 + resources/weapons/a2a-missiles/AIM-9L.yaml | 2 ++ resources/weapons/a2a-missiles/AIM-9M.yaml | 3 +++ resources/weapons/standoff/AGM-12A.yaml | 7 +++++++ resources/weapons/standoff/AGM-12B.yaml | 7 +++++++ resources/weapons/standoff/AGM-12C.yaml | 7 +++++++ resources/weapons/standoff/AGM-45A.yaml | 3 +++ resources/weapons/standoff/AGM-45B.yaml | 2 +- resources/weapons/standoff/AGM-65A.yaml | 6 ++++++ resources/weapons/standoff/AGM-65B.yaml | 6 ++++++ resources/weapons/standoff/AGM-65D-2X.yaml | 2 ++ resources/weapons/standoff/AGM-65D-3X.yaml | 2 ++ resources/weapons/standoff/AGM-65D.yaml | 2 ++ resources/weapons/standoff/AGM-65G.yaml | 2 ++ resources/weapons/standoff/AGM-88C.yaml | 1 + 20 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 resources/weapons/a2a-missiles/AIM-7E-2.yaml create mode 100644 resources/weapons/standoff/AGM-12A.yaml create mode 100644 resources/weapons/standoff/AGM-12B.yaml create mode 100644 resources/weapons/standoff/AGM-12C.yaml diff --git a/README.md b/README.md index 5542e88ff..b0f0d98a6 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ (Github Readme Banner and Splash screen Artwork by Andriy Dankovych, CC BY-SA 4.0) -[![Patreon](https://img.shields.io/badge/patreon-become%20a%20patron-orange?logo=patreon)](https://patreon.com/dcsliberation) - [![Download](https://img.shields.io/github/downloads/dcs-liberation/dcs_liberation/total?label=Download)](https://github.com/dcs-liberation/dcs_liberation/releases) [![Discord](https://img.shields.io/discord/595702951800995872?label=Discord&logo=discord)](https://discord.gg/bKrtrkJ) diff --git a/changelog.md b/changelog.md index e7627d4a4..f3031c9ee 100644 --- a/changelog.md +++ b/changelog.md @@ -12,9 +12,10 @@ Saves from 11.x are not compatible with 12.0.0. ## Fixes -* **[Mission Generation]** Fixed aircraft not spawning correctly on CVNs, LHAs and FARPs. +* **[Data]** Added/updated weapons data for F4E weapons such as AIM-7, AIM-9, AGM-12, AGM-45 and AGM-65. * **[Campaign]** Do not allow aircraft from a captured control point to retreat if the captured control point has a damaged runway. * **[Campaign]** Do not allow ground units to be transferred to LHAs, CVNs or off map spawns. +* **[Mission Generation]** Fixed aircraft not spawning correctly on CVNs, LHAs and FARPs. # 11.1.1 diff --git a/resources/weapons/a2a-missiles/AIM-7E-2.yaml b/resources/weapons/a2a-missiles/AIM-7E-2.yaml new file mode 100644 index 000000000..436b984ea --- /dev/null +++ b/resources/weapons/a2a-missiles/AIM-7E-2.yaml @@ -0,0 +1,6 @@ +name: AIM-7E-2 +year: 1969 +fallback: AIM-7E +clsids: + - "{AIM-7E-2}" + - "{HB_F4E_AIM-7E-2}" \ No newline at end of file diff --git a/resources/weapons/a2a-missiles/AIM-7E.yaml b/resources/weapons/a2a-missiles/AIM-7E.yaml index bbc70d1e7..0c312c75a 100644 --- a/resources/weapons/a2a-missiles/AIM-7E.yaml +++ b/resources/weapons/a2a-missiles/AIM-7E.yaml @@ -4,3 +4,5 @@ fallback: 2xAIM-9X clsids: - "{AIM-7E}" - "{LAU-115 - AIM-7E}" + - "{SHOULDER AIM-7E}" + - "{BELLY AIM-7E}" diff --git a/resources/weapons/a2a-missiles/AIM-7F.yaml b/resources/weapons/a2a-missiles/AIM-7F.yaml index d66fd3b85..626001163 100644 --- a/resources/weapons/a2a-missiles/AIM-7F.yaml +++ b/resources/weapons/a2a-missiles/AIM-7F.yaml @@ -6,3 +6,4 @@ clsids: - "{BELLY AIM-7F}" - "{AIM-7F}" - "{LAU-115 - AIM-7F}" + - "{HB_F4E_AIM-7F}" \ No newline at end of file diff --git a/resources/weapons/a2a-missiles/AIM-7M.yaml b/resources/weapons/a2a-missiles/AIM-7M.yaml index 9128c8ed9..76f5ac5ef 100644 --- a/resources/weapons/a2a-missiles/AIM-7M.yaml +++ b/resources/weapons/a2a-missiles/AIM-7M.yaml @@ -6,3 +6,4 @@ clsids: - "{BELLY AIM-7M}" - "{8D399DDA-FF81-4F14-904D-099B34FE7918}" - "{LAU-115 - AIM-7M}" + - "{HB_F4E_AIM-7M}" diff --git a/resources/weapons/a2a-missiles/AIM-9L.yaml b/resources/weapons/a2a-missiles/AIM-9L.yaml index 12ca45fd8..eb7b64ea8 100644 --- a/resources/weapons/a2a-missiles/AIM-9L.yaml +++ b/resources/weapons/a2a-missiles/AIM-9L.yaml @@ -14,3 +14,5 @@ clsids: - "{JAS39_AIM-9L}" - "{Rb_74}" - "{Robot74}" + - "{LAU-7_AIM-9L_Left}" + - "{LAU-7_AIM-9L_Right}" diff --git a/resources/weapons/a2a-missiles/AIM-9M.yaml b/resources/weapons/a2a-missiles/AIM-9M.yaml index 66fce2296..685abb26e 100644 --- a/resources/weapons/a2a-missiles/AIM-9M.yaml +++ b/resources/weapons/a2a-missiles/AIM-9M.yaml @@ -12,3 +12,6 @@ clsids: - "{LAU-7 - AIM-9M}" - "{AIM-9M-ON-ADAPTER}" - "{JAS39_AIM-9M}" + - "{AIM-9M}" + - "{LAU-7_AIM-9M_Left}" + - "{LAU-7_AIM-9M_Right}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-12A.yaml b/resources/weapons/standoff/AGM-12A.yaml new file mode 100644 index 000000000..cb3d3e1b4 --- /dev/null +++ b/resources/weapons/standoff/AGM-12A.yaml @@ -0,0 +1,7 @@ +name: AGM-12A +# https://en.wikipedia.org/wiki/AGM-12_Bullpup +year: 1960 +fallback: Mk 84 +clsids: + - "{AGM_12A}" + - "{AGM_12A_SWA}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-12B.yaml b/resources/weapons/standoff/AGM-12B.yaml new file mode 100644 index 000000000..ed7f0f3db --- /dev/null +++ b/resources/weapons/standoff/AGM-12B.yaml @@ -0,0 +1,7 @@ +name: AGM-12B +# https://en.wikipedia.org/wiki/AGM-12_Bullpup +year: 1964 +fallback: AGM-12A +clsids: + - "{AGM_12B}" + - "{AGM_12B_SWA}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-12C.yaml b/resources/weapons/standoff/AGM-12C.yaml new file mode 100644 index 000000000..0768ca8b9 --- /dev/null +++ b/resources/weapons/standoff/AGM-12C.yaml @@ -0,0 +1,7 @@ +name: AGM-12C +# https://wiki.warthunder.com/AGM-12C_Bullpup +year: 1965 +fallback: AGM-12B +clsids: + - "{AGM_12C}" + - "{AGM_12C_SWA}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-45A.yaml b/resources/weapons/standoff/AGM-45A.yaml index abb730a93..4c3440db2 100644 --- a/resources/weapons/standoff/AGM-45A.yaml +++ b/resources/weapons/standoff/AGM-45A.yaml @@ -3,3 +3,6 @@ type: ARM year: 1965 clsids: - "{AGM_45A}" + - "{LAU118_AGM_45A}" + - "{LAU_34_AGM_45A_SWA}" + - "{LAU_34_AGM_45A}" diff --git a/resources/weapons/standoff/AGM-45B.yaml b/resources/weapons/standoff/AGM-45B.yaml index abe6d1711..a195afdb5 100644 --- a/resources/weapons/standoff/AGM-45B.yaml +++ b/resources/weapons/standoff/AGM-45B.yaml @@ -3,4 +3,4 @@ type: ARM year: 1972 fallback: AGM-45A Shrike ARM clsids: - - "{AGM_45B}" + - "{3E6B632D-65EB-44D2-9501-1C2D04515405}" diff --git a/resources/weapons/standoff/AGM-65A.yaml b/resources/weapons/standoff/AGM-65A.yaml index 78b0e54e4..2cb74dc6b 100644 --- a/resources/weapons/standoff/AGM-65A.yaml +++ b/resources/weapons/standoff/AGM-65A.yaml @@ -3,3 +3,9 @@ year: 1972 fallback: AGM-62 Walleye II clsids: - "LAU_117_AGM_65A" + - "{HB_F4E_AGM-65A_LAU117}" + - "{HB_F4E_AGM-65A_LAU117_SWA}" + - "{HB_F4EAGM-65A_LAU88_2x_Right}" + - "{HB_F4EAGM-65A_LAU88_2x_Left}" + - "{HB_F4EAGM-65A_LAU88_3x_Right}" + - "{HB_F4EAGM-65A_LAU88_3x_Left}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-65B.yaml b/resources/weapons/standoff/AGM-65B.yaml index 8a2f59986..18220ea45 100644 --- a/resources/weapons/standoff/AGM-65B.yaml +++ b/resources/weapons/standoff/AGM-65B.yaml @@ -3,3 +3,9 @@ year: 1975 fallback: AGM-65A clsids: - "LAU_117_AGM_65B" + - "{HB_F4E_AGM-65B_LAU117}" + - "{HB_F4E_AGM-65B_LAU117_SWA}" + - "{HB_F4EAGM-65B_LAU88_2x_Right}" + - "{HB_F4EAGM-65B_LAU88_2x_Left}" + - "{HB_F4EAGM-65B_LAU88_3x_Right}" + - "{HB_F4EAGM-65B_LAU88_3x_Left}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-65D-2X.yaml b/resources/weapons/standoff/AGM-65D-2X.yaml index 3911443fb..ffcdeccfd 100644 --- a/resources/weapons/standoff/AGM-65D-2X.yaml +++ b/resources/weapons/standoff/AGM-65D-2X.yaml @@ -4,3 +4,5 @@ fallback: AGM-65D clsids: - "{E6A6262A-CA08-4B3D-B030-E1A993B98452}" - "{E6A6262A-CA08-4B3D-B030-E1A993B98453}" + - "{HB_F4EAGM-65D_LAU88_2x_Right}" + - "{HB_F4EAGM-65D_LAU88_2x_Left}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-65D-3X.yaml b/resources/weapons/standoff/AGM-65D-3X.yaml index e3b261520..8f0084ac2 100644 --- a/resources/weapons/standoff/AGM-65D-3X.yaml +++ b/resources/weapons/standoff/AGM-65D-3X.yaml @@ -3,3 +3,5 @@ year: 1986 fallback: 2xAGM-65D clsids: - "{DAC53A2F-79CA-42FF-A77A-F5649B601308}" + - "{HB_F4EAGM-65D_LAU88_3x_Right}" + - "{HB_F4EAGM-65D_LAU88_3x_Left}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-65D.yaml b/resources/weapons/standoff/AGM-65D.yaml index 42c11666f..49a16f690 100644 --- a/resources/weapons/standoff/AGM-65D.yaml +++ b/resources/weapons/standoff/AGM-65D.yaml @@ -5,3 +5,5 @@ clsids: - "{444BA8AE-82A7-4345-842E-76154EFCCA47}" - "{444BA8AE-82A7-4345-842E-76154EFCCA46}" - "LAU_88_AGM_65D_ONE" + - "{HB_F4E_AGM-65D_LAU117}" + - "{HB_F4E_AGM-65D_LAU117_SWA}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-65G.yaml b/resources/weapons/standoff/AGM-65G.yaml index 2c2d9d2b3..b74bf767e 100644 --- a/resources/weapons/standoff/AGM-65G.yaml +++ b/resources/weapons/standoff/AGM-65G.yaml @@ -3,3 +3,5 @@ year: 1989 fallback: AGM-65F clsids: - "LAU_117_AGM_65G" + - "{LAU_117A_AGM_65G}" + - "{HB_F4E_AGM-65G_LAU117}" \ No newline at end of file diff --git a/resources/weapons/standoff/AGM-88C.yaml b/resources/weapons/standoff/AGM-88C.yaml index 35cc34dd2..c10d1da11 100644 --- a/resources/weapons/standoff/AGM-88C.yaml +++ b/resources/weapons/standoff/AGM-88C.yaml @@ -2,6 +2,7 @@ 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 +fallback: AGM-45B Shrike ARM clsids: - "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}" - "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}"