From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Fri, 28 Sep 2018 12:30:26 +0000 (+0900)
Subject: 女神の発動で完全Sになるはずの判定がSになるのを直す
X-Git-Tag: v11.8~8
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=6deba8987d650daa4b875597ba557e1450f67733

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

This reverts commit 639a75e677c15dbebaa8db30218b242887bda06f.
---

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