払暁戦に対応する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 4965516..493403b 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -71,10 +71,11 @@ namespace KancolleSniffer.Test
             SniffLogFile(sniffer, "battle_001");\r
             PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);\r
             AssertEqualBattleResult(sniffer,\r
-                new []{57, 66, 50, 65, 40, 42}, new []{34, 5, 0, 0, 0, 0});\r
+                new[] {57, 66, 50, 65, 40, 42}, new[] {34, 5, 0, 0, 0, 0});\r
         }\r
 \r
-        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy, string msg = null)\r
+        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy,\r
+            string msg = null)\r
         {\r
             var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);\r
             PAssert.That(() => expected.SequenceEqual(result), msg);\r
@@ -169,7 +170,7 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "escape_001");\r
             PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped &&\r
-            sniffer.GetShipStatuses(1)[2].Escaped);\r
+                               sniffer.GetShipStatuses(1)[2].Escaped);\r
         }\r
 \r
         /// <summary>\r
@@ -184,6 +185,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 払暁戦を行う\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NightToDay()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "nighttoday_001");\r
+            PAssert.That(() => sniffer.Battle.WrongResultRank.Count == 0 && sniffer.WrongBattleResult.Count == 0);\r
+        }\r
+\r
+        /// <summary>\r
         /// 出撃時に大破している艦娘がいたら警告する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index 6e131a6..9d8a9fd 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -281,6 +281,8 @@ namespace KancolleSniffer
                 new Phase("injection_kouku", CombatType.Aircraft, "噴式"),\r
                 new Phase("air_base_attack", CombatType.AirBase),\r
                 new Phase("n_support_info", CombatType.Support),\r
+                new Phase("n_hougeki1", CombatType.ByTurn),\r
+                new Phase("n_hougeki2", CombatType.ByTurn),\r
                 new Phase("kouku", CombatType.Aircraft, "航空戦"),\r
                 new Phase("kouku2", CombatType.Aircraft, "航空戦2"),\r
                 new Phase("support_info", CombatType.Support),\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 81ab223..8af70bf 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -360,6 +360,7 @@ namespace KancolleSniffer
                    url.EndsWith("api_req_combined_battle/sp_midnight") ||\r
                    url.EndsWith("api_req_combined_battle/ec_battle") ||\r
                    url.EndsWith("api_req_combined_battle/ec_midnight_battle") ||\r
+                   url.EndsWith("api_req_combined_battle/ec_night_to_day") ||\r
                    url.EndsWith("api_req_combined_battle/each_battle") ||\r
                    url.EndsWith("api_req_combined_battle/each_battle_water");\r
         }\r