OSDN Git Service

レーダー射撃戦の勝利判定を間違えるのを直す
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer.Test / QuestInfoTest.cs
index 6791093..98dfc13 100644 (file)
@@ -16,6 +16,8 @@ using System;
 using System.Collections.Generic;\r
 using System.Linq;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r
@@ -98,7 +100,7 @@ namespace KancolleSniffer.Test
         }\r
 \r
         [TestMethod]\r
-        public void AdjestCountNowArray()\r
+        public void AdjustCountNowArray()\r
         {\r
             var count = new QuestCount\r
             {\r
@@ -115,7 +117,7 @@ namespace KancolleSniffer.Test
         }\r
 \r
         [TestMethod]\r
-        public void ResetQuest()\r
+        public void ResetQuestCount()\r
         {\r
             var queue = new Queue<DateTime>(new[]\r
             {\r
@@ -148,21 +150,51 @@ namespace KancolleSniffer.Test
             PAssert.That(() => status.QuestCountList.Length == 0); // クォータリーが消える\r
         }\r
 \r
+        [TestMethod]\r
+        public void ResetQuestList()\r
+        {\r
+            var queue = new Queue<DateTime>(new[]\r
+            {\r
+                new DateTime(2017, 11, 1, 5, 0, 0), new DateTime(2017, 11, 6, 5, 0, 0),\r
+                new DateTime(2017, 12, 1, 5, 0, 0)\r
+            });\r
+            var questInfo = new QuestInfo(null, null, () => queue.Dequeue());\r
+            var status = new Status\r
+            {\r
+                QuestList = new[]\r
+                {\r
+                    new QuestStatus {Id = 201, Category = 2}, new QuestStatus {Id = 213, Category = 2},\r
+                    new QuestStatus {Id = 265, Category = 2}, new QuestStatus {Id = 822, Category = 8}\r
+                },\r
+                QuestLastReset = new DateTime(2017, 10, 31, 5, 0, 0)\r
+            };\r
+            questInfo.LoadState(status);\r
+            questInfo.InspectQuestList(CreateQuestList(new int[0]));\r
+            questInfo.SaveState(status);\r
+            PAssert.That(() => status.QuestList.Select(q => q.Id).SequenceEqual(new[] {213, 822})); // デイリーとマンスリーが消える\r
+            questInfo.InspectQuestList(CreateQuestList(new int[0]));\r
+            questInfo.SaveState(status);\r
+            PAssert.That(() => status.QuestList.Select(q => q.Id).SequenceEqual(new[] {822})); // ウィークリーが消える\r
+            questInfo.InspectQuestList(CreateQuestList(new int[0]));\r
+            questInfo.SaveState(status);\r
+            PAssert.That(() => status.QuestList.Length == 0); // クォータリーが消える\r
+        }\r
+\r
         private JsonObject Js(object obj) => JsonObject.CreateJsonObject(obj);\r
 \r
         private object CreateQuestList(int[] ids) => Js(new\r
         {\r
             api_list =\r
-            ids.Select(id => new\r
-            {\r
-                api_no = id,\r
-                api_category = id / 100,\r
-                api_state = 2,\r
-                api_title = "",\r
-                api_detail = "",\r
-                api_get_material = new int[0],\r
-                api_progress_flag = 0\r
-            })\r
+                ids.Select(id => new\r
+                {\r
+                    api_no = id,\r
+                    api_category = id / 100,\r
+                    api_state = 2,\r
+                    api_title = "",\r
+                    api_detail = "",\r
+                    api_get_material = new int[0],\r
+                    api_progress_flag = 0\r
+                })\r
         });\r
 \r
         /// <summary>\r
@@ -450,6 +482,9 @@ namespace KancolleSniffer.Test
             PAssert.That(() => questInfo.Quests[0].Count.Now == 0, "駆逐軽巡以外");\r
         }\r
 \r
+        private ShipStatus ShipStatus(int shipType, int shipClass, int specId) =>\r
+            new ShipStatus {NowHp = 1, Spec = new ShipSpec {Id = specId, ShipType = shipType, ShipClass = shipClass}};\r
+\r
         /// <summary>\r
         /// 257: 「水上打撃部隊」南方へ!\r
         /// </summary>\r
@@ -460,11 +495,14 @@ namespace KancolleSniffer.Test
             var questInfo = new QuestInfo(null, battleInfo, () => new DateTime(2015, 1, 1));\r
             questInfo.InspectQuestList(CreateQuestList(new[] {259}));\r
 \r
-            battleInfo.InjectResultStatus(new[]\r
+            var org = new[]\r
             {\r
-                ShipStatus(3, 183), ShipStatus(9, 276), ShipStatus(10, 411),\r
-                ShipStatus(10, 412), ShipStatus(5, 193), ShipStatus(5, 194)\r
-            }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+                ShipStatus(3, 52, 321), ShipStatus(9, 19, 276), ShipStatus(10, 26, 411),\r
+                ShipStatus(10, 26, 412), ShipStatus(5, 29, 193), ShipStatus(5, 29, 194)\r
+            };\r
+            battleInfo.InjectResultStatus(\r
+                org.ToArray(), new ShipStatus[0],\r
+                new ShipStatus[0], new ShipStatus[0]);\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -489,14 +527,57 @@ namespace KancolleSniffer.Test
             PAssert.That(() => questInfo.Quests[0].Count.Now == 0, "軽巡轟沈");\r
             battleInfo.Result.Friend.Main[0].NowHp = 1;\r
 \r
-            battleInfo.Result.Friend.Main[4].Spec = new ShipSpec {Id = 136, ShipType = 9};\r
+            battleInfo.Result.Friend.Main[4] = ShipStatus(9, 37, 136);\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
             PAssert.That(() => questInfo.Quests[0].Count.Now == 0, "戦艦4隻");\r
-            battleInfo.Result.Friend.Main[4].Spec = new ShipSpec {Id = 193, ShipType = 5};\r
+            battleInfo.Result.Friend.Main[4] = org[4];\r
 \r
-            battleInfo.Result.Friend.Main[0].Spec = new ShipSpec {Id = 58, ShipType = 4};\r
+            battleInfo.Result.Friend.Main[0] = ShipStatus(4, 4, 58);\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
             PAssert.That(() => questInfo.Quests[0].Count.Now == 0, "軽巡なし");\r
+            battleInfo.Result.Friend.Main[0] = org[0];\r
+\r
+            battleInfo.Result.Friend.Main[2] = ShipStatus(10, 2, 553);\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 1, "伊勢改二");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 264: 「空母機動部隊」西へ!\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void BattleResult_264()\r
+        {\r
+            var battleInfo = new BattleInfo(null, null);\r
+            var questInfo = new QuestInfo(null, battleInfo, () => new DateTime(2015, 1, 1));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {264}));\r
+\r
+            battleInfo.InjectResultStatus(new[]\r
+            {\r
+                ShipStatus(7), ShipStatus(11), ShipStatus(3),\r
+                ShipStatus(3), ShipStatus(2), ShipStatus(2)\r
+            }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 4,\r
+                api_mapinfo_no = 2,\r
+                api_event_id = 4\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 4,\r
+                api_mapinfo_no = 2,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 1);\r
+\r
+            battleInfo.Result.Friend.Main[0].NowHp = 0;\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 1, "轟沈あり");\r
         }\r
 \r
         /// <summary>\r
