女神の発動で完全Sになるはずの判定がSになるのを直す

This reverts commit 639a75e677c15dbebaa8db30218b242887bda06f.

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index de4487d..1f33776 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -567,7 +567,6 @@ namespace KancolleSniffer.Model
             public ShipStatus.Damage DamageLevel => _status.DamageLevel;\r
             public string Name => _status.Name;\r
             public int StartHp { get; private set; }\r
-            public bool GoddessConsumed { get; private set; }\r
 \r
             public static Record[] Setup(IEnumerable<ShipStatus> ships, bool practice) =>\r
             (from s in ships\r
@@ -613,7 +612,6 @@ namespace KancolleSniffer.Model
                     {\r
                         _status.NowHp = _status.MaxHp;\r
                         ConsumeSlotItem(_status, 43);\r
-                        GoddessConsumed = true;\r
                         break;\r
                     }\r
                 }\r
@@ -655,7 +653,6 @@ namespace KancolleSniffer.Model
             var friendStartHpTotal = 0;\r
             var friendNowHpTotal = 0;\r
             var friendSunk = 0;\r
-            var goddessConsumed = false;\r
             foreach (var ship in friend)\r
             {\r
                 if (ship.Escaped)\r
@@ -664,7 +661,6 @@ namespace KancolleSniffer.Model
                 friendNowHpTotal += ship.NowHp;\r
                 if (ship.NowHp == 0)\r
                     friendSunk++;\r
-                goddessConsumed |= ship.GoddessConsumed;\r
             }\r
             var friendGaugeRate = (int)((double)(friendStartHpTotal - friendNowHpTotal) / friendStartHpTotal * 100);\r
 \r
@@ -676,7 +672,7 @@ namespace KancolleSniffer.Model
 \r
             if (friendSunk == 0 && enemySunk == enemyCount)\r
             {\r
-                if (friendNowHpTotal == friendStartHpTotal && !goddessConsumed)\r
+                if (friendNowHpTotal >= friendStartHpTotal)\r
                     return BattleResultRank.P;\r
                 return BattleResultRank.S;\r
             }\r