Merge pull request #849 from Sidekick-Poe/feature/foulborn

Added support for grafts, wombgifts, foulborn items and mutated modifiers

Author: leMicin

Game Localization.xlsm

@@ -32,6 +32,8 @@ IInvariantFilterProvider invariantFilterProvider
 
     public ApiFilter? Mirrored { get; private set; }
 
+    public ApiFilter? Foulborn { get; private set; }
+
     public ApiFilter? Sanctified { get; private set; }
 
     public ApiFilterCategory? RequirementsCategory { get; private set; }
@@ -86,6 +88,11 @@ public async Task Initialize()
             Mirrored = GetApiFilter(invariantFilterProvider.MirroredDefinition.CategoryId, invariantFilterProvider.MirroredDefinition.FilterId);
         }
 
+        if (invariantFilterProvider.FoulbornDefinition != null)
+        {
+            Foulborn = GetApiFilter(invariantFilterProvider.FoulbornDefinition.CategoryId, invariantFilterProvider.FoulbornDefinition.FilterId);
+        }
+
         if (invariantFilterProvider.SanctifiedDefinition != null)
         {
             Sanctified = GetApiFilter(invariantFilterProvider.SanctifiedDefinition.CategoryId, invariantFilterProvider.SanctifiedDefinition.FilterId);

src/Sidekick.Apis.Poe.Trade/Filters/FilterProvider.cs

@@ -12,6 +12,7 @@ public interface IFilterProvider : IInitializableService
     ApiFilter? Veiled { get; }
     ApiFilter? Fractured { get; }
     ApiFilter? Mirrored { get; }
+    ApiFilter? Foulborn { get; }
     ApiFilter? Sanctified { get; }
     ApiFilterCategory? RequirementsCategory { get; }
     ApiFilterCategory? MiscellaneousCategory { get; }

src/Sidekick.Apis.Poe.Trade/Filters/IFilterProvider.cs

@@ -9,5 +9,6 @@ public interface IInvariantFilterProvider : IInitializableService
     FilterDefinition? VeiledDefinition { get; }
     FilterDefinition? FracturedDefinition { get; }
     FilterDefinition? MirroredDefinition { get; }
+    FilterDefinition? FoulbornDefinition { get; }
     FilterDefinition? SanctifiedDefinition { get; }
 }

src/Sidekick.Apis.Poe.Trade/Filters/IInvariantFilterProvider.cs

@@ -21,6 +21,7 @@ IGameLanguageProvider gameLanguageProvider
     public FilterDefinition? VeiledDefinition { get; private set; }
     public FilterDefinition? FracturedDefinition { get; private set; }
     public FilterDefinition? MirroredDefinition { get; private set; }
+    public FilterDefinition? FoulbornDefinition { get; private set; }
     public FilterDefinition? SanctifiedDefinition { get; private set; }
 
     /// <inheritdoc/>
@@ -82,6 +83,15 @@ public async Task Initialize()
                     };
                 }
 
+                if (category.Id == "misc_filters" && filter.Id == "foulborn_item")
+                {
+                    FoulbornDefinition = new FilterDefinition()
+                    {
+                        CategoryId = category.Id,
+                        FilterId = filter.Id,
+                    };
+                }
+
                 if (category.Id == "misc_filters" && filter.Id == "sanctified")
                 {
                     SanctifiedDefinition = new FilterDefinition()

src/Sidekick.Apis.Poe.Trade/Filters/InvariantFilterProvider.cs

@@ -23,6 +23,8 @@ public class ApiItemConstants
         { "tincture", Category.Tincture },
         { "corpse", Category.Corpse },
         { "idol", Category.Idol },
+        { "graft", Category.Graft },
+        { "wombgift", Category.Wombgift },
     };
 
     public static readonly Dictionary<string, Category> Poe2Categories = new()

src/Sidekick.Apis.Poe.Trade/Items/ApiItemConstants.cs