@@ -600,6 +681,10 @@ namespace KancolleSniffer.Test
             PAssert.That(() => questInfo.Quests[0].Count.Now == 1);\r
         }\r
 \r
+        /// <summary>\r
+        /// 861: 強行輸送艦隊、抜錨!\r
+        /// </summary>\r
+        [TestMethod]\r
         public void MapNext_861()\r
         {\r
             var battleInfo = new BattleInfo(null, null);\r
@@ -608,7 +693,7 @@ namespace KancolleSniffer.Test
 \r
             battleInfo.InjectResultStatus(new[]\r
             {\r
-                ShipStatus(8), ShipStatus(4), ShipStatus(2),\r
+                ShipStatus(10), ShipStatus(22), ShipStatus(2),\r
                 ShipStatus(2), ShipStatus(2), ShipStatus(2)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
 \r
@@ -636,7 +721,7 @@ namespace KancolleSniffer.Test
             PAssert.That(() => questInfo.Quests[0].Count.Now == 1, "轟沈あり");\r
             battleInfo.Result.Friend.Main[1].NowHp = 1;\r
 \r
-            battleInfo.Result.Friend.Main[2].Spec.ShipType = 4;\r
+            battleInfo.Result.Friend.Main[2].Spec.ShipType = 10;\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 1,\r
@@ -684,9 +769,10 @@ namespace KancolleSniffer.Test
             PAssert.That(() => questInfo.Quests[0].Count.Now == 1, "轟沈あり");\r
             battleInfo.Result.Friend.Main[1].NowHp = 1;\r
 \r
+            battleInfo.Result.Friend.Main[3].Spec.ShipType = 3;\r
             battleInfo.Result.Friend.Main[4].Spec.ShipType = 16;\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
-            PAssert.That(() => questInfo.Quests[0].Count.Now == 1, "水母2隻");\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 2, "軽巡3隻水母2隻");\r
         }\r
 \r
         /// <summary>\r
@@ -796,17 +882,206 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 888: 新編成「三川艦隊」、鉄底海峡に突入せよ!\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void BattleResult_888()\r
+        {\r
+            var battleInfo = new BattleInfo(null, null);\r
+            var questInfo = new QuestInfo(null, battleInfo, () => new DateTime(2015, 1, 1));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {888}));\r
+            var count = questInfo.Quests[0].Count;\r
+\r
+            battleInfo.InjectResultStatus(new[]\r
+            {\r
+                ShipStatus(5, 427), ShipStatus(5, 264), ShipStatus(5, 142),\r
+                ShipStatus(5, 417), ShipStatus(2, 144), ShipStatus(2, 195)\r
+            }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 5,\r
+                api_mapinfo_no = 1,\r
+                api_event_id = 4\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 5,\r
+                api_mapinfo_no = 1,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => count.NowArray[0] == 0);\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 1);\r
+\r
+            battleInfo.Result.Friend.Main[0].NowHp = 0;\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 1, "轟沈あり");\r
+            battleInfo.Result.Friend.Main[0].NowHp = 1;\r
+\r
+            battleInfo.Result.Friend.Main[0].Spec.Id = 319;\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 1, "三川艦隊3隻");\r
+            battleInfo.Result.Friend.Main[0].Spec.Id = 427;\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 5,\r
+                api_mapinfo_no = 3,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0}));\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 5,\r
+                api_mapinfo_no = 4,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1}));\r
+        }\r
+\r
+        /// <summary>\r
+        /// 893: 泊地周辺海域の安全確保を徹底せよ!\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void BattleResult_893()\r
+        {\r
+            var questInfo = new QuestInfo(null, null, () => new DateTime(2015, 1, 1));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {893}));\r
+            var count = questInfo.Quests[0].Count;\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 1,\r
+                api_mapinfo_no = 5,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => count.NowArray[0] == 0, "A勝利はカウントしない");\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 1, "1-5");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 7,\r
+                api_mapinfo_no = 1,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[1] == 1, "7-1");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 7,\r
+                api_mapinfo_no = 2,\r
+                api_no = 9,\r
+                api_event_id = 4\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[2] == 1, "7-2G");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 7,\r
+                api_mapinfo_no = 2,\r
+                api_no = 15,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[3] == 1, "7-2M");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 894: 空母戦力の投入による兵站線戦闘哨戒\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void BattleResult_894()\r
+        {\r
+            var battleInfo = new BattleInfo(null, null);\r
+            var questInfo = new QuestInfo(null, battleInfo, () => new DateTime(2015, 1, 1));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {894}));\r
+            var count = questInfo.Quests[0].Count;\r
+            battleInfo.InjectResultStatus(new[]\r
+            {\r
+                ShipStatus(2), ShipStatus(2), ShipStatus(2),\r
+                ShipStatus(2), ShipStatus(2), ShipStatus(2)\r
+            }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 1,\r
+                api_mapinfo_no = 3,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 0, "空母なしはカウントしない");\r
+\r
+            battleInfo.Result.Friend.Main[0].Spec.ShipType = 7;\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => count.NowArray[0] == 0, "A勝利はカウントしない");\r
+\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 1, "1-3");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 1,\r
+                api_mapinfo_no = 4,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[1] == 1, "1-4");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 2,\r
+                api_mapinfo_no = 1,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[2] == 1, "2-1");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 2,\r
+                api_mapinfo_no = 2,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[3] == 1, "2-2");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 2,\r
+                api_mapinfo_no = 3,\r
+                api_event_id = 5\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[4] == 1, "2-3");\r
+        }\r
+\r
+        /// <summary>\r
         /// 302: 大規模演習\r
         /// 303: 「演習」で練度向上!\r
         /// 304: 「演習」で他提督を圧倒せよ!\r
         /// 311: 精鋭艦隊演習\r
