OSDN Git Service

空襲戦で女神で復活すると勝利判定がくるうのを直す
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Mon, 19 Mar 2018 11:01:55 +0000 (20:01 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Mon, 19 Mar 2018 12:24:10 +0000 (21:24 +0900)
KancolleSniffer.Test/BattleTest.cs
KancolleSniffer.Test/logs
KancolleSniffer/BattleInfo.cs

index d0b75f0..e9e0c19 100644 (file)
@@ -99,5 +99,19 @@ namespace KancolleSniffer.Test
             _battleInfo.InspectBattleResult(Data(logs[6]));\r
             PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
         }\r
+\r
+        /// <summary>\r
+        /// 空襲戦で女神が発動して復活する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void LdAirbattleHaveRevivedShip()\r
+        {\r
+            var logs = ReadAllLines("ld_airbattle_002");\r
+            var battle = Data(logs[3]);\r
+            _shipInfo.InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattleResult(Data(logs[6]));\r
+            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+        }\r
     }\r
 }
\ No newline at end of file
index 359c1bd..f928f55 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 359c1bdaac80b0630b3301e04c165a45044b10e2
+Subproject commit f928f55f2d3299e981e25b57426f46b8f4c2b7a0
index 6267c0e..8f9d53f 100644 (file)
@@ -629,7 +629,7 @@ namespace KancolleSniffer
             var friendGauge = combined.Sum(r => r.StartHp - r.NowHp);\r
             var friendGaugeRate = Floor((double)friendGauge / combined.Sum(r => r.StartHp) * 100);\r
 \r
-            if (friendGauge == 0)\r
+            if (friendGauge <= 0)\r
                 return BattleResultRank.P;\r
             if (friendGaugeRate < 10)\r
                 return BattleResultRank.A;\r