Removed duplicate lines in Russia units DB

Updated README and manual for release v0.3.251019
Missions with higher cloud cover and wind speed now award more XP
2025-11-25 19:31:01 +00:00 · 2025-10-24 19:53:01 +02:00 · 2025-10-19 19:20:15 +02:00 · 2025-10-19 18:55:02 +02:00 · 2025-10-19 18:53:57 +02:00 · 2025-10-19 18:52:58 +02:00
319 changed files with 24409 additions and 2370 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 _[Dd]ebug[Oo]utput/
 [Ii]nclude/[Ss]cript.lua
 *.miz
+*.pdf
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,4 +1,9 @@
 {
+  "files.exclude": { "*.miz": true },
  "Lua.workspace.library": ["Libraries/dcs-world-api.lua"],
-  "Lua.diagnostics.disable": ["deprecated"]
+  "Lua.diagnostics.disable": ["deprecated"],
+  "markdown-pdf.convertOnSave": true,
+  "markdown-pdf.convertOnSaveExclude": ["README.md"],
+  "markdown-pdf.headerTemplate": "<span class='title' style='display: none;'></span>",
+  "markdown-pdf.styles": ["docs/style.css"]
 }
--- a/BuildScript/Mission.php
+++ b/BuildScript/Mission.php
@ -97,7 +97,7 @@ function makeZones($theaterJson)
    return $lua;
 }

