ボス前で空襲戦があるとボス戦で大破警告が出るのを直す

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index cb9257e..bab45b5 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -380,5 +380,18 @@ namespace KancolleSniffer.Test
             var ships = battle.Result.Friend.Main;\r
             Assert.IsTrue(new[] {82, 174, 147}.SequenceEqual(ships.Select(ship => ship.NowHp)));\r
         }\r
+\r
+        /// <summary>\r
+        /// 基地航空戦直後のボス戦\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void AirRaidBattleBeforeBoss()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "airraid_battle_004");\r
+            var battle = sniffer.Battle;\r
+            Assert.AreEqual(BattleState.Result, battle.BattleState);\r
+            Assert.AreEqual(0, sniffer.BadlyDamagedShips.Length);\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index c1608a1..90ec01a 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit c1608a1e015ee3bf30a6bf726b06e6e6b3842969
+Subproject commit 90ec01acb709b2bef390d427b765aa0b08c48c10

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index 403050f..1ed857f 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -115,6 +115,7 @@ namespace KancolleSniffer.Model
         public void Port()\r
         {\r
             CleanupResult();\r
+            _lastCell = false;\r
             BattleState = BattleState.None;\r
         }\r
 \r
@@ -260,7 +261,6 @@ namespace KancolleSniffer.Model
         private void CleanupResult()\r
         {\r
             _friend = null;\r
-            _lastCell = false;\r
         }\r
 \r
         private void SetFighterPower()\r