From 76a5d9d0d6c2c2e9732da4b30538bce9fb04ea8b Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 6 Feb 2021 17:22:45 +0900
Subject: [PATCH] =?utf8?q?=E3=80=90=E7=AF=80=E5=88=86=E4=BB=BB=E5=8B=99?=
 =?utf8?q?=E3=80=91=E7=AF=80=E5=88=86=E6=BC=94=E7=BF=92=EF=BC=81=E3=81=AE?=
 =?utf8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=82=BF=E3=83=BC=E3=82=92=E5=AE=9F?=
 =?utf8?q?=E8=A3=85=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/QuestCounterTest.cs | 23 +++++++++++++++++++++++
 KancolleSniffer/Model/QuestCountList.cs  |  1 +
 KancolleSniffer/Model/QuestCounter.cs    |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index d2cdb21..9be5d9d 100644
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1491,6 +1491,29 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 329: 【節分任務】節分演習！
+        /// </summary>
+        [TestMethod]
+        public void PracticeResult_329()
+        {
+            var count = InjectQuest(329);
+
+            _battleInfo.InjectResultStatus(
+                ShipStatusList(3, 2),
+                new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);
+            InjectPracticeResult("S");
+            Assert.AreEqual(0, count.Now, "軽巡、駆逐");
+
+            _battleInfo.Result.Friend.Main = ShipStatusList(3, 2, 1);
+            InjectPracticeResult("A");
+            Assert.AreEqual(0, count.Now, "A勝利でカウントしない");
+
+            _battleInfo.Result.Friend.Main = ShipStatusList(3, 2, 1);
+            InjectPracticeResult("S");
+            Assert.AreEqual(1, count.Now, "軽巡、駆逐、海防");
+        }
+
+        /// <summary>
         /// 330: 空母機動部隊、演習始め！
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 0131fe6..b24191f 100644
--- 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: 精鋭艦隊演習
             {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: 給糧艦「伊良湖」の支援
+            {329, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 2, 2, 0}, Shift = 1}}, // 329: 【節分任務】節分演習！
             {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}, Shift = 2}}, // 337: 「十八駆」演習！
             {339, new QuestPractice {Interval = Daily, Max = 3, Rank = "S", Material = new[] {0, 0, 8, 3}, Shift = 2}}, // 339: 「十九駆」演習！
diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs
index d07342a..a9dbad5 100644
--- 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;
                 case 318:
                     return specs.Types.Count(type => type == 3) >= 2;
+                case 329:
+                    return specs.Types.Count(type => type == 2 || type == 1) >= 2;
                 case 330:
                     return specs.Flagship.IsAircraftCarrier &&
                            specs.Specs.Count(spec => spec.IsAircraftCarrier) >= 2 &&
-- 
2.11.0