-function createMissionTable($theaterJson)
+function createMissionTable($theaterJson, $debugMode)
 {
    $lua = file_get_contents("./Miz/Mission.lua");

@ -109,6 +109,11 @@ function createMissionTable($theaterJson)
    $lua = str_replace("__MISSION_DESCRIPTION__", "The Universal Mission for DCS World is an attempt to create a fully dynamic single-player/PvE mission giving access to the whole content of DCS World.\\n\\nOpen the F10/Other submenu in the communication menu to begin.\\n\\nVisit github.com/akaAgar/the-universal-mission-for-dcs-world to learn more.", $lua);
    $lua = str_replace("__MISSION_NAME__", "The Universal Mission - ".$theaterJson["displayName"], $lua);
    $lua = str_replace("__WEATHER_TEMPERATURE__", strval($theaterJson["temperature"]), $lua);
+    
+    if ($debugMode)
+        $lua = str_replace("__PLAYER_GROUP__", file_get_contents("./Miz/PlayerGroup-Debug.lua"), $lua);
+    else
+        $lua = str_replace("__PLAYER_GROUP__", file_get_contents("./Miz/PlayerGroup-Release.lua"), $lua);

    $lua = str_replace("__PLAYER_AIRDROME_ID__", strval($theaterJson["player"]["airdromeID"]), $lua);
    $lua = str_replace("__PLAYER_X__", strval($theaterJson["player"]["coordinates"][0]), $lua);
--- a/files/autoexec.cfg
+++ b/files/autoexec.cfg
@ -1,15 +1,19 @@
+------------------------------------------------------------------------------------------------------------------------
+-- CONFIG FILE BY BIGNEWY, REQUIRED FOR DCS WORLD 2.9.18.12722 AND ABOVE.
+------------------------------------------------------------------------------------------------------------------------
+-- Copy this file the [Saved Games]\DCS\Config\ directory or The Universal Mission will not work.
+-- See https://forum.dcs.world/topic/376636-changes-to-the-behaviour-of-netdostring_in/ for more information
+------------------------------------------------------------------------------------------------------------------------
+-- Please note: as of DCS 2.9.18.12899, it seems the autoexec.cfg file is no longer needed (see https://www.digitalcombatsimulator.com/en/news/changelog/release/2.9.18.12899/)
+-- but I advise you to copy it anyway, ED might change its mind again.
+------------------------------------------------------------------------------------------------------------------------
+
 if not net then net = {} end

 net.allow_unsafe_api = {  -- this defines the secure zones where net.dostring_in() can be called from
-  "userhooks",
  "scripting",
-  "gui",
 }

 net.allow_dostring_in = { -- and this defines the zones that should be addressed from net.dostring_in()
  "mission",
-  "scripting",
-  "gui",
-  "export",
-  "config",
 }
--- a/Database/Aircraft/A-10A.lua
+++ b/Database/Aircraft/A-10A.lua
@ -1,23 +0,0 @@
-Library.aircraft["A-10A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    liveries = {
-        [coalition.side.BLUE] = { "104th FS Maryland ANG, Baltimore (MD)", "118th FS Bradley ANGB, Connecticut (CT)", "118th FS Bradley ANGB, Connecticut (CT) N621", "172nd FS Battle Creek ANGB, Michigan (BC)", "184th FS Arkansas ANG, Fort Smith (FS)", "190th FS Boise ANGB, Idaho (ID)", "23rd TFW England AFB (EL)", "25th FS Osan AB, Korea (OS)", "354th FS Davis Monthan AFB, Arizona (DM)", "355th FS Eielson AFB, Alaska (AK)", "357th FS Davis Monthan AFB, Arizona (DM)", "358th FS Davis Monthan AFB, Arizona (DM)", "422nd TES Nellis AFB, Nevada (OT)", "47th FS Barksdale AFB, Louisiana (BD)", "66th WS Nellis AFB, Nevada (WA)", "74th FS Moody AFB, Georgia (FT)", "81st FS Spangdahlem AB, Germany (SP) 1", "81st FS Spangdahlem AB, Germany (SP) 2", "A-10 Grey" },
-        [coalition.side.RED] = { "Fictional Russian Air Force 1", "Fictional Russian Air Force 2", "Algerian AF Fictional Desert", "Algerian AF Fictional Grey" },
-    },
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 240,flare = 120,fuel = 5029,ammo_type = 1,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}" },
-         [2] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [3] = { CLSID = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}" },
-         [4] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [5] = { CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" },
-         [7] = { CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" },
-         [8] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [9] = { CLSID = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}" },
-         [10] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [11] = { CLSID = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}" },
-        }
-    }
-}
--- a/Database/Aircraft/A-10C.lua
+++ b/Database/Aircraft/A-10C.lua
@ -1,22 +0,0 @@
-Library.aircraft["A-10C"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    liveries = {
-        [coalition.side.BLUE] = { "104th FS Maryland ANG, Baltimore (MD)", "118th FS Bradley ANGB, Connecticut (CT)", "118th FS Bradley ANGB, Connecticut (CT) N621", "172nd FS Battle Creek ANGB, Michigan (BC)", "184th FS Arkansas ANG, Fort Smith (FS)", "190th FS Boise ANGB, Idaho (ID)", "23rd TFW England AFB (EL)", "25th FS Osan AB, Korea (OS)", "354th FS Davis Monthan AFB, Arizona (DM)", "355th FS Eielson AFB, Alaska (AK)", "357th FS Davis Monthan AFB, Arizona (DM)", "358th FS Davis Monthan AFB, Arizona (DM)", "422nd TES Nellis AFB, Nevada (OT)", "47th FS Barksdale AFB, Louisiana (BD)", "66th WS Nellis AFB, Nevada (WA)", "74th FS Moody AFB, Georgia (FT)", "81st FS Spangdahlem AB, Germany (SP) 1", "81st FS Spangdahlem AB, Germany (SP) 2", "A-10 Grey" },
-        [coalition.side.RED] = { "Fictional Russian Air Force 1", "Fictional Russian Air Force 2", "Algerian AF Fictional Desert", "Algerian AF Fictional Grey" },
-    },
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 240,flare = 120,fuel = 5029,ammo_type = 1,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "ALQ_184" },
-         [3] = { CLSID = "{E6A6262A-CA08-4B3D-B030-E1A993B98452}" },
-         [4] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [5] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [7] = { CLSID = "{GBU-38}" },
-         [8] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [9] = { CLSID = "{E6A6262A-CA08-4B3D-B030-E1A993B98453}" },
-         [10] = { CLSID = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}" },
-         [11] = { CLSID = "{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}" },
-        }
-    }
-}
--- a/Database/Aircraft/A-10C_2.lua
+++ b/Database/Aircraft/A-10C_2.lua
@ -1,22 +0,0 @@
-Library.aircraft["A-10C_2"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    liveries = {
-        [coalition.side.BLUE] = { "104th FS Maryland ANG, Baltimore (MD)", "118th FS Bradley ANGB, Connecticut (CT)", "118th FS Bradley ANGB, Connecticut (CT) N621", "172nd FS Battle Creek ANGB, Michigan (BC)", "184th FS Arkansas ANG, Fort Smith (FS)", "190th FS Boise ANGB, Idaho (ID)", "23rd TFW England AFB (EL)", "25th FS Osan AB, Korea (OS)", "354th FS Davis Monthan AFB, Arizona (DM)", "355th FS Eielson AFB, Alaska (AK)", "357th FS Davis Monthan AFB, Arizona (DM)", "358th FS Davis Monthan AFB, Arizona (DM)", "422nd TES Nellis AFB, Nevada (OT)", "47th FS Barksdale AFB, Louisiana (BD)", "66th WS Nellis AFB, Nevada (WA)", "74th FS Moody AFB, Georgia (FT)", "81st FS Spangdahlem AB, Germany (SP) 1", "81st FS Spangdahlem AB, Germany (SP) 2", "A-10 Grey" },
-        [coalition.side.RED] = { "Fictional Russian Air Force 1", "Fictional Russian Air Force 2", "Algerian AF Fictional Desert", "Algerian AF Fictional Grey" },
-    },
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 240,flare = 120,fuel = 5029,ammo_type = 1,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "ALQ_184" },
-         [3] = { CLSID = "{E6A6262A-CA08-4B3D-B030-E1A993B98452}" },
-         [4] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [5] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [7] = { CLSID = "{GBU-38}" },
-         [8] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [9] = { CLSID = "{E6A6262A-CA08-4B3D-B030-E1A993B98453}" },
-         [10] = { CLSID = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}" },
-         [11] = { CLSID = "{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}" },
-        }
-    }
-}
--- a/Database/Aircraft/A-50.lua
+++ b/Database/Aircraft/A-50.lua
@ -1,6 +0,0 @@
-Library.aircraft["A-50"] = {
-    altitude = DCSEx.converter.feetToMeters(32000),
-    options = { "eplrs" },
-    payload = { chaff = 192, flare = 192, fuel = 70000 },
-    speed = DCSEx.converter.knotsToMps(300),
-}
--- a/Database/Aircraft/AH-1W.lua
+++ b/Database/Aircraft/AH-1W.lua
@ -1,13 +0,0 @@
-Library.aircraft["AH-1W"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 30,flare = 30,fuel = 1250 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{3EA17AB0-A805-4D9E-8732-4CE00CB00F17}" },
-         [2] = { CLSID = "[M260_HYDRA}" },
-         [3] = { CLSID = "[M260_HYDRA}" },
-         [4] = { CLSID = "{3EA17AB0-A805-4D9E-8732-4CE00CB00F17}" },
-        }
-    }
-}
--- a/Database/Aircraft/AH-64A.lua
+++ b/Database/Aircraft/AH-64A.lua
@ -1,13 +0,0 @@
-Library.aircraft["AH-64A"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 30,flare = 30,fuel = 1157 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}" },
-         [2] = { CLSID = "{3DFB7321-AB0E-11d7-9897-000476191836}" },
-         [3] = { CLSID = "{3DFB7321-AB0E-11d7-9897-000476191836}" },
-         [4] = { CLSID = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}" },
-        }
-    }
-}
--- a/Database/Aircraft/AH-64D.lua
+++ b/Database/Aircraft/AH-64D.lua
@ -1,13 +0,0 @@
-Library.aircraft["AH-64D"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 30,flare = 30,fuel = 1157 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}" },
-         [2] = { CLSID = "{3DFB7321-AB0E-11d7-9897-000476191836}" },
-         [3] = { CLSID = "{3DFB7321-AB0E-11d7-9897-000476191836}" },
-         [4] = { CLSID = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}" },
-        }
-    }
-}
--- a/Database/Aircraft/AJS37.lua
+++ b/Database/Aircraft/AJS37.lua
@ -1,25 +0,0 @@
-Library.aircraft["AJS37"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 105,flare = 36,fuel = 4476,gun = 100 },
-    properties = { Rb04GroupTarget = 3, WeapSafeHeight = 1, Rb04VinkelHopp = 0, MissionGeneratorSetting = 0 },
-    pylons = {
-        default = {
-         [2] = { CLSID = "{Robot74}" },
-         [3] = { CLSID = "{RB75T}" },
-         [4] = { CLSID = "{VIGGEN_X-TANK}" },
-         [5] = { CLSID = "{RB75T}" },
-         [6] = { CLSID = "{Robot74}" },
-        }
-    }
-    -- Payload.Decade2000.Task.AirToAir.pylon02={Robot74}
-    -- Payload.Decade2000.Task.AirToAir.pylon03={Robot05}
-    -- Payload.Decade2000.Task.AirToAir.pylon04={VIGGEN_X-TANK}
-    -- Payload.Decade2000.Task.AirToAir.pylon05={Robot05}
-    -- Payload.Decade2000.Task.AirToAir.pylon06={Robot74}
-    -- Payload.Decade2000.Task.Antiship.pylon02={RB75T}
-    -- Payload.Decade2000.Task.Antiship.pylon03={RB75T}
-    -- Payload.Decade2000.Task.Antiship.pylon04={VIGGEN_X-TANK}
-    -- Payload.Decade2000.Task.Antiship.pylon05={RB75T}
-    -- Payload.Decade2000.Task.Antiship.pylon06={RB75T}
-}
--- a/Database/Aircraft/AV8BNA.lua
+++ b/Database/Aircraft/AV8BNA.lua
@ -1,29 +0,0 @@
-Library.aircraft["AV8BNA"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    liveries = {
-        [coalition.side.BLUE] = { "VMA-211", "VMA-211D", "VMA-214", "VMA-214D", "VMA-223D", "VMA-231-1", "VMA-231-2", "VMA-231D", "VMA-311", "VMA-311D", "VMA-513", "VMA-513D", "VMA-542", "VMAT-203", "VMAT-203S" },
-        [coalition.side.RED] = { "default" },
-    },
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 60,flare = 120,fuel = 3519.423,gun = 100 },
-    properties = { EWDispenserTBL = 2, WpBullseye = 0, EWDispenserBR = 2, AAR_Zone3 = 0, AAR_Zone2 = 0, EWDispenserTFR = 1, AAR_Zone1 = 0, ClockTime = 1, RocketBurst = 1, LaserCode100 = 6, LaserCode1 = 8, EWDispenserTFL = 1, EWDispenserBL = 2, EWDispenserTBR = 2, LaserCode10 = 8, MountNVG = false },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         [2] = { CLSID = "LAU_117_AGM_65G" },
-         [3] = { CLSID = "LAU_117_AGM_65G" },
-         [4] = { CLSID = "{GAU_12_Equalizer}" },
-         [6] = { CLSID = "LAU_117_AGM_65G" },
-         [7] = { CLSID = "LAU_117_AGM_65G" },
-         [8] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         -- Payload.Decade2000.Task.sead.pylon01={AGM_122_SIDEARM}
-         -- Payload.Decade2000.Task.sead.pylon02=LAU_117_AGM_65G
-         -- Payload.Decade2000.Task.sead.pylon03=LAU_117_AGM_65G
-         -- Payload.Decade2000.Task.sead.pylon04={GAU_12_Equalizer}
-         -- Payload.Decade2000.Task.sead.pylon05={ALQ_164_RF_Jammer}
-         -- Payload.Decade2000.Task.sead.pylon06=LAU_117_AGM_65G
-         -- Payload.Decade2000.Task.sead.pylon07=LAU_117_AGM_65G
-         -- Payload.Decade2000.Task.sead.pylon08={AGM_122_SIDEARM}
-        }
-    }
-}
--- a/Database/Aircraft/An-26B.lua
+++ b/Database/Aircraft/An-26B.lua
@ -1,5 +0,0 @@
-Library.aircraft["An-26B"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 384,flare = 384,fuel = 5500 },
-}
--- a/Database/Aircraft/An-30M.lua
+++ b/Database/Aircraft/An-30M.lua
@ -1,5 +0,0 @@
-Library.aircraft["An-30M"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 192,flare = 192,fuel = 8300 },
-}
--- a/Database/Aircraft/B-1B.lua
+++ b/Database/Aircraft/B-1B.lua
@ -1,12 +0,0 @@
-Library.aircraft["B-1B"] = {
-    altitude = DCSEx.converter.feetToMeters(30000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 60,flare = 30,fuel = 88450,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "GBU-38*16" },
-         [2] = { CLSID = "GBU-38*16" },
-         [3] = { CLSID = "GBU-38*16" },
-        }
-    }
-}
--- a/Database/Aircraft/B-52H.lua
+++ b/Database/Aircraft/B-52H.lua
@ -1,12 +0,0 @@
-Library.aircraft["B-52H"] = {
-    altitude = DCSEx.converter.feetToMeters(30000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 1125,flare = 192,fuel = 141135,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}" },
-         [2] = { CLSID = "{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}" },
-         [3] = { CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}" },
-        }
-    }
-}
--- a/Database/Aircraft/Bf-109K-4.lua
+++ b/Database/Aircraft/Bf-109K-4.lua
@ -1,10 +0,0 @@
-- Library.aircraft["Bf-109K-4"] = {
--     altitude = DCSEx.converter.feetToMeters(20000),
--     speed = DCSEx.converter.knotsToMps(225),
--     payload = { chaff = 0,flare = 0,fuel = 296,ammo_type = 1 },
--     properties = { MW50TankContents = 1, Flare_Gun = 1 },
--     [Payload]
--     Payload.Decade2000.Task.Antiship.Pylon01=SC_501_SC500
--     Payload.Decade2000.Task.AirToGround.Pylon01=SC_501_SC250
--     }
-- }
--- a/Database/Aircraft/C-101CC.lua
+++ b/Database/Aircraft/C-101CC.lua
@ -1,17 +0,0 @@
-Library.aircraft["C-101CC"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 1881.5 },
-    properties = { SoloFlight = false, MountIFRHood = false, CameraRecorder = false, SightSunFilter = false, NetCrewControlPriority = 1, NS430allow = 1 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}" },
-         [2] = { CLSID = "{BR_250}" },
-         [3] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [4] = { CLSID = "{C-101-DEFA553}" },
-         [5] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         [6] = { CLSID = "{BR_250}" },
-         [7] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}" },
-        }
-    }
-}
--- a/Database/Aircraft/C-130.lua
+++ b/Database/Aircraft/C-130.lua
@ -1,5 +0,0 @@
-Library.aircraft["C-130"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 120,flare = 60,fuel = 20830 },
-}
--- a/Database/Aircraft/C-17A.lua
+++ b/Database/Aircraft/C-17A.lua
@ -1,5 +0,0 @@
-Library.aircraft["C-17A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 120,flare = 60,fuel = 132405 },
-}
--- a/Database/Aircraft/CH-47D.lua
+++ b/Database/Aircraft/CH-47D.lua
@ -1,5 +0,0 @@
-Library.aircraft["CH-47D"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 120,flare = 120,fuel = 3600 },
-}
--- a/Database/Aircraft/CH-53E.lua
+++ b/Database/Aircraft/CH-53E.lua
@ -1,5 +0,0 @@
-Library.aircraft["CH-53E"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 60,flare = 60,fuel = 1908 },
-}
--- a/Database/Aircraft/E-2C.lua
+++ b/Database/Aircraft/E-2C.lua
@ -1,6 +0,0 @@
-Library.aircraft["E-2C"] = {
-    altitude = DCSEx.converter.feetToMeters(32000),
-    options = { "eplrs" },
-    payload = { chaff = 120, flare = 60, fuel = 5624 },
-    speed = DCSEx.converter.knotsToMps(240),
-}
--- a/Database/Aircraft/E-3A.lua
+++ b/Database/Aircraft/E-3A.lua
@ -1,6 +0,0 @@
-Library.aircraft["E-3A"] = {
-    altitude = DCSEx.converter.feetToMeters(32000),
-    options = { "eplrs" },
-    payload = { chaff = 120, flare = 60, fuel = 65000 },
-    speed = DCSEx.converter.knotsToMps(300),
-}
--- a/Database/Aircraft/F-117A.lua
+++ b/Database/Aircraft/F-117A.lua
@ -1,11 +0,0 @@
-Library.aircraft["F-117A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 3840 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{EF0A9419-01D6-473B-99A3-BEBDB923B14D}" },
-         [2] = { CLSID = "{EF0A9419-01D6-473B-99A3-BEBDB923B14D}" },
-        }
-    }
-}
--- a/Database/Aircraft/F-14A-135-GR.lua
+++ b/Database/Aircraft/F-14A-135-GR.lua
@ -1,24 +0,0 @@
-Library.aircraft["F-14A-135-GR"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 140,flare = 60,fuel = 7348 },
-    properties = { LGB100 = 6, M61BURST = 0, IlsChannel = 1, LGB1 = 8, KY28Key = 1, TacanBand = 0, TacanChannel = 0, LGB1000 = 1, LGB10 = 8, INSAlignmentStored = true, UseLAU138 = true, ALE39Loadout = 0 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{LAU-138 wtip - AIM-9M}" },
-         [2] = { CLSID = "{SHOULDER AIM_54A_Mk47 L}" },
-         [3] = { CLSID = "{F14-300gal}" },
-         [4] = { CLSID = "{AIM_54A_Mk47}" },
-         [5] = { CLSID = "{AIM_54A_Mk47}" },
-         [6] = { CLSID = "{AIM_54A_Mk47}" },
-         [7] = { CLSID = "{AIM_54A_Mk47}" },
-         [8] = { CLSID = "{F14-300gal}" },
-         [9] = { CLSID = "{SHOULDER AIM_54A_Mk47 R}" },
-         [10] = { CLSID = "{LAU-138 wtip - AIM-9M}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={BRU-32 MK-84}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={BRU-32 MK-84}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={BRU-32 MK-84}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={BRU-32 MK-84}
-        }
-    }
-}
--- a/Database/Aircraft/F-14A.lua
+++ b/Database/Aircraft/F-14A.lua
@ -1,24 +0,0 @@
-Library.aircraft["F-14A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 30,flare = 15,fuel = 7348 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         [2] = { CLSID = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-         [4] = { CLSID = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-         [5] = { CLSID = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-         [8] = { CLSID = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-         [9] = { CLSID = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-         [11] = { CLSID = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-         [12] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={0395076D-2F77-4420-9D33-087A4398130B}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}
-        }
-    }
-}
--- a/Database/Aircraft/F-14B.lua
+++ b/Database/Aircraft/F-14B.lua
@ -1,24 +0,0 @@
-Library.aircraft["F-14B"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 140,flare = 60,fuel = 7348 },
-    properties = { LGB100 = 6, M61BURST = 0, IlsChannel = 1, LGB1 = 8, KY28Key = 1, TacanBand = 0, TacanChannel = 0, LGB1000 = 1, LGB10 = 8, INSAlignmentStored = true, UseLAU138 = true, ALE39Loadout = 0 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{LAU-138 wtip - AIM-9M}" },
-         [2] = { CLSID = "{SHOULDER AIM_54A_Mk47 L}" },
-         [3] = { CLSID = "{F14-300gal}" },
-         [4] = { CLSID = "{AIM_54A_Mk47}" },
-         [5] = { CLSID = "{AIM_54A_Mk47}" },
-         [6] = { CLSID = "{AIM_54A_Mk47}" },
-         [7] = { CLSID = "{AIM_54A_Mk47}" },
-         [8] = { CLSID = "{F14-300gal}" },
-         [9] = { CLSID = "{SHOULDER AIM_54A_Mk47 R}" },
-         [10] = { CLSID = "{LAU-138 wtip - AIM-9M}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={BRU-32 MK-84}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={BRU-32 MK-84}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={BRU-32 MK-84}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={BRU-32 MK-84}
-        }
-    }
-}
--- a/Database/Aircraft/F-15C.lua
+++ b/Database/Aircraft/F-15C.lua
@ -1,18 +0,0 @@
-Library.aircraft["F-15C"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 120,flare = 60,fuel = 6103 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-         [3] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-         [4] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         [5] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         [6] = { CLSID = "{E1F29B21-F291-4589-9FD8-3272EEC69506}" },
-         [7] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         [8] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         [9] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-         [11] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-        }
-    }
-}
--- a/Database/Aircraft/F-15E.lua
+++ b/Database/Aircraft/F-15E.lua
@ -1,24 +0,0 @@
-Library.aircraft["F-15E"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 120,flare = 60,fuel = 10246 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         [2] = { CLSID = "{9BCC2A2B-5708-4860-B1F1-053A18442067}" },
-         [3] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         [4] = { CLSID = "{GBU-38}" },
-         [6] = { CLSID = "{GBU-38}" },
-         [7] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [9] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [10] = { CLSID = "{E1F29B21-F291-4589-9FD8-3272EEC69506}" },
-         [11] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [13] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [14] = { CLSID = "{GBU-38}" },
-         [16] = { CLSID = "{GBU-38}" },
-         [17] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         [18] = { CLSID = "{9BCC2A2B-5708-4860-B1F1-053A18442067}" },
-         [19] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-        }
-    }
-}
--- a/Database/Aircraft/F-16A.lua
+++ b/Database/Aircraft/F-16A.lua
@ -1,38 +0,0 @@
-Library.aircraft["F-16A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { ammo_type = 5,chaff = 60,flare = 60,fuel = 3249,gun = 100 },
-    properties = { LaserCode1 = 8, LaserCode100 = 6, LAU3ROF = 0, LaserCode10 = 8 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         [2] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         [3] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [4] = { CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" },
-         [5] = { CLSID = "{CAAC1CFD-6745-416B-AFA4-CB57414856D0}" },
-         [6] = { CLSID = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}" },
-         [7] = { CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" },
-         [8] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" },
-         [9] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-         [10] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}" },
-         -- Payload.Decade2000.Task.AirToAir.Pylon01={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.AirToAir.Pylon02={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.AirToAir.Pylon03={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.AirToAir.Pylon04={F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}
-         -- Payload.Decade2000.Task.AirToAir.Pylon06={6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}
-         -- Payload.Decade2000.Task.AirToAir.Pylon07={F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}
-         -- Payload.Decade2000.Task.AirToAir.Pylon08={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.AirToAir.Pylon09={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.AirToAir.Pylon10={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={C8E06185-7CD6-4C90-959F-044679E90751}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={6CEB49FC-DED8-4DED-B053-E1F033FF72D3}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={B06DD79A-F21E-4EB9-BD9D-AB3844618C93}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}
-         -- Payload.Decade2000.Task.SEAD.Pylon08={B06DD79A-F21E-4EB9-BD9D-AB3844618C93}
-         -- Payload.Decade2000.Task.SEAD.Pylon09={6CEB49FC-DED8-4DED-B053-E1F033FF72D3}
-         -- Payload.Decade2000.Task.SEAD.Pylon10={C8E06185-7CD6-4C90-959F-044679E90751}
-        }
-    }
-}
--- a/Database/Aircraft/F-16C_50.lua
+++ b/Database/Aircraft/F-16C_50.lua
@ -1,31 +0,0 @@
-Library.aircraft["F-16C_50"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { ammo_type = 5,chaff = 60,flare = 60,fuel = 3249,gun = 100 },
-    properties = { LaserCode1 = 8, LaserCode100 = 6, LAU3ROF = 0, LaserCode10 = 8, HelmetMountedDevice = 1 },
-    pylons = {
-        default = {
-            [1] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [2] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-            [3] = { CLSID = "{TER_9A_2L*GBU-12}" },
-            [4] = { CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" },
-            [5] = { CLSID = "<CLEAN>" },
-            [6] = { CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" },
-            [7] = { CLSID = "{TER_9A_2R*GBU-12}" },
-            [8] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-            [9] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [11] = { CLSID = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}" },
-        },
-        cap = {
-            [1] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [2] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [3] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-            [4] = { CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" },
-            [5] = { CLSID = "<CLEAN>" },
-            [6] = { CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}" },
-            [7] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-            [8] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [9] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-        },
-    }
-}
--- a/Database/Aircraft/F-5E-3.lua
+++ b/Database/Aircraft/F-5E-3.lua
@ -1,23 +0,0 @@
-Library.aircraft["F-5E-3"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 30,flare = 15,fuel = 2046,ammo_type = 2,gun = 100, },
-    properties = { LAU68ROF = 0,ChaffSalvo = 0,ChaffSalvoInt = 0,LAU3ROF = 0,ChaffBurstInt = 0,LaserCode100 = 6,LaserCode1 = 8,FlareBurstInt = 0,FlareBurst = 0,LaserCode10 = 8,ChaffBurst = 0 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{AIM-9P5}" },
-         [3] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         [4] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         [5] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         [7] = { CLSID = "{AIM-9P5}" },
-         -- pylons = {
-         -- [1] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}" },
-         -- [2] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [3] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [4] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         -- [5] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [6] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [7] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}" },
-        }
-    }
-}
--- a/Database/Aircraft/F-5E.lua
+++ b/Database/Aircraft/F-5E.lua
@ -1,22 +0,0 @@
-Library.aircraft["F-5E"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 30,flare = 15,fuel = 2046 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{AIM-9P5}" },
-         [3] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         [4] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         [5] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         [7] = { CLSID = "{AIM-9P5}" },
-         -- pylons = {
-         -- [1] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}" },
-         -- [2] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [3] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [4] = { CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}" },
-         -- [5] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [6] = { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" },
-         -- [7] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}" },
-        }
-    }
-}
--- a/Database/Aircraft/F-86F
+++ b/Database/Aircraft/F-86F
@ -1,17 +0,0 @@
-Library.aircraft["F-86F Sabre"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 1282,gun = 100 },
-    pylons = {
-        default = {
-         [4] = { CLSID = "{PTB_120_F86F35}" },
-         [5] = { CLSID = "{GAR-8}" },
-         [6] = { CLSID = "{GAR-8}" },
-         [7] = { CLSID = "{PTB_120_F86F35}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={PTB_200_F86F35}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={F86ANM64}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={F86ANM64}
-         -- Payload.Decade2000.Task.AirToGround.Pylon10={PTB_200_F86F35}
-        }
-    }
-}
--- a/Database/Aircraft/FA-18C_hornet.lua
+++ b/Database/Aircraft/FA-18C_hornet.lua
@ -1,30 +0,0 @@
-Library.aircraft["FA-18C_hornet"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 60,flare = 30,fuel = 4900,gun = 100 },
-    properties = { OuterBoard = 0, InnerBoard = 0, HelmetMountedDevice = 1 },
-    pylons = {
-        default = {
-            [1] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-            [2] = { CLSID = "LAU_117_AGM_65F" },
-            [3] = { CLSID = "{BRU33_2X_GBU-12}" },
-            [4] = { CLSID = "{AAQ-28_LEFT}" },
-            [5] = { CLSID = "{FPU_8A_FUEL_TANK}" },
-            [6] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [7] = { CLSID = "{BRU33_2X_GBU-12}" },
-            [8] = { CLSID = "{F16A4DE0-116C-4A71-97F0-2CF85B0313EC}" },
-            [9] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-        },
-        cap = {
-            [1] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-            [2] = { CLSID = "LAU-115_2*LAU-127_AIM-120C" },
-            [3] = { CLSID = "{FPU_8A_FUEL_TANK}" },
-            [4] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [5] = { CLSID = "{FPU_8A_FUEL_TANK}" },
-            [6] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}" },
-            [7] = { CLSID = "{FPU_8A_FUEL_TANK}" },
-            [8] = { CLSID = "LAU-115_2*LAU-127_AIM-120C" },
-            [9] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}" },
-        },
-    }
-}
--- a/Database/Aircraft/I-16.lua
+++ b/Database/Aircraft/I-16.lua
@ -1,14 +0,0 @@
-Library.aircraft["I-16"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(225),
-    payload = { chaff = 0,flare = 0,fuel = 191,gun = 100 },
-    properties = { landingTorch = false },
-    -- Payload.Decade2000.Task.AirToGround.Pylon01=I16_RS_82
-    -- Payload.Decade2000.Task.AirToGround.Pylon02=I16_RS_82
-    -- Payload.Decade2000.Task.AirToGround.Pylon03=I16_RS_82
-    -- Payload.Decade2000.Task.AirToGround.Pylon04=I16_FAB_100SV
-    -- Payload.Decade2000.Task.AirToGround.Pylon05=I16_FAB_100SV
-    -- Payload.Decade2000.Task.AirToGround.Pylon06=I16_RS_82
-    -- Payload.Decade2000.Task.AirToGround.Pylon07=I16_RS_82
-    -- Payload.Decade2000.Task.AirToGround.Pylon08=I16_RS_82
-}
--- a/Database/Aircraft/IL-76MD.lua
+++ b/Database/Aircraft/IL-76MD.lua
@ -1,5 +0,0 @@
-Library.aircraft["IL-76MD"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 80000 },
-}
--- a/Database/Aircraft/IL-78M.lua
+++ b/Database/Aircraft/IL-78M.lua
@ -1,5 +0,0 @@
-Library.aircraft["IL-78M"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 90000 },
-}
--- a/Database/Aircraft/J-11A.lua
+++ b/Database/Aircraft/J-11A.lua
@ -1,49 +0,0 @@
-Library.aircraft["J-11A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 9400,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{RKL609_L}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{B79C379A-9E87-4E50-A1EE-7F7E29C2E87A}" },
-         [4] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [5] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [6] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [7] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [8] = { CLSID = "{B79C379A-9E87-4E50-A1EE-7F7E29C2E87A}" },
-         [9] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [10] = { CLSID = "{RKL609_R}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={RKL609_L}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={FAB_500_DUAL_L}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon08={FAB_500_DUAL_R}
-         -- Payload.Decade2000.Task.AirToGround.Pylon09={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon10={RKL609_R}
-         -- Payload.Decade2000.Task.AntiShip.Pylon01={RKL609_L}
-         -- Payload.Decade2000.Task.AntiShip.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon03={FAB_500_DUAL_L}
-         -- Payload.Decade2000.Task.AntiShip.Pylon04={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon08={FAB_500_DUAL_R}
-         -- Payload.Decade2000.Task.AntiShip.Pylon09={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon10={RKL609_R}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={RKL609_L}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={FAB_500_DUAL_L}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon08={FAB_500_DUAL_R}
-         -- Payload.Decade2000.Task.SEAD.Pylon09={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon10={RKL609_R}
-        }
-    }
-}
--- a/Database/Aircraft/JF-17.lua
+++ b/Database/Aircraft/JF-17.lua
@ -1,38 +0,0 @@
-Library.aircraft["JF-17"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 36,flare = 32,fuel = 2325,gun = 100 },
-    properties = { AARProbe = false,LaserCode100 = 6,LaserCode10 = 8,LaserCode1 = 8 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "DIS_PL-5EII" },
-         [2] = { CLSID = "DIS_GBU_12_DUAL" },
-         [3] = { CLSID = "DIS_LS_6_500" },
-         [4] = { CLSID = "DIS_WMD7" },
-         [5] = { CLSID = "DIS_LS_6_500" },
-         [6] = { CLSID = "DIS_GBU_12_DUAL" },
-         [7] = { CLSID = "DIS_PL-5EII" },
-         -- Payload.Decade2000.Task.SEAD.Pylon01=DIS_PL-5EII
-         -- Payload.Decade2000.Task.SEAD.Pylon02=DIS_LD-10_DUAL_L
-         -- Payload.Decade2000.Task.SEAD.Pylon03=DIS_TANK1100
-         -- Payload.Decade2000.Task.SEAD.Pylon04=DIS_SPJ_POD
-         -- Payload.Decade2000.Task.SEAD.Pylon05=DIS_TANK1100
-         -- Payload.Decade2000.Task.SEAD.Pylon06=DIS_LD-10_DUAL_R
-         -- Payload.Decade2000.Task.SEAD.Pylon07=DIS_PL-5EII
-         -- Payload.Decade2000.Task.Antiship.Pylon01=DIS_PL-5EII
-         -- Payload.Decade2000.Task.Antiship.Pylon02=DIS_C-701IR
-         -- Payload.Decade2000.Task.Antiship.Pylon03=DIS_C-802AK
-         -- Payload.Decade2000.Task.Antiship.Pylon04=DIS_TANK800
-         -- Payload.Decade2000.Task.Antiship.Pylon05=DIS_C-802AK
-         -- Payload.Decade2000.Task.Antiship.Pylon06=DIS_C-701IR
-         -- Payload.Decade2000.Task.Antiship.Pylon07=DIS_PL-5EII
-         -- Payload.Decade2000.Task.AirToAir.Pylon01=DIS_PL-5EII
-         -- Payload.Decade2000.Task.AirToAir.Pylon02=DIS_SD-10
-         -- Payload.Decade2000.Task.AirToAir.Pylon03=DIS_TANK1100
-         -- Payload.Decade2000.Task.AirToAir.Pylon04=DIS_TANK800
-         -- Payload.Decade2000.Task.AirToAir.Pylon05=DIS_TANK1100
-         -- Payload.Decade2000.Task.AirToAir.Pylon06=DIS_SD-10
-         -- Payload.Decade2000.Task.AirToAir.Pylon07=DIS_PL-5EII
-        }
-    }
-}
--- a/Database/Aircraft/KC-135.lua
+++ b/Database/Aircraft/KC-135.lua
@ -1,5 +0,0 @@
-Library.aircraft["KC-135"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 90700 },
-}
--- a/Database/Aircraft/KC135MPRS.lua
+++ b/Database/Aircraft/KC135MPRS.lua
@ -1,5 +0,0 @@
-Library.aircraft["KC135MPRS"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 120,flare = 60,fuel = 90700,gun = 100 },
-}
--- a/Database/Aircraft/Ka-27.lua
+++ b/Database/Aircraft/Ka-27.lua
@ -1,5 +0,0 @@
-Library.aircraft["Ka-27"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 0,fuel = 2616,gun = 100 },
-}
--- a/Database/Aircraft/Ka-50.lua
+++ b/Database/Aircraft/Ka-50.lua
@ -1,13 +0,0 @@
-Library.aircraft["Ka-50"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 128,fuel = 1450,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}" },
-         [2] = { CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" },
-         [3] = { CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" },
-         [4] = { CLSID = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}" },
-        }
-    }
-}
--- a/Database/Aircraft/L-39C.lua
+++ b/Database/Aircraft/L-39C.lua
@ -1,17 +0,0 @@
-Library.aircraft["L-39C"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 823.2,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{UB-16-57UMP}" },
-         [2] = { CLSID = "{FB3CE165-BF07-4979-887C-92B87F13276B}" },
-         [4] = { CLSID = "{FB3CE165-BF07-4979-887C-92B87F13276B}" },
-         [5] = { CLSID = "{UB-16-57UMP}" },
-         -- Payload.Decade2000.Task.AirToAir.Pylon01={APU-60-1_R_60M}
-         -- Payload.Decade2000.Task.AirToAir.Pylon02={PK-3}
-         -- Payload.Decade2000.Task.AirToAir.Pylon04={PK-3}
-         -- Payload.Decade2000.Task.AirToAir.Pylon05={APU-60-1_R_60M}
-        }
-    }
-}
--- a/Database/Aircraft/M-2000C.lua
+++ b/Database/Aircraft/M-2000C.lua
@ -1,42 +0,0 @@
-Library.aircraft["M-2000C"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 112,flare = 16,fuel = 3165,gun = 100 },
-    properties = { ForceINSRules = false, LaserCode100 = 6, NoDDMSensor = false, LaserCode1 = 8, WpBullseye = 0, LoadNVGCase = false, RocketBurst = 6, LaserCode10 = 8, GunBurst = 1 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{MMagicII}" },
-         [2] = { CLSID = "{Matra_S530D}" },
-         [5] = { CLSID = "{M2KC_RPL_522}" },
-         [8] = { CLSID = "{Matra_S530D}" },
-         [9] = { CLSID = "{MMagicII}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={MMagicII}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={M2KC_RAFAUT_MK82}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={M2KC_RPL_522}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AirToGround.Pylon08={M2KC_RAFAUT_MK82}
-         -- Payload.Decade2000.Task.AirToGround.Pylon09={MMagicII}
-         -- Payload.Decade2000.Task.AntiShip.Pylon01={MMagicII}
-         -- Payload.Decade2000.Task.AntiShip.Pylon02={M2KC_RAFAUT_MK82}
-         -- Payload.Decade2000.Task.AntiShip.Pylon03={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AntiShip.Pylon04={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AntiShip.Pylon05={M2KC_RPL_522}
-         -- Payload.Decade2000.Task.AntiShip.Pylon06={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AntiShip.Pylon07={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.AntiShip.Pylon08={M2KC_RAFAUT_MK82}
-         -- Payload.Decade2000.Task.AntiShip.Pylon09={MMagicII}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={MMagicII}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={M2KC_RAFAUT_MK82}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={M2KC_RPL_522}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={BCE4E030-38E9-423E-98ED-24BE3DA87C32}
-         -- Payload.Decade2000.Task.SEAD.Pylon08={M2KC_RAFAUT_MK82}
-         -- Payload.Decade2000.Task.SEAD.Pylon09={MMagicII}
-        }
-    }
-}
--- a/Database/Aircraft/Mi-24V.lua
+++ b/Database/Aircraft/Mi-24V.lua
@ -1,13 +0,0 @@
-Library.aircraft["Mi-24V"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 192,fuel = 1704 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}" },
-         [3] = { CLSID = "{B_8V20A_CM}" },
-         [4] = { CLSID = "{B_8V20A_CM}" },
-         [6] = { CLSID = "{B919B0F4-7C25-455E-9A02-CEA51DB895E3}" },
-        }
-    }
-}
--- a/Database/Aircraft/Mi-26.lua
+++ b/Database/Aircraft/Mi-26.lua
@ -1,5 +0,0 @@
-Library.aircraft["Mi-26"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 192,fuel = 9600,gun = 100 },
-}
--- a/Database/Aircraft/Mi-28N.lua
+++ b/Database/Aircraft/Mi-28N.lua
@ -1,13 +0,0 @@
-Library.aircraft["Mi-28N"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 128,fuel = 1500 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{57232979-8B0F-4db7-8D9A-55197E06B0F5}" },
-         [2] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [3] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [4] = { CLSID = "{57232979-8B0F-4db7-8D9A-55197E06B0F5}" },
-        }
-    }
-}
--- a/Database/Aircraft/Mi-8MT.lua
+++ b/Database/Aircraft/Mi-8MT.lua
@ -1,16 +0,0 @@
-Library.aircraft["Mi-8MT"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 128,fuel = 1929,gun = 100 },
-    properties = { LeftEngineResource = 90, RightEngineResource = 90, NetCrewControlPriority = 1, ExhaustScreen = true, CargoHalfdoor = true, GunnersAISkill = 90, AdditionalArmor = true, NS430allow = true },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{GUV_VOG}" },
-         [2] = { CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" },
-         [3] = { CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" },
-         [4] = { CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" },
-         [5] = { CLSID = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}" },
-         [6] = { CLSID = "{GUV_VOG}" },
-        }
-    }
-}
--- a/Database/Aircraft/MiG-15bis.lua
+++ b/Database/Aircraft/MiG-15bis.lua
@ -1,13 +0,0 @@
-Library.aircraft["MiG-15bis"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 1172,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{PTB600_MIG15}" },
-         [2] = { CLSID = "{PTB600_MIG15}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={FAB_50}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={FAB_50}
-        }
-    }
-}
--- a/Database/Aircraft/MiG-19P.lua
+++ b/Database/Aircraft/MiG-19P.lua
@ -1,18 +0,0 @@
-Library.aircraft["MiG-19P"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 1800,gun = 100 },
-    properties = { MissileToneVolume = 5,ADF_Selected_Frequency = 1,MountSIRENA = false,ADF_NEAR_Frequency = 303,ADF_FAR_Frequency = 625,NAV_Initial_Hdg = 0 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{K-13A}" },
-         [2] = { CLSID = "{PTB760_MIG19}" },
-         [5] = { CLSID = "{PTB760_MIG19}" },
-         [6] = { CLSID = "{K-13A}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={3C612111-C7AD-476E-8A8E-2485812F4E5C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={ORO57K_S5M_HEFRAG}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={ORO57K_S5M_HEFRAG}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={3C612111-C7AD-476E-8A8E-2485812F4E5C}
-        }
-    }
-}
--- a/Database/Aircraft/MiG-21Bis.lua
+++ b/Database/Aircraft/MiG-21Bis.lua
@ -1,21 +0,0 @@
-Library.aircraft["MiG-21Bis"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 18,flare = 40,fuel = 2280,ammo_type = 1,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{R-60 2L}" },
-         [2] = { CLSID = "{R-3R}" },
-         [3] = { CLSID = "{PTB_800_MIG21}" },
-         [4] = { CLSID = "{R-3R}" },
-         [5] = { CLSID = "{R-60 2R}" },
-         [6] = { CLSID = "{ASO-2}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={3C612111-C7AD-476E-8A8E-2485812F4E5C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={UB-32_S5M}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={PTB_800_MIG21}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={UB-32_S5M}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={3C612111-C7AD-476E-8A8E-2485812F4E5C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={ASO-2}
-        }
-    }
-}
--- a/Database/Aircraft/MiG-23MLD.lua
+++ b/Database/Aircraft/MiG-23MLD.lua
@ -1,19 +0,0 @@
-Library.aircraft["MiG-23MLD"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 60,flare = 60,fuel = 3800,gun = 100 },
-    pylons = {
-        default = {
-         [2] = { CLSID = "{CCF898C9-5BC7-49A4-9D1E-C3ED3D5166A1}" },
-         [3] = { CLSID = "{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}" },
-         [4] = { CLSID = "{A5BAEAB7-6FAF-4236-AF72-0FD900F493F9}" },
-         [5] = { CLSID = "{275A2855-4A79-4B2D-B082-91EA2ADF4691}" },
-         [6] = { CLSID = "{CCF898C9-5BC7-49A4-9D1E-C3ED3D5166A1}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={682A481F-0CB5-4693-A382-D00DD4A156D7}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={A5BAEAB7-6FAF-4236-AF72-0FD900F493F9}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={682A481F-0CB5-4693-A382-D00DD4A156D7}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-        }
-    }
-}
--- a/Database/Aircraft/MiG-25PD.lua
+++ b/Database/Aircraft/MiG-25PD.lua
@ -1,13 +0,0 @@
-Library.aircraft["MiG-25PD"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 64,flare = 64,fuel = 15245,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [2] = { CLSID = "{4EDBA993-2E34-444C-95FB-549300BF7CAF}" },
-         [3] = { CLSID = "{4EDBA993-2E34-444C-95FB-549300BF7CAF}" },
-         [4] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-        }
-    }
-}
--- a/Database/Aircraft/MiG-25RBT.lua
+++ b/Database/Aircraft/MiG-25RBT.lua
@ -1,13 +0,0 @@
-Library.aircraft["MiG-25RBT"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 64,flare = 64,fuel = 15245,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [2] = { CLSID = "{37DCC01E-9E02-432F-B61D-10C166CA2798}" },
-         [3] = { CLSID = "{37DCC01E-9E02-432F-B61D-10C166CA2798}" },
-         [4] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-        }
-    }
-}
--- a/Database/Aircraft/MiG-27K.lua
+++ b/Database/Aircraft/MiG-27K.lua
@ -1,16 +0,0 @@
-Library.aircraft["MiG-27K"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 60,flare = 60,fuel = 4500,gun = 100 },
-    pylons = {
-        default = {
-         [2] = { CLSID = "{E659C4BE-2CD8-4472-8C08-3F28ACB61A8A}" },
-         [3] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [4] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [5] = { CLSID = "{A5BAEAB7-6FAF-4236-AF72-0FD900F493F9}" },
-         [6] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [7] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [8] = { CLSID = "{E659C4BE-2CD8-4472-8C08-3F28ACB61A8A}" },
-        }
-    }
-}
--- a/Database/Aircraft/MiG-29A.lua
+++ b/Database/Aircraft/MiG-29A.lua
@ -1,37 +0,0 @@
-Library.aircraft["MiG-29A"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 30,flare = 30,fuel = 3376,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}" },
-         [4] = { CLSID = "{2BEC576B-CDF5-4B7F-961F-B0FA4312B841}" },
-         [5] = { CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}" },
-         [6] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [7] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={2BEC576B-CDF5-4B7F-961F-B0FA4312B841}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon02={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AntiShip.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon04={2BEC576B-CDF5-4B7F-961F-B0FA4312B841}
-         -- Payload.Decade2000.Task.AntiShip.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon06={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AntiShip.Pylon07={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={2BEC576B-CDF5-4B7F-961F-B0FA4312B841}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={FBC29BFE-3D24-4C64-B81D-941239D12249}
-        }
-    }
-}
--- a/Database/Aircraft/MiG-29S.lua
+++ b/Database/Aircraft/MiG-29S.lua
@ -1,37 +0,0 @@
-Library.aircraft["MiG-29S"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 30,flare = 30,fuel = 3493,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}" },
-         [4] = { CLSID = "{2BEC576B-CDF5-4B7F-961F-B0FA4312B841}" },
-         [5] = { CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}" },
-         [6] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [7] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={2BEC576B-CDF5-4B7F-961F-B0FA4312B841}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon02={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AntiShip.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon04={2BEC576B-CDF5-4B7F-961F-B0FA4312B841}
-         -- Payload.Decade2000.Task.AntiShip.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon06={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.AntiShip.Pylon07={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={2BEC576B-CDF5-4B7F-961F-B0FA4312B841}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={3858707D-F5D5-4bbb-BDD8-ABB0530EBC7C}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={FBC29BFE-3D24-4C64-B81D-941239D12249}
-        }
-    }
-}
--- a/Database/Aircraft/MiG-31.lua
+++ b/Database/Aircraft/MiG-31.lua
@ -1,15 +0,0 @@
-Library.aircraft["MiG-31"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 15500,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{4EDBA993-2E34-444C-95FB-549300BF7CAF}" },
-         [2] = { CLSID = "{F1243568-8EF0-49D4-9CB5-4DA90D92BC1D}" },
-         [3] = { CLSID = "{F1243568-8EF0-49D4-9CB5-4DA90D92BC1D}" },
-         [4] = { CLSID = "{F1243568-8EF0-49D4-9CB5-4DA90D92BC1D}" },
-         [5] = { CLSID = "{F1243568-8EF0-49D4-9CB5-4DA90D92BC1D}" },
-         [6] = { CLSID = "{5F26DBC2-FB43-4153-92DE-6BBCE26CB0FF}" },
-        }
-    }
-}
--- a/Database/Aircraft/OH-58D.lua
+++ b/Database/Aircraft/OH-58D.lua
@ -1,11 +0,0 @@
-Library.aircraft["OH-58D"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 30,flare = 30,fuel = 454 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{AGM114x2_OH_58}" },
-         [2] = { CLSID = "{M260_HYDRA}" },
-        }
-    }
-}
--- a/Database/Aircraft/P-47D-30.lua
+++ b/Database/Aircraft/P-47D-30.lua
@ -1,15 +0,0 @@
-Library.aircraft["P-47D-30"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(225),
-    payload = { chaff = 0,flare = 0,fuel = 557.76,gun = 100,ammo_type = 1 },
-    properties = { WaterTankContents = 1 },
-    pylons = {
-        default = {
-         [2] = { CLSID = "{US_150GAL_FUEL_TANK}" },
-         [3] = { CLSID = "{US_150GAL_FUEL_TANK}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={US_110GAL_FUEL_TANK}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={AN-M64}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={AN-M64}
-        }
-    }
-}
--- a/Database/Aircraft/P-47D-30bl1.lua
+++ b/Database/Aircraft/P-47D-30bl1.lua
@ -1,9 +0,0 @@
-Library.aircraft["P-47D-30bl1"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(225),
-    payload = { chaff = 0,flare = 0,fuel = 557.76,gun = 100,ammo_type = 1 },
-    properties = { WaterTankContents = 1 },
-    -- Payload.Decade2000.Task.AirToGround.Pylon01={US_110GAL_FUEL_TANK}
-    -- Payload.Decade2000.Task.AirToGround.Pylon02={AN-M64}
-    -- Payload.Decade2000.Task.AirToGround.Pylon03={AN-M64}
-}
--- a/Database/Aircraft/P-47D-40.lua
+++ b/Database/Aircraft/P-47D-40.lua
@ -1,15 +0,0 @@
-Library.aircraft["P-47D-40"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(225),
-    payload = { chaff = 0,flare = 0,fuel = 557.76,gun = 100,ammo_type = 1 },
-    properties = { WaterTankContents = 1 },
-    pylons = {
-        default = {
-         [2] = { CLSID = "{US_150GAL_FUEL_TANK}" },
-         [3] = { CLSID = "{US_150GAL_FUEL_TANK}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={US_110GAL_FUEL_TANK}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={AN-M64}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={AN-M64}
-        }
-    }
-}
--- a/Database/Aircraft/P-51D-30-NA.lua
+++ b/Database/Aircraft/P-51D-30-NA.lua
@ -1,7 +0,0 @@
-Library.aircraft["P-51D-30-NA"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 497.76,gun = 100 },
-    -- Payload.Decade2000.Task.AirToGround.Pylon04={AN-M64}
-    -- Payload.Decade2000.Task.AirToGround.Pylon07={AN-M64}
-}
--- a/Database/Aircraft/P-51D.lua
+++ b/Database/Aircraft/P-51D.lua
@ -1,7 +0,0 @@
-Library.aircraft["P-51D"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 0,flare = 0,fuel = 497.76,gun = 100 },
-    -- Payload.Decade2000.Task.AirToGround.Pylon04={AN-M64}
-    -- Payload.Decade2000.Task.AirToGround.Pylon07={AN-M64}
-}
--- a/Database/Aircraft/SA342L.lua
+++ b/Database/Aircraft/SA342L.lua
@ -1,13 +0,0 @@
-Library.aircraft["SA342L"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 32,fuel = 416.33,gun = 100 },
-    properties = { NS430allow = true },
-    pylons = {
-        default = {
-         [2] = { CLSID = "{LAU_SNEB68G}" },
-         [5] = { CLSID = "{FAS}" },
-         [6] = { CLSID = "{IR_Deflector}" },
-        }
-    }
-}
--- a/Database/Aircraft/SA342M.lua
+++ b/Database/Aircraft/SA342M.lua
@ -1,16 +0,0 @@
-Library.aircraft["SA342M"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 32,fuel = 416.33,gun = 100 },
-    properties = { NS430allow = true },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{HOT3D}" },
-         [2] = { CLSID = "{HOT3D}" },
-         [3] = { CLSID = "{HOT3D}" },
-         [4] = { CLSID = "{HOT3D}" },
-         [5] = { CLSID = "{FAS}" },
-         [6] = { CLSID = "{IR_Deflector}" },
-        }
-    }
-}
--- a/Database/Aircraft/SA342Minigun.lua
+++ b/Database/Aircraft/SA342Minigun.lua
@ -1,12 +0,0 @@
-Library.aircraft["SA342Minigun"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 32,fuel = 416.33,gun = 100 },
-    properties = { NS430allow = true },
-    pylons = {
-        default = {
-         [5] = { CLSID = "{FAS}" },
-         [6] = { CLSID = "{IR_Deflector}" },
-        }
-    }
-}
--- a/Database/Aircraft/SA342Mistral.lua
+++ b/Database/Aircraft/SA342Mistral.lua
@ -1,16 +0,0 @@
-Library.aircraft["SA342Mistral"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 32,fuel = 416.33,gun = 100 },
-    properties = { NS430allow = true },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{MBDA_MistralD}" },
-         [2] = { CLSID = "{MBDA_MistralG}" },
-         [3] = { CLSID = "{MBDA_MistralD}" },
-         [4] = { CLSID = "{MBDA_MistralG}" },
-         [5] = { CLSID = "{FAS}" },
-         [6] = { CLSID = "{IR_Deflector}" },
-        }
-    }
-}
--- a/Database/Aircraft/SH-60B.lua
+++ b/Database/Aircraft/SH-60B.lua
@ -1,10 +0,0 @@
-Library.aircraft["SH-60B"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 30,flare = 30,fuel = 1100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{7B8DCEB4-820B-4015-9B48-1028A4195692}" },
-        }
-    }
-}
--- a/Database/Aircraft/SpitfireLFMkIX.lua
+++ b/Database/Aircraft/SpitfireLFMkIX.lua
@ -1,5 +0,0 @@
-Library.aircraft["SpitfireLFMkIX"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(225),
-    payload = { chaff = 0,flare = 0,fuel = 247,ammo_type = 1,gun = 100 },
-}
--- a/Database/Aircraft/SpitfireLFMkIXCW.lua
+++ b/Database/Aircraft/SpitfireLFMkIXCW.lua
@ -1,5 +0,0 @@
-Library.aircraft["SpitfireLFMkIXCW"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(225),
-    payload = { chaff = 0,flare = 0,fuel = 247,ammo_type = 1,gun = 100 },
-}
--- a/Database/Aircraft/Su-17M4.lua
+++ b/Database/Aircraft/Su-17M4.lua
@ -1,17 +0,0 @@
-Library.aircraft["Su-17M4"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 11700,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{637334E4-AB5A-47C0-83A6-51B7F1DF3CD5}" },
-         [2] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [3] = { CLSID = "{637334E4-AB5A-47C0-83A6-51B7F1DF3CD5}" },
-         [4] = { CLSID = "{E659C4BE-2CD8-4472-8C08-3F28ACB61A8A}" },
-         [5] = { CLSID = "{E659C4BE-2CD8-4472-8C08-3F28ACB61A8A}" },
-         [6] = { CLSID = "{637334E4-AB5A-47C0-83A6-51B7F1DF3CD5}" },
-         [7] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [8] = { CLSID = "{637334E4-AB5A-47C0-83A6-51B7F1DF3CD5}" },
-        }
-    }
-}
--- a/Database/Aircraft/Su-24M.lua
+++ b/Database/Aircraft/Su-24M.lua
@ -1,15 +0,0 @@
-Library.aircraft["Su-24M"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 11700,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}" },
-         [2] = { CLSID = "{BA565F89-2373-4A84-9502-A0E017D3A44A}" },
-         [3] = { CLSID = "{BA565F89-2373-4A84-9502-A0E017D3A44A}" },
-         [6] = { CLSID = "{BA565F89-2373-4A84-9502-A0E017D3A44A}" },
-         [7] = { CLSID = "{BA565F89-2373-4A84-9502-A0E017D3A44A}" },
-         [8] = { CLSID = "{275A2855-4A79-4B2D-B082-91EA2ADF4691}" },
-        }
-    }
-}
--- a/Database/Aircraft/Su-25.lua
+++ b/Database/Aircraft/Su-25.lua
@ -1,19 +0,0 @@
-Library.aircraft["Su-25"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 128,flare = 128,fuel = 2835,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-         [2] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [3] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [4] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [5] = { CLSID = "{E92CBFE5-C153-11d8-9897-000476191836}" },
-         [6] = { CLSID = "{E92CBFE5-C153-11d8-9897-000476191836}" },
-         [7] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [8] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [9] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [10] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}" },
-        }
-    }
-}
--- a/Database/Aircraft/Su-25T.lua
+++ b/Database/Aircraft/Su-25T.lua
@ -1,31 +0,0 @@
-Library.aircraft["Su-25T"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 128,flare = 128,fuel = 3790,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{44EE8698-89F9-48EE-AF36-5FD31896A82D}" },
-         [2] = { CLSID = "{CBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{0180F983-C14A-11d8-9897-000476191836}" },
-         [4] = { CLSID = "{F789E86A-EE2E-4E6B-B81E-D5E5F903B6ED}" },
-         [5] = { CLSID = "{E92CBFE5-C153-11d8-9897-000476191836}" },
-         [6] = { CLSID = "{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}" },
-         [7] = { CLSID = "{E92CBFE5-C153-11d8-9897-000476191836}" },
-         [8] = { CLSID = "{F789E86A-EE2E-4E6B-B81E-D5E5F903B6ED}" },
-         [9] = { CLSID = "{0180F983-C14A-11d8-9897-000476191836}" },
-         [10] = { CLSID = "{CBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [11] = { CLSID = "{44EE8698-89F9-48EE-AF36-5FD31896A82C}" },
-         -- Payload.Decade2000.Task.SEAD.Pylon01={44EE8698-89F9-48EE-AF36-5FD31896A82D}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={CBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={79D73885-0801-45a9-917F-C90FE1CE3DFC}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={79D73885-0801-45a9-917F-C90FE1CE3DFC}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={B5CA9846-776E-4230-B4FD-8BCC9BFB1676}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={0519A264-0AB6-11d6-9193-00A0249B6F00}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={B5CA9846-776E-4230-B4FD-8BCC9BFB1676}
-         -- Payload.Decade2000.Task.SEAD.Pylon08={79D73885-0801-45a9-917F-C90FE1CE3DFC}
-         -- Payload.Decade2000.Task.SEAD.Pylon09={79D73885-0801-45a9-917F-C90FE1CE3DFC}
-         -- Payload.Decade2000.Task.SEAD.Pylon10={CBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon11={44EE8698-89F9-48EE-AF36-5FD31896A82C}
-        }
-    }
-}
--- a/Database/Aircraft/Su-27.lua
+++ b/Database/Aircraft/Su-27.lua
@ -1,49 +0,0 @@
-Library.aircraft["Su-27"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 9400,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{B79C379A-9E87-4E50-A1EE-7F7E29C2E87A}" },
-         [4] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [5] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [6] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [7] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [8] = { CLSID = "{B79C379A-9E87-4E50-A1EE-7F7E29C2E87A}" },
-         [9] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [10] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={44EE8698-89F9-48EE-AF36-5FD31896A82F}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon08={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon09={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon10={44EE8698-89F9-48EE-AF36-5FD31896A82A}
-         -- Payload.Decade2000.Task.AntiShip.Pylon01={44EE8698-89F9-48EE-AF36-5FD31896A82F}
-         -- Payload.Decade2000.Task.AntiShip.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon04={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon08={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon09={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon10={44EE8698-89F9-48EE-AF36-5FD31896A82A}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={44EE8698-89F9-48EE-AF36-5FD31896A82F}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon08={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon09={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon10={44EE8698-89F9-48EE-AF36-5FD31896A82A}
-        }
-    }
-}
--- a/Database/Aircraft/Su-30.lua
+++ b/Database/Aircraft/Su-30.lua
@ -1,19 +0,0 @@
-Library.aircraft["Su-30"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 96,flare = 96,fuel = 9400,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{44EE8698-89F9-48EE-AF36-5FD31896A82F}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{B4C01D60-A8A3-4237-BD72-CA7655BC0FE9}" },
-         [4] = { CLSID = "{B4C01D60-A8A3-4237-BD72-CA7655BC0FE9}" },
-         [5] = { CLSID = "{B4C01D60-A8A3-4237-BD72-CA7655BC0FE9}" },
-         [6] = { CLSID = "{B4C01D60-A8A3-4237-BD72-CA7655BC0FE9}" },
-         [7] = { CLSID = "{B4C01D60-A8A3-4237-BD72-CA7655BC0FE9}" },
-         [8] = { CLSID = "{B4C01D60-A8A3-4237-BD72-CA7655BC0FE9}" },
-         [9] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [10] = { CLSID = "{44EE8698-89F9-48EE-AF36-5FD31896A82A}" },
-        }
-    }
-}
--- a/Database/Aircraft/Su-33.lua
+++ b/Database/Aircraft/Su-33.lua
@ -1,57 +0,0 @@
-Library.aircraft["Su-33"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 48,flare = 48,fuel = 9500,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}" },
-         [4] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [5] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [6] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [7] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [8] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [9] = { CLSID = "{E8069896-8435-4B90-95C0-01A03AE6E400}" },
-         [10] = { CLSID = "{9B25D316-0434-4954-868F-D51DB1A38DF0}" },
-         [11] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [12] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         -- Payload.Decade2000.Task.AirToGround.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon03={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AirToGround.Pylon04={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AirToGround.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon08={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AirToGround.Pylon09={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AirToGround.Pylon10={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AirToGround.Pylon11={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AirToGround.Pylon12={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon03={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AntiShip.Pylon04={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AntiShip.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon08={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.AntiShip.Pylon09={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AntiShip.Pylon10={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.AntiShip.Pylon11={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.AntiShip.Pylon12={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon01={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon02={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon03={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.SEAD.Pylon04={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.SEAD.Pylon05={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon06={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon07={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon08={37DCC01E-9E02-432F-B61D-10C166CA2798}
-         -- Payload.Decade2000.Task.SEAD.Pylon09={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.SEAD.Pylon10={A0648264-4BC0-4EE8-A543-D119F6BA4257}
-         -- Payload.Decade2000.Task.SEAD.Pylon11={FBC29BFE-3D24-4C64-B81D-941239D12249}
-         -- Payload.Decade2000.Task.SEAD.Pylon12={FBC29BFE-3D24-4C64-B81D-941239D12249}
-        }
-    }
-}
--- a/Database/Aircraft/Su-34.lua
+++ b/Database/Aircraft/Su-34.lua
@ -1,21 +0,0 @@
-Library.aircraft["Su-34"] = {
-    altitude = DCSEx.converter.feetToMeters(20000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 64,flare = 64,fuel = 9800,gun = 100 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{44EE8698-89F9-48EE-AF36-5FD31896A82F}" },
-         [2] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [3] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [4] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [5] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [6] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [7] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [8] = { CLSID = "{3C612111-C7AD-476E-8A8E-2485812F4E5C}" },
-         [9] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [10] = { CLSID = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}" },
-         [11] = { CLSID = "{FBC29BFE-3D24-4C64-B81D-941239D12249}" },
-         [12] = { CLSID = "{44EE8698-89F9-48EE-AF36-5FD31896A82A}" },
-        }
-    }
-}
--- a/Database/Aircraft/Tu-160.lua
+++ b/Database/Aircraft/Tu-160.lua
@ -1,11 +0,0 @@
-Library.aircraft["Tu-160"] = {
-    altitude = DCSEx.converter.feetToMeters(30000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 72,flare = 72,fuel = 157000 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{0290F5DE-014A-4BB1-9843-D717749B1DED}" },
-         [2] = { CLSID = "{0290F5DE-014A-4BB1-9843-D717749B1DED}" },
-        }
-    }
-}
--- a/Database/Aircraft/Tu-22M3.lua
+++ b/Database/Aircraft/Tu-22M3.lua
@ -1,10 +0,0 @@
-Library.aircraft["Tu-22M3"] = {
-    altitude = DCSEx.converter.feetToMeters(30000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 48,flare = 48,fuel = 50000 },
-    pylons = {
-        default = {
-         [3] = { CLSID = "{AD5E5863-08FC-4283-B92C-162E2B2BD3FF}" },
-        }
-    }
-}
--- a/Database/Aircraft/Tu-95MS.lua
+++ b/Database/Aircraft/Tu-95MS.lua
@ -1,10 +0,0 @@
-Library.aircraft["Tu-95MS"] = {
-    altitude = DCSEx.converter.feetToMeters(30000),
-    speed = DCSEx.converter.knotsToMps(300),
-    payload = { chaff = 48,flare = 48,fuel = 87000 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{0290F5DE-014A-4BB1-9843-D717749B1DED}" },
-        }
-    }
-}
--- a/Database/Aircraft/UH-1H.lua
+++ b/Database/Aircraft/UH-1H.lua
@ -1,14 +0,0 @@
-Library.aircraft["UH-1H"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 0,flare = 60,fuel = 631 },
-    properties = { SoloFlight = false, ExhaustScreen = true, GunnersAISkill = 90, NetCrewControlPriority = 0, EngineResource = 90 },
-    pylons = {
-        default = {
-         [1] = { CLSID = "{M134_L}" },
-         [2] = { CLSID = "{XM158_MK5}" },
-         [5] = { CLSID = "{XM158_MK5}" },
-         [6] = { CLSID = "{M134_R}" },
-        }
-    }
-}
--- a/Database/Aircraft/UH-60A.lua
+++ b/Database/Aircraft/UH-60A.lua
@ -1,5 +0,0 @@
-Library.aircraft["UH-60A"] = {
-    altitude = DCSEx.converter.feetToMeters(1500),
-    speed = DCSEx.converter.knotsToMps(90),
-    payload = { chaff = 30,flare = 30,fuel = 1100 },
-}
--- a/Database/Factions/Europe.lua
+++ b/Database/Factions/Europe.lua
@ -0,0 +1,6 @@
+-- TODO
+
+-- [DCSEx.enums.unitFamily.GROUND_APC] = { "CHAP_FV107" },
+
+
+-- CHAP_IRISTSLM_CP, CHAP_IRISTSLM_LN, CHAP_IRISTSLM_STR
--- a/Database/Factions/NATO.lua
+++ b/Database/Factions/NATO.lua
@ -0,0 +1,51 @@
+-- do
+--     Library.factions.tables["NATO"] = {}
+--     Library.factions.tables["NATO"].theaters = {}
+--     Library.factions.tables["NATO"].timePeriods = {}
+
+--     Library.factions.tables["NATO"].units = {}
+
+--     Library.factions.tables["NATO"].units[DCSEx.enums.timePeriod.WORLD_WAR_2] = {}
+--     Library.factions.tables["NATO"].units[DCSEx.enums.timePeriod.KOREA_WAR] = {}
+--     Library.factions.tables["NATO"].units[DCSEx.enums.timePeriod.VIETNAM_WAR] = {}
+--     Library.factions.tables["NATO"].units[DCSEx.enums.timePeriod.COLD_WAR] = {}
+
+--     Library.factions.tables["NATO"].units[DCSEx.enums.timePeriod.MODERN] = {
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_MOBILE] = { "Gepard", "Vulcan" },
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_STATIC] = { "Gepard", "Vulcan" },
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_MANPADS] = { "Soldier stinger" },
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_LONG] = { "*Patriot" },
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_MEDIUM] = { "*HAWK", "*NASAMS" },
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT] = { "rapier_fsa", "Roland ADS" },
+--         [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT_IR] = { "M6 Linebacker", "M48 Chaparral", "M1097 Avenger" },
+
+--         [DCSEx.enums.unitFamily.GROUND_APC] = { "AAV7", "Cobra", "LAV-25", "M-2 Bradley", "M-113", "M1045 HMMWV TOW", "M1126 Stryker ICV", "M1128 Stryker MGS", "Marder", "MCV-80", "MLRS FDDM", "TPZ", "CHAP_M1130", "CHAP_MATV" },
+--         [DCSEx.enums.unitFamily.GROUND_ARTILLERY] = { "M-109", "MLRS", "CHAP_M142_ATACMS_M48", "CHAP_M142_GMLRS_M31" },
+--         [DCSEx.enums.unitFamily.GROUND_INFANTRY] = { "Soldier M4 GRG", "Soldier M4", "Soldier M249", "Soldier RPG" },
+--         [DCSEx.enums.unitFamily.GROUND_MBT] = { "Challenger2", "Leclerc", "Leopard-2", "Leopard1A3", "M-1 Abrams", "Merkava_Mk4" },
+--         [DCSEx.enums.unitFamily.GROUND_SS_MISSILE] = { "Scud_B" },
+--         [DCSEx.enums.unitFamily.GROUND_UNARMED] = { "Land_Rover_101_FC", "Land_Rover_109_S3", "M 818", "CHAP_M1083" },
+
+--         [DCSEx.enums.unitFamily.HELICOPTER_ATTACK] = { "AH-1W", "AH-64D", "OH-58D", "SA342L", "SA342M", "SA342Minigun", "SA342Mistral" },
+--         [DCSEx.enums.unitFamily.HELICOPTER_TRANSPORT] = { "CH-47D", "CH-53E", "SH-60B", "UH-60A" },
+
+--         [DCSEx.enums.unitFamily.PLANE_ATTACK] = { "A-10C_2" },
+--         [DCSEx.enums.unitFamily.PLANE_AWACS] = { "E-2C", "E-3A" },
+--         [DCSEx.enums.unitFamily.PLANE_BOMBER] = { "B-1B Lancer", "B-52H" },
+--         [DCSEx.enums.unitFamily.PLANE_FIGHTER] = { "F-16C_50", "FA-18C_hornet" },
+--         [DCSEx.enums.unitFamily.PLANE_TANKER] = { "KC-135", "KC135MPRS" },
+--         [DCSEx.enums.unitFamily.PLANE_TRANSPORT] = { "C-17A", "C-130" },
+--         [DCSEx.enums.unitFamily.PLANE_UAV] = { "RQ-1A Predator" },
+
+--         [DCSEx.enums.unitFamily.SHIP_CARGO] = { "Dry-cargo ship-1", "Dry-cargo ship-2", "ELNYA", "Ship_Tilde_Supply" },
+--         [DCSEx.enums.unitFamily.SHIP_CARRIER] = { "CVN_71", "CVN_72", "CVN_73", "CVN_75", "hms_invincible", "LHA_Tarawa", "Stennis" },
+--         [DCSEx.enums.unitFamily.SHIP_CRUISER] = { "TICONDEROG" },
+--         [DCSEx.enums.unitFamily.SHIP_FRIGATE] = { "PERRY", "USS_Arleigh_Burke_IIa" },
+--         [DCSEx.enums.unitFamily.SHIP_LIGHT] = { "speedboat" },
+--         [DCSEx.enums.unitFamily.SHIP_MISSILE_BOAT] = { "CastleClass_01", "La_Combattante_II" },
+--         [DCSEx.enums.unitFamily.SHIP_SUBMARINE] = { "santafe" },
+
+--         -- [DCSEx.enums.unitFamily.STATIC_STRUCTURE] = { "af_hq", ".Command Center", "Building01_PBR", "Building02_PBR", "Building03_PBR", "Building04_PBR", "Building05_PBR", "Bunker", "Chemical tank A", "Comms tower M", "FARP Fuel Depot", "outpost", "Sandbox", "Workshop A" },
+--         [DCSEx.enums.unitFamily.STATIC_STRUCTURE] = { "af_hq", ".Command Center", "Building01_PBR", "Building02_PBR", "Building03_PBR", "Building04_PBR", "Building05_PBR", "Chemical tank A", "Comms tower M", "FARP Fuel Depot", "outpost", "Workshop A" },
+--     }
+-- end
--- a/Database/Factions/Russia.lua
+++ b/Database/Factions/Russia.lua
@ -21,17 +21,17 @@ do
        [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_MOBILE] = { "Ural-375 ZU-23", "ZSU_57_2", "ZSU-23-4 Shilka" },
        [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_STATIC] = { "ZU-23 Emplacement Closed", "ZU-23 Emplacement" },
        [DCSEx.enums.unitFamily.AIRDEFENSE_MANPADS] = { "SA-18 Igla manpad", "SA-18 Igla-S manpad" },
-        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_LONG] = { "*SA-2", "*SA-10" },
+        -- [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_LONG] = { "*SA-2", "*SA-10" },
        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_LONG] = { "*SA-10" },
        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_MEDIUM] = { "*SA-3", "*SA-6", "*SA-11" },
-        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT] = { "2S6 Tunguska", "Osa 9A33 ln", "Tor 9A331" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT] = { "2S6 Tunguska", "Osa 9A33 ln", "Tor 9A331", "CHAP_PantsirS1", "CHAP_TorM2" },
        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT_IR] = { "Strela-1 9P31", "Strela-10M3" },

-        [DCSEx.enums.unitFamily.GROUND_APC] = { "BMD-1", "BMP-1", "BMP-2", "BMP-3", "Boman", "BRDM-2", "BTR_D", "BTR-80", "BTR-82A", "Grad_FDDM", "MTLB" },
-        [DCSEx.enums.unitFamily.GROUND_ARTILLERY] = { "Grad-URAL", "SAU 2-C9", "SAU Akatsia", "SAU Gvozdika", "SAU Msta", "Smerch", "SpGH_Dana", "Uragan_BM-27" },
+        [DCSEx.enums.unitFamily.GROUND_APC] = { "BMD-1", "BMP-1", "BMP-2", "BMP-3", "Boman", "BRDM-2", "BTR_D", "BTR-80", "BTR-82A", "Grad_FDDM", "MTLB", "CHAP_BMPT" },
+        [DCSEx.enums.unitFamily.GROUND_ARTILLERY] = { "Grad-URAL", "SAU 2-C9", "SAU Akatsia", "SAU Gvozdika", "SAU Msta", "Smerch", "SpGH_Dana", "Uragan_BM-27", "CHAP_TOS1A" },
        [DCSEx.enums.unitFamily.GROUND_INFANTRY] = { "Infantry AK", "Infantry AK ver2", "Infantry AK ver3", "Paratrooper AKS-74", "Paratrooper RPG-16", "Soldier AK" },
        [DCSEx.enums.unitFamily.GROUND_MBT] = { "T-55", "T-72B", "T-80UD", "T-90" },
-        [DCSEx.enums.unitFamily.GROUND_SS_MISSILE] = { "Scud_B" },
+        [DCSEx.enums.unitFamily.GROUND_SS_MISSILE] = { "Scud_B", "CHAP_9K720_HE" },
        [DCSEx.enums.unitFamily.GROUND_UNARMED] = { "Ural-375", "Ural-4320 APA-5D", "Ural-4320T" },

        [DCSEx.enums.unitFamily.HELICOPTER_ATTACK] = { "Ka-50", "Mi-24V", "Mi-28N" },
@ -45,14 +45,12 @@ do
        [DCSEx.enums.unitFamily.PLANE_TRANSPORT] = { "An-26B", "An-30M", "IL-76MD" },
        [DCSEx.enums.unitFamily.PLANE_UAV] = { "WingLoong-I" },

-        [DCSEx.enums.unitFamily.HELICOPTER_ATTACK] = { "Ka-50", "Mi-24V", "Mi-28N" },
-
        [DCSEx.enums.unitFamily.SHIP_CARGO] = { "Dry-cargo ship-1", "Dry-cargo ship-2", "ELNYA", "Ship_Tilde_Supply" },
        [DCSEx.enums.unitFamily.SHIP_CARRIER] = { "CV_1143_5", "KUZNECOW" },
        [DCSEx.enums.unitFamily.SHIP_CRUISER] = { "MOSCOW", "PIOTR" },
        [DCSEx.enums.unitFamily.SHIP_FRIGATE] = { "NEUSTRASH", "REZKY" },
        [DCSEx.enums.unitFamily.SHIP_LIGHT] = { "speedboat" },
-        [DCSEx.enums.unitFamily.SHIP_MISSILE_BOAT] = { "ALBATROS", "BDK-775", "MOLNIYA" },
+        [DCSEx.enums.unitFamily.SHIP_MISSILE_BOAT] = { "ALBATROS", "BDK-775", "MOLNIYA", "CHAP_Project22160_TorM2KM" },
        [DCSEx.enums.unitFamily.SHIP_SUBMARINE] = { "IMPROVED_KILO", "KILO", "SOM" },

        -- [DCSEx.enums.unitFamily.STATIC_STRUCTURE] = { "af_hq", ".Command Center", "Building01_PBR", "Building02_PBR", "Building03_PBR", "Building04_PBR", "Building05_PBR", "Bunker", "Chemical tank A", "Comms tower M", "FARP Fuel Depot", "outpost", "Sandbox", "Workshop A" },
--- a/Database/Factions/USA.lua
+++ b/Database/Factions/USA.lua
@ -10,7 +10,45 @@ do
    Library.factions.tables["USA"].units[DCSEx.enums.timePeriod.WORLD_WAR_2] = {}
    Library.factions.tables["USA"].units[DCSEx.enums.timePeriod.KOREA_WAR] = {}
    Library.factions.tables["USA"].units[DCSEx.enums.timePeriod.VIETNAM_WAR] = {}
-    Library.factions.tables["USA"].units[DCSEx.enums.timePeriod.COLD_WAR] = {}
+
+    Library.factions.tables["USA"].units[DCSEx.enums.timePeriod.COLD_WAR] = {
+        [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_MOBILE] = { "Gepard", "Vulcan" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_STATIC] = { "Gepard", "Vulcan" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_MANPADS] = { "Soldier stinger" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_LONG] = { "*Patriot" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_MEDIUM] = { "*HAWK", "*NASAMS" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT] = { "rapier_fsa", "Roland ADS" },
+        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT_IR] = { "M6 Linebacker", "M48 Chaparral", "M1097 Avenger" },
+
+        [DCSEx.enums.unitFamily.GROUND_APC] = { "AAV7", "Cobra", "LAV-25", "M-2 Bradley", "M-113", "M1045 HMMWV TOW", "M1126 Stryker ICV", "M1128 Stryker MGS", "Marder", "MCV-80", "MLRS FDDM", "TPZ", "CHAP_M1130", "CHAP_MATV" },
+        [DCSEx.enums.unitFamily.GROUND_ARTILLERY] = { "M-109", "MLRS", "CHAP_M142_ATACMS_M48", "CHAP_M142_GMLRS_M31" },
+        [DCSEx.enums.unitFamily.GROUND_INFANTRY] = { "Soldier M4 GRG", "Soldier M4", "Soldier M249", "Soldier RPG" },
+        [DCSEx.enums.unitFamily.GROUND_MBT] = { "Challenger2", "Leclerc", "Leopard-2", "Leopard1A3", "M-1 Abrams", "Merkava_Mk4" },
+        [DCSEx.enums.unitFamily.GROUND_SS_MISSILE] = { "Scud_B" },
+        [DCSEx.enums.unitFamily.GROUND_UNARMED] = { "Land_Rover_101_FC", "Land_Rover_109_S3", "M 818", "CHAP_M1083" },
+
+        [DCSEx.enums.unitFamily.HELICOPTER_ATTACK] = { "AH-1W", "AH-64D", "OH-58D", "SA342L", "SA342M", "SA342Minigun", "SA342Mistral" },
+        [DCSEx.enums.unitFamily.HELICOPTER_TRANSPORT] = { "CH-47D", "CH-53E", "SH-60B", "UH-60A" },
+
+        [DCSEx.enums.unitFamily.PLANE_ATTACK] = { "A-10C_2" },
+        [DCSEx.enums.unitFamily.PLANE_AWACS] = { "E-2C", "E-3A" },
+        [DCSEx.enums.unitFamily.PLANE_BOMBER] = { "B-1B Lancer", "B-52H" },
+        [DCSEx.enums.unitFamily.PLANE_FIGHTER] = { "F-16C_50", "FA-18C_hornet" },
+        [DCSEx.enums.unitFamily.PLANE_TANKER] = { "KC-135", "KC135MPRS" },
+        [DCSEx.enums.unitFamily.PLANE_TRANSPORT] = { "C-17A", "C-130" },
+        [DCSEx.enums.unitFamily.PLANE_UAV] = { "RQ-1A Predator" },
+
+        [DCSEx.enums.unitFamily.SHIP_CARGO] = { "Dry-cargo ship-1", "Dry-cargo ship-2", "ELNYA", "Ship_Tilde_Supply" },
+        [DCSEx.enums.unitFamily.SHIP_CARRIER] = { "CVN_71", "CVN_72", "CVN_73", "CVN_75", "hms_invincible", "LHA_Tarawa", "Stennis" },
+        [DCSEx.enums.unitFamily.SHIP_CRUISER] = { "TICONDEROG" },
+        [DCSEx.enums.unitFamily.SHIP_FRIGATE] = { "PERRY", "USS_Arleigh_Burke_IIa" },
+        [DCSEx.enums.unitFamily.SHIP_LIGHT] = { "speedboat" },
+        [DCSEx.enums.unitFamily.SHIP_MISSILE_BOAT] = { "CastleClass_01", "La_Combattante_II" },
+        [DCSEx.enums.unitFamily.SHIP_SUBMARINE] = { "santafe" },
+
+        -- [DCSEx.enums.unitFamily.STATIC_STRUCTURE] = { "af_hq", ".Command Center", "Building01_PBR", "Building02_PBR", "Building03_PBR", "Building04_PBR", "Building05_PBR", "Bunker", "Chemical tank A", "Comms tower M", "FARP Fuel Depot", "outpost", "Sandbox", "Workshop A" },
+        [DCSEx.enums.unitFamily.STATIC_STRUCTURE] = { "af_hq", ".Command Center", "Building01_PBR", "Building02_PBR", "Building03_PBR", "Building04_PBR", "Building05_PBR", "Chemical tank A", "Comms tower M", "FARP Fuel Depot", "outpost", "Workshop A" },
+    }

    Library.factions.tables["USA"].units[DCSEx.enums.timePeriod.MODERN] = {
        [DCSEx.enums.unitFamily.AIRDEFENSE_AAA_MOBILE] = { "Gepard", "Vulcan" },
@ -21,12 +59,12 @@ do
        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT] = { "rapier_fsa", "Roland ADS" },
        [DCSEx.enums.unitFamily.AIRDEFENSE_SAM_SHORT_IR] = { "M6 Linebacker", "M48 Chaparral", "M1097 Avenger" },

-        [DCSEx.enums.unitFamily.GROUND_APC] = { "AAV7", "Cobra", "LAV-25", "M-2 Bradley", "M-113", "M1045 HMMWV TOW", "M1126 Stryker ICV", "M1128 Stryker MGS", "Marder", "MCV-80", "MLRS FDDM", "TPZ" },
-        [DCSEx.enums.unitFamily.GROUND_ARTILLERY] = { "M-109", "MLRS" },
+        [DCSEx.enums.unitFamily.GROUND_APC] = { "AAV7", "Cobra", "LAV-25", "M-2 Bradley", "M-113", "M1045 HMMWV TOW", "M1126 Stryker ICV", "M1128 Stryker MGS", "Marder", "MCV-80", "MLRS FDDM", "TPZ", "CHAP_M1130", "CHAP_MATV" },
+        [DCSEx.enums.unitFamily.GROUND_ARTILLERY] = { "M-109", "MLRS", "CHAP_M142_ATACMS_M48", "CHAP_M142_GMLRS_M31" },
        [DCSEx.enums.unitFamily.GROUND_INFANTRY] = { "Soldier M4 GRG", "Soldier M4", "Soldier M249", "Soldier RPG" },
        [DCSEx.enums.unitFamily.GROUND_MBT] = { "Challenger2", "Leclerc", "Leopard-2", "Leopard1A3", "M-1 Abrams", "Merkava_Mk4" },
        [DCSEx.enums.unitFamily.GROUND_SS_MISSILE] = { "Scud_B" },
-        [DCSEx.enums.unitFamily.GROUND_UNARMED] = { "Land_Rover_101_FC", "Land_Rover_109_S3", "M 818" },
+        [DCSEx.enums.unitFamily.GROUND_UNARMED] = { "Land_Rover_101_FC", "Land_Rover_109_S3", "M 818", "CHAP_M1083" },

        [DCSEx.enums.unitFamily.HELICOPTER_ATTACK] = { "AH-1W", "AH-64D", "OH-58D", "SA342L", "SA342M", "SA342Minigun", "SA342Mistral" },
        [DCSEx.enums.unitFamily.HELICOPTER_TRANSPORT] = { "CH-47D", "CH-53E", "SH-60B", "UH-60A" },
--- a/Database/Tasks/GroundAttackAPC.lua
+++ b/Database/Tasks/GroundAttackAPC.lua
@ -3,11 +3,11 @@ Library.tasks.groundAttackAPC = {
   description =
   {
      briefing = {
-         "Enemy APCs are moving to reinforce frontline positions—neutralizing them now will cripple their mobility and delay their counterattack.",
+         "Enemy APCs are moving to reinforce frontline positions. Neutralizing them now will cripple their mobility and delay their counterattack.",
         "Taking out these APCs disrupts enemy troop deployments and buys our ground forces critical time to consolidate gains.",
-         "Enemy armored personnel carriers are transporting infantry toward our exposed flank—engage immediately to prevent a breakthrough.",
-         "Our troops are under pressure—eliminating those APCs will ease the fight and reduce incoming fire on their position.",
-         "Recon confirms high-value targets in the APC convoy, including command elements—destroying them now will cause significant disruption."
+         "Enemy armored personnel carriers are transporting infantry toward our exposed flank. Engage immediately to prevent a breakthrough.",
+         "Our troops are under pressure. Eliminating those APCs will ease the fight and reduce incoming fire on their position.",
+         "Recon confirms high-value targets in the APC convoy, including command elements. Destroying them now will cause significant disruption."
      },
      short = "Destroy enemy APCs",
   },
--- a/Database/Tasks/GroundAttackArtillery.lua
+++ b/Database/Tasks/GroundAttackArtillery.lua
@ -4,7 +4,7 @@ Library.tasks.groundAttackArtillery = {
   {
      briefing = {
         "Enemy artillery is shelling our forward positions and delaying our advance. Take them out to clear the way for ground troops.",
-         "Enemy artillery is hammering our lines and must be silenced immediately. Hit them hard—our soldiers are counting on it.",
+         "Enemy artillery is hammering our lines and must be silenced immediately. Hit them hard, our soldiers are counting on it.",
         "A group of artillery batteries is a key part of the enemy's defensive network. Neutralizing it will open a gap in their lines.",
         "Our forces are pinned down by enemy artillery and taking losses. Eliminating the artillery threat will save lives and keep the momentum on our side.",
         "High command has prioritized the destruction of enemy artillery to enable a broader offensive. This objective is critical."
--- a/Database/Tasks/HelicopterDestroyInfantry.lua
+++ b/Database/Tasks/HelicopterDestroyInfantry.lua
@ -0,0 +1,22 @@
+-- Library.tasks.helicopterDestroyInfantry = {
+--    taskFamily = DCSEx.enums.taskFamily.HELICOPTER,
+--    description =
+--    {
+--       briefing = {
+--          "",
+--       },
+--       short = "Neutralize enemy infantry",
+--    },
+--    conditions = {
+--       difficultyMinimum = 0,
+--       eras = {},
+--    },
+--    completionEvent = DCSEx.enums.taskEvent.DESTROY,
+--    flags = { },
+--    minimumDistance = DCSEx.converter.nmToMeters(5.0),
+--    safeRadius = 100,
+--    surfaceType = nil,
+--    targetCount = { 6, 8 },
+--    targetFamilies = { DCSEx.enums.unitFamily.GROUND_INFANTRY },
+--    waypointInaccuracy = DCSEx.converter.nmToMeters(1.5)
+-- }
--- a/Database/Tasks/HelicopterPickUpInfantry.lua
+++ b/Database/Tasks/HelicopterPickUpInfantry.lua
@ -0,0 +1,22 @@
+-- Library.tasks.helicopterPickUpInfantry = {
+--    taskFamily = DCSEx.enums.taskFamily.HELICOPTER,
+--    description =
+--    {
+--       briefing = {
+--          "",
+--       },
+--       short = "Land and pick up friendly infantry",
+--    },
+--    conditions = {
+--       difficultyMinimum = 0,
+--       eras = {},
+--    },
+--    completionEvent = DCSEx.enums.taskEvent.LAND,
+--    flags = { DCSEx.enums.taskFlag.FRIENDLY_TARGET },
+--    minimumDistance = DCSEx.converter.nmToMeters(5.0),
+--    safeRadius = 100,
+--    surfaceType = nil,
+--    targetCount = { 6, 8 },
+--    targetFamilies = { DCSEx.enums.unitFamily.GROUND_INFANTRY },
+--    waypointInaccuracy = DCSEx.converter.nmToMeters(1.5)
+-- }
--- a/Database/Tasks/HeloHuntAttack.lua
+++ b/Database/Tasks/HeloHuntAttack.lua
@ -0,0 +1,25 @@
+Library.tasks.heloHuntAttack = {
+   taskFamily = DCSEx.enums.taskFamily.HELO_HUNT,
+   description =
+   {
+      briefing = {
+         "Locate and neutralize all enemy rotary-wing assets in the area.",
+         "Enemy attack helicopters are staging nearby, you are to eliminate them before they launch their attack.",
+         "Intel confirms a group of hostile gunships in the area. You must render them combat-ineffective.",
+         "Engage and destroy rotary assets nearby, crippling enemy air support.",
+      },
+      short = "Destroy enemy attack helicopters",
+   },
+   conditions = {
+      difficultyMinimum = 0,
+      eras = {},
+   },
+   completionEvent = DCSEx.enums.taskEvent.DESTROY,
+   flags = { },
+   minimumDistance = DCSEx.converter.nmToMeters(10.0),
+   safeRadius = 100,
+   surfaceType = nil,
+   targetCount = { 2, 3 },
+   targetFamilies = { DCSEx.enums.unitFamily.HELICOPTER_ATTACK },
+   waypointInaccuracy = DCSEx.converter.nmToMeters(6.0)
+}
--- a/Database/Tasks/HeloHuntTransport.lua
+++ b/Database/Tasks/HeloHuntTransport.lua
@ -0,0 +1,22 @@
+Library.tasks.heloHuntTransport = {
+   taskFamily = DCSEx.enums.taskFamily.HELO_HUNT,
+   description =
+   {
+      briefing = {
+         "",
+      },
+      short = "Destroy enemy transport helicopters",
+   },
+   conditions = {
+      difficultyMinimum = 0,
+      eras = {},
+   },
+   completionEvent = DCSEx.enums.taskEvent.DESTROY,
+   flags = { },
+   minimumDistance = DCSEx.converter.nmToMeters(10.0),
+   safeRadius = 100,
+   surfaceType = nil,
+   targetCount = { 2, 3 },
+   targetFamilies = { DCSEx.enums.unitFamily.HELICOPTER_TRANSPORT },
+   waypointInaccuracy = DCSEx.converter.nmToMeters(6.0)
+}
--- a/Database/Tasks/InterceptionBomber.lua
+++ b/Database/Tasks/InterceptionBomber.lua
@ -5,9 +5,9 @@ Library.tasks.interceptionBomber = {
      briefing = {
         "Enemy bomber inbound. If it reaches its target, thousands of civilians are at risk. You're the last line to stop it before it crosses the border.",
         "Intel confirms a hostile bomber on approach to critical infrastructure. Your mission: intercept and neutralize before it gets within strike range.",
-         "An enemy bomber is carrying high-yield ordnance toward a populated zone. Failure to intercept means catastrophic loss—scramble now.",
+         "An enemy bomber is carrying high-yield ordnance toward a populated zone. Failure to intercept means catastrophic loss. Scramble now.",
         "Hostile bomber detected on vector to our forward base. Engage immediately; do not allow it to release payload.",
-         "Enemy bomber is on a direct course for our command center. Intercept at all costs—success ensures the survival of our forces."
+         "Enemy bomber is on a direct course for our command center. Intercept at all costs. Success ensures the survival of our forces."
      },
      short = "Intercept enemy bomber",
   },
--- a/Database/Tasks/OCAAirbase.lua
+++ b/Database/Tasks/OCAAirbase.lua
@ -0,0 +1,26 @@
+-- Library.tasks.ocaAirbase = {
+--    taskFamily = DCSEx.enums.taskFamily.OCA,
+--    description =
+--    {
+--       briefing = {
+--          "Neutralizing this enemy airbase will eliminate their ability to conduct sustained air sorties and restore local air superiority.",
+--          "Taking out this airbase will disrupt their logistics and sortie tempo, buying time for our ground forces to consolidate.",
+--          "This airbase is the hub of enemy reconnaissance and close air support—removing it reduces battlefield intelligence and strike pressure.",
+--          "Outlasting enemy air campaign requires degrading that facility's operational capacity to prevent rotational sorties.",
+--          "Disabling this node of their air network constrains their command-and-control reach and limits coordinated strikes."
+--       },
+--       short = "Destroy enemy airbase",
+--    },
+--    conditions = {
+--       difficultyMinimum = 0,
+--       eras = {},
+--    },
+--    completionEvent = DCSEx.enums.taskEvent.DESTROY,
+--    flags = { DCSEx.enums.taskFlag.ALLOW_JTAC, DCSEx.enums.taskFlag.AIRBASE_TARGET },
+--    minimumDistance = 0.0,
+--    safeRadius = 0,
+--    surfaceType = land.SurfaceType.LAND,
+--    targetCount = { 1, 1 },
+--    targetFamilies = { DCSEx.enums.unitFamily.STATIC_SCENERY },
+--    waypointInaccuracy = 0.0
+-- }
--- a/Show More
+++ b/Show More