精鋭複葉機飛行隊の編成のカウンターを実装する

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 251cc7d..d4d9e8a 100644 (file)
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1942,6 +1942,7 @@ namespace KancolleSniffer.Test
         /// 643: 主力「陸攻」の調達\r
         /// 645: 「洋上補給」物資の調達\r
         /// 653: 工廠稼働！次期作戦準備！\r
+        /// 654: 精鋭複葉機飛行隊の編成\r
         /// 657: 新型兵装開発整備の強化\r
         /// 663: 新型艤装の継続研究\r
         /// 673: 装備開発力の整備\r
@@ -1954,7 +1955,7 @@ namespace KancolleSniffer.Test
         /// 688: 航空戦力の強化\r
         /// </summary>\r
         [TestMethod]\r
-        public void DestroyItem_613_638_643_645_653_657_663_673_674_675_676_677_678_680_686_688()\r
+        public void DestroyItem_613_638_643_645_653_654_657_663_673_674_675_676_677_678_680_686_688()\r
         {\r
             _itemInfo.InjectItemSpec(new[]\r
             {\r
@@ -1974,11 +1975,13 @@ namespace KancolleSniffer.Test
                 new ItemSpec {Id = 23, Name = "九九式艦爆", Type = 7},\r
                 new ItemSpec {Id = 16, Name = "九七式艦攻", Type = 8},\r
                 new ItemSpec {Id = 3, Name = "10cm連装高角砲", Type = 1},\r
-                new ItemSpec {Id = 121, Name = "94式高射装置", Type = 36}\r
+                new ItemSpec {Id = 121, Name = "94式高射装置", Type = 36},\r
+                new ItemSpec {Id = 242, Name = "Swordfish", Type = 8},\r
+                new ItemSpec {Id = 249, Name = "Fulmar", Type = 6}\r
             });\r
-            var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31, 35, 23, 16, 3, 121};\r
+            var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31, 35, 23, 16, 3, 121, 242, 249};\r
             _itemInfo.InjectItems(items);\r
-            var questList = new[] {613, 638, 643, 645, 653, 657, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688};\r
+            var questList = new[] {613, 638, 643, 645, 653, 654, 657, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688};\r
             InjectQuestList(questList);\r
             _questCounter.InspectDestroyItem(\r
                 $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, items.Length))}&api%5Fverno=1");\r
@@ -1995,11 +1998,11 @@ namespace KancolleSniffer.Test
             }\r
             var array = new[]\r
             {\r
-                new {Id = 657, NowArray = new[] {2, 1, 1}},\r
-                new {Id = 675, NowArray = new[] {2, 1}}, new {Id = 676, NowArray = new[] {1, 1, 1}},\r
+                new {Id = 654, NowArray = new[] {1, 1}}, new {Id = 657, NowArray = new[] {2, 1, 1}},\r
+                new {Id = 675, NowArray = new[] {3, 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 = 686, NowArray = new[] {1, 1}},\r
-                new {Id = 688, NowArray = new[] {2, 1, 1, 1}}\r
+                new {Id = 688, NowArray = new[] {3, 1, 2, 1}}\r
             };\r
             foreach (var e in array)\r
             {\r

diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 40e78bc..0127417 100644 (file)
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -126,6 +126,7 @@ namespace KancolleSniffer.Model
             {643, new QuestDestroyItem {Interval = Quarterly, Max = 2, Ids = new[] {20}, Material = new[] {0, 0, 2, 0}, AdjustCount = false}}, // 643: 主力「陸攻」の調達\r
             {645, new QuestDestroyItem {Interval = Monthly, Max = 1, Ids = new[] {35}, Material = new[] {0, 0, 0, 0}, AdjustCount = false}}, // 645: 「洋上補給」物資の調達\r
             {653, new QuestDestroyItem {Interval = Quarterly, Max = 6, Ids = new[] {4}, Material = new[] {0, 0, 0, 0}, AdjustCount = false}}, // 653: 工廠稼働！次期作戦準備！\r
+            {654, new QuestDestroyItem {Interval = Yearly10, MaxArray = new[] {1, 2}, Ids = new[] {242, 249}, Material = new[] {0, 0, 0, 0}, AdjustCount = false}}, // 654: 精鋭複葉機飛行隊の編成\r
             {657, new QuestDestroyItem {Interval = Yearly9, MaxArray = new[] {6, 5, 4}, Types = new[] {1, 2, 5}, Material = new[] {0, 0, 10, 5}}}, // 657: 新型兵装開発整備の強化\r
             {663, new QuestDestroyItem {Interval = Quarterly, Max = 10, Types = new[] {3}, Material = new[] {0, 0, 3, 0}}}, // 663: 新型艤装の継続研究\r
             {673, new QuestDestroyItem {Interval = Daily, Max = 4, Types = new[] {1}, Shift = 1, Material = new[] {0, 0, 1, 0}}}, // 673: 装備開発力の整備\r