レーダー射撃戦の勝利判定を間違えるのを直す

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index 88af54b..47d1c42 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -286,7 +286,8 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "ld_shooting_001");\r
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "ld_shooting_001");\r

-            PAssert.That(() => sniffer.Battle.Result.Friend.Main[0].NowHp == 44);\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r

         }\r
     }\r
 }
\ No newline at end of file
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index 2d5d0ac..a3ca5fa 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -111,7 +111,7 @@ namespace KancolleSniffer.Model
             BattleState = url.Contains("sp_midnight") ? BattleState.SpNight :\r
                 url.Contains("midnight") ? BattleState.Night : BattleState.Day;\r
             CalcDamage(json);\r
             BattleState = url.Contains("sp_midnight") ? BattleState.SpNight :\r
                 url.Contains("midnight") ? BattleState.Night : BattleState.Day;\r
             CalcDamage(json);\r

-            ResultRank = url.EndsWith("ld_airbattle") ? CalcLdAirBattleRank() : CalcResultRank();\r
+            ResultRank = url.Contains("/ld_") ? CalcLdResultRank() : CalcResultRank();\r

             SetResult();\r
         }\r
 \r
             SetResult();\r
         }\r
 \r


@@ -637,7 +637,7 @@ namespace KancolleSniffer.Model
             }\r
         }\r
 \r
             }\r
         }\r
 \r

-        private BattleResultRank CalcLdAirBattleRank()\r
+        private BattleResultRank CalcLdResultRank()\r

         {\r
             var combined = _friend.Concat(_guard).Where(r => !r.Escaped).ToArray();\r
             var friendGauge = combined.Sum(r => r.StartHp - r.NowHp);\r
         {\r
             var combined = _friend.Concat(_guard).Where(r => !r.Escaped).ToArray();\r
             var friendGauge = combined.Sum(r => r.StartHp - r.NowHp);\r