ShipStatusのSlotとSlotExに触ったときにItemSpecを取得する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Model / ShipInfo.cs

diff --git a/KancolleSniffer/Model/ShipInfo.cs b/KancolleSniffer/Model/ShipInfo.cs
index 2219ebe..2aaae71 100644 (file)
--- a/KancolleSniffer/Model/ShipInfo.cs
+++ b/KancolleSniffer/Model/ShipInfo.cs
@@ -169,6 +169,7 @@ namespace KancolleSniffer.Model
                     Fuel = (int)entry.api_fuel,\r
                     Bull = (int)entry.api_bull,\r
                     OnSlot = (int[])entry.api_onslot,\r
+                    GetItem = item => _itemInventry[item.Id],\r
                     Slot = ((int[])entry.api_slot).Select(item => new ItemStatus(item)).ToArray(),\r
                     SlotEx = entry.api_slot_ex() ? new ItemStatus((int)entry.api_slot_ex) : new ItemStatus(0),\r
                     NdockTime = (int)entry.api_ndock_time,\r
@@ -341,8 +342,6 @@ namespace KancolleSniffer.Model
         {\r
             if (ship.Empty)\r
                 return ship;\r
-            ship.Slot = ship.Slot.Select(item => _itemInventry[item.Id]).ToArray();\r
-            ship.SlotEx = _itemInventry[ship.SlotEx.Id];\r
             ship.Escaped = _escapedShips.Contains(ship.Id);\r
             ship.Fleet = FindFleet(ship.Id, out var idx);\r
             ship.DeckIndex = idx;\r