use modoverrides when hosting

Dyvinia · Oct 13, 2023 · 4b9a15e · 4b9a15e
1 parent 7c93044
commit 4b9a15e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -61,9 +61,11 @@ public App() {
 
             DispatcherUnhandledException += Application_DispatcherUnhandledException;
 
-            DownloadKyber();
-            GetProxies();
-            GetMapsModes();
+            Task.Run(() => {
+                DownloadKyber();
+                GetProxies();
+                GetMapsModes();
+            });
         }
 
         protected override async void OnStartup(StartupEventArgs e) {

diff --git a/Windows/HostWindow.xaml b/Windows/HostWindow.xaml
@@ -134,7 +134,7 @@
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
-                        <ComboBox x:Name="ModDataComboBox" DisplayMemberPath="Name" Margin="0 0 0 4" ToolTip="Select ModData" Height="30" FontFamily="/Fonts/Univers.ttf #Linotype Univers 520 CnMedium" Padding="6 0 0 0" FontSize="16" VerticalContentAlignment="Center" Foreground="#FFA3A3A3"/>
+                        <ComboBox x:Name="ModDataComboBox" DisplayMemberPath="Name" Margin="0 0 0 4" ToolTip="Select ModData" Height="30" FontFamily="/Fonts/Univers.ttf #Linotype Univers 520 CnMedium" Padding="6 0 0 0" FontSize="16" VerticalContentAlignment="Center" Foreground="#FFA3A3A3" SelectionChanged="ModDataComboBox_SelectionChanged"/>
 
                         <Grid>
                             <Grid.ColumnDefinitions>

diff --git a/Windows/HostWindow.xaml.cs b/Windows/HostWindow.xaml.cs
@@ -35,6 +35,8 @@ public HostWindow() {
         }
 
         private void GetMaps() {
+            if (ModeComboBox.SelectedItem is null) return;
+
             Dictionary<string, string> mapOverrides = ((dynamic)ModeComboBox.SelectedItem).Value.MapOverrides?.ToObject<Dictionary<string, string>>();
             string[] selectedMapKeys = ((dynamic)ModeComboBox.SelectedItem).Value.Maps.ToObject<string[]>();
 
@@ -58,9 +60,7 @@ public void UpdatePingSiteComboBox() {
                 PingSiteComboBox.SelectedIndex = 0;
         }
 
-        private void ModeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) {
-            GetMaps();
-        }
+        private void ModeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) => GetMaps();
 
         private void MaxPlayersTextBox_PreviewTextInput(object sender, TextCompositionEventArgs e) {
             TextBox tBox = (TextBox)sender;
@@ -76,6 +76,31 @@ private void MaxPlayersTextBox_LostFocus(object sender, RoutedEventArgs e) {
                 tBox.Text = "2";
         }
 
+        private void ModDataComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            if (ModDataComboBox.SelectedItem is null) return;
+
+            Dictionary<string, dynamic> selectedModes = App.Modes.ToDictionary(m => m.Key, m => m.Value.DeepClone());
+
+            DirectoryInfo selectedModData = ModDataComboBox.SelectedItem as DirectoryInfo;
+            string selectedModsJson = Path.Combine(selectedModData.FullName, "patch", "mods.json");
+            if (File.Exists(selectedModsJson)) {
+                // reset modes
+                selectedModes = App.Modes.ToDictionary(m => m.Key, m => m.Value.DeepClone());
+                dynamic[] mods = JsonConvert.DeserializeObject<dynamic[]>(File.ReadAllText(selectedModsJson));
+
+                Dictionary<string, string> modOverrides = App.ModOverrides.FirstOrDefault(m => mods.Any(o => ((string)o.name).Contains(m.Key))).Value ?? new();
+                foreach (var modOverride in modOverrides) {
+                    if (selectedModes.ContainsKey(modOverride.Key))
+                        selectedModes[modOverride.Key].Name = modOverride.Value;
+                }
+            }
+
+            // refresh combobox
+            int selectedIndex = ModeComboBox.SelectedIndex;
+            ModeComboBox.ItemsSource = selectedModes;
+            ModeComboBox.SelectedIndex = selectedIndex;
+        }
+
         public void UpdateModDataComboBox() {
             string path = Path.Combine(Path.GetDirectoryName(Config.Settings.BF2Path) ?? "", "ModData");