集中開発に対応する

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

diff --git a/KancolleSniffer/Model/ItemInfo.cs b/KancolleSniffer/Model/ItemInfo.cs
index e62905c..02c722c 100644 (file)
--- a/KancolleSniffer/Model/ItemInfo.cs
+++ b/KancolleSniffer/Model/ItemInfo.cs
@@ -21,14 +21,14 @@ namespace KancolleSniffer.Model
     public class ItemInfo\r
     {\r
         private readonly ItemMaster _itemMaster;\r
-        private readonly ItemInventry _itemInventry;\r
+        private readonly ItemInventory _itemInventory;\r
         public AlarmCounter Counter { get; }\r
 \r
-        public ItemInfo(ItemMaster itemMaster, ItemInventry itemInventry)\r
+        public ItemInfo(ItemMaster itemMaster, ItemInventory itemInventory)\r
         {\r
             _itemMaster = itemMaster;\r
-            _itemInventry = itemInventry;\r
-            Counter = new AlarmCounter(() => _itemInventry.Count) {Margin = 10};\r
+            _itemInventory = itemInventory;\r
+            Counter = new AlarmCounter(() => _itemInventory.Count) {Margin = 5};\r
         }\r
 \r
         public void InspectBasic(dynamic json)\r
@@ -46,11 +46,13 @@ namespace KancolleSniffer.Model
             if (!json.IsArray)\r
                 json = new[] {json};\r
             if (full)\r
-                _itemInventry.Clear();\r
+                _itemInventory.Clear();\r
             foreach (var entry in json)\r
             {\r
                 var id = (int)entry.api_id;\r
-                _itemInventry[id] = new ItemStatus(id)\r
+                if (id == -1)\r
+                    continue;\r
+                _itemInventory[id] = new ItemStatus(id)\r
                 {\r
                     Spec = _itemMaster[(int)entry.api_slotitem_id],\r
                     Level = entry.api_level() ? (int)entry.api_level : 0,\r
@@ -61,9 +63,15 @@ namespace KancolleSniffer.Model
 \r
         public void InspectCreateItem(dynamic json)\r
         {\r
-            if (!json.IsDefined("api_slot_item"))\r
-                return;\r
-            InspectSlotItem(json.api_slot_item);\r
+\r
+            if (json.api_slot_item())\r
+            {\r
+                InspectSlotItem(json.api_slot_item);\r
+            }\r
+            else if (json.api_get_items())\r
+            {\r
+                InspectSlotItem(json.api_get_items);\r
+            }\r
         }\r
 \r
         public void InspectGetShip(dynamic json)\r
@@ -88,14 +96,9 @@ namespace KancolleSniffer.Model
             DeleteItems((int[])json.api_use_slot_id);\r
         }\r
 \r
-        public void DeleteItems(IEnumerable<ItemStatus> items)\r
-        {\r
-            DeleteItems(items.Select(item => item.Id));\r
-        }\r
-\r
         private void DeleteItems(IEnumerable<int> ids)\r
         {\r
-            _itemInventry.Remove(ids);\r
+            _itemInventory.Remove(ids);\r
         }\r
 \r
         public ItemSpec GetSpecByItemId(int id) => _itemMaster[id];\r
@@ -104,16 +107,16 @@ namespace KancolleSniffer.Model
 \r
         public ItemStatus GetStatus(int id)\r
         {\r
-            return _itemInventry[id];\r
+            return _itemInventory[id];\r
         }\r
 \r
         public void ClearHolder()\r
         {\r
-            foreach (var item in _itemInventry.AllItems)\r
+            foreach (var item in _itemInventory.AllItems)\r
                 item.Holder = new ShipStatus();\r
         }\r
 \r
-        public ItemStatus[] ItemList => _itemInventry.AllItems.ToArray();\r
+        public ItemStatus[] ItemList => _itemInventory.AllItems.ToArray();\r
 \r
         public string GetUseItemName(int id) => _itemMaster.GetUseItemName(id);\r
 \r
@@ -125,7 +128,7 @@ namespace KancolleSniffer.Model
 \r
         public ItemStatus[] InjectItems(IEnumerable<int> itemIds)\r
         {\r
-            var id = _itemInventry.MaxId + 1;\r
+            var id = _itemInventory.MaxId + 1;\r
             return itemIds.Select(itemId =>\r
             {\r
                 var spec = _itemMaster[itemId];\r
@@ -135,7 +138,7 @@ namespace KancolleSniffer.Model
                     _itemMaster[itemId] = spec;\r
                 }\r
                 var item = new ItemStatus {Id = id++, Spec = spec};\r
-                _itemInventry.Add(item);\r
+                _itemInventory.Add(item);\r
                 return item;\r
             }).ToArray();\r
         }\r