Fix sort bug, add to max hp on level up

This commit is contained in:
2025-03-19 01:31:19 -07:00
parent 79f57264ec
commit f6c42747ca
5 changed files with 46 additions and 33 deletions

View File

@@ -52,7 +52,8 @@ public partial class Inventory : Node, IInventory
var accessories = listToSort.Where(x => x is Accessory).OrderBy(x => x as Accessory, new AccessoryComparer());
var consumables = listToSort.Where(x => x is ConsumableItem).OrderBy(x => x as ConsumableItem, new ConsumableComparer());
var throwables = listToSort.Where(x => x is ThrowableItem).OrderBy(x => x as ThrowableItem, new ThrowableComparer());
Items = [.. equippedItems, .. weapons, .. armor, .. accessories, .. consumables, .. throwables];
var effectItems = listToSort.Where(x => x is EffectItem).OrderBy(x => x as EffectItem, new EffectComparer());
Items = [.. equippedItems, .. weapons, .. armor, .. accessories, .. consumables, .. throwables, .. effectItems];
var stackableItems = Items.OfType<IStackable>();
var itemsToStack = stackableItems.GroupBy(x => ((InventoryItem)x).ItemName).Where(x => x.Count() > 1);
@@ -109,4 +110,12 @@ public partial class Inventory : Node, IInventory
return x.ItemName.CompareTo(y.ItemName);
}
}
public class EffectComparer : IComparer<EffectItem>
{
public int Compare(EffectItem x, EffectItem y)
{
return x.ItemName.CompareTo(y.ItemName);
}
}
}