| リビジョン | 6deba8987d650daa4b875597ba557e1450f67733 (tree) |
|---|---|
| 日時 | 2018-09-28 21:30:26 |
| 作者 | Kazuhiro Fujieda <fujieda@user...> |
| コミッター | Kazuhiro Fujieda |
女神の発動で完全Sになるはずの判定がSになるのを直す
This reverts commit 639a75e677c15dbebaa8db30218b242887bda06f.
KancolleSniffer/Model/BattleInfo.cs (diff)| @@ -567,7 +567,6 @@ namespace KancolleSniffer.Model | ||
| 567 | 567 | public ShipStatus.Damage DamageLevel => _status.DamageLevel; |
| 568 | 568 | public string Name => _status.Name; |
| 569 | 569 | public int StartHp { get; private set; } |
| 570 | - public bool GoddessConsumed { get; private set; } | |
| 571 | 570 | |
| 572 | 571 | public static Record[] Setup(IEnumerable<ShipStatus> ships, bool practice) => |
| 573 | 572 | (from s in ships |
| @@ -613,7 +612,6 @@ namespace KancolleSniffer.Model | ||
| 613 | 612 | { |
| 614 | 613 | _status.NowHp = _status.MaxHp; |
| 615 | 614 | ConsumeSlotItem(_status, 43); |
| 616 | - GoddessConsumed = true; | |
| 617 | 615 | break; |
| 618 | 616 | } |
| 619 | 617 | } |
| @@ -655,7 +653,6 @@ namespace KancolleSniffer.Model | ||
| 655 | 653 | var friendStartHpTotal = 0; |
| 656 | 654 | var friendNowHpTotal = 0; |
| 657 | 655 | var friendSunk = 0; |
| 658 | - var goddessConsumed = false; | |
| 659 | 656 | foreach (var ship in friend) |
| 660 | 657 | { |
| 661 | 658 | if (ship.Escaped) |
| @@ -664,7 +661,6 @@ namespace KancolleSniffer.Model | ||
| 664 | 661 | friendNowHpTotal += ship.NowHp; |
| 665 | 662 | if (ship.NowHp == 0) |
| 666 | 663 | friendSunk++; |
| 667 | - goddessConsumed |= ship.GoddessConsumed; | |
| 668 | 664 | } |
| 669 | 665 | var friendGaugeRate = (int)((double)(friendStartHpTotal - friendNowHpTotal) / friendStartHpTotal * 100); |
| 670 | 666 |
| @@ -676,7 +672,7 @@ namespace KancolleSniffer.Model | ||
| 676 | 672 | |
| 677 | 673 | if (friendSunk == 0 && enemySunk == enemyCount) |
| 678 | 674 | { |
| 679 | - if (friendNowHpTotal == friendStartHpTotal && !goddessConsumed) | |
| 675 | + if (friendNowHpTotal >= friendStartHpTotal) | |
| 680 | 676 | return BattleResultRank.P; |
| 681 | 677 | return BattleResultRank.S; |
| 682 | 678 | } |
KancolleSniffer
Fork