提交: 230f955774daf88ce397a9dcb4659ab38e182dec - KancolleSniffer (git)

Commit MetaInfo

• 修订版: 230f955774daf88ce397a9dcb4659ab38e182dec (tree)
• 时间: 2020-08-30 14:58:22
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

questlistがすべての任務を返す仕様変更に対応する

更改概述

• modified: KancolleSniffer.Test/QuestCounterTest.cs
• modified: KancolleSniffer.Test/QuestInfoTest.cs
• modified: KancolleSniffer/MainForm.Designer.cs
• modified: KancolleSniffer/MainForm.cs
• modified: KancolleSniffer/Model/QuestInfo.cs
• modified: KancolleSniffer/Sniffer.cs

差异

--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -238,10 +238,15 @@ namespace KancolleSniffer.Test
 
         private QuestCount InjectQuest(int id)
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {id}));
+            InjectQuestList(new[] {id});
             return _questInfo.Quests[0].Count;
         }
 
+        private void InjectQuestList(int[] ids)
+        {
+            _questInfo.InspectQuestList("api_tab_id=0", CreateQuestList(ids));
+        }
+
         private void InjectMapStart(int map, int eventId)
         {
             _questCounter.InspectMapStart(CreateMap(map, eventId));
@@ -304,7 +309,7 @@ namespace KancolleSniffer.Test
         {
             _battleInfo = new BattleInfo(null, null, null);
             _itemInfo = new ItemInfo(new ItemMaster(), new ItemInventory());
-            _questInfo = new QuestInfo(() => new DateTime(2015, 1, 1)) {AcceptMax = 10};
+            _questInfo = new QuestInfo(() => new DateTime(2015, 1, 1));
             _questCounter = new QuestCounter(_questInfo, _itemInfo, _battleInfo);
         }
 
@@ -317,7 +322,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void BattleResult_201_216_210_214()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {201, 216, 210, 214}));
+            InjectQuestList(new[] {201, 216, 210, 214});
 
             InjectMapStart(11, 4);
             var counts = _questInfo.Quests.Select(q => q.Count).ToArray();
@@ -361,7 +366,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void BattleResult_211_212_213_218_220_221()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {211, 212, 213, 218, 220, 221}));
+            InjectQuestList(new[] {211, 212, 213, 218, 220, 221});
             // 補給艦1隻と空母2隻
             _battleInfo.InjectResultStatus(new ShipStatus[0], new ShipStatus[0], new[]
             {
@@ -389,7 +394,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void BattleResult_228_230()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {228, 230}));
+            InjectQuestList(new[] {228, 230});
             // 潜水艦3
             _battleInfo.InjectResultStatus(new ShipStatus[0], new ShipStatus[0], new[]
             {
@@ -721,7 +726,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void BattleResult_822_854()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {822, 854}));
+            InjectQuestList(new[] {822, 854});
             var c822 = _questInfo.Quests[0].Count;
             var c854 = _questInfo.Quests[1].Count;
 
@@ -1320,7 +1325,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void BattleResult_280_854()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {280, 854}));
+            InjectQuestList(new[] {280, 854});
 
             _battleInfo.InjectResultStatus(
                 ShipStatusList(1, 1, 1, 1, 1, 1), new ShipStatus[0],
@@ -1337,7 +1342,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void BattleResult_888_893()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {888, 893}));
+            InjectQuestList(new[] {888, 893});
 
             _battleInfo.InjectResultStatus(
                 ShipStatusList(1, 1, 1, 1, 1, 1), new ShipStatus[0],
@@ -1358,7 +1363,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void PracticeResult_303_304_302_311_315()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {302, 303, 304, 311, 315}));
+            InjectQuestList(new[] {302, 303, 304, 311, 315});
 
             _battleInfo.InjectResultStatus(new[]
             {
@@ -1401,7 +1406,7 @@ namespace KancolleSniffer.Test
             Assert.AreEqual(1, count.Now);
 
             count.Now = 2;
-            _questInfo.InspectQuestList(CreateQuestList(new[] {318}));
+            InjectQuestList(new[] {318});
             Assert.AreEqual(2, count.Now, "進捗調節しない");
         }
 
@@ -1535,7 +1540,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void MissionResult_402_403_404_410_411()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {402, 403, 404, 410, 411}));
+            InjectQuestList(new[] {402, 403, 404, 410, 411});
 
             _questCounter.InspectDeck(Js(
                 new[]
@@ -1672,7 +1677,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void PowerUp_503_504()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {503, 504}));
+            InjectQuestList(new[] {503, 504});
 
             _questCounter.CountNyukyo();
             _questCounter.CountCharge();
