From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 31 Mar 2018 05:41:13 +0000 (+0900)
Subject: 主力「陸攻」の調達と「洋上補給」物資の調達のカウンターを実装する
X-Git-Tag: v10.6~7
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=a7c60828c60138c0cb2d2cf371346d9bd9cdb6fa

主力「陸攻」の調達と「洋上補給」物資の調達のカウンターを実装する
---

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index c1c6b14..cef14ba 100644
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -968,6 +968,8 @@ namespace KancolleSniffer.Test
         /// <summary>
         /// 613: 資源の再利用
         /// 638: 対空機銃量産
+        /// 643: 主力「陸攻」の調達
+        /// 645: 「洋上補給」物資の調達
         /// 663: 新型艤装の継続研究
         /// 673: 装備開発力の整備
         /// 674: 工廠環境の整備
@@ -978,10 +980,10 @@ namespace KancolleSniffer.Test
         /// 680: 対空兵装の整備拡充
         /// </summary>
         [TestMethod]
-        public void DestroyItem_613_638_663_673_674_675_676_677_678()
+        public void DestroyItem_613_638_643_645_663_673_674_675_676_677_678()
         {
             var itemInfo = new ItemInfo();
-            var questInfo = new QuestInfo(itemInfo, null, () => new DateTime(2015, 1, 1)) {AcceptMax = 10};
+            var questInfo = new QuestInfo(itemInfo, null, () => new DateTime(2015, 1, 1)) {AcceptMax = 12};
 
             itemInfo.InjectItemSpec(new[]
             {
@@ -996,17 +998,19 @@ namespace KancolleSniffer.Test
                 new ItemSpec {Id = 13, Name = "61cm三連装魚雷", Type = 5},
                 new ItemSpec {Id = 20, Name = "零式艦戦21型", Type = 6},
                 new ItemSpec {Id = 28, Name = "22号水上電探", Type = 12},
-                new ItemSpec {Id = 31, Name = "32号水上電探", Type = 13}
+                new ItemSpec {Id = 31, Name = "32号水上電探", Type = 13},
+                new ItemSpec {Id = 35, Name = "三式弾", Type = 18}
             });
-            var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31};
+            var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31, 35};
             itemInfo.InjectItems(items);
             questInfo.InspectQuestList(CreateQuestList(new[]
-                {613, 638, 663, 673, 674, 675, 676, 677, 678, 680}));
+                {613, 638, 643, 645, 663, 673, 674, 675, 676, 677, 678, 680}));
             questInfo.InspectDestroyItem(
                 $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, items.Length))}&api%5Fverno=1", null);
             var scalar = new[]
             {
-                new {Id = 613, Now = 1}, new {Id = 638, Now = 1},
+
+                new {Id = 613, Now = 1}, new {Id = 638, Now = 1}, new {Id = 643, Now = 1}, new {Id = 645, Now = 1},
                 new {Id = 663, Now = 1}, new {Id = 673, Now = 1}, new {Id = 674, Now = 1}
             };
             foreach (var e in scalar)
diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/QuestInfo.cs
index 9e3fdb8..a963148 100644
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/QuestInfo.cs
@@ -303,6 +303,8 @@ namespace KancolleSniffer
 
             {613, new QuestSpec {Interval = Weekly, Max = 24, Material = new[] {0, 0, 0, 0}}}, // 613: 資源の再利用
             {638, new QuestDestroyItem {Interval = Weekly, Max = 6, Types = new[] {21}, Material = new[] {0, 0, 2, 1}}}, // 638: 対空機銃量産
+            {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: 「洋上補給」物資の調達
             {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: 工廠環境の整備