From 67bb3c715060cb17ce5d4abcefc6f81b447d9b2b Mon Sep 17 00:00:00 2001
From: zhexu14 <64713351+zhexu14@users.noreply.github.com>
Date: Sun, 3 Nov 2024 22:59:26 +1100
Subject: [PATCH 1/3] Update weapons data for F4E weapons to add HB CLSIDs and
 introduce AGM-12

---
 README.md                                    | 2 --
 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 +
 19 files changed, 61 insertions(+), 3 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/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}"

From 1dace6680c4bad5c3b8a10fd0f4835fd6d8d444e Mon Sep 17 00:00:00 2001
From: zhexu14 <64713351+zhexu14@users.noreply.github.com>
Date: Sun, 3 Nov 2024 23:00:00 +1100
Subject: [PATCH 2/3] Update weapons data for F4E weapons to add HB CLSIDs and
 introduce AGM-12

---
 changelog.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
 

From 9ecb27f5d5fda71dc237778b7c7b15e63a6a3fc4 Mon Sep 17 00:00:00 2001
From: zhexu14 <64713351+zhexu14@users.noreply.github.com>
Date: Mon, 4 Nov 2024 18:11:10 +1100
Subject: [PATCH 3/3] Update pydcs for DCS 2.9.9, update beacon data

---
 changelog.md                     |   2 +-
 requirements.txt                 |   2 +-
 resources/dcs/beacons/sinai.json | 357 ++++++++++++++++---------------
 resources/dcs/beacons/syria.json | 193 +++++++++++++++--
 4 files changed, 361 insertions(+), 193 deletions(-)

diff --git a/changelog.md b/changelog.md
index f3031c9ee..9a5751228 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,7 @@ Saves from 11.x are not compatible with 12.0.0.
 
 ## Features/Improvements
 
-* **[Engine]** Support for DCS 2.9.8.1214.
+* **[Engine]** Support for DCS 2.9.9.2280.
 * **[Campaign]** Flights are assigned different callsigns appropriate to the faction.
 * **[Campaign]** Removed deprecated settings for generating persistent and invulnerable AWACs and tankers.
 * **[Mission Generation]** Added option to skip combat when fast forwarding, which progresses fast forward as if the combat did not occur. Simplified fast forward settings by consolidating "Fast forward mission to first contact" and "Player missions interrupt fast forward" into a single setting and expanding options for "Auto-resolve combat during fast-forward (WIP)".
diff --git a/requirements.txt b/requirements.txt
index 314fa55d1..5b0bf6ce1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,7 +36,7 @@ pre-commit==3.5.0
 pydantic==2.5.2
 pydantic-settings==2.1.0
 pydantic_core==2.14.5
-pydcs @ git+https://github.com/dcs-liberation/dcs@52b1a3510829dd46d52bbb79ba18e85e8608f25c
+pydcs @ git+https://github.com/dcs-liberation/dcs@2eddd456dd23effc9f8c254b967b82a8e8c3c790
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.6.1
diff --git a/resources/dcs/beacons/sinai.json b/resources/dcs/beacons/sinai.json
index fcc89889e..8037c5ecb 100644
--- a/resources/dcs/beacons/sinai.json
+++ b/resources/dcs/beacons/sinai.json
@@ -119,467 +119,446 @@
   "channel": 110
  },
  "world_17": {
-  "name": "Ovda",
-  "callsign": "OVD",
-  "beacon_type": 8,
-  "hertz": 353000,
-  "channel": 0
- },
- "world_18": {
   "name": "Haifa",
   "callsign": "HFA",
   "beacon_type": 8,
   "hertz": 323000,
   "channel": 0
  },
