Fixed price checking organs

Related to #6
Sidekick-Poe · Sep 3, 2021 · 3617af8 · 3617af8
1 parent b19c1e8
commit 3617af8
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 23 deletions.
diff --git a/src/Sidekick.Apis.Poe/Trade/Results/Hashes.cs b/src/Sidekick.Apis.Poe/Trade/Results/Hashes.cs
@@ -23,5 +23,8 @@ public class Hashes
 
         [JsonPropertyName("fractured")]
         public List<List<JsonElement>> Fractured { get; set; }
+
+        [JsonPropertyName("monster")]
+        public List<List<JsonElement>> Monster { get; set; }
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/TradeSearchService.cs b/src/Sidekick.Apis.Poe/Trade/TradeSearchService.cs
@@ -482,7 +482,7 @@ private TradeItem GetItem(Result result)
                 item.Modifiers.Explicit,
                 result.Item.ExplicitMods,
                 result.Item.Extended.Mods?.Explicit,
-                ParseHash(result.Item.Extended.Hashes?.Explicit));
+                ParseHash(result.Item.Extended.Hashes?.Explicit, result.Item.Extended.Hashes?.Monster));
 
             ParseMods(modifierProvider,
                 item.Modifiers.Implicit,
@@ -505,25 +505,30 @@ private TradeItem GetItem(Result result)
             return item;
         }
 
-        private static List<LineContentValue> ParseHash(List<List<JsonElement>> values)
+        private static List<LineContentValue> ParseHash(params List<List<JsonElement>>[] hashes)
         {
             var result = new List<LineContentValue>();
-            if (values != null)
+
+            foreach (var values in hashes)
             {
-                foreach (var value in values)
+                if (values != null)
                 {
-                    if (value.Count != 2)
+                    foreach (var value in values)
                     {
-                        continue;
-                    }
+                        if (value.Count != 2)
+                        {
+                            continue;
+                        }
 
-                    result.Add(new LineContentValue()
-                    {
-                        Value = value[0].GetString(),
-                        Type = value[1].ValueKind == JsonValueKind.Array ? (LineContentType)value[1][0].GetInt32() : LineContentType.Simple
-                    });
+                        result.Add(new LineContentValue()
+                        {
+                            Value = value[0].GetString(),
+                            Type = value[1].ValueKind == JsonValueKind.Array ? (LineContentType)value[1][0].GetInt32() : LineContentType.Simple
+                        });
+                    }
                 }
             }
+
             return result;
         }
 

diff --git a/src/Sidekick.Modules.Trade/Components/Items/ItemComponent.razor b/src/Sidekick.Modules.Trade/Components/Items/ItemComponent.razor
@@ -19,8 +19,10 @@
 
         <div class="pa-2">
             <ItemLineContentsComponent Item="Item" LineContents="Item.PropertyContents" />
-            <ItemRequirementsComponent Item="Item" />
             <ItemLineContentsComponent Item="Item" LineContents="Item.AdditionalPropertyContents" />
+
+            <ItemProperties Item="Item" />
+
             <ItemModifiersComponent Item="Item"
                                     Modifiers="Item.Modifiers.Enchant" />
             <ItemModifiersComponent Item="Item"

diff --git a/src/Sidekick.Modules.Trade/Components/Items/ItemLineContentsComponent.razor b/src/Sidekick.Modules.Trade/Components/Items/ItemLineContentsComponent.razor
@@ -1,12 +1,15 @@
 
