Updated data for v2.0.2.58474

josdemmers · Oct 8, 2024 · d990e21 · d990e21
1 parent 4ed3e55
commit d990e21
Show file tree

Hide file tree

Showing 86 changed files with 33,095 additions and 28,167 deletions.
diff --git a/D4Companion.Services/AffixManager.cs b/D4Companion.Services/AffixManager.cs
@@ -92,6 +92,7 @@ private void HandleAffixLanguageChangedEvent()
 
         private void HandleApplicationLoadedEvent()
         {
+            ValidateAffixPresets();
             ValidateMultiBuild();
         }
 
@@ -813,6 +814,25 @@ private void LoadAffixPresets()
             SaveAffixPresets();
         }
 
+        private void ValidateAffixPresets()
+        {
+            foreach (AffixPreset preset in _affixPresets)
+            {
+                foreach (var affix in preset.ItemAffixes)
+                {
+                    var affixInfo = _affixes.FirstOrDefault(a => a.IdName.Equals(affix.Id));
+                    if (affixInfo == null)
+                    {
+                        _eventAggregator.GetEvent<ErrorOccurredEvent>().Publish(new ErrorOccurredEventParams
+                        {
+                            Message = $"Build: \"{preset.Name}\": Affix not found. Replace missing affix or import build again."
+                        });
+                        break;
+                    }
+                }
+            }
+        }
+
         public void SaveAffixPresets()
         {
             // Sort affixes

diff --git a/D4Companion.Services/OcrHandler.cs b/D4Companion.Services/OcrHandler.cs
@@ -732,13 +732,16 @@ private double TextToAffixValue(string text)
                         (c != '%'))).Trim();
 
             string textValue = Regex.Match(textClean, @"\d+\.\d+|\d+\,\d+|\d+").Value;
+            if (string.IsNullOrEmpty(textValue))
+            {
+                return 0.0;
+            }
+
             textValue = textValue.IndexOf(".") == textValue.Length - 2 ? textValue : textValue.Replace(".", string.Empty);
             textValue = textValue.IndexOf(",") == textValue.Length - 2 ? textValue : textValue.Replace(",", string.Empty);
 
             textValue = textValue.Replace(',', '.');
-            double affixValue = double.Parse(textValue, CultureInfo.InvariantCulture);
-
-            return affixValue;
+            return double.Parse(textValue, CultureInfo.InvariantCulture);
         }
 
         private string TextToAspect(string text)