From 99133326b9e9b18aac1b21221c51bdc42cb02634 Mon Sep 17 00:00:00 2001 From: Ambroise Garel <47314805+akaAgar@users.noreply.github.com> Date: Tue, 26 Aug 2025 10:55:47 +0200 Subject: [PATCH] Added units from Currenthill unit pack --- Database/Factions/Europe.lua | 6 ++++++ Database/Factions/Russia.lua | 10 +++++----- Database/Factions/USA.lua | 6 +++--- README.md | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 Database/Factions/Europe.lua diff --git a/Database/Factions/Europe.lua b/Database/Factions/Europe.lua new file mode 100644 index 0000000..931a1e3 --- /dev/null +++ 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 \ No newline at end of file diff --git a/Database/Factions/Russia.lua b/Database/Factions/Russia.lua index 0eed915..3f2cc74 100644 --- a/Database/Factions/Russia.lua +++ b/Database/Factions/Russia.lua @@ -24,14 +24,14 @@ do [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" }, @@ -52,7 +52,7 @@ do [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" }, diff --git a/Database/Factions/USA.lua b/Database/Factions/USA.lua index 1f6ed88..5e4a362 100644 --- a/Database/Factions/USA.lua +++ b/Database/Factions/USA.lua @@ -21,12 +21,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" }, diff --git a/README.md b/README.md index 20d8d80..69543dd 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Please also note that PvP is not supported at the moment and that the mission wi

Planned for next version (could be subject to change)

- Additional content + - [x] Added new units (Currenthill unit pack) from DCS 2.9.19.13478 - [ ] At least partial Germany map support - AI improvements - [ ] AI wingmen should engage tracking radars first when told to engage SAM sites, in order to disable the site ASAP