解体の一括解体と装備保管に対応する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 31c8199..480ac46 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -647,5 +647,18 @@ namespace KancolleSniffer.Test
             SniffLogFile(sniffer, "nyukyo_001");\r
             PAssert.That(() => sniffer.RepairList.Length == 1);\r
         }\r
+\r
+        /// <summary>\r
+        /// 一括解体する(装備保管なしとあり)\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void DestroyShip()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "destroyship_001");\r
+            PAssert.That(() => sniffer.Item.NowShips == 250);\r
+            PAssert.That(() => sniffer.Item.NowEquips == 1118);\r
+            PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index c3b3e41..db10704 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit c3b3e410489d0b02b9a6cb5a1e261c5b5f596c13
+Subproject commit db107042fc086e42a82afb693c2a5052993a82fd

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 1950b27..6dc696b 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -298,13 +298,17 @@ namespace KancolleSniffer
         public void InspectDestroyShip(string request, dynamic json)\r
         {\r
             var values = HttpUtility.ParseQueryString(request);\r
-            var ship = int.Parse(values["api_ship_id"]);\r
-            _itemInfo.NowShips--;\r
-            _itemInfo.DeleteItems(_shipInfo[ship].Slot);\r
-            var of = FindFleet(ship, out var oi);\r
-            if (of != -1)\r
-                WithdrowShip(of, oi);\r
-            _shipInfo.Remove(ship);\r
+            var delitem = int.Parse(values["api_slot_dest_flag"] ?? "0") == 1;\r
+            foreach (var ship in values["api_ship_id"].Split(',').Select(int.Parse))\r
+            {\r
+                _itemInfo.NowShips--;\r
+                if (delitem)\r
+                    _itemInfo.DeleteItems(_shipInfo[ship].Slot);\r
+                var of = FindFleet(ship, out var oi);\r
+                if (of != -1)\r
+                    WithdrowShip(of, oi);\r
+                _shipInfo.Remove(ship);\r
+            }\r
         }\r
 \r
         public void InspectCombined(string request)\r