Merge pull request #291 from DrymarchonShaun/efdlc

feat: add Expeditionary Forces CDLC

Author: muttleyxd

src/arma3-unix-launcher-library/arma3client.hpp

@@ -13,7 +13,7 @@ namespace ARMA3::Definitions
 
     static constexpr char const *app_id = "107410";
 
-    static const std::array<char const *, 30> exclusions{"Addons", "AoW", "Argo", "BattlEye", "Contact", "Curator", "Dll", "Dta", "Enoch", "Expansion", "fontconfig", "GM", "CSLA", "Heli", "Jets", "Kart", "Keys", "Launcher", "MPMissions", "Mark", "Missions", "Orange", "SPE", "Tacops", "Tank", "vn", "RF", "WS", "legal", "steam_shader_cache"};
+    static const std::array<char const *, 31> exclusions{"Addons", "AoW", "Argo", "BattlEye", "Contact", "Curator", "Dll", "Dta", "Enoch", "Expansion", "fontconfig", "GM", "CSLA", "Heli", "Jets", "Kart", "Keys", "Launcher", "MPMissions", "Mark", "Missions", "Orange", "SPE", "Tacops", "Tank", "vn", "RF", "EF", "WS", "legal", "steam_shader_cache"};
     //TODO: Use dta/product.bin for exclusion list
 
     #ifdef __linux

src/arma3-unix-launcher/mainwindow.cpp

@@ -222,6 +222,8 @@ try
         mods.push_back(client->GetPath() / "vn");
     if (parameters["dlcReactionForces"])
         mods.push_back(client->GetPath() / "RF");
+    if (parameters["dlcExpeditionaryForces"])
+        mods.push_back(client->GetPath() / "EF");
     if (parameters["dlcCSLA"])
         mods.push_back(client->GetPath() / "CSLA");
     if (parameters["dlcSpearhead1944"])

src/arma3-unix-launcher/mainwindow.ui

@@ -256,6 +256,13 @@
                   </property>
                  </widget>
                 </item>
+                <item>
+                 <widget class="QCheckBox" name="checkbox_dlc_expeditionary_forces">
+                  <property name="text">
+                   <string>Enable Expeditionary Forces DLC</string>
+                  </property>
+                 </widget>
+                </item>
                 <item>
                  <widget class="QCheckBox" name="checkbox_dlc_csla">
                   <property name="text">

src/arma3-unix-launcher/settings.cpp

@@ -142,6 +142,7 @@ void Settings::load_settings_to_ui(Ui::MainWindow *ui)
     read_setting("dlcGlobalMobilization", ui->checkbox_dlc_global_mobilization);
     read_setting("dlcSogPrairieFire", ui->checkbox_dlc_sog_prairie_fire);
     read_setting("dlcReactionForces", ui->checkbox_dlc_reaction_forces);
+    read_setting("dlcExpeditionaryForces", ui->checkbox_dlc_expeditionary_forces);
     read_setting("dlcCSLA", ui->checkbox_dlc_csla);
     read_setting("dlcSpearhead1944", ui->checkbox_dlc_spearhead_1944);
     read_setting("dlcWesternSahara", ui->checkbox_dlc_western_sahara);
@@ -226,6 +227,7 @@ void Settings::save_settings_from_ui(Ui::MainWindow *ui)
     write_setting("dlcGlobalMobilization", ui->checkbox_dlc_global_mobilization);
     write_setting("dlcSogPrairieFire", ui->checkbox_dlc_sog_prairie_fire);
     write_setting("dlcReactionForces", ui->checkbox_dlc_reaction_forces);
+    write_setting("dlcExpeditionaryForces", ui->checkbox_dlc_expeditionary_forces);
     write_setting("dlcCSLA", ui->checkbox_dlc_csla);
     write_setting("dlcSpearhead1944", ui->checkbox_dlc_spearhead_1944);
     write_setting("dlcWesternSahara", ui->checkbox_dlc_western_sahara);