Merge pull request #174 from Foxlider/hotfix/RF

Hotfix for RF Support
Foxlider · Mar 27, 2024 · d950840 · d950840
2 parents 8523c1b + fd42c97
commit d950840
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 2 deletions.
diff --git a/FASTER/App.config b/FASTER/App.config
@@ -79,6 +79,9 @@
 			<setting name="usingSPEDlc" serializeAs="String">
 				<value>False</value>
 			</setting>
+            <setting name="usingRFDlc" serializeAs="String">
+				<value>False</value>
+			</setting>
         </FASTER.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/FASTER/Models/ServerProfile.cs b/FASTER/Models/ServerProfile.cs
@@ -60,6 +60,7 @@ public class ServerProfile : INotifyPropertyChanged
         private bool _cslaDlcChecked;
         private bool _wsDlcChecked;
         private bool _speDlcChecked;
+        private bool _rfDlcChecked;
         private bool _enableHT = true;
         private bool _enableRanking;
 
@@ -202,6 +203,16 @@ public bool SPEDLCChecked
             }
         }
 
+        public bool RFDLCChecked
+        {
+            get => _rfDlcChecked;
+            set
+            {
+                _rfDlcChecked = value;
+                RaisePropertyChanged(nameof(RFDLCChecked));
+            }
+        }
+
         public bool EnableHyperThreading
         {
             get => _enableHT;
@@ -483,6 +494,10 @@ public string GetDlcAndPlayerMods(string playerMods)
             {
                 _ = mods.Append("spe;");
             }
+            if (RFDLCChecked)
+            {
+                _ = mods.Append("rf;");
+            }
             if (!string.IsNullOrWhiteSpace(playerMods))
             {
                 _ = mods.Append($"{playerMods};");

diff --git a/FASTER/Models/SteamUpdaterModel.cs b/FASTER/Models/SteamUpdaterModel.cs
@@ -161,6 +161,16 @@ public bool UsingSPEDlc
             }
         }
 
+        public bool UsingRFDlc
+        {
+            get => Settings.Default.usingRFDlc;
+            set
+            {
+                Settings.Default.usingRFDlc = value;
+                Settings.Default.Save();
+                RaisePropertyChanged(nameof(UsingRFDlc));
+            }
+        }
 
         public string ApiKey
         {

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
@@ -88,5 +88,9 @@
     </Setting>
     <Setting Name="usingSPEDlc" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="usingRFDlc" 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
@@ -387,7 +387,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" };
+            var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.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
@@ -138,7 +138,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 " : "")}"},
+                {"DLCs", $"{(Parameters.UsingGMDlc ? "GM " : "")}{(Parameters.UsingCSLADlc? "CSLA " : "")}{(Parameters.UsingPFDlc ? "SOG " : "")}{(Parameters.UsingWSDlc ? "WS " : "")}{(Parameters.UsingSPEDlc ? "SPE " : "")}{(Parameters.UsingRFDlc ? "RF " : "")}"},
                 {"Branch", $"{(Parameters.UsingPerfBinaries? "Profiling" : "Public")}"}
             });
 
@@ -160,6 +160,7 @@ public async Task UpdateClick()
                 {233793, "Arma 3 Server Creator DLC - CSLA"},
                 {233794, "Arma 3 Server Creator DLC - SOGPF"},
                 {233795, "Arma 3 Server Creator DLC - WS"},
+                {233799, "Arma 3 Server Creator DLC - RF"},
             };
 
             //IReadOnlyList<Depot> depotsList;
@@ -252,6 +253,15 @@ public async Task UpdateClick()
                     null));
             }
 
+            if (Parameters.UsingRFDlc)
+            {
+                Parameters.Output += "\nChecking Arma 3 Server Creator DLC - RF...";
+                depotsDownload.Add((
+                    depotsIDs.FirstOrDefault(d => d.Value == "Arma 3 Server Creator DLC - RF").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
@@ -99,6 +99,7 @@
                                             <CheckBox IsChecked="{Binding Profile.CSLADLCChecked}" Content="CSLA DLC" Margin="10,3" HorizontalAlignment="Left"/>
                                             <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"/>
                                         </StackPanel>
                                     </Expander>
                                 </Canvas>

diff --git a/FASTER/Views/Updater.xaml b/FASTER/Views/Updater.xaml
@@ -118,6 +118,8 @@
                               Margin="10,3" HorizontalAlignment="Left" />
                     <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"/>
                 </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>