+        /// 318: 給糧艦「伊良湖」の支援\r
         /// </summary>\r
         [TestMethod]\r
-        public void PracticeResult_303_304_302_311()\r
+        public void PracticeResult_303_304_302_311_315()\r
         {\r
-            var questInfo = new QuestInfo(null, null, () => new DateTime(2015, 1, 1));\r
-            questInfo.InspectQuestList(CreateQuestList(new[] {302, 303, 304, 311}));\r
+            var battleInfo = new BattleInfo(null, null);\r
+            var questInfo = new QuestInfo(null, battleInfo, () => new DateTime(2015, 1, 1));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {302, 303, 304, 311, 315}));\r
 \r
+            battleInfo.InjectResultStatus(new[]\r
+            {\r
+                ShipStatus(2, 543), ShipStatus(3, 488)\r
+            }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
             questInfo.InspectPracticeResult(Js(new {api_win_rank = "C"}));\r
             questInfo.InspectPracticeResult(Js(new {api_win_rank = "A"}));\r
             PAssert.That(() =>\r
@@ -814,10 +1089,40 @@ namespace KancolleSniffer.Test
                     .SequenceEqual(new[]\r
                     {\r
                         new {Id = 302, Now = 1}, new {Id = 303, Now = 2}, new {Id = 304, Now = 1},\r
-                        new {Id = 311, Now = 1}\r
+                        new {Id = 311, Now = 1}, new {Id = 315, Now = 1}\r
                     }));\r
         }\r
 \r
