Merge pull request #222 from Foxlider/EF-cDLC-push

jupster · web-flow · commit 4702ccde4ada · 2024-11-27T00:12:33.000+10:00
cDLC Branch push
diff --git a/FASTER/App.config b/FASTER/App.config
@@ -82,6 +82,9 @@
             <setting name="usingRFDlc" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="usingEFDlc" serializeAs="String">
+                <value>False</value>
+            </setting>
         </FASTER.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/FASTER/FASTER.csproj b/FASTER/FASTER.csproj
@@ -10,7 +10,7 @@
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
 		<Authors>Keelah Fox, Jupster, Canno.n</Authors>
-		<Version>1.9.6.1</Version>
+		<Version>1.9.6.2</Version>
 		<Company>FoxliCorp.</Company>
 		<Description>Fox's Arma Server Tool Extended Rewrite</Description>
 		<Copyright>Copyright © 2019</Copyright>
diff --git a/FASTER/Models/ServerProfile.cs b/FASTER/Models/ServerProfile.cs
@@ -61,6 +61,7 @@ public class ServerProfile : INotifyPropertyChanged
         private bool _wsDlcChecked;
         private bool _speDlcChecked;
         private bool _rfDlcChecked;
+        private bool _efDlcChecked;
         private bool _enableHT = true;
         private bool _enableRanking;
 
@@ -214,6 +215,16 @@ public bool RFDLCChecked
             }
         }
 
+        public bool EFDLCChecked
+        {
+            get => _efDlcChecked;
+            set
+            {
+                _efDlcChecked = value;
+                RaisePropertyChanged(nameof(EFDLCChecked));
+            }
+        }
+
         public bool EnableHyperThreading
         {
             get => _enableHT;
@@ -504,6 +515,10 @@ public string GetDlcAndPlayerMods(string playerMods)
             {
                 _ = mods.Append($"{playerMods};");
             }
+            if (EFDLCChecked)
+            {
+                _ = mods.Append("ef;");
+            }
             return !string.IsNullOrWhiteSpace(mods.ToString()) ? $" \"-mod={mods}\"" : "";
         }
 
diff --git a/FASTER/Models/StaticData.cs b/FASTER/Models/StaticData.cs
@@ -21,6 +21,9 @@ internal static class StaticData
             "Harkness31",
             "Ace",
             "bojothebigman",
+            "EmPtY.zip",
+            "OverlordZorn",
+            "Jupster",
         };
 
         /// <summary>
diff --git a/FASTER/Models/SteamUpdaterModel.cs b/FASTER/Models/SteamUpdaterModel.cs
@@ -172,6 +172,17 @@ public bool UsingRFDlc
             }
         }
 
