From 314ce165a645af5ce16e9a6556bebf9d04977fbd Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 28 Mar 2020 14:41:29 -0700 Subject: [PATCH] Merge pocket1/2 for GUI editing --- NHSE.WinForms/Subforms/PlayerItemEditor.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/NHSE.WinForms/Subforms/PlayerItemEditor.cs b/NHSE.WinForms/Subforms/PlayerItemEditor.cs index 055362f..9a335f8 100644 --- a/NHSE.WinForms/Subforms/PlayerItemEditor.cs +++ b/NHSE.WinForms/Subforms/PlayerItemEditor.cs @@ -53,19 +53,21 @@ private void CreateTabs() private static InventorySet[] GetInventory(Player player) { + var _21 = player.Personal.Pocket2.Concat(player.Personal.Pocket1).ToArray(); return new[] { - new InventorySet(InventoryType.Pocket1, player.Personal.Pocket2), - new InventorySet(InventoryType.Pocket2, player.Personal.Pocket1), + new InventorySet(InventoryType.Pocket1, _21), new InventorySet(InventoryType.Storage, player.Personal.Storage), }; } private void SetInventory(Player player) { - player.Personal.Pocket2 = Inventory[0].Items; - player.Personal.Pocket1 = Inventory[1].Items; - player.Personal.Storage = Inventory[2].Items; + var p2 = Inventory[0].Items.Take(20).ToArray(); + var p1 = Inventory[0].Items.Skip(20).Take(20).ToArray(); + player.Personal.Pocket2 = p2; + player.Personal.Pocket1 = p1; + player.Personal.Storage = Inventory[1].Items; } private void B_Cancel_Click(object sender, EventArgs e) => Close();