+        [TestMethod]\r
+        public void PracticeResult_318()\r
+        {\r
+            var battleInfo = new BattleInfo(null, null);\r
+            var questInfo = new QuestInfo(null, battleInfo, () => new DateTime(2015, 1, 1));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {318}));\r
+            var q318 = questInfo.Quests[0];\r
+\r
+            battleInfo.InjectResultStatus(new[]\r
+            {\r
+                ShipStatus(2, 543), ShipStatus(3, 488)\r
+            }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
+            questInfo.InspectPracticeResult(Js(new {api_win_rank = "B"}));\r
+            PAssert.That(() => q318.Count.Now == 0, "軽巡1隻");\r
+            battleInfo.Result.Friend.Main[0] = ShipStatus(3, 200);\r
+            questInfo.StartPractice("api%5Fdeck%5Fid=2");\r
+            questInfo.InspectPracticeResult(Js(new {api_win_rank = "B"}));\r
+            PAssert.That(() => q318.Count.Now == 0, "第2艦隊");\r
+            questInfo.StartPractice("api%5Fdeck%5Fid=1"); // 第一艦隊\r
+            questInfo.InspectPracticeResult(Js(new {api_win_rank = "C"}));\r
+            PAssert.That(() => q318.Count.Now == 0, "敗北");\r
+            questInfo.InspectPracticeResult(Js(new {api_win_rank = "B"}));\r
+            PAssert.That(() => q318.Count.Now == 1);\r
+\r
+            q318.Count.Now = 2;\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {318}));\r
+            PAssert.That(() => q318.Count.Now == 2, "進捗調節しない");\r
+        }\r
+\r
         /// <summary>\r
         /// 402: 「遠征」を3回成功させよう!\r
         /// 403: 「遠征」を10回成功させよう!\r
