From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 21 Oct 2020 13:10:55 +0000 (+0900)
Subject: 新型兵装開発整備の強化のカウンターを実装する
X-Git-Tag: v12.6~9
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=d9da8ed8ad02f22cde66dcd778d0e825753673a3

新型兵装開発整備の強化のカウンターを実装する
---

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 3340b90..251cc7d 100644
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1942,6 +1942,7 @@ namespace KancolleSniffer.Test
         /// 643: 主力「陸攻」の調達
         /// 645: 「洋上補給」物資の調達
         /// 653: 工廠稼働！次期作戦準備！
+        /// 657: 新型兵装開発整備の強化
         /// 663: 新型艤装の継続研究
         /// 673: 装備開発力の整備
         /// 674: 工廠環境の整備
@@ -1953,7 +1954,7 @@ namespace KancolleSniffer.Test
         /// 688: 航空戦力の強化
         /// </summary>
         [TestMethod]
-        public void DestroyItem_613_638_643_645_653_663_673_674_675_676_677_678_680_686_688()
+        public void DestroyItem_613_638_643_645_653_657_663_673_674_675_676_677_678_680_686_688()
         {
             _itemInfo.InjectItemSpec(new[]
             {
@@ -1977,7 +1978,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};
+            var questList = new[] {613, 638, 643, 645, 653, 657, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688};
             InjectQuestList(questList);
             _questCounter.InspectDestroyItem(
                 $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, items.Length))}&api%5Fverno=1");
@@ -1994,6 +1995,7 @@ namespace KancolleSniffer.Test
             }
             var array = new[]
             {
+                new {Id = 657, NowArray = new[] {2, 1, 1}},
                 new {Id = 675, NowArray = new[] {2, 1}}, new {Id = 676, NowArray = new[] {1, 1, 1}},
                 new {Id = 677, NowArray = new[] {1, 1, 1}}, new {Id = 678, NowArray = new[] {1, 1}},
                 new {Id = 680, NowArray = new[] {1, 2}}, new {Id = 686, NowArray = new[] {1, 1}},
diff --git a/KancolleSniffer/Model/QuestCountList.cs b/KancolleSniffer/Model/QuestCountList.cs
index 12ea130..40e78bc 100644
--- 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: 主力「陸攻」の調達
             {645, new QuestDestroyItem {Interval = Monthly, Max = 1, Ids = new[] {35}, Material = new[] {0, 0, 0, 0}, AdjustCount = false}}, // 645: 「洋上補給」物資の調達
             {653, new QuestDestroyItem {Interval = Quarterly, Max = 6, Ids = new[] {4}, Material = new[] {0, 0, 0, 0}, AdjustCount = false}}, // 653: 工廠稼働！次期作戦準備！
+            {657, new QuestDestroyItem {Interval = Yearly9, MaxArray = new[] {6, 5, 4}, Types = new[] {1, 2, 5}, Material = new[] {0, 0, 10, 5}}}, // 657: 新型兵装開発整備の強化
             {663, new QuestDestroyItem {Interval = Quarterly, Max = 10, Types = new[] {3}, Material = new[] {0, 0, 3, 0}}}, // 663: 新型艤装の継続研究
             {673, new QuestDestroyItem {Interval = Daily, Max = 4, Types = new[] {1}, Shift = 1, Material = new[] {0, 0, 1, 0}}}, // 673: 装備開発力の整備
             {674, new QuestDestroyItem {Interval = Daily, Max = 3, Types = new[] {21}, Shift = 2, Material = new[] {0, 1, 1, 0}}}, // 674: 工廠環境の整備