@@ -1692,7 +1697,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void Kousyou_605_606_607_608_609_619()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {605, 606, 607, 608, 609, 619}));
+            InjectQuestList(new[] {605, 606, 607, 608, 609, 619});
 
             _questCounter.InspectCreateItem(
                 "api_verno=1&api_item1=10&api_item2=10&api_item3=30&api_item4=10&api_multiple_flag=0");
@@ -1752,8 +1757,7 @@ namespace KancolleSniffer.Test
             var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31, 35, 23, 16, 3, 121};
             _itemInfo.InjectItems(items);
             var questList = new[] {613, 638, 643, 645, 653, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688};
-            _questInfo.AcceptMax = questList.Length;
-            _questInfo.InspectQuestList(CreateQuestList(questList));
+            InjectQuestList(questList);
             _questCounter.InspectDestroyItem(
                 $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, items.Length))}&api%5Fverno=1", null);
             var scalar = new[]
@@ -1789,7 +1793,7 @@ namespace KancolleSniffer.Test
         [TestMethod]
         public void PowerUp_702_703()
         {
-            _questInfo.InspectQuestList(CreateQuestList(new[] {702, 703}));
+            InjectQuestList(new[] {702, 703});
             _questCounter.InspectPowerUp(Js(new {api_powerup_flag = 1}));
             PAssert.That(() =>
                 _questInfo.Quests.Select(q => new {q.Id, q.Count.Now})

--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -59,42 +59,12 @@ namespace KancolleSniffer.Test
 
         private void CheckQuestCountList(QuestInfo questInfo, Status status, int[] quests)
         {
-            questInfo.InspectQuestList(CreateQuestList(new[] {201}));
+            InspectQuestList(questInfo, new[] {201});
             questInfo.SaveState(status);
             PAssert.That(() =>  status.QuestCountList.Select(qc => qc.Id).SequenceEqual(quests));
         }
 
         [TestMethod]
-        public void ResetQuestList()
-        {
-            var queue = new Queue<DateTime>(new[]
-            {
-                new DateTime(2017, 11, 1, 5, 0, 0), new DateTime(2017, 11, 6, 5, 0, 0),
-                new DateTime(2017, 12, 1, 5, 0, 0)
-            });
-            var questInfo = new QuestInfo(() => queue.Dequeue());
-            var status = new Status
-            {
-                QuestList = new[]
-                {
-                    new QuestStatus {Id = 201, Category = 2}, new QuestStatus {Id = 213, Category = 2},
-                    new QuestStatus {Id = 265, Category = 2}, new QuestStatus {Id = 822, Category = 8}
-                },
-                QuestLastReset = new DateTime(2017, 10, 31, 5, 0, 0)
-            };
-            questInfo.LoadState(status);
-            questInfo.InspectQuestList(CreateQuestList(new int[0]));
-            questInfo.SaveState(status);
-            PAssert.That(() => status.QuestList.Select(q => q.Id).SequenceEqual(new[] {213, 822})); // デイリーとマンスリーが消える
-            questInfo.InspectQuestList(CreateQuestList(new int[0]));
-            questInfo.SaveState(status);
-            PAssert.That(() => status.QuestList.Select(q => q.Id).SequenceEqual(new[] {822})); // ウィークリーが消える
-            questInfo.InspectQuestList(CreateQuestList(new int[0]));
-            questInfo.SaveState(status);
-            PAssert.That(() => status.QuestList.Length == 0); // クォータリーが消える
-        }
-
-        [TestMethod]
         public void ResetFrom0To5OClock()
         {
             var queue = new Queue<DateTime>(new[]
@@ -108,7 +78,7 @@ namespace KancolleSniffer.Test
                 QuestLastReset = new DateTime(2019, 1, 20, 5, 16, 22)
             };
             questInfo.LoadState(status);
-            questInfo.InspectQuestList(CreateQuestList(new[] {201}));
+            InspectQuestList(questInfo, new[] {201});
             questInfo.SaveState(status);
             PAssert.That(() => status.QuestCountList.Length == 0);
         }
@@ -127,13 +97,21 @@ namespace KancolleSniffer.Test
                 QuestLastReset = new DateTime(2019, 1, 27, 5, 0, 0)
             };
             questInfo.LoadState(status);
-            questInfo.InspectQuestList( // 2019-1-27 10:00
-                CreateQuestList(new[] {237})); // 【節分拡張任務】南方海域 艦隊決戦
+            InspectQuestList(questInfo, // 2019-1-27 10:00
+                new[] {237}); // 【節分拡張任務】南方海域 艦隊決戦
             PAssert.That(() => questInfo.Quests[0].Id == 237);
-            questInfo.InspectQuestList(CreateQuestList(new[] {201})); // 2019-1-28 05:00
+            InspectQuestList(questInfo, new[] {201}); // 2019-1-28 05:00
             PAssert.That(() => questInfo.Quests[0].Id == 201);
         }
 
