艦隊情報のツールチップに夜間触接発動率を表示する

diff --git a/KancolleSniffer/View/FleetSpec.cs b/KancolleSniffer/View/FleetSpec.cs
index 58c4df5..356bb89 100644 (file)
--- a/KancolleSniffer/View/FleetSpec.cs
+++ b/KancolleSniffer/View/FleetSpec.cs
@@ -159,7 +159,8 @@ namespace KancolleSniffer.View
                 {\r
                     var fleet = fleets[number];\r
                     Fleet = new[] {"第一", "第二", "第三", "第四"}[number] + " " + SpeedName(fleet) + "   " + SpecTotal(fleet);\r
-                    Fleet2 = FleetParams(fleet) + GetTp(fleets, number);\r
+                    Fleet2 = Concat(FleetParams(fleet),\r
+                        Concat(GetTp(fleets, number), GetNightContact(fleet), " "), "\r\n");\r
                 }\r
 \r
                 private static string SpeedName(Fleet fleet)\r
@@ -168,6 +169,11 @@ namespace KancolleSniffer.View
                     return new[] {"", "低速", "高速", "高速+", "最速"}[(speed ?? 0) / 5];\r
                 }\r
 \r
+                private static string Concat(string a, string b, string separator)\r
+                {\r
+                    return a == "" ? b : b == "" ? a : a + separator + b;\r
+                }\r
+\r
                 private static string GetTp(IReadOnlyList<Fleet> fleets, int number)\r
                 {\r
                     var tp = fleets[number].TransportPoint;\r
@@ -178,7 +184,12 @@ namespace KancolleSniffer.View
                         else if (number == 1)\r
                             return "";\r
                     }\r
-                    return $"\r\nTP:S{(int)tp} A{(int)(tp * 0.7)}";\r
+                    return $"TP:S{(int)tp} A{(int)(tp * 0.7)}";\r
+                }\r
+\r
+                private static string GetNightContact(Fleet fleet)\r
+                {\r
+                    return fleet.NightContactTriggerRate > 0 ? $"夜偵:{fleet.NightContactTriggerRate}%" : "";\r
                 }\r
 \r
                 private static string SpecTotal(Fleet fleet)\r