@@ -909,7 +1214,7 @@ namespace KancolleSniffer.Test
         /// 504: 艦隊酒保祭り!\r
         /// </summary>\r
         [TestMethod]\r
-        public void Powerup_503_504()\r
+        public void PowerUp_503_504()\r
         {\r
             var questInfo = new QuestInfo(null, null, () => new DateTime(2015, 1, 1));\r
             questInfo.InspectQuestList(CreateQuestList(new[] {503, 504}));\r
@@ -951,18 +1256,23 @@ namespace KancolleSniffer.Test
         /// <summary>\r
         /// 613: 資源の再利用\r
         /// 638: 対空機銃量産\r
+        /// 643: 主力「陸攻」の調達\r
+        /// 645: 「洋上補給」物資の調達\r
         /// 663: 新型艤装の継続研究\r
         /// 673: 装備開発力の整備\r
         /// 674: 工廠環境の整備\r
         /// 675: 運用装備の統合整備\r
         /// 676: 装備開発力の集中整備\r
         /// 677: 継戦支援能力の整備\r
+        /// 678: 主力艦上戦闘機の更新\r
+        /// 680: 対空兵装の整備拡充\r
+        /// 688: 航空戦力の強化\r
         /// </summary>\r
         [TestMethod]\r
-        public void DestroyItem_613_638_663_673_674_675_676_677()\r
+        public void DestroyItem_613_638_643_645_663_673_674_675_676_677_678_680_688()\r
         {\r
-            var itemInfo = new ItemInfo();\r
-            var questInfo = new QuestInfo(itemInfo, null, () => new DateTime(2015, 1, 1)) {AcceptMax = 8};\r
+            var itemInfo = new ItemInfo(new ItemMaster(), new ItemInventory());\r
+            var questInfo = new QuestInfo(itemInfo, null, () => new DateTime(2015, 1, 1));\r
 \r
             itemInfo.InjectItemSpec(new[]\r
             {\r
@@ -974,23 +1284,42 @@ namespace KancolleSniffer.Test
                 new ItemSpec {Id = 75, Name = "ドラム缶(輸送用)", Type = 30},\r
                 new ItemSpec {Id = 7, Name = "35.6cm連装砲", Type = 3},\r
                 new ItemSpec {Id = 25, Name = "零式水上偵察機", Type = 10},\r
-                new ItemSpec {Id = 13, Name = "61cm三連装魚雷", Type = 5}\r
+                new ItemSpec {Id = 13, Name = "61cm三連装魚雷", Type = 5},\r
+                new ItemSpec {Id = 20, Name = "零式艦戦21型", Type = 6},\r
+                new ItemSpec {Id = 28, Name = "22号水上電探", Type = 12},\r
+                new ItemSpec {Id = 31, Name = "32号水上電探", Type = 13},\r
+                new ItemSpec {Id = 35, Name = "三式弾", Type = 18},\r
+                new ItemSpec {Id = 23, Name = "九九式艦爆", Type = 7},\r
+                new ItemSpec {Id = 16, Name = "九七式艦攻", Type = 8}\r
             });\r
-            itemInfo.InjectItems(new[] {1, 37, 19, 4, 11, 75, 7, 25, 13});\r
-            questInfo.InspectQuestList(CreateQuestList(new[] {613, 638, 663, 673, 674, 675, 676, 677}));\r
-            questInfo.InspectDestroyItem("api%5Fslotitem%5Fids=1%2C2%2C3%2C4%2C5%2C6%2C7%2C8%2C9&api%5Fverno=1", null);\r
-            PAssert.That(() =>\r
-                questInfo.Quests.Select(q => new {q.Id, q.Count.Now}).Take(5).SequenceEqual(new[]\r
-                {\r
-                    new {Id = 613, Now = 1}, new {Id = 638, Now = 1}, new {Id = 663, Now = 1},\r
-                    new {Id = 673, Now = 1}, new {Id = 674, Now = 1}\r
-                }));\r
-            var q675 = questInfo.Quests[5];\r
-            PAssert.That(() => q675.Id == 675 && q675.Count.NowArray.SequenceEqual(new[] {1, 1}));\r
-            var q676 = questInfo.Quests[6];\r
-            PAssert.That(() => q676.Id == 676 && q676.Count.NowArray.SequenceEqual(new[] {1, 1, 1}));\r
-            var q677 = questInfo.Quests[7];\r
-            PAssert.That(() => q677.Id == 677 && q677.Count.NowArray.SequenceEqual(new[] {1, 1, 1}));\r
+            var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31, 35, 23, 16};\r
+            itemInfo.InjectItems(items);\r
+            var questList = new[] {613, 638, 643, 645, 663, 673, 674, 675, 676, 677, 678, 680, 688};\r
+            questInfo.AcceptMax = questList.Length;\r
+            questInfo.InspectQuestList(CreateQuestList(questList));\r
+            questInfo.InspectDestroyItem(\r
+                $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, items.Length))}&api%5Fverno=1", null);\r
+            var scalar = new[]\r
+            {\r
+                new {Id = 613, Now = 1}, new {Id = 638, Now = 1}, new {Id = 643, Now = 1}, new {Id = 645, Now = 1},\r
+                new {Id = 663, Now = 1}, new {Id = 673, Now = 1}, new {Id = 674, Now = 1}\r
+            };\r
+            foreach (var e in scalar)\r
+            {\r
+                var c = Array.Find(questInfo.Quests, q => q.Id == e.Id).Count;\r
+                PAssert.That(() => c.Id == e.Id && c.Now == e.Now, $"{c.Id}");\r
+            }\r
+            var array = new[]\r
+            {\r
+                new {Id = 675, NowArray = new[] {2, 1}}, new {Id = 676, NowArray = new[] {1, 1, 1}},\r
+                new {Id = 677, NowArray = new[] {1, 1, 1}}, new {Id = 678, NowArray = new[] {1, 1}},\r
+                new {Id = 680, NowArray = new[] {1, 2}}, new {Id = 688, NowArray = new[] {2, 1, 1, 1}}\r
+            };\r
+            foreach (var e in array)\r
+            {\r
+                var c = Array.Find(questInfo.Quests, q => q.Id == e.Id).Count;\r
+                PAssert.That(() => c.Id == e.Id && c.NowArray.SequenceEqual(e.NowArray), $"{c.Id}");\r
+            }\r
         }\r
 \r
         /// <summary>\r