-<div class="line-contents">
-    @foreach (var property in LineContents)
-    {
-        <MudText Typo="Typo.body1" Class="font-smallcaps" Align="Align.Center">@((MarkupString)GetLine(property))</MudText>
-    }
-</div>
+@if (LineContents != null && LineContents.Count > 0)
+{
+    <div class="line-contents">
+        @foreach (var property in LineContents)
+        {
+            <MudText Typo="Typo.body1" Class="font-smallcaps" Align="Align.Center">@((MarkupString)GetLine(property))</MudText>
+        }
+    </div>
 
-<ItemSeparatorComponent Item="Item" />
+    <ItemSeparatorComponent Item="Item" />
+}
 
 @code {
     [Parameter] public Item Item { get; set; }

diff --git a/src/Sidekick.Modules.Trade/Components/Items/ItemProperties.razor b/src/Sidekick.Modules.Trade/Components/Items/ItemProperties.razor
@@ -0,0 +1,27 @@
+
+@if (Item != null)
+{
+    <div class="properties">
+        @if (Item.Properties.ItemLevel > 0)
+        {
+            <MudText Typo="Typo.body1" Class="font-smallcaps" Align="Align.Center">@((MarkupString)GetLine(GameLanguageProvider.Language.DescriptionItemLevel, Item.Properties.ItemLevel))</MudText>
+        }
+    </div>
+    <ItemRequirementsComponent Item="Item" />
+
+    @if (Item.RequirementContents != null || Item.Properties.ItemLevel > 0)
+    {
+        <ItemSeparatorComponent Item="Item" />
+    }
+}
+
+@code {
+    [Parameter] public TradeItem Item { get; set; }
+
+    [Inject] public IGameLanguageProvider GameLanguageProvider { get; set; }
+
+    private string GetLine(string label, object value)
+    {
+        return $"{label}: <span style=\"color:#FFFFFF;\">{value}</span>";
+    }
+}
diff --git a/src/Sidekick.Modules.Trade/Components/Items/ItemProperties.razor.css b/src/Sidekick.Modules.Trade/Components/Items/ItemProperties.razor.css
@@ -0,0 +1,3 @@
+.properties {
+    color: #7f7f7f;
+}
diff --git a/src/Sidekick.Modules.Trade/Components/Items/ItemRequirementsComponent.razor b/src/Sidekick.Modules.Trade/Components/Items/ItemRequirementsComponent.razor
@@ -3,8 +3,6 @@
     <div class="requirements font-smallcaps">
         <MudText Typo="Typo.body1" Class="font-smallcaps" Align="Align.Center">@Resources.Requires @((MarkupString)Text)</MudText>
     </div>
-
-    <ItemSeparatorComponent Item="Item" />
 }
 
 @code {

diff --git a/tests/Sidekick.Apis.Poe.Tests/Parser/MetamorphParsing.cs b/tests/Sidekick.Apis.Poe.Tests/Parser/MetamorphParsing.cs
@@ -60,7 +60,7 @@ Combine this with four other different samples in Tane's Laboratory.
         [Fact]
         public void ParseOrgan()
         {
-            var actual = parser.ParseItem(@"Item Class: Metamorph Sample
+            var actual = parser.ParseItem(@"Item Class: Metamorph Samples
 Rarity: Unique
 Portentia, the Foul's Heart
 --------
@@ -81,5 +81,31 @@ Drops additional Rare Jewellery
             Assert.Equal("Portentia, the Foul", actual.Metadata.Type);
         }
 
+        [Fact]
+        public void Portentia()
+        {
+            var actual = parser.ParseItem(@"Item Class: Metamorph Samples
+Rarity: Unique
+Portentia, the Foul's Heart
+--------
+Uses: Blood Bubble
+--------
+Item Level: 79
+--------
+Drops additional Rare Jewellery
+Drops additional Currency Items
+Drops additional Currency Items
+Drops additional Rare Weapons
+Drops additional Rare Armour
+--------
+Combine this with four other different samples in Tane's Laboratory.");
+
+            Assert.Equal(Class.MetamorphSample, actual.Metadata.Class);
+            Assert.Equal(Category.ItemisedMonster, actual.Metadata.Category);
+            Assert.Equal(Rarity.Unique, actual.Metadata.Rarity);
+            Assert.Equal("Portentia, the Foul's Heart", actual.Metadata.Name);
+            Assert.Equal("Portentia, the Foul", actual.Metadata.Type);
+        }
+
     }
 }