+        [TestMethod]
+        public void NotImplemented()
+        {
+            var questInfo = new QuestInfo(() => new DateTime(2015, 1, 1));
+            InspectQuestList(questInfo, new[] {679});
+            PAssert.That(() => questInfo.Quests[0].Count.Spec.Material.Length == 0);
+        }
+
         private JsonObject Js(object obj) => new JsonObject(obj);
 
         private object CreateQuestList(int[] ids) => Js(new
@@ -156,14 +134,12 @@ namespace KancolleSniffer.Test
             };
         }
 
-        [TestMethod]
-        public void NotImplemented()
+        private void InspectQuestList(QuestInfo questInfo, int[] ids)
         {
-            var questInfo = new QuestInfo(() => new DateTime(2015, 1, 1));
-            questInfo.InspectQuestList(CreateQuestList(new[] {679}));
-            PAssert.That(() => questInfo.Quests[0].Count.Spec.Material.Length == 0);
+            questInfo.InspectQuestList("api_tab_id=0", CreateQuestList(ids));
         }
 
+
         /// <summary>
         /// 状態をロードするときに獲得資材に特殊資材のリストを追加しない
         /// </summary>
@@ -192,35 +168,5 @@ namespace KancolleSniffer.Test
             questInfo.LoadState(status);
             PAssert.That(() => questInfo.Quests[0].Material.Length == 8);
         }
-
-        /// <summary>
-        /// 任務を受領したときにNeedSaveを設定する
-        /// </summary>
-        [TestMethod]
-        public void SetNeedSaveOnStartQuest()
-        {
-            var questInfo = new QuestInfo(() => new DateTime(2019, 1, 1));
-            // _lastResetが未設定だと必ずResetQuestsが動いてNeedSaveがtrueになる
-            questInfo.LoadState(new Status {QuestLastReset = new DateTime(2019, 1, 1)});
-            questInfo.InspectQuestList(Js(
-                new
-                {
-                    api_list = new[]
-                    {
-                        CreateQuest(213, 1),
-                        CreateQuest(214, 1)
-                    }
-                }));
-            Assert.IsFalse(questInfo.NeedSave);
-            questInfo.InspectQuestList(Js(new
-            {
-                api_list = new[]
-                {
-                    CreateQuest(213, 1),
-                    CreateQuest(214, 2)
-                }
-            }));
-            Assert.IsTrue(questInfo.NeedSave);
-        }
     }
 }
\ No newline at end of file

--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -55,7 +55,6 @@ namespace KancolleSniffer
             this.labelMaterialCaption = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
             this.labelAkashiRepair = new System.Windows.Forms.Label();
-            this.labelClearQuest = new System.Windows.Forms.Label();
             this.dropDownButtonRepairList = new KancolleSniffer.View.DropDownButton();
             this.labelQuestCount = new System.Windows.Forms.Label();
             this.kdockPanel = new KancolleSniffer.View.KDockPanel();
@@ -149,19 +148,6 @@ namespace KancolleSniffer
             this.labelAkashiRepair.TabIndex = 54;
             this.labelAkashiRepair.Text = "修理";
             // 
