From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 29 Dec 2018 08:31:06 +0000 (+0900)
Subject: 戦闘後のHPの矛盾と勝利判定の矛盾を一度に確認する
X-Git-Tag: v11.13~1
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=0276486e3caca82fa5e4ee3e32b202be90d71c50

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

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index 47d1c42..5eaf884 100644
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -97,7 +97,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "practice_001");
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -108,7 +108,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "practice_002");
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -130,7 +130,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "combined_battle_001");
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -141,7 +141,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "combined_battle_002");
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -152,7 +152,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "combined_battle_003");
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -176,7 +176,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "sp_midnight_002");
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -187,7 +187,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "nighttoday_001");
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError && !sniffer.IsBattleResultStatusError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -211,7 +211,7 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "escape_002");
             PAssert.That(() => sniffer.Fleets[2].Ships[1].Escaped);
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
 
         /// <summary>
@@ -255,7 +255,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "nelsontouch_001");
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
             PAssert.That(() => sniffer.Battle.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);
             PAssert.That(() => sniffer.Fleets[0].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);
             // ship_deckでフラグを引き継ぐ
@@ -273,7 +273,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "nagatospecial_001");
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
             PAssert.That(() => sniffer.Battle.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);
             PAssert.That(() => sniffer.Fleets[0].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);
         }
@@ -286,8 +286,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "ld_shooting_001");
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
+            PAssert.That(() => !sniffer.IsBattleResultError);
         }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 5bb606a..0c12769 100644
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -18,7 +18,6 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using KancolleSniffer.Model;
 using KancolleSniffer.Util;
@@ -52,7 +51,7 @@ namespace KancolleSniffer
                 }
                 else if (_prevBattleState == BattleState.Result &&
                          // battleresultのあとのship_deckかportでのみエラー判定する
-                         IsBattleResultError)
+                         _sniffer.IsBattleResultError)
                 {
                     throw new BattleResultError();
                 }
@@ -63,9 +62,6 @@ namespace KancolleSniffer
             }
         }
 
-        private bool IsBattleResultError =>
-            _sniffer.Battle.DisplayedResultRank.IsError || _sniffer.IsBattleResultStatusError;
-
         public string GenerateBattleErrorLog()
         {
             foreach (var logs in _battleApiLog)
diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index cafc9e1..28dc70d 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -639,7 +639,7 @@ namespace KancolleSniffer
 
         public ShipInfo.ShipStatusPair[] BattleResultStatusDiff => _shipInfo.BattleResultDiff;
 
-        public bool IsBattleResultStatusError => _shipInfo.IsBattleResultError;
+        public bool IsBattleResultError => _shipInfo.IsBattleResultError || _battleInfo.DisplayedResultRank.IsError;
 
         public ShipStatus[] BattleStartStatus => _shipInfo.BattleStartStatus;