Merge pull request #1026 from Sidekick-Poe/feature/map-tiers

Restored map tier parsing for PoE1

Author: leMicin

src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/MapTierProperty.cs

@@ -14,17 +14,15 @@ public class MapTierProperty(
     GameType game,
     ICurrentGameLanguage currentGameLanguage) : PropertyDefinition
 {
-    private Regex Pattern { get; } = currentGameLanguage.Language.DescriptionMapTier.ToRegexIntCapture();
+    private Regex Pattern { get; } = new(@"^[^\(]+\([^\d]+(\d+)\)$");
 
     public override string Label => currentGameLanguage.Language.DescriptionMapTier;
 
     public override void Parse(Item item)
     {
-        if (item.Properties.ItemClass != ItemClass.Map) return;
+        if (item.Properties.ItemClass != ItemClass.Map || string.IsNullOrEmpty(item.Type)) return;
 
-        var propertyBlock = item.Text.Blocks[1];
-        item.Properties.MapTier = GetInt(Pattern, propertyBlock);
-        if (item.Properties.MapTier > 0) propertyBlock.Parsed = true;
+        item.Properties.MapTier = GetInt(Pattern, item.Type);
     }
 
     public override Task<TradeFilter?> GetFilter(Item item)

src/Sidekick.Apis.Poe.Trade/Parser/Properties/PropertyDefinition.cs

@@ -46,6 +46,14 @@ protected static int GetInt(Regex pattern, TextBlock textBlock)
         return int.TryParse(match.Groups[1].Value, out var result) ? result : 0;
     }
 
+    protected static int GetInt(Regex pattern, string value)
+    {
+        var match = pattern.Match(value);
+        if (!match.Success) return 0;
+
+        return int.TryParse(match.Groups[1].Value, out var result) ? result : 0;
+    }
+
     protected static double GetDouble(Regex pattern, TextBlock textBlock)
     {
         if (!textBlock.TryParseRegex(pattern, out var match))

tests/Sidekick.Apis.Poe.Tests/Poe1English/Parser/MapParsing.cs

@@ -0,0 +1,78 @@
+using Sidekick.Apis.Poe.Items;
+using Sidekick.Apis.Poe.Trade.Parser;
+using Sidekick.Data.Items;
+using Xunit;
+namespace Sidekick.Apis.Poe.Tests.Poe1English.Parser;
+
+[Collection(Collections.Poe1EnglishFixture)]
+public class MapParsing(Poe1EnglishFixture fixture)
+{
+    private readonly IItemParser parser = fixture.Parser;
+
+    [Fact]
+    public void Tier2()
+    {
+        var actual = parser.ParseItem(@"Item Class: Maps
+Rarity: Magic
+Armoured Map (Tier 2)
+--------
+Item Quantity: +13% (augmented)
+Item Rarity: +8% (augmented)
+Monster Pack Size: +5% (augmented)
+--------
+Item Level: 71
+--------
+Monster Level: 69
+--------
++20% Monster Physical Damage Reduction
+--------
+Travel to a Map by using this in a personal Map Device. Maps can only be used once.
+
+");
+
+        Assert.Equal(ItemClass.Map, actual.Properties.ItemClass);
+        Assert.Equal(Rarity.Magic, actual.Properties.Rarity);
+        Assert.Null(actual.ApiInformation.Name);
+        Assert.Equal("Map", actual.ApiInformation.Type);
+        Assert.Equal(2, actual.Properties.MapTier);
+
+        fixture.AssertHasStat(actual, StatCategory.Explicit, "+#% Monster Physical Damage Reduction", 20);
+    }
+
+    [Fact]
+    public void OlmecSanctum()
+    {
+        var actual = parser.ParseItem(@"Item Class: Maps
+Rarity: Unique
+Olmec's Sanctum
+Map (Tier 6)
+--------
+Item Quantity: +179% (augmented)
+--------
+Item Level: 73
+--------
+Monster Level: 73
+--------
+42% more Monster Life
+37% increased Monster Damage
+Final Boss drops higher Level Items
+--------
+They flew, and leapt, and clambered over,
+They crawled, and swam, and slithered under.
+Still its ancient secrets await unclaimed
+And of this hidden temple, only legends remain.
+--------
+Travel to a Map by using this in a personal Map Device. Maps can only be used once.
+");
+
+        Assert.Equal(ItemClass.Map, actual.Properties.ItemClass);
+        Assert.Equal(Rarity.Unique, actual.Properties.Rarity);
+        Assert.Equal("Olmec's Sanctum", actual.ApiInformation.Name);
+        Assert.Equal("Map", actual.ApiInformation.Type);
+        Assert.Equal(6, actual.Properties.MapTier);
+
+        fixture.AssertHasStat(actual, StatCategory.Explicit, "#% more Monster Life", 42);
+        fixture.AssertHasStat(actual, StatCategory.Explicit, "#% increased Monster Damage", 37);
+        fixture.AssertHasStat(actual, StatCategory.Explicit, "Final Boss drops higher Level Items");
+    }
+}