From e0fe8b4e5a66eb997c011b8d72d51cf9a59dc57c Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Mon, 18 May 2015 19:59:06 +0900
Subject: [PATCH] =?utf8?q?ship2=E3=81=AB=E4=BB=A3=E3=82=8F=E3=82=8Bship=5F?=
 =?utf8?q?deck=E3=82=92=E5=87=A6=E7=90=86=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/ShipInfo.cs         |  2 +-
 KancolleSniffer/Sniffer.cs          |  7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 8c6b92a..019a9aa 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -255,6 +255,17 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// ship2に代わるship_deckを処理する
+        /// </summary>
+        [TestMethod]
+        public void ShipDeck()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "ship_deck_001");
+            PAssert.That(() => sniffer.GetShipStatuses(0)[0].Fuel == 36);
+        }
+
+        /// <summary>
         /// 編成で空き番号を使ったローテートを正しく反映する
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 410ab5d..cff56fb 100644
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -239,7 +239,7 @@ namespace KancolleSniffer
                 InspectShipData(json.api_data);
                 _itemInfo.NowShips = ((object[])json.api_data).Length;
             }
-            else if (json.api_ship_data()) // ship3
+            else if (json.api_ship_data()) // ship3とship_deck
             {
                 // 一隻分のデータしか来ないことがあるので艦娘数を数えない
                 InspectDeck(json.api_deck_data);
diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index c24e701..2a72247 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -167,6 +167,13 @@ namespace KancolleSniffer
                 _battleInfo.InBattle = false;
                 return Update.Item | Update.Ship | Update.Battle;
             }
+            if (url.EndsWith("api_get_member/ship_deck"))
+            {
+                _shipInfo.InspectShip(data);
+                _akashiTimer.SetTimer();
+                _battleInfo.InBattle = false;
+                return Update.Ship | Update.Battle;
+            }
             if (url.EndsWith("api_get_member/ship3"))
             {
                 _shipInfo.InspectShip(data);
-- 
2.11.0