Fix rechargeable items being mergeable

Kaioru · Oct 3, 2023 · fe0a48c · fe0a48c
1 parent cbaa28f
commit fe0a48c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/common/Edelstein.Common.Gameplay/Models/Inventories/InventoryManager.cs b/src/common/Edelstein.Common.Gameplay/Models/Inventories/InventoryManager.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using Edelstein.Common.Gameplay.Constants;
 using Edelstein.Common.Gameplay.Models.Inventories.Items;
 using Edelstein.Protocol.Gameplay.Models.Characters;
 using Edelstein.Protocol.Gameplay.Models.Inventories;
@@ -153,6 +154,7 @@ public bool HasSlotFor(IItemInventory? inventory, ICollection<IItemSlot> items)
 
         var bundles = items
             .OfType<IItemSlotBundle>()
+            .Where(b => !ItemConstants.IsRechargeableItem(b.ID))
             .ToImmutableList();
         var bundlesMerged = new List<IItemSlotBundle>();
 

diff --git a/src/common/Edelstein.Common.Gameplay/Models/Inventories/Modify/ModifyInventoryContext.cs b/src/common/Edelstein.Common.Gameplay/Models/Inventories/Modify/ModifyInventoryContext.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using Edelstein.Common.Gameplay.Constants;
 using Edelstein.Common.Gameplay.Models.Inventories.Items;
 using Edelstein.Common.Gameplay.Models.Inventories.Modify.Operations;
 using Edelstein.Protocol.Gameplay.Models.Inventories;
@@ -43,7 +44,7 @@ public override short Add(IItemSlot? item)
         {
             case ItemSlotBundle bundle:
                 if (_manager.Retrieve(bundle.ID).Result is not IItemBundleTemplate template) goto default;
-                // if (ItemConstants.IsRechargeableItem(bundle.TemplateID)) goto default; // TODO: rechargeable constants
+                if (ItemConstants.IsRechargeableItem(template.ID)) goto default;
                 if (bundle.Number < 1) bundle.Number = 1;
 
                 var mergeable = _inventory.Items
@@ -98,7 +99,7 @@ public override void Remove(int templateID, short count)
         foreach (var kv in match)
         {
             if (removed >= count) return;
-            if (kv.Value is ItemSlotBundle bundle) // TODO: rechargable
+            if (kv.Value is ItemSlotBundle bundle && !ItemConstants.IsRechargeableItem(bundle.ID))
             {
                 var diff = count - removed;
 
@@ -158,6 +159,7 @@ public override void Sort()
         var inventoryCopy = _inventory.Items
             .Where(kv => kv.Key > 0)
             .OrderBy(kv => kv.Value.ID)
+            .ThenByDescending(kv => kv.Value is IItemSlotBundle bundle ? bundle.Number : 1)
             .ToList();
 
         inventoryCopy.ForEach(kv => RemoveSlot(kv.Key));
@@ -261,7 +263,7 @@ public void SetSlot(short slot, IItemTemplate? template, short count)
     {
         var item = this[slot];
 
-        if (item is IItemSlotBundle bundle)
+        if (item is IItemSlotBundle bundle && !ItemConstants.IsRechargeableItem(bundle.ID))
         {
             if (bundle.Number > count)
             {