From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 22 Oct 2017 08:35:00 +0000 (+0900)
Subject: 修復時間が1分以内の入渠で艦娘が即座に回復するのを反映する
X-Git-Tag: v9.27~3
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=ceef9716570d8d5518ccfb47875d1a6220e2ec43

修復時間が1分以内の入渠で艦娘が即座に回復するのを反映する
---

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 1686f59..6eb6186 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -1052,6 +1052,17 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 修復時間が1分以内の艦娘が入渠する
+        /// </summary>
+        [TestMethod]
+        public void NyukyoLessThanOrEqualTo1Min()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "nyukyo_001");
+            PAssert.That(() => sniffer.RepairList.Length == 1);
+        }
+
+        /// <summary>
         /// 海域ゲージ情報を作成する
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index f6a8d89..72620e9 160000
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit f6a8d898f9f33e4dd24b7f63c82f328445e82e63
+Subproject commit 72620e9309d9bffaf76504a9c5877cb75c00d7cd
diff --git a/KancolleSniffer/DockInfo.cs b/KancolleSniffer/DockInfo.cs
index e1414bb..744d6c8 100644
--- a/KancolleSniffer/DockInfo.cs
+++ b/KancolleSniffer/DockInfo.cs
@@ -53,13 +53,18 @@ namespace KancolleSniffer
         {
             var values = HttpUtility.ParseQueryString(request);
             var id = int.Parse(values["api_ship_id"]);
-            var m = _shipInfo.GetStatus(id).NdockItem;
+            var ship = _shipInfo.GetStatus(id);
+            var m = ship.NdockItem;
             _materialInfo.SubMaterial(Material.Fuel, m[0]);
             _materialInfo.SubMaterial(Material.Steal, m[1]);
-            if (int.Parse(values["api_highspeed"]) == 0)
+            if (int.Parse(values["api_highspeed"]) == 1)
+            {
+                _shipInfo.RepairShip(id);
+                _materialInfo.SubMaterial(Material.Bucket, 1);
                 return;
-            _shipInfo.RepairShip(id);
-            _materialInfo.SubMaterial(Material.Bucket, 1);
+            }
+            if (ship.RepairTime.CompareTo(TimeSpan.FromMinutes(1)) <= 0)
+                _shipInfo.RepairShip(id);
         }
 
         public void InspectSpeedChange(string request)