Skip to content

Commit

Permalink
Weapons updates for F4E (#3451)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
zhexu14 authored Nov 3, 2024
1 parent df43d2e commit 805b036
Show file tree
Hide file tree
Showing 20 changed files with 63 additions and 4 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions resources/weapons/a2a-missiles/AIM-7E-2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: AIM-7E-2
year: 1969
fallback: AIM-7E
clsids:
- "{AIM-7E-2}"
- "{HB_F4E_AIM-7E-2}"
2 changes: 2 additions & 0 deletions resources/weapons/a2a-missiles/AIM-7E.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ fallback: 2xAIM-9X
clsids:
- "{AIM-7E}"
- "{LAU-115 - AIM-7E}"
- "{SHOULDER AIM-7E}"
- "{BELLY AIM-7E}"
1 change: 1 addition & 0 deletions resources/weapons/a2a-missiles/AIM-7F.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ clsids:
- "{BELLY AIM-7F}"
- "{AIM-7F}"
- "{LAU-115 - AIM-7F}"
- "{HB_F4E_AIM-7F}"
1 change: 1 addition & 0 deletions resources/weapons/a2a-missiles/AIM-7M.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ clsids:
- "{BELLY AIM-7M}"
- "{8D399DDA-FF81-4F14-904D-099B34FE7918}"
- "{LAU-115 - AIM-7M}"
- "{HB_F4E_AIM-7M}"
2 changes: 2 additions & 0 deletions resources/weapons/a2a-missiles/AIM-9L.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ clsids:
- "{JAS39_AIM-9L}"
- "{Rb_74}"
- "{Robot74}"
- "{LAU-7_AIM-9L_Left}"
- "{LAU-7_AIM-9L_Right}"
3 changes: 3 additions & 0 deletions resources/weapons/a2a-missiles/AIM-9M.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
7 changes: 7 additions & 0 deletions resources/weapons/standoff/AGM-12A.yaml
Original file line number Diff line number Diff line change
@@ -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}"
7 changes: 7 additions & 0 deletions resources/weapons/standoff/AGM-12B.yaml
Original file line number Diff line number Diff line change
@@ -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}"
7 changes: 7 additions & 0 deletions resources/weapons/standoff/AGM-12C.yaml
Original file line number Diff line number Diff line change
@@ -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}"
3 changes: 3 additions & 0 deletions resources/weapons/standoff/AGM-45A.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ type: ARM
year: 1965
clsids:
- "{AGM_45A}"
- "{LAU118_AGM_45A}"
- "{LAU_34_AGM_45A_SWA}"
- "{LAU_34_AGM_45A}"
2 changes: 1 addition & 1 deletion resources/weapons/standoff/AGM-45B.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ type: ARM
year: 1972
fallback: AGM-45A Shrike ARM
clsids:
- "{AGM_45B}"
- "{3E6B632D-65EB-44D2-9501-1C2D04515405}"
6 changes: 6 additions & 0 deletions resources/weapons/standoff/AGM-65A.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
6 changes: 6 additions & 0 deletions resources/weapons/standoff/AGM-65B.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 2 additions & 0 deletions resources/weapons/standoff/AGM-65D-2X.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 2 additions & 0 deletions resources/weapons/standoff/AGM-65D-3X.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 2 additions & 0 deletions resources/weapons/standoff/AGM-65D.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 2 additions & 0 deletions resources/weapons/standoff/AGM-65G.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ year: 1989
fallback: AGM-65F
clsids:
- "LAU_117_AGM_65G"
- "{LAU_117A_AGM_65G}"
- "{HB_F4E_AGM-65G_LAU117}"
1 change: 1 addition & 0 deletions resources/weapons/standoff/AGM-88C.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

0 comments on commit 805b036

Please sign in to comment.