From 24b76b1b490f85bf5965518360d5a6ecd188304e Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Thu, 25 Jan 2024 09:47:46 +0100
Subject: [PATCH] Fix not all armoury items being discarded

---
 ARDiscard/ARDiscard.csproj           | 2 +-
 ARDiscard/GameData/InventoryUtils.cs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ARDiscard/ARDiscard.csproj b/ARDiscard/ARDiscard.csproj
index dd3a902..0be9dbb 100644
--- a/ARDiscard/ARDiscard.csproj
+++ b/ARDiscard/ARDiscard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>4.4</Version>
+        <Version>4.5</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/ARDiscard/GameData/InventoryUtils.cs b/ARDiscard/GameData/InventoryUtils.cs
index 8aa7494..93e8669 100644
--- a/ARDiscard/GameData/InventoryUtils.cs
+++ b/ARDiscard/GameData/InventoryUtils.cs
@@ -82,13 +82,14 @@ internal sealed class InventoryUtils
     private unsafe IEnumerable<ItemWrapper> GetArmouryItemsToDiscard(bool condition, InventoryManager* inventoryManager,
         InventoryType[] inventoryTypes, Dictionary<uint, uint> itemCounts, List<uint>? gearsetItems)
     {
+        List<ItemWrapper> items = new();
         if (condition)
         {
             foreach (InventoryType inventoryType in inventoryTypes)
-                return GetItemsToDiscard(inventoryManager, inventoryType, itemCounts, gearsetItems);
+                items.AddRange(GetItemsToDiscard(inventoryManager, inventoryType, itemCounts, gearsetItems));
         }
 
-        return new List<ItemWrapper>();
+        return items;
     }
 
     public unsafe InventoryItem* GetNextItemToDiscard(ItemFilter? itemFilter)