-            // labelClearQuest
-            // 
-            this.labelClearQuest.AutoSize = true;
-            this.labelClearQuest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelClearQuest.Location = new System.Drawing.Point(49, 340);
-            this.labelClearQuest.Name = "labelClearQuest";
-            this.labelClearQuest.Size = new System.Drawing.Size(15, 14);
-            this.labelClearQuest.TabIndex = 55;
-            this.labelClearQuest.Text = "↺";
-            this.labelClearQuest.Click += new System.EventHandler(this.labelClearQuest_Click);
-            this.labelClearQuest.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelClearQuest_MouseDown);
-            this.labelClearQuest.MouseUp += new System.Windows.Forms.MouseEventHandler(this.labelClearQuest_MouseUp);
-            // 
             // dropDownButtonRepairList
             // 
             this.dropDownButtonRepairList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -273,7 +259,6 @@ namespace KancolleSniffer
             this.Controls.Add(this.missionPanel);
             this.Controls.Add(this.labelQuestCount);
             this.Controls.Add(this.questPanel);
-            this.Controls.Add(this.labelClearQuest);
             this.Controls.Add(this.labelAkashiRepair);
             this.Controls.Add(this.labelAkashiRepairTimer);
             this.Controls.Add(this.dropDownButtonRepairList);
@@ -305,7 +290,6 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label labelAkashiRepairTimer;
         private System.Windows.Forms.Label labelAkashiRepair;
         private RepairListForMain panelRepairList;
-        private System.Windows.Forms.Label labelClearQuest;
         private QuestPanel questPanel;
         private System.Windows.Forms.Label labelQuestCount;
         private MissionPanel missionPanel;

--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -428,21 +428,5 @@ namespace KancolleSniffer
             panelRepairList.Visible = false;
             dropDownButtonRepairList.BackColor = DefaultBackColor;
         }
-
-        private void labelClearQuest_Click(object sender, EventArgs e)
-        {
-            Sniffer.ClearQuests();
-            UpdateQuestList();
-        }
-
-        private void labelClearQuest_MouseDown(object sender, MouseEventArgs e)
-        {
-            labelClearQuest.BackColor = CustomColors.ActiveButtonColor;
-        }
-
-        private void labelClearQuest_MouseUp(object sender, MouseEventArgs e)
-        {
-            labelClearQuest.BackColor = DefaultBackColor;
-        }
     }
 }
\ No newline at end of file

