From 9ed14f9f9933e3e03bdbe58e94a70f57c5919495 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 22 Nov 2020 22:24:29 +0900
Subject: [PATCH] =?utf8?q?=E5=B7=A5=E5=BB=A0=E3=83=95=E3=83=AB=E7=A8=BC?=
 =?utf8?q?=E5=83=8D=EF=BC=81=E6=96=B0=E5=85=B5=E8=A3=85=E3=82=92=E9=96=8B?=
 =?utf8?q?=E7=99=BA=E3=81=9B=E3=82=88=EF=BC=81=E3=81=AE=E3=82=AB=E3=82=A6?=
 =?utf8?q?=E3=83=B3=E3=82=BF=E3=83=BC=E3=82=92=E5=AE=9F=E8=A3=85=E3=81=99?=
 =?utf8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/QuestCounterTest.cs | 7 ++++---
 KancolleSniffer/Model/QuestCountList.cs  | 2 ++
 KancolleSniffer/Model/QuestInfo.cs       | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index d11e1c9..2288c7c 100644
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1985,7 +1985,7 @@ namespace KancolleSniffer.Test
         /// 688: 航空戦力の強化
         /// </summary>
         [TestMethod]
-        public void DestroyItem_613_638_643_645_653_654_657_663_673_674_675_676_677_678_680_686_688()
+        public void DestroyItem_613_638_643_645_653_654_655_657_663_673_674_675_676_677_678_680_686_688()
         {
             _itemInfo.InjectItemSpec(new[]
             {
@@ -2011,7 +2011,7 @@ namespace KancolleSniffer.Test
             });
             var items = new[] {1, 37, 19, 4, 11, 75, 7, 25, 13, 20, 28, 31, 35, 23, 16, 3, 121, 242, 249};
             _itemInfo.InjectItems(items);
-            var questList = new[] {613, 638, 643, 645, 653, 654, 657, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688};
+            var questList = new[] {613, 638, 643, 645, 655, 653, 654, 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");
@@ -2028,7 +2028,8 @@ namespace KancolleSniffer.Test
             }
             var array = new[]
             {
-                new {Id = 654, NowArray = new[] {1, 1}}, new {Id = 657, NowArray = new[] {2, 1, 1}},
+                new {Id = 654, NowArray = new[] {1, 1}}, new {Id = 655, NowArray = new[] {2, 1, 1, 1, 2}},
+                new {Id = 657, NowArray = new[] {2, 1, 1}},
                 new {Id = 675, NowArray = new[] {3, 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 222c182..b5ab125 100644
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -29,6 +29,7 @@ namespace KancolleSniffer.Model
         private const QuestInterval Yearly8 = QuestInterval.Yearly8;
         private const QuestInterval Yearly9 = QuestInterval.Yearly9;
         private const QuestInterval Yearly10 = QuestInterval.Yearly10;
+        private const QuestInterval Yearly11 = QuestInterval.Yearly11;
 
         /// <summary>
         /// このテーブルは七四式電子観測儀を参考に作成した。
@@ -128,6 +129,7 @@ namespace KancolleSniffer.Model
             {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: 工廠稼働！次期作戦準備！
             {654, new QuestDestroyItem {Interval = Yearly10, MaxArray = new[] {1, 2}, Ids = new[] {242, 249}, Material = new[] {0, 0, 0, 0}, AdjustCount = false}}, // 654: 精鋭複葉機飛行隊の編成
+            {655, new QuestDestroyItem {Interval = Yearly11, MaxArray = new[] {5, 5, 5, 5, 5}, Types = new[] {1, 2, 3, 10, 8}, Material = new[] {0, 0, 10, 5}, AdjustCount = false}}, // 655: 工廠フル稼働！新兵装を開発せよ！
             {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: 装備開発力の整備
diff --git a/KancolleSniffer/Model/QuestInfo.cs b/KancolleSniffer/Model/QuestInfo.cs
index 3d94a64..b71b09a 100644
--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -67,7 +67,8 @@ namespace KancolleSniffer.Model
         Yearly5,
         Yearly8,
         Yearly9,
-        Yearly10
+        Yearly10,
+        Yearly11
     }
 
     public class QuestInfo : IHaveState
@@ -203,6 +204,7 @@ namespace KancolleSniffer.Model
                 QuestInterval.Yearly8 => CrossBoundary(new DateTime(_now.Year, 8, 1, 5, 0, 0)),
                 QuestInterval.Yearly9 => CrossBoundary(new DateTime(_now.Year, 9, 1, 5, 0, 0)),
                 QuestInterval.Yearly10 => CrossBoundary(new DateTime(_now.Year, 10, 1, 5, 0, 0)),
+                QuestInterval.Yearly11 => CrossBoundary(new DateTime(_now.Year, 11, 1, 5, 0, 0)),
                 _ => false
             };
         }
-- 
2.11.0