戦闘後のHPの矛盾と勝利判定の矛盾を一度に確認する

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index 47d1c42..5eaf884 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -97,7 +97,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "practice_001");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -108,7 +108,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "practice_002");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -130,7 +130,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "combined_battle_001");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -141,7 +141,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "combined_battle_002");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -152,7 +152,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "combined_battle_003");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -176,7 +176,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "sp_midnight_002");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -187,7 +187,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "nighttoday_001");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError && !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -211,7 +211,7 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "escape_002");\r
             PAssert.That(() => sniffer.Fleets[2].Ships[1].Escaped);\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
 \r
         /// <summary>\r
@@ -255,7 +255,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "nelsontouch_001");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
             PAssert.That(() => sniffer.Battle.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);\r
             PAssert.That(() => sniffer.Fleets[0].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);\r
             // ship_deckでフラグを引き継ぐ\r
@@ -273,7 +273,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "nagatospecial_001");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
             PAssert.That(() => sniffer.Battle.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);\r
             PAssert.That(() => sniffer.Fleets[0].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);\r
         }\r
@@ -286,8 +286,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "ld_shooting_001");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+            PAssert.That(() => !sniffer.IsBattleResultError);\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 5bb606a..0c12769 100644 (file)
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -18,7 +18,6 @@ using System.IO;
 using System.IO.Compression;\r
 using System.Linq;\r
 using System.Text;\r
-using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
 using KancolleSniffer.Model;\r
 using KancolleSniffer.Util;\r
@@ -52,7 +51,7 @@ namespace KancolleSniffer
                 }\r
                 else if (_prevBattleState == BattleState.Result &&\r
                          // battleresultのあとのship_deckかportでのみエラー判定する\r
-                         IsBattleResultError)\r
+                         _sniffer.IsBattleResultError)\r
                 {\r
                     throw new BattleResultError();\r
                 }\r
@@ -63,9 +62,6 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private bool IsBattleResultError =>\r
-            _sniffer.Battle.DisplayedResultRank.IsError || _sniffer.IsBattleResultStatusError;\r
-\r
         public string GenerateBattleErrorLog()\r
         {\r
             foreach (var logs in _battleApiLog)\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index cafc9e1..28dc70d 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -639,7 +639,7 @@ namespace KancolleSniffer
 \r
         public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;\r
 \r
-        public bool IsBattleResultStatusError => _shipInfo.IsBattleResultError;\r
+        public bool IsBattleResultError => _shipInfo.IsBattleResultError || _battleInfo.DisplayedResultRank.IsError;\r
 \r
         public ShipStatus[] BattleStartStatus => _shipInfo.BattleStartStatus;\r
 \r