+        public bool UsingEFDlc
+        {
+            get => Settings.Default.usingEFDlc;
+            set
+            {
+                Settings.Default.usingEFDlc = value;
+                Settings.Default.Save();
+                RaisePropertyChanged(nameof(UsingEFDlc));
+            }
+        }
+
         public string ApiKey
         {
             get => !string.IsNullOrEmpty(Settings.Default.SteamAPIKey)
diff --git a/FASTER/Properties/Settings.Designer.cs b/FASTER/Properties/Settings.Designer.cs
diff --git a/FASTER/Properties/Settings.settings b/FASTER/Properties/Settings.settings
@@ -92,5 +92,8 @@
     <Setting Name="usingRFDlc" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="usingEFDlc" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/FASTER/ViewModel/ProfileViewModel.cs b/FASTER/ViewModel/ProfileViewModel.cs
@@ -391,7 +391,7 @@ internal async Task CopyModKeys()
 
         internal async Task ClearModKeys()
         {
-            var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.bikey" };
+            var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.bikey", "ef.bikey" };
             if (Directory.Exists(Path.Combine(Profile.ArmaPath, "keys")))
             {
                 foreach (var keyFile in Directory.GetFiles(Path.Combine(Profile.ArmaPath, "keys")))
diff --git a/FASTER/ViewModel/SteamUpdaterViewModel.cs b/FASTER/ViewModel/SteamUpdaterViewModel.cs
@@ -133,7 +133,7 @@ public async Task UpdateClick()
             Analytics.TrackEvent("Updater - Clicked Update", new Dictionary<string, string>
             {
                 {"Name", Properties.Settings.Default.steamUserName},
-                {"DLCs", $"{(Parameters.UsingGMDlc ? "GM " : "")}{(Parameters.UsingCSLADlc? "CSLA " : "")}{(Parameters.UsingPFDlc ? "SOG " : "")}{(Parameters.UsingWSDlc ? "WS " : "")}{(Parameters.UsingSPEDlc ? "SPE " : "")}{(Parameters.UsingRFDlc ? "RF " : "")}"},
+                {"DLCs", $"{(Parameters.UsingGMDlc ? "GM " : "")}{(Parameters.UsingCSLADlc? "CSLA " : "")}{(Parameters.UsingPFDlc ? "SOG " : "")}{(Parameters.UsingWSDlc ? "WS " : "")}{(Parameters.UsingSPEDlc ? "SPE " : "")}{(Parameters.UsingRFDlc ? "RF " : "")}{(Parameters.UsingEFDlc ? "EF " : "")}"},
                 {"Branch", $"{(Parameters.UsingPerfBinaries? "Profiling" : "Public")}"}
             });
 
@@ -156,6 +156,7 @@ public async Task UpdateClick()
                 {233794, "Arma 3 Server Creator DLC - SOGPF"},
                 {233795, "Arma 3 Server Creator DLC - WS"},
                 {233799, "Arma 3 Server Creator DLC - RF"},
+                {233798, "Arma 3 Server Creator DLC - EF"},
             };
 
             //IReadOnlyList<Depot> depotsList;
@@ -257,6 +258,15 @@ public async Task UpdateClick()
                     null));
             }
 
+            if (Parameters.UsingEFDlc)
+            {
+                Parameters.Output += "\nChecking Arma 3 Server Creator DLC - EF...";
+                depotsDownload.Add((
+                    depotsIDs.FirstOrDefault(d => d.Value == "Arma 3 Server Creator DLC - EF").Key,
+                    "creatordlc",
+                    null));
+            }
+
             await RunServerUpdater(Parameters.InstallDirectory, appId, depotsDownload);
 
             Parameters.Output += "\n\nAll Done ! ";
diff --git a/FASTER/Views/Profile.xaml b/FASTER/Views/Profile.xaml
@@ -71,6 +71,7 @@
                                 <CheckBox IsChecked="{Binding Profile.WSDLCChecked}" Content="Western Sahara DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                 <CheckBox IsChecked="{Binding Profile.SPEDLCChecked}" Content="Spearhead 1944 DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                 <CheckBox IsChecked="{Binding Profile.RFDLCChecked}" Content="Reaction Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
+                                <CheckBox IsChecked="{Binding Profile.EFDLCChecked}" Content="Expeditionary Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                 <StackPanel Height="10"/>
                             </StackPanel>
                         </GroupBox>
@@ -114,6 +115,7 @@
                                             <CheckBox IsChecked="{Binding Profile.WSDLCChecked}" Content="Western Sahara DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                             <CheckBox IsChecked="{Binding Profile.SPEDLCChecked}" Content="Spearhead 1944 DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                             <CheckBox IsChecked="{Binding Profile.RFDLCChecked}" Content="Reaction Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
+                                            <CheckBox IsChecked="{Binding Profile.EFDLCChecked}" Content="Expeditionary Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                         </StackPanel>
                                     </Expander>
                                 </Canvas>-->
diff --git a/FASTER/Views/Updater.xaml b/FASTER/Views/Updater.xaml
@@ -119,7 +119,9 @@
                     <CheckBox IsChecked="{Binding Parameters.UsingSPEDlc}" Content="Spearhead 1944 DLC"
                               Margin="10,3" HorizontalAlignment="Left"/>
                     <CheckBox IsChecked="{Binding Parameters.UsingRFDlc}" Content="Reaction Forces DLC"
