From: Kazuhiro Fujieda Date: Thu, 26 Nov 2015 13:39:40 +0000 (+0900) Subject: 大破したときにダメコン・女神の有無を表示する X-Git-Tag: v7.8~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=215e7dc67581ef09bcf9e0bc4e81ca001ab64f6b;p=kancollesniffer%2FKancolleSniffer.git 大破したときにダメコン・女神の有無を表示する --- diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs index 8882699..e443536 100644 --- a/KancolleSniffer/ShipInfo.cs +++ b/KancolleSniffer/ShipInfo.cs @@ -146,6 +146,13 @@ namespace KancolleSniffer return (int)(bonus * (vanilla / 5 + all * 2 + (aircraft > 0 ? 10 : 25))); } } + + public int PreparedDamageControl => + (DamageLevel < Damage.Badly) + ? -1 + : SlotEx.Spec.Id == 42 || SlotEx.Spec.Id == 43 + ? SlotEx.Spec.Id + : Slot.FirstOrDefault(item => item.Spec.Id == 42 || item.Spec.Id == 43)?.Spec.Id ?? -1; } public struct ChargeStatus diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs index e654daf..4a8fcbe 100644 --- a/KancolleSniffer/ShipLabels.cs +++ b/KancolleSniffer/ShipLabels.cs @@ -334,7 +334,9 @@ namespace KancolleSniffer public void SetName(ShipStatus status) { - SetName((status.Escaped ? "[避]" : "") + status.Name); + var dc = status.PreparedDamageControl; + var dcname = dc == 42 ? "[ダ]" : dc == 43 ? "[メ]" : ""; + SetName((status.Escaped ? "[避]" : dcname) + status.Name); } public void SetName(string name)