From 0899644b800ca78119a84384aa46b4da5b4c2bbd Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Thu, 18 Jan 2018 00:36:02 +0900
Subject: [PATCH] =?utf8?q?ship2=E3=81=A7=E4=B8=80=E9=9A=BB=E5=88=86?=
 =?utf8?q?=E3=81=AE=E3=83=87=E3=83=BC=E3=82=BF=E3=81=97=E3=81=8B=E6=9D=A5?=
 =?utf8?q?=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB=E5=AF=BE=E5=BF=9C?=
 =?utf8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/SnifferTest.cs | 11 +++++++++++
 KancolleSniffer.Test/logs           |  2 +-
 KancolleSniffer/ShipInfo.cs         |  3 +--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index ce9ff1d..e0ab9d3 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -672,5 +672,16 @@ namespace KancolleSniffer.Test
             var expected = Enumerable.Repeat(new ChargeStatus(5, 5), ShipInfo.FleetCount);
             PAssert.That(() => expected.SequenceEqual(sniffer.ChargeStatuses));
         }
+
+        /// <summary>
+        /// ship2がリクエストで指定した艦娘のデータしか返さない
+        /// </summary>
+        [TestMethod]
+        public void Ship2ReturnShipSpecifiedByRequest()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "ship2_001");
+            PAssert.That(() => sniffer.Item.NowShips == 243);
+        }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index aa1d9f8..f9012c8 160000
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit aa1d9f836f05d30e5166a8d3781c27653a67e9ba
+Subproject commit f9012c80155a0960371c5519888496d58cbb4c30
diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index ba8cacb..2b66b02 100644
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -111,10 +111,9 @@ namespace KancolleSniffer
             }
             else if (json.api_data()) // ship2
             {
-                ClearShipInfo();
+                // 一隻分のデータしか来ないことがあるので艦娘数を数えない
                 InspectDeck(json.api_data_deck);
                 InspectShipData(json.api_data);
-                _itemInfo.NowShips = ((object[])json.api_data).Length;
             }
             else if (json.api_ship_data()) // ship3とship_deck
             {
-- 
2.11.0