- "world_19": {
+ "world_18": {
   "name": "Aqaba",
   "callsign": "AQ",
   "beacon_type": 8,
   "hertz": 404000,
   "channel": 0
  },
- "world_20": {
+ "world_19": {
   "name": "Alexandria",
   "callsign": "AXD",
   "beacon_type": 8,
   "hertz": 403000,
   "channel": 0
  },
- "world_21": {
+ "world_20": {
   "name": "Baltim",
   "callsign": "BLT",
   "beacon_type": 3,
   "hertz": 116900000,
   "channel": 116
  },
- "world_22": {
+ "world_21": {
   "name": "Turaif",
   "callsign": "TRF",
   "beacon_type": 3,
   "hertz": 116100000,
   "channel": 108
  },
- "world_23": {
+ "world_22": {
   "name": "Wejh",
   "callsign": "WEJ",
   "beacon_type": 5,
   "hertz": 113900000,
   "channel": 86
  },
- "world_24": {
+ "world_23": {
   "name": "Metzada",
   "callsign": "MZD",
   "beacon_type": 5,
   "hertz": 115000000,
   "channel": 97
  },
- "world_25": {
+ "world_24": {
   "name": "RoshPina",
   "callsign": "RPN",
   "beacon_type": 8,
   "hertz": 243000,
   "channel": 0
  },
- "world_26": {
-  "name": "Hurghada",
-  "callsign": "HGD",
-  "beacon_type": 3,
-  "hertz": 116500000,
-  "channel": 112
- },
- "world_27": {
+ "world_25": {
   "name": "Chekka",
   "callsign": "CAK",
   "beacon_type": 3,
   "hertz": 116200000,
   "channel": 109
  },
- "world_28": {
+ "world_26": {
   "name": "QueenAlia",
   "callsign": "QA",
   "beacon_type": 8,
   "hertz": 410000,
   "channel": 0
  },
- "world_29": {
+ "world_27": {
   "name": "October",
   "callsign": "OCT",
   "beacon_type": 8,
   "hertz": 340000,
   "channel": 0
  },
- "world_30": {
+ "world_28": {
   "name": "PortSaid",
   "callsign": "PSD",
   "beacon_type": 3,
   "hertz": 112700000,
   "channel": 74
  },
- "world_31": {
+ "world_29": {
   "name": "Alexandria",
   "callsign": "NOZ",
   "beacon_type": 3,
   "hertz": 115900000,
   "channel": 106
  },
- "world_32": {
+ "world_30": {
   "name": "DeirZzor",
   "callsign": "DRZ",
   "beacon_type": 8,
   "hertz": 295000,
   "channel": 0
  },
- "world_33": {
+ "world_31": {
   "name": "DeirZzor",
   "callsign": "DRZ",
   "beacon_type": 3,
   "hertz": 117000000,
   "channel": 117
  },
- "world_34": {
+ "world_32": {
   "name": "Cairo",
   "callsign": "ALI",
   "beacon_type": 8,
   "hertz": 310000,
   "channel": 0
  },
- "world_35": {
+ "world_33": {
   "name": "Al-Shigar",
   "callsign": "ASH",
   "beacon_type": 3,
   "hertz": 112300000,
   "channel": 70
  },
- "world_36": {
+ "world_34": {
   "name": "Cairo",
   "callsign": "MKT",
   "beacon_type": 8,
   "hertz": 317000,
   "channel": 0
  },
- "world_37": {
+ "world_35": {
   "name": "MarsaAlam",
   "callsign": "MAK",
   "beacon_type": 3,
   "hertz": 115500000,
   "channel": 102
  },
- "world_38": {
+ "world_36": {
   "name": "Taba",
   "callsign": "TBA",
   "beacon_type": 8,
   "hertz": 316000,
   "channel": 0
  },
- "world_39": {
+ "world_37": {
   "name": "Zofar",
   "callsign": "ZFR",
   "beacon_type": 3,
   "hertz": 115600000,
   "channel": 103
  },
- "world_40": {
+ "world_38": {
   "name": "Natania",
   "callsign": "NAT",
   "beacon_type": 5,
   "hertz": 112400000,
   "channel": 71
  },
- "world_41": {
+ "world_39": {
   "name": "Kariatain",
   "callsign": "KTN",
   "beacon_type": 3,
   "hertz": 117700000,
   "channel": 124
  },
- "world_42": {
+ "world_40": {
   "name": "Herzlia",
   "callsign": "HRZ",
   "beacon_type": 8,
   "hertz": 273000,
   "channel": 0
  },
- "world_43": {
+ "world_41": {
   "name": "Guriat",
   "callsign": "GRY",
   "beacon_type": 5,
   "hertz": 114700000,
   "channel": 94
  },
- "world_44": {
+ "world_42": {
   "name": "Gaza",
   "callsign": "GZA",
   "beacon_type": 3,
   "hertz": 113350000,
   "channel": 80
  },
- "world_45": {
+ "world_43": {
   "name": "Cairo",
   "callsign": "CVO",
   "beacon_type": 3,
   "hertz": 115200000,
   "channel": 99
  },
- "world_46": {
+ "world_44": {
   "name": "ReneMouawad",
   "callsign": "RA",
   "beacon_type": 8,
   "hertz": 450000,
   "channel": 0
  },
- "world_47": {
+ "world_45": {
   "name": "Amman",
   "callsign": "JYO",
   "beacon_type": 8,
   "hertz": 391000,
   "channel": 0
  },
- "world_48": {
+ "world_46": {
   "name": "Aqaba",
   "callsign": "AQA",
   "beacon_type": 8,
   "hertz": 418000,
   "channel": 0
  },
- "world_49": {
+ "world_47": {
   "name": "Cairo",
   "callsign": "CAI",
   "beacon_type": 3,
   "hertz": 112500000,
   "channel": 72
  },
- "world_50": {
+ "world_48": {
   "name": "BasselAlAssad",
   "callsign": "LTK",
   "beacon_type": 8,
   "hertz": 414000,
   "channel": 0
  },
- "world_51": {
-  "name": "SharmElSheikh",
-  "callsign": "SHM",
-  "beacon_type": 3,
-  "hertz": 114200000,
-  "channel": 89
- },
- "world_52": {
+ "world_49": {
   "name": "QueenAlia(Locator)",
   "callsign": "QL",
   "beacon_type": 8,
   "hertz": 307000,
   "channel": 0
  },
- "world_53": {
+ "world_50": {
   "name": "Khaldeh",
   "callsign": "KAD",
   "beacon_type": 3,
   "hertz": 112600000,
   "channel": 73
  },
- "world_54": {
+ "world_51": {
   "name": "ElDaba",
   "callsign": "DBA",
   "beacon_type": 3,
   "hertz": 115700000,
   "channel": 104
  },
- "world_55": {
+ "world_52": {
   "name": "InnerBeacon",
   "callsign": "D",
   "beacon_type": 8,
   "hertz": 273000,
   "channel": 0
  },
- "world_56": {
+ "world_53": {
   "name": "CairoWest",
   "callsign": "BLA",
   "beacon_type": 4,
   "hertz": 116700000,
   "channel": 114
  },
- "world_57": {
+ "world_54": {
   "name": "Gaza",
   "callsign": "RFH",
   "beacon_type": 8,
   "hertz": 380000,
   "channel": 0
  },
- "world_58": {
+ "world_55": {
   "name": "Palmyra",
   "callsign": "PAL",
   "beacon_type": 8,
   "hertz": 337000,
   "channel": 0
  },
- "world_59": {
+ "world_56": {
   "name": "ElKharga",
   "callsign": "KHG",
   "beacon_type": 3,
   "hertz": 113800000,
   "channel": 85
  },
- "world_60": {
+ "world_57": {
   "name": "Halaifa",
   "callsign": "HLF",
   "beacon_type": 3,
   "hertz": 116700000,
   "channel": 114
  },
- "world_61": {
+ "world_58": {
   "name": "Aqaba",
   "callsign": "AQB",
   "beacon_type": 3,
   "hertz": 113100000,
   "channel": 78
  },
- "world_62": {
+ "world_59": {
   "name": "Beirut",
   "callsign": "BAB",
   "beacon_type": 8,
   "hertz": 312000,
   "channel": 0
  },
- "world_63": {
+ "world_60": {
   "name": "SidiBarrani",
   "callsign": "BRN",
   "beacon_type": 3,
   "hertz": 116200000,
   "channel": 109
  },
- "world_64": {
+ "world_61": {
   "name": "Luxor",
   "callsign": "LXR",
   "beacon_type": 3,
   "hertz": 114400000,
   "channel": 91
  },
- "world_65": {
+ "world_62": {
   "name": "Luxor",
   "callsign": "LO",
   "beacon_type": 8,
   "hertz": 364000,
   "channel": 0
  },
- "world_66": {
+ "world_63": {
   "name": "Tabuk",
   "callsign": "TBK",
   "beacon_type": 5,
   "hertz": 115700000,
   "channel": 104
  },
- "world_67": {
+ "world_64": {
   "name": "Tanf",
   "callsign": "TAN",
   "beacon_type": 3,
   "hertz": 114000000,
   "channel": 87
  },
- "world_68": {
+ "world_65": {
   "name": "Qatraneh",
   "callsign": "JYT",
   "beacon_type": 8,
   "hertz": 302000,
   "channel": 0
  },
- "world_69": {
+ "world_66": {
   "name": "BorgElArab",
   "callsign": "DJ",
   "beacon_type": 8,
   "hertz": 563000,
   "channel": 0
  },
- "world_70": {
+ "world_67": {
   "name": "Abyad",
   "callsign": "ABD",
   "beacon_type": 8,
   "hertz": 264000,
   "channel": 0
  },
- "world_71": {
+ "world_68": {
   "name": "Otaebe",
   "callsign": "DAL",
   "beacon_type": 8,
   "hertz": 342000,
   "channel": 0
  },
- "world_72": {
+ "world_69": {
   "name": "Beer-Sheba",
   "callsign": "BSA",
   "beacon_type": 5,
   "hertz": 114300000,
   "channel": 90
  },
- "world_73": {
+ "world_70": {
   "name": "Dakhla",
   "callsign": "MB",
   "beacon_type": 8,
   "hertz": 387000,
   "channel": 0
  },
- "world_74": {
+ "world_71": {
   "name": "Eilot",
   "callsign": "LOT",
   "beacon_type": 3,
   "hertz": 112000000,
   "channel": 57
  },
- "world_75": {
+ "world_72": {
   "name": "SharmElSheikh",
   "callsign": "SKH",
   "beacon_type": 8,
   "hertz": 335000,
   "channel": 0
  },
- "world_76": {
+ "world_73": {
   "name": "RoshPina",
   "callsign": "ROP",
   "beacon_type": 3,
   "hertz": 115300000,
   "channel": 100
  },
- "world_77": {
+ "world_74": {
   "name": "Ovda",
   "callsign": "OVD",
-  "beacon_type": 3,
+  "beacon_type": 5,
   "hertz": 114100000,
   "channel": 88
  },
- "world_78": {
+ "world_75": {
   "name": "Qatraneh",
   "callsign": "QTR",
   "beacon_type": 3,
   "hertz": 112900000,
   "channel": 76
  },
- "world_79": {
+ "world_76": {
   "name": "Fayoum",
   "callsign": "FYM",
   "beacon_type": 3,
   "hertz": 117300000,
   "channel": 120
  },
+ "world_77": {
+  "name": "SHG",
+  "callsign": "SHG",
+  "beacon_type": 3,
+  "hertz": 115300000,
+  "channel": 100
+ },
  "airfield2_0": {
   "name": "",
   "callsign": "WAYR",
   "beacon_type": 13,
-  "hertz": 119700000,
+  "hertz": 109950000,
   "channel": null
  },
  "airfield2_1": {
   "name": "",
   "callsign": "WAYR",
   "beacon_type": 14,
-  "hertz": 119700000,
+  "hertz": 109950000,
   "channel": null
  },
- "airfield2_2": {
-  "name": "AbuSuwayr",
-  "callsign": "ZYT",
-  "beacon_type": 4,
-  "hertz": 109200000,
-  "channel": 29
- },
  "airfield4_0": {
   "name": "Ismailiyah",
   "callsign": "ISA",
@@ -594,13 +573,6 @@
   "hertz": 110300000,
   "channel": null
  },
- "airfield14_0": {
-  "name": "AlMansurah",
-  "callsign": "MRN",
-  "beacon_type": 4,
-  "hertz": 111600000,
-  "channel": 53
- },
  "airfield3_0": {
   "name": "AsSalihiyah",
   "callsign": "SAI",
@@ -615,20 +587,6 @@
   "hertz": 110700000,
   "channel": null
  },
- "airfield3_2": {
-  "name": "AsSalihiyah",
-  "callsign": "ASL",
-  "beacon_type": 4,
-  "hertz": 111200000,
-  "channel": 26
- },
- "airfield15_0": {
-  "name": "AzZaqaziq",
-  "callsign": "AMB",
-  "beacon_type": 4,
-  "hertz": 114700000,
-  "channel": 94
- },
  "airfield24_0": {
   "name": "BenGurion",
   "callsign": "BC",
@@ -707,13 +665,6 @@
   "channel": null
  },
  "airfield16_1": {
-  "name": "BilbeisAirBase",
-  "callsign": "ARF",
-  "beacon_type": 4,
-  "hertz": 113900000,
-  "channel": 86
- },
- "airfield16_2": {
   "name": "BilbeisAirBase",
   "callsign": "BA",
   "beacon_type": 13,
@@ -724,9 +675,30 @@
   "name": "Melez",
   "callsign": "MLZ",
   "beacon_type": 3,
-  "hertz": 110100000,
+  "hertz": 115650000,
   "channel": 38
  },
+ "airfield35_0": {
+  "name": "BorgElArabIntl",
+  "callsign": "BIL",
+  "beacon_type": 14,
+  "hertz": 111300000,
+  "channel": null
+ },
+ "airfield35_1": {
+  "name": "AXD",
+  "callsign": "BEAI",
+  "beacon_type": 3,
+  "hertz": 115900000,
+  "channel": null
+ },
+ "airfield35_2": {
+  "name": "BorgElArabIntl",
+  "callsign": "BIL",
+  "beacon_type": 13,
+  "hertz": 111300000,
+  "channel": null
+ },
  "airfield17_0": {
   "name": "CairoInternationalAirport",
   "callsign": "IZFL",
@@ -812,20 +784,13 @@
   "channel": null
  },
  "airfield18_0": {
-  "name": "",
-  "callsign": "SPX",
-  "beacon_type": 5,
-  "hertz": 0,
-  "channel": null
- },
- "airfield18_1": {
   "name": "CairoWest",
   "callsign": "IPSX",
   "beacon_type": 14,
   "hertz": 111500000,
   "channel": null
  },
- "airfield18_2": {
+ "airfield18_1": {
   "name": "CairoWest",
   "callsign": "IPSX",
   "beacon_type": 13,
@@ -853,13 +818,6 @@
   "hertz": 110150000,
   "channel": 0
  },
- "airfield6_2": {
-  "name": "Faid",
-  "callsign": "GIO",
-  "beacon_type": 4,
-  "hertz": 117800000,
-  "channel": 125
- },
  "airfield7_0": {
   "name": "Hatzerim",
   "callsign": "BRA",
@@ -902,25 +860,39 @@
   "hertz": 108500000,
   "channel": null
  },
+ "airfield38_0": {
+  "name": "Hurghada",
+  "callsign": "HGD",
+  "beacon_type": 3,
+  "hertz": 116500000,
+  "channel": 112
+ },
+ "airfield38_1": {
+  "name": "HURG",
+  "callsign": "HIL",
+  "beacon_type": 13,
+  "hertz": 110300000,
+  "channel": 0
+ },
+ "airfield38_2": {
+  "name": "HURG",
+  "callsign": "HIL",
+  "beacon_type": 14,
+  "hertz": 110300000,
+  "channel": 0
+ },
  "airfield19_0": {
   "name": "InshasAirbase",
   "callsign": "ISH",
   "beacon_type": 14,
-  "hertz": 116900000,
+  "hertz": 111350000,
   "channel": null
  },
  "airfield19_1": {
-  "name": "InshasAirbase",
-  "callsign": "IHA",
-  "beacon_type": 4,
-  "hertz": 115100000,
-  "channel": 98
- },
- "airfield19_2": {
   "name": "InshasAirbase",
   "callsign": "ISH",
   "beacon_type": 13,
-  "hertz": 116900000,
+  "hertz": 111350000,
   "channel": null
  },
  "airfield11_0": {
@@ -931,27 +903,20 @@
   "channel": 55
  },
  "airfield8_0": {
-  "name": "Nevatim",
-  "callsign": "NEV",
-  "beacon_type": 13,
-  "hertz": 108300000,
-  "channel": null
- },
- "airfield8_1": {
   "name": "Nevatim",
   "callsign": "NEV",
   "beacon_type": 14,
   "hertz": 108300000,
   "channel": null
  },
- "airfield8_2": {
+ "airfield8_1": {
   "name": "Nevatim",
   "callsign": "NGV",
   "beacon_type": 14,
   "hertz": 111500000,
   "channel": null
  },
- "airfield8_3": {
+ "airfield8_2": {
   "name": "Nevatim",
   "callsign": "NGV",
   "beacon_type": 13,
@@ -966,13 +931,6 @@
   "channel": null
  },
  "airfield10_1": {
-  "name": "Ovda",
-  "callsign": "OVD",
-  "beacon_type": 4,
-  "hertz": 133600000,
-  "channel": 63
- },
- "airfield10_2": {
   "name": "Ovda",
   "callsign": "VA",
   "beacon_type": 13,
@@ -1000,6 +958,62 @@
   "hertz": 115800000,
   "channel": 105
  },
+ "airfield41_0": {
+  "name": "Eilat/IlanandAsafRamonAirport",
+  "callsign": "RB",
+  "beacon_type": 13,
+  "hertz": 110500000,
+  "channel": 0
+ },
+ "airfield41_1": {
+  "name": "Eilat/IlanandAsafRamonAirport",
+  "callsign": "RB",
+  "beacon_type": 14,
+  "hertz": 110500000,
+  "channel": 0
+ },
+ "airfield41_2": {
+  "name": "Eilat/IlanandAsafRamonAirport",
+  "callsign": "R\u00d0\u00a1",
+  "beacon_type": 14,
+  "hertz": 108700000,
+  "channel": null
+ },
+ "airfield41_3": {
+  "name": "Eilat/IlanandAsafRamonAirport",
+  "callsign": "RC",
+  "beacon_type": 14,
+  "hertz": 108700000,
+  "channel": null
+ },
+ "airfield41_4": {
+  "name": "Eilat",
+  "callsign": "RAM",
+  "beacon_type": 3,
+  "hertz": 113850000,
+  "channel": 85
+ },
+ "airfield42_0": {
+  "name": "SharmElSheikhIntl",
+  "callsign": "KIL",
+  "beacon_type": 13,
+  "hertz": 109500000,
+  "channel": 0
+ },
+ "airfield42_1": {
+  "name": "SharmElSheikhIntl",
+  "callsign": "KIL",
+  "beacon_type": 14,
+  "hertz": 109500000,
+  "channel": 0
+ },
+ "airfield42_2": {
+  "name": "SharmElSheikhIntl",
+  "callsign": "SHM",
+  "beacon_type": 3,
+  "hertz": 114200000,
+  "channel": 89
+ },
  "airfield23_0": {
   "name": "TelNof",
   "callsign": "AKR",
@@ -1010,8 +1024,8 @@
  "airfield23_1": {
   "name": "TelNof",
   "callsign": "AKR",
-  "beacon_type": 13,
-  "hertz": 109700000,
+  "beacon_type": 14,
+  "hertz": 109100000,
   "channel": null
  },
  "airfield23_2": {
@@ -1021,6 +1035,20 @@
   "hertz": 109100000,
   "channel": null
  },
+ "airfield43_0": {
+  "name": "WADIABURISH",
+  "callsign": "RB",
+  "beacon_type": 14,
+  "hertz": 110600000,
+  "channel": null
+ },
+ "airfield43_1": {
+  "name": "WADIABURISH",
+  "callsign": "RB",
+  "beacon_type": 13,
+  "hertz": 110600000,
+  "channel": null
+ },
  "airfield13_0": {
   "name": "WadiAlJandali",
   "callsign": "ICTM",
@@ -1034,12 +1062,5 @@
   "beacon_type": 14,
   "hertz": 109700000,
   "channel": null
- },
- "airfield13_2": {
-  "name": "WadialJandali",
-  "callsign": "WAJ",
-  "beacon_type": 4,
-  "hertz": 114900000,
-  "channel": 96
  }
 }
\ No newline at end of file
diff --git a/resources/dcs/beacons/syria.json b/resources/dcs/beacons/syria.json
index d015fd5ae..8c4908cda 100644
--- a/resources/dcs/beacons/syria.json
+++ b/resources/dcs/beacons/syria.json
@@ -223,6 +223,83 @@
   "hertz": 351000,
   "channel": null
  },
+ "airfield221_0": {
+  "name": "",
+  "callsign": "BG",
+  "beacon_type": 13,
+  "hertz": 110300000,
+  "channel": null
+ },
+ "airfield221_1": {
+  "name": "",
+  "callsign": "GP",
+  "beacon_type": 14,
+  "hertz": 110900000,
+  "channel": null
+ },
+ "airfield221_2": {
+  "name": "BenGurion",
+  "callsign": "BGN",
+  "beacon_type": 3,
+  "hertz": 113500000,
+  "channel": null
+ },
+ "airfield221_3": {
+  "name": "",
+  "callsign": "BD",
+  "beacon_type": 14,
+  "hertz": 111900000,
+  "channel": null
+ },
+ "airfield221_4": {
+  "name": "",
+  "callsign": "GP",
+  "beacon_type": 14,
+  "hertz": 108700000,
+  "channel": null
+ },
+ "airfield221_5": {
+  "name": "",
+  "callsign": "BA",
+  "beacon_type": 13,
+  "hertz": 110900000,
+  "channel": null
+ },
+ "airfield221_6": {
+  "name": "",
+  "callsign": "BN",
+  "beacon_type": 13,
+  "hertz": 109700000,
+  "channel": null
+ },
+ "airfield221_7": {
+  "name": "",
+  "callsign": "GP",
+  "beacon_type": 14,
+  "hertz": 110300000,
+  "channel": null
+ },
+ "airfield221_8": {
+  "name": "",
+  "callsign": "GP",
+  "beacon_type": 14,
+  "hertz": 109700000,
+  "channel": null
+ },
+ "airfield221_9": {
+  "name": "",
+  "callsign": "BA",
+  "beacon_type": 13,
+  "hertz": 108700000,
+  "channel": null
+ },
+ "airfield221_10": {
+  "name": "",
+  "callsign": "BD",
+  "beacon_type": 13,
+  "hertz": 111900000,
+  "channel": null
+ },
  "airfield7_0": {
   "name": "",
   "callsign": "IDA",
@@ -287,16 +364,23 @@
   "channel": null
  },
  "airfield49_0": {
+  "name": "",
+  "callsign": "IECR",
+  "beacon_type": 13,
+  "hertz": 108300000,
+  "channel": null
+ },
+ "airfield49_1": {
   "name": "ERCAN",
   "callsign": "ECN",
   "beacon_type": 3,
   "hertz": 117000000,
   "channel": null
  },
- "airfield49_1": {
+ "airfield49_2": {
   "name": "",
   "callsign": "IECR",
-  "beacon_type": 13,
+  "beacon_type": 14,
   "hertz": 108300000,
   "channel": null
  },
@@ -331,18 +415,25 @@
  "airfield41_0": {
   "name": "",
   "callsign": "IGZP",
-  "beacon_type": 13,
+  "beacon_type": 14,
   "hertz": 108500000,
   "channel": null
  },
  "airfield41_1": {
+  "name": "",
+  "callsign": "IGZP",
+  "beacon_type": 13,
+  "hertz": 108500000,
+  "channel": null
+ },
+ "airfield41_2": {
   "name": "ALANYA/GAZIPASA",
   "callsign": "GZP",
   "beacon_type": 3,
   "hertz": 114200000,
   "channel": 89
  },
- "airfield41_2": {
+ "airfield41_3": {
   "name": "GAZIPASA/ALANYA",
   "callsign": "GZP",
   "beacon_type": 9,
@@ -391,6 +482,27 @@
   "hertz": 336000,
   "channel": null
  },
+ "airfield222_0": {
+  "name": "",
+  "callsign": "HZR",
+  "beacon_type": 14,
+  "hertz": 108500000,
+  "channel": 0
+ },
+ "airfield222_1": {
+  "name": "",
+  "callsign": "HZR",
+  "beacon_type": 2,
+  "hertz": 115900000,
+  "channel": 106
+ },
+ "airfield222_2": {
+  "name": "",
+  "callsign": "HZR",
+  "beacon_type": 13,
+  "hertz": 108500000,
+  "channel": null
+ },
  "airfield16_0": {
   "name": "INCIRLIC",
   "callsign": "DAN",
@@ -505,30 +617,30 @@
  },
  "airfield68_0": {
   "name": "",
-  "callsign": "",
+  "callsign": "IGHS",
   "beacon_type": 13,
-  "hertz": 112910000,
+  "hertz": 109700000,
   "channel": null
  },
  "airfield68_1": {
   "name": "",
-  "callsign": "",
-  "beacon_type": 13,
-  "hertz": 112900000,
+  "callsign": "IGHS",
+  "beacon_type": 14,
+  "hertz": 109700000,
   "channel": null
  },
  "airfield68_2": {
   "name": "",
-  "callsign": "",
-  "beacon_type": 14,
-  "hertz": 112910000,
+  "callsign": "IGHI",
+  "beacon_type": 13,
+  "hertz": 107700000,
   "channel": null
  },
  "airfield68_3": {
   "name": "",
-  "callsign": "",
+  "callsign": "IGHI",
   "beacon_type": 14,
-  "hertz": 112900000,
+  "hertz": 107700000,
   "channel": null
  },
  "airfield27_0": {
@@ -609,24 +721,24 @@
   "channel": 79
  },
  "airfield64_0": {
-  "name": "PrinceHussein",
-  "callsign": "ABC",
-  "beacon_type": 4,
-  "hertz": 0,
-  "channel": 106
- },
- "airfield64_1": {
   "name": "",
   "callsign": "ABC",
   "beacon_type": 13,
-  "hertz": 111400000,
+  "hertz": 111700000,
   "channel": null
  },
+ "airfield64_1": {
+  "name": "PrinceHussein",
+  "callsign": "ABC",
+  "beacon_type": 5,
+  "hertz": 115900000,
+  "channel": 106
+ },
  "airfield64_2": {
   "name": "",
   "callsign": "ABC",
   "beacon_type": 14,
-  "hertz": 111400000,
+  "hertz": 111700000,
   "channel": null
  },
  "airfield30_0": {
@@ -678,6 +790,41 @@
   "hertz": 391000,
   "channel": null
  },
+ "airfield58_2": {
+  "name": "",
+  "callsign": "ISUR",
+  "beacon_type": 14,
+  "hertz": 111900000,
+  "channel": null
+ },
+ "airfield58_3": {
+  "name": "",
+  "callsign": "ISUR",
+  "beacon_type": 13,
+  "hertz": 111900000,
+  "channel": null
+ },
+ "airfield220_0": {
+  "name": "TEL_NOF",
+  "callsign": "XAKR",
+  "beacon_type": 10,
+  "hertz": 87000,
+  "channel": null
+ },
+ "airfield220_1": {
+  "name": "",
+  "callsign": "AKR",
+  "beacon_type": 13,
+  "hertz": 109100000,
+  "channel": null
+ },
+ "airfield220_2": {
+  "name": "",
+  "callsign": "AKR",
+  "beacon_type": 14,
+  "hertz": 109100000,
+  "channel": null
+ },
  "airfield40_0": {
   "name": "Cheka",
   "callsign": "CAK",