【節分任務】節分演習！のカウンターを実装する

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index d2cdb21..9be5d9d 100644 (file)
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1491,6 +1491,29 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 329: 【節分任務】節分演習！\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void PracticeResult_329()\r
+        {\r
+            var count = InjectQuest(329);\r
+\r
+            _battleInfo.InjectResultStatus(\r
+                ShipStatusList(3, 2),\r
+                new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+            InjectPracticeResult("S");\r
+            Assert.AreEqual(0, count.Now, "軽巡、駆逐");\r
+\r
+            _battleInfo.Result.Friend.Main = ShipStatusList(3, 2, 1);\r
+            InjectPracticeResult("A");\r
+            Assert.AreEqual(0, count.Now, "A勝利でカウントしない");\r
+\r
+            _battleInfo.Result.Friend.Main = ShipStatusList(3, 2, 1);\r
+            InjectPracticeResult("S");\r
+            Assert.AreEqual(1, count.Now, "軽巡、駆逐、海防");\r
+        }\r
+\r
+        /// <summary>\r
         /// 330: 空母機動部隊、演習始め！\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 0131fe6..b24191f 100644 (file)
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -92,6 +92,7 @@ namespace KancolleSniffer.Model
             {311, new QuestPractice {Interval = Daily, Max = 7, Rank = "B", Material = new[] {0, 2, 0, 0}}}, // 311: 精鋭艦隊演習\r
             {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
+            {329, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 2, 2, 0}, Shift = 1}}, // 329: 【節分任務】節分演習！\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}, Shift = 2}}, // 337: 「十八駆」演習！\r
             {339, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 8, 3}, Shift = 2}}, // 339: 「十九駆」演習！\r

diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs
index d07342a..a9dbad5 100644 (file)
--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -334,6 +334,8 @@ namespace KancolleSniffer.Model
                     return specs.Types.Count(type => type == 5) >= 3 && specs.Types.Count(type => type == 2) >= 1;\r
                 case 318:\r
                     return specs.Types.Count(type => type == 3) >= 2;\r
+                case 329:\r
+                    return specs.Types.Count(type => type == 2 || type == 1) >= 2;\r
                 case 330:\r
                     return specs.Flagship.IsAircraftCarrier &&\r
                            specs.Specs.Count(spec => spec.IsAircraftCarrier) >= 2 &&\r