From 0f377e30b207441f57037b55a1412947afa6b1e7 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 21 Oct 2020 21:55:40 +0900
Subject: [PATCH] =?utf8?q?=E7=89=B9=E8=A8=AD=E8=AD=B7=E8=A1=9B=E8=88=B9?=
 =?utf8?q?=E5=9B=A3=E5=8F=B8=E4=BB=A4=E9=83=A8=E3=80=81=E6=B4=BB=E5=8B=95?=
 =?utf8?q?=E9=96=8B=E5=A7=8B=EF=BC=81=E3=81=AE=E3=82=AB=E3=82=A6=E3=83=B3?=
 =?utf8?q?=E3=82=BF=E3=83=BC=E3=82=92=E5=AE=9F=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 | 35 ++++++++++++++++++++++++++++++++
 KancolleSniffer/Model/QuestCountList.cs  |  5 +++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index cd27081..3340b90 100644
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -166,6 +166,7 @@ namespace KancolleSniffer.Test
                     new QuestCount {Id = 872, NowArray = new[] {1, 1, 1, 1}},
                     new QuestCount {Id = 284, NowArray = new[] {1, 1, 1, 1}},
                     new QuestCount {Id = 226, Now = 2},
+                    new QuestCount {Id = 434, NowArray = new[] {1, 0, 1, 0, 1}},
                     new QuestCount {Id = 436, NowArray = new[] {1, 0, 1, 1, 1}},
                     new QuestCount {Id = 437, NowArray = new[] {1, 0, 1, 1}},
                     new QuestCount {Id = 438, NowArray = new[] {1, 0, 1, 1}},
@@ -236,6 +237,9 @@ namespace KancolleSniffer.Test
             var q226 = status.QuestCountList.First(q => q.Id == 226);
             Assert.AreEqual("2/5", q226.ToString());
             Assert.AreEqual("", q226.ToToolTip());
+            var q434 = status.QuestCountList.First(q => q.Id == 434);
+            Assert.AreEqual("1\u200a0\u200a1\u200a0\u200a1", q434.ToString());
+            Assert.AreEqual("警備任務1 海上護衛任務0 兵站強化任務1 海峡警備行動0 タンカー護衛任務1", q434.ToToolTip());
             var q436 = status.QuestCountList.First(q => q.Id == 436);
             Assert.AreEqual("1\u200a0\u200a1\u200a1\u200a1", q436.ToString());
             Assert.AreEqual("練習航海1 長距離練習航海0 警備任務1 対潜警戒任務1 強行偵察任務1", q436.ToToolTip());
@@ -1708,6 +1712,37 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 434: 特設護衛船団司令部、活動開始！
+        /// </summary>
+        [TestMethod]
+        public void MissionResult_434()
+        {
+            var count = InjectQuest(434);
+
+            _questCounter.InspectDeck(Js(
+                new[]
+                {
+                    new {api_id = 2, api_mission = new[] {2, 3}},
+                    new {api_id = 3, api_mission = new[] {2, 5}},
+                    new {api_id = 4, api_mission = new[] {2, 100}}
+                }));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=4", Js(new {api_clear_result = 1}));
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0, 0}));
+
+            _questCounter.InspectDeck(Js(
+                new[]
+                {
+                    new {api_id = 2, api_mission = new[] {2, 101}},
+                    new {api_id = 3, api_mission = new[] {2, 9}}
+                }));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new {api_clear_result = 1}));
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 1}));
+        }
+
+        /// <summary>
         /// 436: 練習航海及び警備任務を実施せよ！
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 8a47055..12ea130 100644
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -104,8 +104,9 @@ namespace KancolleSniffer.Model
             {424, new QuestMission {Interval = Monthly, Max = 4, Shift = 1, Ids = new[] {5}, Material = new[] {0, 0, 0, 0}}}, // 424: 輸送船団護衛を強化せよ！
             {426, new QuestMission {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {3, 4, 5, 10}, Material = new[] {0, 0, 4, 0}}}, // 426: 海上通商航路の警戒を厳とせよ！
             {428, new QuestMission {Interval = Quarterly, MaxArray = new[] {2, 2, 2}, Ids = new[] {4, 101, 102}, Material = new[] {0, 0, 0, 3}}}, // 428: 近海に侵入する敵潜を制圧せよ！
-            {436, new QuestMission {Interval = Yearly3, MaxArray = new[] {1, 1, 1, 1, 1}, Ids = new[] {1, 2, 3, 4, 10}, Material = new [] {0, 4, 0, 0}}}, // 436: 練習航海及び警備任務を実施せよ！
-            {437, new QuestMission {Interval = Yearly5, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {4, 104, 105, 110}, Material = new [] {0, 0, 7, 3}, Shift = 1}}, // 437: 小笠原沖哨戒線の強化を実施せよ！
+            {434, new QuestMission {Interval = Yearly2, MaxArray = new[] {1, 1, 1, 1, 1}, Ids = new[] {3, 5, 100, 101, 9}, Material = new[] {0, 5, 0, 3}}}, // 434: 特設護衛船団司令部、活動開始！
+            {436, new QuestMission {Interval = Yearly3, MaxArray = new[] {1, 1, 1, 1, 1}, Ids = new[] {1, 2, 3, 4, 10}, Material = new[] {0, 4, 0, 0}}}, // 436: 練習航海及び警備任務を実施せよ！
+            {437, new QuestMission {Interval = Yearly5, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {4, 104, 105, 110}, Material = new[] {0, 0, 7, 3}, Shift = 1}}, // 437: 小笠原沖哨戒線の強化を実施せよ！
             {438, new QuestMission {Interval = Yearly8, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {4, 100, 9, 114}, Material = new[] {0, 0, 5, 4}, Shift = 1}}, // 438: 南西諸島方面の海上護衛を強化せよ！
             {439, new QuestMission {Interval = Yearly9, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {5, 100, 11, 110}, Material = new[] {0, 0, 5, 4}, Shift = 1}}, // 439: 兵站強化遠征任務【基本作戦】
             {440, new QuestMission {Interval = Yearly9, MaxArray = new[] {1, 1, 1, 1, 1}, Ids = new[] {5, 41, 46, 40, 142}, Material = new[] {0, 0, 0, 4}}}, // 440: 兵站強化遠征任務【拡張作戦】
-- 
2.11.0