複数項目こなす任務のカウンターのツールチップの仕様を変更する

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 961f1ba..876b749 100644 (file)
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -146,38 +146,38 @@ namespace KancolleSniffer.Test
             Assert.AreEqual("20/36 7/6 10/24 8/12", status.QuestCountList[1].ToString());\r
             var z = status.QuestCountList[2];\r
             Assert.AreEqual("2\u200a1\u200a1\u200a1", z.ToString());\r
-            Assert.AreEqual("2-4 6-1 6-3 6-4", z.ToToolTip());\r
+            Assert.AreEqual("2-4:2 6-1:1 6-3:1 6-4:1", z.ToToolTip());\r
             z.NowArray = new[] {0, 0, 0, 0};\r
-            Assert.AreEqual("", z.ToToolTip());\r
+            Assert.AreEqual("2-4:0 6-1:0 6-3:0 6-4:0", z.ToToolTip());\r
             var q426 = status.QuestCountList[3];\r
             Assert.AreEqual("1\u200a1\u200a1\u200a1", q426.ToString());\r
-            Assert.AreEqual("警備任務 対潜警戒任務 海上護衛任務 強硬偵察任務", q426.ToToolTip());\r
+            Assert.AreEqual("警備任務1 対潜警戒任務1 海上護衛任務1 強硬偵察任務1", q426.ToToolTip());\r
             var q428 = status.QuestCountList[4];\r
             Assert.AreEqual("対潜警戒任務1 海峡警備行動1 長時間対潜警戒1", q428.ToToolTip());\r
             q428.NowArray = new[] {0, 1, 0};\r
-            Assert.AreEqual("海峡警備行動1", q428.ToToolTip());\r
+            Assert.AreEqual("対潜警戒任務0 海峡警備行動1 長時間対潜警戒0", q428.ToToolTip());\r
             var q873 = status.QuestCountList[5];\r
             Assert.AreEqual("1\u200a1\u200a1", q873.ToString());\r
-            Assert.AreEqual("3-1 3-2 3-3", q873.ToToolTip());\r
+            Assert.AreEqual("3-1:1 3-2:1 3-3:1", q873.ToToolTip());\r
             var q888 = status.QuestCountList[6];\r
             Assert.AreEqual("1\u200a1\u200a1", q888.ToString());\r
-            Assert.AreEqual("5-1 5-3 5-4", q888.ToToolTip());\r
+            Assert.AreEqual("5-1:1 5-3:1 5-4:1", q888.ToToolTip());\r
             var q688 = status.QuestCountList[7];\r
             Assert.AreEqual("艦戦2 艦爆1 艦攻2 水偵1", q688.ToToolTip());\r
             var q893 = status.QuestCountList[8];\r
             Assert.AreEqual("1-5:1 7-1:1 7-2G:1 7-2M:1", q893.ToToolTip());\r
             var q894 = status.QuestCountList[9];\r
             Assert.AreEqual("1\u200a1\u200a1\u200a1\u200a1", q894.ToString());\r
-            Assert.AreEqual("1-3 1-4 2-1 2-2 2-3", q894.ToToolTip());\r
+            Assert.AreEqual("1-3:1 1-4:1 2-1:1 2-2:1 2-3:1", q894.ToToolTip());\r
             var q280 = status.QuestCountList[10];\r
             Assert.AreEqual("1\u200a1\u200a1\u200a1", q280.ToString());\r
-            Assert.AreEqual("1-2 1-3 1-4 2-1", q280.ToToolTip());\r
+            Assert.AreEqual("1-2:1 1-3:1 1-4:1 2-1:1", q280.ToToolTip());\r
             var q872 = status.QuestCountList.First(q => q.Id == 872);\r
             Assert.AreEqual("1\u200a1\u200a1\u200a1", q872.ToString());\r
-            Assert.AreEqual("7-2M 5-5 6-2 6-5", q872.ToToolTip());\r
+            Assert.AreEqual("7-2M:1 5-5:1 6-2:1 6-5:1", q872.ToToolTip());\r
             var q284 = status.QuestCountList.First(q => q.Id == 284);\r
             Assert.AreEqual("1\u200a1\u200a1\u200a1", q284.ToString());\r
-            Assert.AreEqual("1-4 2-1 2-2 2-3", q284.ToToolTip());\r
+            Assert.AreEqual("1-4:1 2-1:1 2-2:1 2-3:1", q284.ToToolTip());\r
             var q226 = status.QuestCountList.First(q => q.Id == 226);\r
             Assert.AreEqual("2/5", q226.ToString());\r
             Assert.AreEqual("", q226.ToToolTip());\r

diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs
index 9c47c06..2f7b0f5 100644 (file)
--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -113,26 +113,19 @@ namespace KancolleSniffer.Model
 \r
         public string ToToolTip()\r
         {\r
+            if (NowArray == null)\r
+                return "";\r
             if (Spec is QuestSortie spec && spec.Maps != null && spec.MaxArray != null)\r
             {\r
-                var flags = spec.MaxArray.All(x => x == 1);\r
-                return string.Join(" ",\r
-                    spec.Maps.Zip(NowArray, (map, n) => n >= 1 ? $"{MapString(map)}{(flags ? "" : $":{n}")}" : "")\r
-                    .Where(s => !string.IsNullOrEmpty(s)));\r
+                return string.Join(" ", spec.Maps.Zip(NowArray, (map, n) => $"{MapString(map)}:{n}"));\r
             }\r
-            return Id switch\r
+            return string.Join(" ", (Id switch\r
             {\r
-                426 => string.Join(" ",\r
-                    new[] {"警備任務", "対潜警戒任務", "海上護衛任務", "強硬偵察任務"}.Zip(NowArray, (mission, n) => n >= 1 ? mission : "")\r
-                        .Where(s => !string.IsNullOrEmpty(s))),\r
-                428 => string.Join(" ",\r
-                    new[] {"対潜警戒任務", "海峡警備行動", "長時間対潜警戒"}.Zip(NowArray, (mission, n) => n >= 1 ? mission + n : "")\r
-                        .Where(s => !string.IsNullOrEmpty(s))),\r
-                688 => string.Join(" ",\r
-                    new[] {"艦戦", "艦爆", "艦攻", "水偵"}.Zip(NowArray, (type, n) => n >= 1 ? type + n : "")\r
-                        .Where(s => !string.IsNullOrEmpty(s))),\r
-                _ => ""\r
-            };\r
+                426 => new[] {"警備任務", "対潜警戒任務", "海上護衛任務", "強硬偵察任務"},\r
+                428 => new[] {"対潜警戒任務", "海峡警備行動", "長時間対潜警戒"},\r
+                688 => new[] {"艦戦", "艦爆", "艦攻", "水偵"},\r
+                _ => new string[0]\r
+            }).Zip(NowArray, (entry, n) => $"{entry}{n}"));\r
         }\r
 \r
         public bool Cleared => NowArray?.Zip(Spec.MaxArray, (n, m) => n >= m).All(x => x) ??\r