update analyser lib, refactored for the new LootItemExtended interface

AndrewSav · Jan 20, 2025 · caab0fc · caab0fc
1 parent ae88958
commit caab0fc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.0.36 (21 Jan 2025)
+- Fixed a crahs
 
 ## 0.0.35 (13 Jan 2025)
 - Update analyser library

diff --git a/Remnant2SaveAnalyzer-dev.sln.DotSettings b/Remnant2SaveAnalyzer-dev.sln.DotSettings
@@ -11,6 +11,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bloodmoon/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Brabus/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cabe/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cervine/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Charnel/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=craftable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=dlcs/@EntryIndexedValue">True</s:Boolean>

diff --git a/Remnant2SaveAnalyzer/Remnant2SaveAnalyzer.csproj b/Remnant2SaveAnalyzer/Remnant2SaveAnalyzer.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="lib.remnant2.analyzer" Version="0.0.37" />
+    <PackageReference Include="lib.remnant2.analyzer" Version="0.0.39" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />

diff --git a/Remnant2SaveAnalyzer/RemnantSave.cs b/Remnant2SaveAnalyzer/RemnantSave.cs
@@ -260,9 +260,6 @@ private void ReportPlayerInfo()
             logger.Information($"BEGIN Inventory, Character {index+1} (save_{character.Index})");
 
 
-            List<InventoryItem> debug = character.Profile.Inventory.Where(x => x.ProfileId == "/Game/Items/Common/Item_DragonHeartUpgrade.Item_DragonHeartUpgrade_C").ToList();
-
-
             List<IGrouping<string, InventoryItem>> itemTypes = [.. character.Profile.Inventory
                 .GroupBy(x => x.LootItem?.Type)
                 .OrderBy(x=> x.Key)];

diff --git a/Remnant2SaveAnalyzer/Views/Pages/WorldAnalyzerPage.xaml.cs b/Remnant2SaveAnalyzer/Views/Pages/WorldAnalyzerPage.xaml.cs
@@ -783,7 +783,7 @@ private List<WorldAnalyzerGridData> FilterGridData(Profile profile, RolledWorld?
     private List<WorldAnalyzerGridData> AddLootGroup(LootGroup lg, string locationName, List<string> missingIds)
     {
         List<WorldAnalyzerGridData> result = [];
-        List<LootItem> items = lg.Items;
+        List<LootItemExtended> items = lg.Items;
         if (!Properties.Settings.Default.ShowCoopItems)
         {
             items = items.Where(x => !x.Properties.ContainsKey("Coop") || x.Properties["Coop"] != "True").ToList();
@@ -819,15 +819,16 @@ private List<WorldAnalyzerGridData> AddLootGroup(LootGroup lg, string locationNa
         return result;
     }
 
-    public class LocalisedLootItem : LootItem
+    public class LocalisedLootItem : LootItemExtended
     {
         private readonly WorldAnalyzerPage _parent;
         [SetsRequiredMembers]
-        public LocalisedLootItem(LootItem item, WorldAnalyzerPage parent)
+        public LocalisedLootItem(LootItemExtended item, WorldAnalyzerPage parent) : base(item)
         {
             IsLooted = item.IsLooted;
             IsPrerequisiteMissing = item.IsPrerequisiteMissing;
-            Properties = item.Properties;
+            IsVendoredAccountAward = item.IsVendoredAccountAward;
+            HasRequiredMaterial = item.HasRequiredMaterial;
             _parent = parent;
         }