--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -26,7 +26,6 @@ namespace KancolleSniffer.Model
     {
         public int Id { get; set; }
         public int Category { get; set; }
-        public QuestInterval Interval { get; set; }
         public string Name { get; set; }
         public string Detail { get; set; }
         public int[] Material { get; set; }
@@ -70,7 +69,6 @@ namespace KancolleSniffer.Model
 
     public class QuestInfo : IHaveState
     {
-        private readonly SortedDictionary<int, QuestStatus> _quests = new SortedDictionary<int, QuestStatus>();
         private readonly QuestCountList _countList = new QuestCountList();
         private readonly Func<DateTime> _nowFunc = () => DateTime.Now;
         private DateTime _now;
@@ -84,11 +82,9 @@ namespace KancolleSniffer.Model
             Color.FromArgb(200, 148, 231), Color.FromArgb(232, 57, 41), Color.FromArgb(232, 57, 41)
         };
 
-        public int AcceptMax { get; set; } = 5;
+        public SortedDictionary<int, QuestStatus> QuestDictionary { get; } = new SortedDictionary<int, QuestStatus>();
 
-        public SortedDictionary<int, QuestStatus> QuestDictionary => _quests;
-
-        public QuestStatus[] Quests => _quests.Values.ToArray();
+        public QuestStatus[] Quests => QuestDictionary.Values.ToArray();
 
         public QuestInfo(Func<DateTime> nowFunc = null)
         {
@@ -98,7 +94,7 @@ namespace KancolleSniffer.Model
 
         public void GetNotifications(out string[] notify, out string[] stop)
         {
-            var cleared = _quests.Values.Where(q => q.Count.Cleared).ToArray();
+            var cleared = QuestDictionary.Values.Where(q => q.Count.Cleared).ToArray();
             notify = cleared.Except(_clearedQuest, new QuestComparer()).Select(q => q.Name).ToArray();
             stop = _clearedQuest.Except(cleared, new QuestComparer()).Select(q => q.Name).ToArray();
             _clearedQuest = cleared;
@@ -117,84 +113,61 @@ namespace KancolleSniffer.Model
             }
         }
 
-        private readonly QuestInterval[] _intervals =
-        {
-            QuestInterval.Daily, QuestInterval.Weekly, QuestInterval.Monthly,
-            QuestInterval.Other, QuestInterval.Quarterly, QuestInterval.Yearly2
-        };
-
         private readonly int[] _progress = {0, 50, 80};
 
-        public void InspectQuestList(dynamic json)
+        public void InspectQuestList(string request, dynamic json)
         {
-            ResetQuests();
+            ResetCounts();
+            var values = HttpUtility.ParseQueryString(request);
+            if (values["api_tab_id"] == "0")
+                QuestDictionary.Clear();
             if (json.api_list == null)
                 return;
-            for (var i = 0; i < 2; i++)
+            foreach (var entry in json.api_list)
             {
-                foreach (var entry in json.api_list)
+                if (entry is double) // -1の場合がある。
+                    continue;
+                var quest = new QuestStatus
+                {
+                    Id = (int)entry.api_no,
+                    Category = (int)entry.api_category,
+                    Progress = _progress[(int)entry.api_progress_flag],
+                    Name = (string)entry.api_title,
+                    Detail = ((string)entry.api_detail).Replace("<br>", "\r\n"),
+                    Material = (int[])entry.api_get_material
+                };
+                var state = (int)entry.api_state;
+                switch (state)
                 {
-                    if (entry is double) // -1の場合がある。
-                        continue;
-                    var quest = new QuestStatus
-                    {
-                        Id = (int)entry.api_no,
-                        Category = (int)entry.api_category,
-                        Progress = _progress[(int)entry.api_progress_flag],
-                        Interval = _intervals[(int)entry.api_type - 1],
-                        Name = (string)entry.api_title,
-                        Detail = ((string)entry.api_detail).Replace("<br>", "\r\n"),
-                        Material = (int[])entry.api_get_material
-                    };
-                    var state = (int)entry.api_state;
-                    switch (state)
-                    {
-                        case 1:
-                            if (_quests.Remove(quest.Id))
-                                NeedSave = true;
-                            break;
-                        case 3:
-                            quest.Progress = 100;
-                            goto case 2;
-                        case 2:
-                            SetProcessedQuest(quest);
-                            break;
-                    }
+                    case 3:
+                        quest.Progress = 100;
+                        goto case 2;
+                    case 2:
+                        AdjustQuest(quest);
+                        SetQuest(quest);
+                        break;
                 }
-                if (_quests.Count <= AcceptMax)
-                    break;
-                /*
-                 * ほかのPCで任務を達成した場合、任務が消えずに受領した任務の数がAcceptMaxを超えることがある。
-                 * その場合はいったん任務をクリアして、現在のページの任務だけを登録し直す。
-                 */
-                _quests.Clear();
             }
         }
 
-        private void SetProcessedQuest(QuestStatus quest)
+        private void AdjustQuest(QuestStatus quest)
         {
-            var count = _countList.GetCount(quest.Id);
-            if (count.AdjustCount(quest.Progress))
+            quest.Count = _countList.GetCount(quest.Id);
+            if (quest.Count.AdjustCount(quest.Progress))
                 NeedSave = true;
-            quest.Material = quest.Material.Concat(count.Spec.Material).ToArray();
-            if (!_quests.ContainsKey(quest.Id))
+            quest.Material = quest.Material.Concat(quest.Count.Spec.Material).ToArray();
+            if (!QuestDictionary.ContainsKey(quest.Id))
                 NeedSave = true;
-            SetQuest(quest);
         }
 
         private void SetQuest(QuestStatus quest)
         {
             quest.Count = _countList.GetCount(quest.Id);
             quest.Color = quest.Category <= _color.Length ? _color[quest.Category - 1] : Control.DefaultBackColor;
-            _quests[quest.Id] = quest;
+            QuestDictionary[quest.Id] = quest;
         }
 
-        public void ClearQuests()
-        {
-            _quests.Clear();
-        }
-
-        private void ResetQuests()
+        private void ResetCounts()
         {
             _now = _nowFunc();
             if (!CrossBoundary(QuestInterval.Daily))
@@ -203,7 +176,6 @@ namespace KancolleSniffer.Model
             {
                 if (!CrossBoundary(interval))
                     continue;
-                RemoveQuest(interval);
                 _countList.Remove(interval);
             }
             _lastReset = _now;
@@ -240,27 +212,10 @@ namespace KancolleSniffer.Model
             return _lastReset < boundary && boundary <= _now;
         }
 
-        private void RemoveQuest(QuestInterval interval)
-        {
-            foreach (var id in
-                (from kv in _quests
-                    where MatchInterval(kv.Value, interval)
-                    select kv.Key).ToArray())
-                _quests.Remove(id);
-        }
-
-        private bool MatchInterval(QuestStatus quest, QuestInterval interval)
-        {
-            var i = quest.Count.Spec.Interval;
-            return i == QuestInterval.Other // 定期任務の定義がない
-                ? quest.Interval == interval
-                : i == interval;
-        }
-
         public void InspectStop(string request)
         {
             var values = HttpUtility.ParseQueryString(request);
-            _quests.Remove(int.Parse(values["api_quest_id"]));
+            QuestDictionary.Remove(int.Parse(values["api_quest_id"]));
             NeedSave = true;
         }
 
@@ -269,7 +224,7 @@ namespace KancolleSniffer.Model
             var values = HttpUtility.ParseQueryString(request);
             var id = int.Parse(values["api_quest_id"]);
             _countList.Remove(id);
-            _quests.Remove(id);
+            QuestDictionary.Remove(id);
             NeedSave = true;
         }
 