@@ -998,11 +1327,11 @@ namespace KancolleSniffer.Test
         /// 703: 「近代化改修」を進め、戦備を整えよ!\r
         /// </summary>\r
         [TestMethod]\r
-        public void Powerup_702_703()\r
+        public void PowerUp_702_703()\r
         {\r
             var questInfo = new QuestInfo(null, null, () => new DateTime(2015, 1, 1));\r
             questInfo.InspectQuestList(CreateQuestList(new[] {702, 703}));\r
-            questInfo.InspectPowerup(Js(new {api_powerup_flag = 1}));\r
+            questInfo.InspectPowerUp(Js(new {api_powerup_flag = 1}));\r
             PAssert.That(() =>\r
                 questInfo.Quests.Select(q => new {q.Id, q.Count.Now})\r
                     .SequenceEqual(new[] {new {Id = 702, Now = 1}, new {Id = 703, Now = 1}}));\r
@@ -1012,7 +1341,7 @@ namespace KancolleSniffer.Test
         public void NotImplemented()\r
         {\r
             var questInfo = new QuestInfo(null, null, () => new DateTime(2015, 1, 1));\r
-            questInfo.InspectQuestList(CreateQuestList(new[] {318}));\r
+            questInfo.InspectQuestList(CreateQuestList(new[] {679}));\r
             PAssert.That(() => questInfo.Quests[0].Count.Spec.Material.Length == 0);\r
         }\r
 \r
@@ -1032,7 +1361,11 @@ namespace KancolleSniffer.Test
                     new QuestCount {Id = 854, NowArray = new[] {2, 1, 1, 1}},\r
                     new QuestCount {Id = 426, NowArray = new[] {1, 1, 1, 1}},\r
                     new QuestCount {Id = 428, NowArray = new[] {1, 1, 1}},\r
-                    new QuestCount {Id = 873, NowArray = new[] {1, 1, 1}}\r
+                    new QuestCount {Id = 873, NowArray = new[] {1, 1, 1}},\r
+                    new QuestCount {Id = 888, NowArray = new[] {1, 1, 1}},\r
+                    new QuestCount {Id = 688, NowArray = new[] {2, 1, 2, 1}},\r
+                    new QuestCount {Id = 893, NowArray = new[] {1, 1, 1, 1}},\r
+                    new QuestCount {Id = 894, NowArray = new[] {1, 1, 1, 1, 1}}\r
                 }\r
             };\r
             questInfo.LoadState(status);\r
