十八駆・十九駆演習で進捗50%でカウンターが2になるのを直す

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 9bd91b4..9f8e8e9 100644 (file)
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -79,6 +79,33 @@ namespace KancolleSniffer.Test
         }\r
 \r
         [TestMethod]\r
+        public void AdjustCountMax3WithShift2()\r
+        {\r
+            var count = new QuestCount\r
+            {\r
+                Spec = new QuestSpec {Max = 3, Shift = 2},\r
+                Now = 0\r
+            };\r
+            count.AdjustCount(0);\r
+            Assert.AreEqual(0, count.Now);\r
+            count.AdjustCount(50);\r
+            Assert.AreEqual(1, count.Now);\r
+            count.AdjustCount(80);\r
+            Assert.AreEqual(2, count.Now);\r
+            count.AdjustCount(100);\r
+            Assert.AreEqual(3, count.Now);\r
+            count.Now = 4;\r
+            count.AdjustCount(100);\r
+            Assert.AreEqual(4, count.Now);\r
+            count.AdjustCount(80);\r
+            Assert.AreEqual(2, count.Now);\r
+            count.AdjustCount(50);\r
+            Assert.AreEqual(1, count.Now);\r
+            count.AdjustCount(0);\r
+            Assert.AreEqual(0, count.Now);\r
+        }\r
+\r
+        [TestMethod]\r
         public void AdjustCount80Percent()\r
         {\r
             var count = new QuestCount\r

diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 8844094..d9e4779 100644 (file)
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -82,8 +82,8 @@ namespace KancolleSniffer.Model
             {315, new QuestPractice {Interval = Daily, Max = 8, Rank = "B", Material = new[] {0, 0, 0, 0}}}, // 315: 春季大演習\r
             {318, new QuestPractice {Interval = Daily, Max = 3, Rank = "B", Material = new[] {0, 2, 2, 0}, AdjustCount = false}}, // 318: 給糧艦「伊良湖」の支援\r
             {330, new QuestPractice {Interval = Daily, Max = 4, Rank = "A", Material = new[] {0, 0, 3, 0}}}, // 330: 空母機動部隊、演習始め！\r
-            {337, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 0, 3}}}, // 337: 「十八駆」演習！\r
-            {339, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 8, 3}}}, // 339: 「十九駆」演習！\r
+            {337, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 0, 3}, Shift = 2}}, // 337: 「十八駆」演習！\r
+            {339, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 8, 3}, Shift = 2}}, // 339: 「十九駆」演習！\r
 \r
             {402, new QuestMission {Interval = Daily, Max = 3, Material = new[] {0, 0, 1, 0}}}, // 402: 「遠征」を3回成功させよう！\r
             {403, new QuestMission {Interval = Daily, Max = 10, Material = new[] {0, 0, 0, 0}}}, // 403: 「遠征」を10回成功させよう！\r