@@ -279,8 +234,8 @@ namespace KancolleSniffer.Model
         {
             NeedSave = false;
             status.QuestLastReset = _lastReset;
-            if (_quests != null)
-                status.QuestList = _quests.Values.ToArray();
+            if (QuestDictionary != null)
+                status.QuestList = QuestDictionary.Values.ToArray();
             if (_countList != null)
                 status.QuestCountList = _countList.NonZeroCountList.ToArray();
         }
@@ -292,7 +247,7 @@ namespace KancolleSniffer.Model
                 _countList.SetCountList(status.QuestCountList);
             if (status.QuestList != null)
             {
-                _quests.Clear();
+                QuestDictionary.Clear();
                 foreach (var quest in status.QuestList)
                     SetQuest(quest);
             }

--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -152,7 +152,7 @@ namespace KancolleSniffer
             if (url.EndsWith("api_port/port"))
                 return ApiPort(data);
             if (url.Contains("member"))
-                return ApiMember(url, json);
+                return ApiMember(url, request,json);
             if (url.Contains("kousyou"))
                 return ApiKousyou(url, request, data);
             if (url.Contains("practice"))
@@ -213,8 +213,6 @@ namespace KancolleSniffer
             _questCounter.InspectDeck(data.api_deck_port);
             _dockInfo.InspectNDock(data.api_ndock);
             _achievement.InspectBasic(data.api_basic);
-            if (data.api_parallel_quest_count()) // 昔のログにはないので
-                _questInfo.AcceptMax = (int)data.api_parallel_quest_count;
             if (data.api_event_object())
                 _airBase.InspectEventObject(data.api_event_object);
             if (data.api_plane_info())
@@ -228,7 +226,7 @@ namespace KancolleSniffer
             return Update.All;
         }
 
-        private Update ApiMember(string url, dynamic json)
+        private Update ApiMember(string url, string request, dynamic json)
         {
             var data = json.api_data() ? json.api_data : new object();
 
@@ -274,7 +272,7 @@ namespace KancolleSniffer
             }
             if (url.EndsWith("api_get_member/questlist"))
             {
-                _questInfo.InspectQuestList(data);
+                _questInfo.InspectQuestList(request, data);
                 return Update.QuestList;
             }
             if (url.EndsWith("api_get_member/deck"))
@@ -632,8 +630,6 @@ namespace KancolleSniffer
         public void GetQuestNotifications(out string[] notify, out string[] stop) =>
             _questInfo.GetNotifications(out notify, out stop);
 
-        public void ClearQuests() => _questInfo.ClearQuests();
-
         public NameAndTimer[] Missions => _missionInfo.Missions;
 
         public DateTime GetConditionTimer(int fleet) => _conditionTimer.GetTimer(fleet);