バージョン12.11の準備

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

diff --git a/KancolleSniffer/Model/ItemInfo.cs b/KancolleSniffer/Model/ItemInfo.cs
index f014e4a..ae0d3df 100644 (file)
--- a/KancolleSniffer/Model/ItemInfo.cs
+++ b/KancolleSniffer/Model/ItemInfo.cs
@@ -21,14 +21,16 @@ namespace KancolleSniffer.Model
     public class ItemInfo\r
     {\r
         private readonly ItemMaster _itemMaster;\r
-        private readonly ItemInventry _itemInventry;\r
+        private readonly ItemInventory _itemInventory;\r
+        private readonly Dictionary<int, int> _useItem = new Dictionary<int, int>();\r
+\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 = 5};\r
+            _itemInventory = itemInventory;\r
+            Counter = new AlarmCounter(() => _itemInventory.Count) {Margin = 5};\r
         }\r
 \r
         public void InspectBasic(dynamic json)\r
@@ -46,24 +48,41 @@ 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
-                    Alv = entry.api_alv() ? (int)entry.api_alv : 0\r
+                    Alv = entry.api_alv() ? (int)entry.api_alv : 0,\r
+                    Locked = entry.api_locked() && (int)entry.api_locked == 1\r
                 };\r
             }\r
         }\r
 \r
+        public void InspectUseItem(dynamic json)\r
+        {\r
+            foreach (var entry in json)\r
+            {\r
+                _useItem[(int)entry.api_id] = (int)entry.api_count;\r
+            }\r
+        }\r
+\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
@@ -73,7 +92,7 @@ namespace KancolleSniffer.Model
             InspectSlotItem(json.api_slotitem);\r
         }\r
 \r
-        public void InspectDestroyItem(string request, dynamic json)\r
+        public void InspectDestroyItem(string request)\r
         {\r
             var values = HttpUtility.ParseQueryString(request);\r
             DeleteItems(values["api_slotitem_ids"].Split(',').Select(int.Parse).ToArray());\r
@@ -90,7 +109,7 @@ namespace KancolleSniffer.Model
 \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
@@ -99,19 +118,26 @@ 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.Concat(UseItemList).ToArray();\r
 \r
         public string GetUseItemName(int id) => _itemMaster.GetUseItemName(id);\r
 \r
+        private IEnumerable<ItemStatus> UseItemList =>\r
+            Enumerable.Repeat(new ItemStatus\r
+            {\r
+                Spec = GetSpecByItemId(ItemMaster.EmergencyRepairSpecId),\r
+                Holder = new ShipStatus()\r
+            }, _useItem.TryGetValue(ItemMaster.EmergencyRepairId, out var count) ? count : 0);\r
+\r
         public void InjectItemSpec(IEnumerable<ItemSpec> specs)\r
         {\r
             foreach (var spec in specs)\r
@@ -120,7 +146,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
@@ -130,7 +156,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