From 7faab64848743f8a128a7ade77f0adb052cf8569 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Sat, 3 Feb 2018 21:43:51 +0900 Subject: [PATCH] =?utf8?q?=E8=89=A6=E9=9A=8A=E6=83=85=E5=A0=B1=E3=81=AE?= =?utf8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E5=BD=A2=E5=BC=8F=E3=81=A7?= =?utf8?q?=E8=A3=9C=E5=BC=B7=E3=82=B9=E3=83=AD=E3=83=83=E3=83=88=E3=81=8C?= =?utf8?q?=E5=85=88=E3=81=AB=E6=9D=A5=E3=82=8B=E3=81=AE=E3=82=92=E7=9B=B4?= =?utf8?q?=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/BattleInfo.cs | 2 +- KancolleSniffer/ShipStatus.cs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs index 04dddc4..14e5035 100644 --- a/KancolleSniffer/BattleInfo.cs +++ b/KancolleSniffer/BattleInfo.cs @@ -586,7 +586,7 @@ namespace KancolleSniffer _status.NowHp = 0; if (_practice) return; - foreach (var item in _status.AllSlot) + foreach (var item in new[] {_status.SlotEx}.Concat(_status.Slot)) { if (item.Spec.Id == 42) { diff --git a/KancolleSniffer/ShipStatus.cs b/KancolleSniffer/ShipStatus.cs index ca85652..c074583 100644 --- a/KancolleSniffer/ShipStatus.cs +++ b/KancolleSniffer/ShipStatus.cs @@ -53,7 +53,7 @@ namespace KancolleSniffer public int CombinedFleetType { get; set; } - public IEnumerable AllSlot => SlotEx.Id == 0 ? Slot : new[] {SlotEx}.Concat(Slot); + public IEnumerable AllSlot => SlotEx.Id == 0 ? Slot : Slot.Concat(new[] {SlotEx}); public ShipStatus() { @@ -79,7 +79,9 @@ namespace KancolleSniffer if (now == 0 && max > 0) return Damage.Sunk; var ratio = max == 0 ? 1 : (double)now / max; - return ratio > 0.75 ? Damage.Minor : ratio > 0.5 ? Damage.Small : ratio > 0.25 ? Damage.Half : Damage.Badly; + return ratio > 0.75 ? Damage.Minor : + ratio > 0.5 ? Damage.Small : + ratio > 0.25 ? Damage.Half : Damage.Badly; } public TimeSpan RepairTime => TimeSpan.FromSeconds((int)(RepairTimePerHp.TotalSeconds * (MaxHp - NowHp)) + 30); -- 2.11.0