From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 8 Mar 2020 05:02:28 +0000 (+0900)
Subject: 十八駆・十九駆演習で進捗50%でカウンターが2になるのを直す
X-Git-Tag: v11.35~1
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=5ba56786e141668b11d4a83856ac5724516443cc

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

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 9bd91b4..9f8e8e9 100644
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -79,6 +79,33 @@ namespace KancolleSniffer.Test
         }
 
         [TestMethod]
+        public void AdjustCountMax3WithShift2()
+        {
+            var count = new QuestCount
+            {
+                Spec = new QuestSpec {Max = 3, Shift = 2},
+                Now = 0
+            };
+            count.AdjustCount(0);
+            Assert.AreEqual(0, count.Now);
+            count.AdjustCount(50);
+            Assert.AreEqual(1, count.Now);
+            count.AdjustCount(80);
+            Assert.AreEqual(2, count.Now);
+            count.AdjustCount(100);
+            Assert.AreEqual(3, count.Now);
+            count.Now = 4;
+            count.AdjustCount(100);
+            Assert.AreEqual(4, count.Now);
+            count.AdjustCount(80);
+            Assert.AreEqual(2, count.Now);
+            count.AdjustCount(50);
+            Assert.AreEqual(1, count.Now);
+            count.AdjustCount(0);
+            Assert.AreEqual(0, count.Now);
+        }
+
+        [TestMethod]
         public void AdjustCount80Percent()
         {
             var count = new QuestCount
diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 8844094..d9e4779 100644
--- 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: 春季大演習
             {318, new QuestPractice {Interval = Daily, Max = 3, Rank = "B", Material = new[] {0, 2, 2, 0}, AdjustCount = false}}, // 318: 給糧艦「伊良湖」の支援
             {330, new QuestPractice {Interval = Daily, Max = 4, Rank = "A", Material = new[] {0, 0, 3, 0}}}, // 330: 空母機動部隊、演習始め！
-            {337, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 0, 3}}}, // 337: 「十八駆」演習！
-            {339, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 8, 3}}}, // 339: 「十九駆」演習！
+            {337, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 0, 3}, Shift = 2}}, // 337: 「十八駆」演習！
+            {339, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 8, 3}, Shift = 2}}, // 339: 「十九駆」演習！
 
             {402, new QuestMission {Interval = Daily, Max = 3, Material = new[] {0, 0, 1, 0}}}, // 402: 「遠征」を3回成功させよう！
             {403, new QuestMission {Interval = Daily, Max = 10, Material = new[] {0, 0, 0, 0}}}, // 403: 「遠征」を10回成功させよう！