@@ -1053,6 +1386,45 @@ namespace KancolleSniffer.Test
             var q873 = status.QuestCountList[5];\r
             PAssert.That(() => q873.ToString() == "3/3");\r
             PAssert.That(() => q873.ToToolTip() == "3-1 3-2 3-3");\r
+            var q888 = status.QuestCountList[6];\r
+            PAssert.That(() => q888.ToString() == "3/3");\r
+            PAssert.That(() => q888.ToToolTip() == "5-1 5-3 5-4");\r
+            var q688 = status.QuestCountList[7];\r
+            PAssert.That(() => q688.ToToolTip() == "艦戦2 艦爆1 艦攻2 水偵1");\r
+            var q893 = status.QuestCountList[8];\r
+            PAssert.That(() => q893.ToToolTip() == "1-5:1 7-1:1 7-2G:1 7-2M:1");\r
+            var q894 = status.QuestCountList[9];\r
+            PAssert.That(() => q894.ToString() == "5/5");\r
+            PAssert.That(() => q894.ToToolTip() == "1-3 1-4 2-1 2-2 2-3");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 状態をロードするときに獲得資材に特殊資材のリストを追加しない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void LoadStateNotAppendMaterialList()\r
+        {\r
+            var questInfo = new QuestInfo(null, null, () => new DateTime(2015, 1, 1));\r
+            var status = new Status\r
+            {\r
+                QuestList = new[]\r
+                {\r
+                    new QuestStatus\r
+                    {\r
+                        Id = 854,\r
+                        Category = 8,\r
+                        Name = "",\r
+                        Detail = "",\r
+                        Material = new[] {0, 2000, 0, 0, 0, 0, 0, 4}\r
+                    }\r
+                },\r
+                QuestCountList = new[]\r
+                {\r
+                    new QuestCount {Id = 854, NowArray = new[] {1, 0, 1, 0}}\r
+                }\r
+            };\r
+            questInfo.LoadState(status);\r
+            PAssert.That(() => questInfo.Quests[0].Material.Length == 8);\r
         }\r
     }\r
 }
\ No newline at end of file