- Added support for duplicate/implicit affixes.

- Added setting to adjust tooltip width for different resolutions.
- Added logging view.
- Only allow one tooltip at a time.
- Merged normal and lite mode in one image set.
- Fixed issues with affix filter by removing all underscores '_' from affix image names.

D4Companion.Entities/SettingsD4.cs

@@ -9,9 +9,12 @@ namespace D4Companion.Entities
     public class SettingsD4
     {
         public bool DebugMode { get; set; } = false;
+        public bool DevMode { get; set; } = false;
+        public bool LiteMode { get; set; } = true;
         public string SelectedAffixName { get; set; } = string.Empty;
-        public string SelectedSystemPreset { get; set; } = "2560x1440";
+        public string SelectedSystemPreset { get; set; } = "2560x1440_SMF";
         public int ThresholdMin { get; set; } = 60;
         public int ThresholdMax { get; set; } = 255;
+        public int TooltipWidth { get; set; } = 500;
     }
 }

D4Companion.Events/LoggingEvents.cs

@@ -0,0 +1,27 @@
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace D4Companion.Events
+{
+    public class ErrorOccurredEvent : PubSubEvent<ErrorOccurredEventParams>
+    {
+    }
+
+    public class ErrorOccurredEventParams
+    {
+        public string Message { get; set; } = string.Empty;
+    }
+
+    public class ExceptionOccurredEvent : PubSubEvent<ExceptionOccurredEventParams>
+    {
+    }
+
+    public class ExceptionOccurredEventParams
+    {
+        public string Message { get; set; } = string.Empty;
+    }
+}

D4Companion.Events/ScreenProcessEvents.cs

@@ -69,6 +69,6 @@ public class TooltipDataReadyEvent : PubSubEvent<TooltipDataReadyEventParams>
 
     public class TooltipDataReadyEventParams
     {
-        public List<ItemTooltipDescriptor> Tooltips { get; set; } = new List<ItemTooltipDescriptor>();
+        public ItemTooltipDescriptor Tooltip { get; set; } = new ItemTooltipDescriptor();
     }
 }

D4Companion.Interfaces/IAffixPresetManager.cs

@@ -8,6 +8,7 @@ public interface IAffixPresetManager
         List<ItemAffix> ItemAffixes { get; }
         List<ItemAspect> ItemAspects { get; }
         List<ItemType> ItemTypes { get; }
+        List<ItemType> ItemTypesLite { get; }
 
         void AddAffixPreset(AffixPreset affixPreset);
         void RemoveAffixPreset(AffixPreset affixPreset);

D4Companion.Services/AffixPresetManager.cs

@@ -2,10 +2,14 @@
 using D4Companion.Entities;
 using D4Companion.Events;
 using D4Companion.Interfaces;
+using Emgu.CV.Structure;
+using Emgu.CV;
 using Microsoft.Extensions.Logging;
 using Prism.Events;
+using System.IO;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using System.Windows.Media;
 
 namespace D4Companion.Services
 {
@@ -19,6 +23,7 @@ public class AffixPresetManager : IAffixPresetManager
         private List<ItemAspect> _itemAspects = new List<ItemAspect>();
         private List<AffixPreset> _affixPresets = new List<AffixPreset>();
         private List<ItemType> _itemTypes = new List<ItemType>();
+        private List<ItemType> _itemTypesLite = new List<ItemType>();
 
         // Start of Constructors region
 
@@ -47,6 +52,7 @@ public AffixPresetManager(IEventAggregator eventAggregator, ILogger<AffixPresetM
 
             // Load item types
             LoadItemTypes();
+            LoadItemTypesLite();
         }
 
         #endregion
@@ -65,6 +71,7 @@ public AffixPresetManager(IEventAggregator eventAggregator, ILogger<AffixPresetM
         public List<ItemAffix> ItemAffixes { get => _itemAffixes; set => _itemAffixes = value; }
         public List<ItemAspect> ItemAspects { get => _itemAspects; set => _itemAspects = value; }
         public List<ItemType> ItemTypes { get => _itemTypes; }
+        public List<ItemType> ItemTypesLite { get => _itemTypesLite; }
 
         #endregion
 
@@ -78,6 +85,7 @@ private void HandleSystemPresetChangedEvent()
             LoadItemAffixes();
             LoadItemAspects();
             LoadItemTypes();
+            LoadItemTypesLite();
         }
 
         #endregion
@@ -193,23 +201,50 @@ private void LoadItemTypes()
 
             string systemPreset = _settingsManager.Settings.SelectedSystemPreset;
 
-            // Process the list of files found in the directory.
-            string[] fileEntries = Directory.GetFiles($"{Environment.CurrentDirectory}/Images/{systemPreset}/Types/");
-            foreach (string filePath in fileEntries)
+            var directory = $"Images\\{systemPreset}\\Types\\";
+            if (Directory.Exists(directory))
             {
-                string fileName = Path.GetFileName(filePath);
-                string typeName = fileName.Split('_')[0];
+                var fileEntries = Directory.GetFiles(directory).Where(itemtype => !itemtype.ToLower().Contains("weapon_all"));
+                foreach (string filePath in fileEntries)
+                {
+                    string fileName = Path.GetFileName(filePath);
+                    string typeName = fileName.Split('_')[0];
+
+                    _itemTypes.Add(new ItemType
+                    {
+                        FileName = fileName,
+                        Name = typeName
+                    });
+                }
+            }
+        }
 
-                _itemTypes.Add(new ItemType
+        private void LoadItemTypesLite()
+        {
+            _itemTypesLite.Clear();
+
+            string systemPreset = _settingsManager.Settings.SelectedSystemPreset;            
+
+            var directory = $"Images\\{systemPreset}\\Types\\";
+            if (Directory.Exists(directory))
+            {
+                var fileEntries = Directory.GetFiles(directory).Where(itemtype => itemtype.ToLower().Contains("weapon_all") ||
+                (!itemtype.ToLower().Contains("weapon_") && !itemtype.ToLower().Contains("ranged_") && !itemtype.ToLower().Contains("offhand_focus")));
+                foreach (string filePath in fileEntries)
                 {
-                    FileName = fileName,
-                    Name = typeName
-                });
+                    string fileName = Path.GetFileName(filePath);
+                    string typeName = fileName.Split('_')[0];
+
+                    _itemTypesLite.Add(new ItemType
+                    {
+                        FileName = fileName,
+                        Name = typeName
+                    });
+                }
             }
         }
 
         #endregion
 
-
     }
 }