対象マップを複数回攻略するとZ作戦のカウンタがくるうのを直す

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index bdb85ba..b72a6d2 100644 (file)
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -615,7 +615,7 @@ namespace KancolleSniffer.Test
                 {\r
                     new QuestCount {Id = 211, Now = 2},\r
                     new QuestCount {Id = 214, NowArray = new[] {20, 7, 10, 8}},\r
-                    new QuestCount {Id = 854, NowArray = new[] {1, 1, 1, 1}}\r
+                    new QuestCount {Id = 854, NowArray = new[] {2, 1, 1, 1}}\r
                 }\r
             };\r
             questInfo.LoadState(status);\r

diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/QuestInfo.cs
index c5abd21..4515ced 100644 (file)
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/QuestInfo.cs
@@ -161,7 +161,7 @@ namespace KancolleSniffer
         public override string ToString()\r
         {\r
             if (Id == 854)\r
-                return $"{NowArray.Count(n => n == 1)}/{Spec.MaxArray.Length}";\r
+                return $"{NowArray.Count(n => n >= 1)}/{Spec.MaxArray.Length}";\r
             return NowArray != null\r
                 ? string.Join(" ", NowArray.Zip(Spec.MaxArray, (n, m) => $"{n}/{m}"))\r
                 : $"{Now}/{Spec.Max}";\r
@@ -172,7 +172,7 @@ namespace KancolleSniffer
             return Id != 854\r
                 ? ""\r
                 : string.Join(" ",\r
-                    new[] {"2-4", "6-1", "6-3", "6-4"}.Zip(NowArray, (map, flag) => flag == 1 ? map : "")\r
+                    new[] {"2-4", "6-1", "6-3", "6-4"}.Zip(NowArray, (map, n) => n >= 1 ? map : "")\r
                         .Where(s => !string.IsNullOrEmpty(s)));\r
         }\r
 \r