任務カウンタが進捗80%で達成数に修正されることがあるのを直す

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index 8002aa9..6791093 100644 (file)
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -78,6 +78,26 @@ namespace KancolleSniffer.Test
         }\r
 \r
         [TestMethod]\r
+        public void AdjustCount80Percent()\r
+        {\r
+            var count = new QuestCount\r
+            {\r
+                Spec = new QuestSpec()\r
+            };\r
+            for (var shift = 0; shift <= 1; shift++)\r
+            {\r
+                for (var max = 2; max <= 6; max++)\r
+                {\r
+                    count.Spec.Max = max;\r
+                    count.Spec.Shift = shift;\r
+                    count.Now = 1;\r
+                    count.AdjustCount(80);\r
+                    PAssert.That(() => count.Now == count.Spec.Max - 1);\r
+                }\r
+            }\r
+        }\r
+\r
+        [TestMethod]\r
         public void AdjestCountNowArray()\r
         {\r
             var count = new QuestCount\r

diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/QuestInfo.cs
index 82e72d9..e97d090 100644 (file)
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/QuestInfo.cs
@@ -155,6 +155,8 @@ namespace KancolleSniffer
             var now = Now + Spec.Shift;\r
             var max = Spec.Max + Spec.Shift;\r
             var low = (int)Ceiling(max * progress / 100.0);\r
+            if (low >= max && progress != 100)\r
+                low = max - 1;\r
             var high = (int)Ceiling(max * next / 100.0);\r
             if (now < low)\r
             {\r