From 8b5b8dbf9a23c34066ef5bacc6a0a69d55d4d0d5 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Tue, 28 Nov 2017 20:48:54 +0900
Subject: [PATCH] =?utf8?q?=E6=89=95=E6=9A=81=E6=88=A6=E3=81=AB=E5=AF=BE?=
 =?utf8?q?=E5=BF=9C=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/SnifferTest.cs | 18 +++++++++++++++---
 KancolleSniffer/BattleInfo.cs       |  2 ++
 KancolleSniffer/Sniffer.cs          |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 4965516..493403b 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -71,10 +71,11 @@ namespace KancolleSniffer.Test
             SniffLogFile(sniffer, "battle_001");
             PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
             AssertEqualBattleResult(sniffer,
-                new []{57, 66, 50, 65, 40, 42}, new []{34, 5, 0, 0, 0, 0});
+                new[] {57, 66, 50, 65, 40, 42}, new[] {34, 5, 0, 0, 0, 0});
         }
 
-        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy, string msg = null)
+        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy,
+            string msg = null)
         {
             var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
             PAssert.That(() => expected.SequenceEqual(result), msg);
@@ -169,7 +170,7 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "escape_001");
             PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped &&
-            sniffer.GetShipStatuses(1)[2].Escaped);
+                               sniffer.GetShipStatuses(1)[2].Escaped);
         }
 
         /// <summary>
@@ -184,6 +185,17 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 払暁戦を行う
+        /// </summary>
+        [TestMethod]
+        public void NightToDay()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "nighttoday_001");
+            PAssert.That(() => sniffer.Battle.WrongResultRank.Count == 0 && sniffer.WrongBattleResult.Count == 0);
+        }
+
+        /// <summary>
         /// 出撃時に大破している艦娘がいたら警告する
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index 6e131a6..9d8a9fd 100644
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -281,6 +281,8 @@ namespace KancolleSniffer
                 new Phase("injection_kouku", CombatType.Aircraft, "噴式"),
                 new Phase("air_base_attack", CombatType.AirBase),
                 new Phase("n_support_info", CombatType.Support),
+                new Phase("n_hougeki1", CombatType.ByTurn),
+                new Phase("n_hougeki2", CombatType.ByTurn),
                 new Phase("kouku", CombatType.Aircraft, "航空戦"),
                 new Phase("kouku2", CombatType.Aircraft, "航空戦2"),
                 new Phase("support_info", CombatType.Support),
diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 81ab223..8af70bf 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -360,6 +360,7 @@ namespace KancolleSniffer
                    url.EndsWith("api_req_combined_battle/sp_midnight") ||
                    url.EndsWith("api_req_combined_battle/ec_battle") ||
                    url.EndsWith("api_req_combined_battle/ec_midnight_battle") ||
+                   url.EndsWith("api_req_combined_battle/ec_night_to_day") ||
                    url.EndsWith("api_req_combined_battle/each_battle") ||
                    url.EndsWith("api_req_combined_battle/each_battle_water");
         }
-- 
2.11.0