From 382c6d59caaaf27021912800bc3c8a9e2eead262 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 4 Mar 2020 23:17:06 +0900
Subject: [PATCH] =?utf8?q?1-6=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?utf8?q?=E3=82=92=E6=B1=8E=E7=94=A8=E5=8C=96=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/Model/QuestCountList.cs |  2 +-
 KancolleSniffer/Model/QuestCounter.cs   | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 1051a41..ea541e4 100644
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -64,7 +64,7 @@ namespace KancolleSniffer.Model
             {822, new QuestSortie {Interval = Quarterly, Max = 2, Rank = "S", Maps = new[] {24}, Material = new[] {0, 0, 0, 5}}}, // 822: 沖ノ島海域迎撃戦
             {845, new QuestSortie {Interval = Quarterly, MaxArray = new []{1, 1, 1, 1, 1}, Rank = "S", Maps = new[] {41, 42, 43, 44, 45}, Material = new[] {0, 0, 1, 0}}}, // 845: 発令！「西方海域作戦」
             {854, new QuestSortie {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1}, Ranks = new[] {"A", "A", "A", "S"}, Maps = new[] {24, 61, 63, 64}, Material = new[] {0, 0, 0, 4}}}, // 854: 戦果拡張任務！「Z作戦」前段作戦
-            {861, new QuestSpec {Interval = Quarterly, Max = 2, Material = new[] {0, 4, 0, 0}}}, // 861: 強行輸送艦隊、抜錨！
+            {861, new QuestSortie {Interval = Quarterly, Max = 2, Rank = "B", Maps = new[] {16}, Material = new[] {0, 4, 0, 0}}}, // 861: 強行輸送艦隊、抜錨！
             {862, new QuestSortie {Interval = Quarterly, Max = 2, Rank = "A", Maps = new[] {63}, Material = new[] {0, 0, 8, 4}}}, // 862: 前線の航空偵察を実施せよ！
             {872, new QuestSortie {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1}, Rank = "S", Maps = new[] {722, 55, 62, 65}, Material = new[] {0, 0, 0, 4}}}, // 872: 戦果拡張任務！「Z作戦」後段作戦
             {873, new QuestSortie {Interval = Quarterly, MaxArray = new[] {1, 1, 1}, Rank = "A", Maps = new[] {31, 32, 33}, Material = new[] {0, 0, 0, 0}}}, // 873: 北方海域警備を実施せよ！
diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs
index 5440563..2e59c8e 100644
--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -216,10 +216,16 @@ namespace KancolleSniffer.Model
             }
             _boss = (int)json.api_event_id == 5;
 
-            if (_quests.TryGetValue(861, out var q861) && _map == 16 && (int)json.api_event_id == 8)
+            if (_map != 16 || (int)json.api_event_id != 8)
+                return;
+            foreach (var count in _quests.Values.Select(q => q.Count))
             {
-                if (new ResultShipSpecs(_battleInfo).Types.Count(s => s == 10 || s == 22) == 2)
-                    Increment(q861.Count);
+                if (!(count.Spec is QuestSortie sortie))
+                    continue;
+                if (!FleetCheck(count.Id))
+                    continue;
+                if (sortie.Count(count, "S", _map, true))
+                    NeedSave = true;
             }
         }
 
@@ -292,6 +298,8 @@ namespace KancolleSniffer.Model
                 case 284:
                     return specs.Types.Count(type => type == 1 || type == 2) >= 3 &&
                            specs.Types.Intersect(new[] {3, 4, 7, 21}).Any();
+                case 861:
+                    return specs.Types.Count(s => s == 10 || s == 22) == 2;
                 case 862:
                     return specs.Types.Count(s => s == 3) >= 2 && specs.Types.Count(s => s == 16) >= 1;
                 case 873:
-- 
2.11.0