Merge branch 'master' into darkviper

Author: Regynate

ChaosMod/Util/OptionsFile.h

@@ -73,7 +73,7 @@ class OptionsFile
 		std::ofstream file(m_FoundFileName);
 		if (!file.is_open())
 		{
-			LOG("Couldn't write config file " << m_FoundFileName << " " << GetLastError());
+			LOG("Couldn't write config file " << m_FoundFileName);
 			return;
 		}
 		for (auto &[key, value] : m_Options)

ConfigApp/Tabs/ChaosGrid.cs

@@ -54,7 +54,7 @@ public void SetRowHeight(GridLength gridLength)
             m_RowDefinitions[m_CurrentRow].Height = gridLength;
         }
 
-        private void PushRow(string? text, UIElement? control)
+        private void PushRow(string? text, FrameworkElement? control, string? tooltip = null)
         {
             if (text != null)
             {
@@ -70,6 +70,10 @@ private void PushRow(string? text, UIElement? control)
 
                 textBlock.SetValue(Grid.ColumnProperty, m_CurrentColumn);
                 textBlock.SetValue(Grid.RowProperty, m_CurrentRow);
+                if (tooltip != null)
+                {
+                    textBlock.ToolTip = new ToolTip { Content = tooltip };
+                }
                 Grid.Children.Add(textBlock);
 
                 m_CurrentColumn++;
@@ -89,6 +93,10 @@ private void PushRow(string? text, UIElement? control)
 
                 control.SetValue(Grid.ColumnProperty, m_CurrentColumn);
                 control.SetValue(Grid.RowProperty, m_CurrentRow);
+                if (tooltip != null)
+                {
+                    control.ToolTip = new ToolTip { Content = tooltip };
+                }
                 Grid.Children.Add(control);
 
                 m_CurrentColumn++;
@@ -122,12 +130,12 @@ public void PushRowEmptyPair()
             m_CurrentColumn += 3;
         }
 
-        public void PushRowElement(UIElement element)
+        public void PushRowElement(FrameworkElement element)
         {
             PushRow(null, element);
         }
 
-        public void PushRowExpandElement(UIElement element)
+        public void PushRowExpandElement(FrameworkElement element)
         {
             element.ClipToBounds = false;
 
@@ -136,20 +144,20 @@ public void PushRowExpandElement(UIElement element)
             PushRow(null, canvas);
         }
 
-        public void PushRowPair(string text, UIElement element)
+        public void PushRowPair(string text, FrameworkElement element)
         {
             PushRow(text, element);
         }
 
-        public void PushRowSpacedPair(string text, UIElement element)
+        public void PushRowSpacedPair(string text, FrameworkElement element, string? tooltip = null)
         {
-            PushRow(text, null);
+            PushRow(text, null, tooltip);
             PushRowEmpty();
 
             element.SetValue(FrameworkElement.HorizontalAlignmentProperty, HorizontalAlignment.Left);
             element.SetValue(FrameworkElement.VerticalAlignmentProperty, VerticalAlignment.Center);
 
-            PushRow(null, element);
+            PushRow(null, element, tooltip);
         }
 
         public void PushRowTextBlock(string text)

ConfigApp/Tabs/Settings/ModesTab.cs

@@ -109,7 +109,7 @@ static ChaosGrid createCommonGrid()
             body.Children.Add(m_DistanceGrid.Grid);
 
             var footerGrid = createCommonGrid();
-            footerGrid.PushRowSpacedPair("Enable Crossing Challenge™", m_EnableCrossingChallenge = Utils.GenerateCommonCheckBox());
+            footerGrid.PushRowSpacedPair("Enable Crossing Challenge™", m_EnableCrossingChallenge = Utils.GenerateCommonCheckBox(), "Set respawn and finish points on the map. Reach the finish point without dying to win.");
             grid.PushRowElement(footerGrid.Grid);
 
             scrollViewer.Content = grid.Grid;

ConfigApp/Workshop/WorkshopEditDialog.xaml.cs

@@ -137,7 +137,7 @@ string handleEffectId(string itemName)
                     if (file.Type == WorkshopSubmissionFileType.Sound)
                     {
                         var effectId = itemName;
-                        if (!Effects.EffectsMap.ContainsKey(effectId))
+                        if (!Effects.EffectsMap.ContainsKey(effectId) && itemName.Length > 4)
                             effectId = itemName[..^4];
                         if (Effects.EffectsMap.ContainsKey(effectId))
                             itemName += $" ({Effects.EffectsMap[effectId].Name})";

ConfigApp/Workshop/WorkshopSubmissionItem.cs

@@ -157,7 +157,7 @@ public void UpdateSearchTerms()
                     {
                         foreach (var line in File.ReadAllLines(m_FileHandler.SubmissionDirectory + file.Name))
                         {
-                            var match = Regex.Match(line, @"(?:Name|ScriptId)\s*=\s*""((?:\\""|[^""])+)""");
+                            var match = Regex.Match(line, @"(?:Name|ScriptId|EffectId)\s*=\s*""((?:\\""|[^""])+)""");
                             if (match.Success)
                             {
                                 SearchTerms.Add(new(match.Groups[1].Value, file.Name));