-                              Margin="10,3" HorizontalAlignment="Left"/>		  
+                              Margin="10,3" HorizontalAlignment="Left"/>
+                    <CheckBox IsChecked="{Binding Parameters.UsingEFDlc}" Content="Expeditionary Forces DLC"
+                              Margin="10,3" HorizontalAlignment="Left"/>
                 </StackPanel>
                 <Button Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0" Grid.Row="4" Content="Update" Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Click="Update_Click"/>
             </Grid>
diff --git a/FASTER_Version.xml b/FASTER_Version.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.9.6.1</version>
+  <version>1.9.6.2</version>
   <url>https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip</url>
   <changelog>https://github.com/Foxlider/FASTER/releases</changelog>
   <mandatory>true</mandatory>

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public class ServerProfile : INotifyPropertyChanged`
`61`	`61`	`private bool _wsDlcChecked;`
`62`	`62`	`private bool _speDlcChecked;`
`63`	`63`	`private bool _rfDlcChecked;`
	`64`	`+ private bool _efDlcChecked;`
`64`	`65`	`private bool _enableHT = true;`
`65`	`66`	`private bool _enableRanking;`
`66`	`67`
`@@ -214,6 +215,16 @@ public bool RFDLCChecked`
`214`	`215`	`}`
`215`	`216`	`}`
`216`	`217`
	`218`	`+ public bool EFDLCChecked`
	`219`	`+ {`
	`220`	`+ get => _efDlcChecked;`
	`221`	`+ set`
	`222`	`+ {`
	`223`	`+ _efDlcChecked = value;`
	`224`	`+ RaisePropertyChanged(nameof(EFDLCChecked));`
	`225`	`+ }`
	`226`	`+ }`
	`227`	`+`
`217`	`228`	`public bool EnableHyperThreading`
`218`	`229`	`{`
`219`	`230`	`get => _enableHT;`
`@@ -504,6 +515,10 @@ public string GetDlcAndPlayerMods(string playerMods)`
`504`	`515`	`{`
`505`	`516`	`_ = mods.Append($"{playerMods};");`
`506`	`517`	`}`
	`518`	`+ if (EFDLCChecked)`
	`519`	`+ {`
	`520`	`+ _ = mods.Append("ef;");`
	`521`	`+ }`
`507`	`522`	`return !string.IsNullOrWhiteSpace(mods.ToString()) ? $" \"-mod={mods}\"" : "";`
`508`	`523`	`}`
`509`	`524`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,17 @@ public bool UsingRFDlc`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
	`175`	`+ public bool UsingEFDlc`
	`176`	`+ {`
	`177`	`+ get => Settings.Default.usingEFDlc;`
	`178`	`+ set`
	`179`	`+ {`
	`180`	`+ Settings.Default.usingEFDlc = value;`
	`181`	`+ Settings.Default.Save();`
	`182`	`+ RaisePropertyChanged(nameof(UsingEFDlc));`
	`183`	`+ }`
	`184`	`+ }`
	`185`	`+`
`175`	`186`	`public string ApiKey`
`176`	`187`	`{`
`177`	`188`	`get => !string.IsNullOrEmpty(Settings.Default.SteamAPIKey)`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ internal async Task CopyModKeys()`
`391`	`391`
`392`	`392`	`internal async Task ClearModKeys()`
`393`	`393`	`{`
`394`		`- var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.bikey" };`
	`394`	`+ var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.bikey", "ef.bikey" };`
`395`	`395`	`if (Directory.Exists(Path.Combine(Profile.ArmaPath, "keys")))`
`396`	`396`	`{`
`397`	`397`	`foreach (var keyFile in Directory.GetFiles(Path.Combine(Profile.ArmaPath, "keys")))`