艦娘の装備が任務で消滅したときに例外が発生するのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 8895f8f..faaf9ba 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -570,9 +570,12 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void CountItem()\r
         {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "createitem_001");\r
-            PAssert.That(() => sniffer.Item.NowEquips == 900);\r
+            var sniffer1 = new Sniffer();\r
+            SniffLogFile(sniffer1, "createitem_001");\r
+            PAssert.That(() => sniffer1.Item.NowEquips == 900);\r
+            var sniffer2 = new Sniffer();\r
+            SniffLogFile(sniffer2, "createship_001");\r
+            PAssert.That(() => sniffer2.Item.NowEquips == 904);\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs
index 9e03712..c8c1828 100644 (file)
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/ItemInfo.cs
@@ -533,7 +533,7 @@ namespace KancolleSniffer
                 InspectSlotItem(json.api_after_slot);\r
             if (!json.api_use_slot_id())\r
                 return;\r
-            DeleteItems(((int[])json.api_use_slot_id));\r
+            DeleteItems((int[])json.api_use_slot_id);\r
         }\r
 \r
         public void DeleteItems(ItemStatus[] items)\r
@@ -550,22 +550,15 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        public void CountNewItems(int[] ids)\r
-        {\r
-            foreach (var id in ids.Where(id => id != -1 && !_itemInfo.ContainsKey(id)))\r
-            {\r
-                _itemInfo[id] = new ItemStatus(id);\r
-                NowEquips++;\r
-            }\r
-        }\r
-\r
-        public string GetName(int id) => _itemInfo[id].Spec.Name;\r
-\r
-        public int GetItemId(int id) => _itemInfo[id].Spec.Id;\r
-\r
         public ItemSpec GetSpecByItemId(int id) => _itemSpecs[id];\r
 \r
-        public ItemStatus GetStatus(int id) => _itemInfo[id];\r
+        public string GetName(int id) => GetStatus(id).Spec.Name;\r
+\r
+        public ItemStatus GetStatus(int id)\r
+        {\r
+            ItemStatus item;\r
+            return _itemInfo.TryGetValue(id, out item) ? item : new ItemStatus(id);\r
+        }\r
 \r
         public ItemStatus[] GetItemListWithOwner(ShipStatus[] shipList)\r
         {\r

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index a7e622c..b7f90e0 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -347,7 +347,6 @@ namespace KancolleSniffer
                     Lucky = (int)entry.api_lucky[0],\r
                     Locked = entry.api_locked() && entry.api_locked == 1\r
                 };\r
-                _itemInfo.CountNewItems((int[])entry.api_slot);\r
             }\r
         }\r
 \r