@@ -24,7 +24,7 @@ public class ApiItemProvider
     IApiStaticDataProvider apiStaticDataProvider
 ) : IApiItemProvider
 {
-    public Dictionary<string, List<(Regex Regex, ItemApiInformation Item)>> NameDictionary { get; private set; } = [];
+    public List<(Regex Regex, ItemApiInformation Item)> NamePatterns { get; private set; } = [];
 
     public List<(Regex Regex, ItemApiInformation Item)> TypePatterns { get; private set; } = [];
 
@@ -45,8 +45,7 @@ public async Task Initialize()
         if (result == null) throw new SidekickException("Could not fetch items from the trade API.");
 
         InitializeItems(game, result);
-        UniqueItems = NameDictionary.SelectMany(x => x.Value)
-            .Select(x => x.Item)
+        UniqueItems = NamePatterns.Select(x => x.Item)
             .Where(x => x.IsUnique)
             .OrderByDescending(x => x.Name?.Length)
             .ToList();
@@ -57,7 +56,7 @@ public async Task Initialize()
 
     private void InitializeItems(GameType game, FetchResult<ApiCategory> result)
     {
-        NameDictionary.Clear();
+        NamePatterns.Clear();
         TypePatterns.Clear();
         TextPatterns.Clear();
 
@@ -100,13 +99,8 @@ private void FillCategoryItems(List<ApiCategory> categories, string categoryId,
 
             if (!string.IsNullOrEmpty(information.Name))
             {
-                if (!NameDictionary.TryGetValue(information.Name, out var namePatterns))
-                {
-                    namePatterns = new List<(Regex Regex, ItemApiInformation Item)>();
-                    NameDictionary.Add(information.Name, namePatterns);
-                }
-
-                namePatterns.Add((new Regex(Regex.Escape(information.Name)), information));
+                var regex = $"^{Regex.Escape(information.Name)}|{Regex.Escape(information.Name)}$";
+                NamePatterns.Add((new Regex(regex), information));
             }
 
             if (!string.IsNullOrEmpty(information.Type) && !information.IsUnique)

src/Sidekick.Apis.Poe.Trade/Items/ApiItemProvider.cs

@@ -6,7 +6,7 @@ namespace Sidekick.Apis.Poe.Trade.Items;
 
 public interface IApiItemProvider : IInitializableService
 {
-    Dictionary<string, List<(Regex Regex, ItemApiInformation Item)>> NameDictionary { get; }
+    List<(Regex Regex, ItemApiInformation Item)> NamePatterns { get; }
 
     List<(Regex Regex, ItemApiInformation Item)> TypePatterns { get; }
 

src/Sidekick.Apis.Poe.Trade/Items/IApiItemProvider.cs

@@ -97,6 +97,9 @@ public class ApiItem
     [JsonPropertyName("sanctumMods")]
     public List<string> SanctumMods { get; set; } = [];
 
+    [JsonPropertyName("mutatedMods")]
+    public List<string> MutatedMods { get; set; } = [];
+
     public List<string> GemSockets { get; set; } = [];
 
     public List<ApiItemSocket> Sockets { get; set; } = [];
@@ -137,5 +140,5 @@ public int? MaxLinks
         return value.Value.GetInt32();
     }
 
-    public bool HasModifiers => !Identified || ImplicitMods.Count > 0 || CraftedMods.Count > 0 || ExplicitMods.Count > 0 || UtilityMods.Count > 0 || PseudoMods.Count > 0 || EnchantMods.Count > 0 || RuneMods.Count > 0 || FracturedMods.Count > 0 || DesecratedMods.Count > 0 || ScourgeMods.Count > 0 || SanctumMods.Count > 0 || LogbookMods.Count > 0;
+    public bool HasModifiers => !Identified || ImplicitMods.Count > 0 || CraftedMods.Count > 0 || ExplicitMods.Count > 0 || UtilityMods.Count > 0 || PseudoMods.Count > 0 || EnchantMods.Count > 0 || RuneMods.Count > 0 || FracturedMods.Count > 0 || DesecratedMods.Count > 0 || ScourgeMods.Count > 0 || SanctumMods.Count > 0 || LogbookMods.Count > 0 || MutatedMods.Count > 0;
 }

src/Sidekick.Apis.Poe.Trade/Models/Items/ApiItem.cs

@@ -150,6 +150,7 @@ private Regex ComputePattern(string text, ModifierCategory? category = null, str
             ModifierCategory.Crafted => @"\ \(crafted\)",
             ModifierCategory.Fractured => @"\ \(fractured\)",
             ModifierCategory.Desecrated => @"\ \(desecrated\)",
+            ModifierCategory.Explicit => @"(?:\ \(mutated\))?",
             _ => "",
         };