提交: bad21b1362e7e80c5fae7feb1c096c0ade6ea5d5 - KancolleSniffer (git)

Commit MetaInfo

• 修订版: bad21b1362e7e80c5fae7feb1c096c0ade6ea5d5 (tree)
• 时间: 2020-09-26 21:54:58
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

兵站強化遠征任務【基本作戦】【拡張作戦】のカンターを追加する

更改概述

• modified: KancolleSniffer.Test/QuestCounterTest.cs
• modified: KancolleSniffer.Test/QuestInfoTest.cs
• modified: KancolleSniffer/Model/QuestCountList.cs
• modified: KancolleSniffer/Model/QuestInfo.cs

差异

--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -168,7 +168,9 @@ namespace KancolleSniffer.Test
                     new QuestCount {Id = 226, Now = 2},
                     new QuestCount {Id = 436, NowArray = new[] {1, 0, 1, 1, 1}},
                     new QuestCount {Id = 437, NowArray = new[] {1, 0, 1, 1}},
-                    new QuestCount {Id = 438, NowArray = new[] {1, 0, 1, 1}}
+                    new QuestCount {Id = 438, NowArray = new[] {1, 0, 1, 1}},
+                    new QuestCount {Id = 439, NowArray = new[] {1, 0, 1, 1}},
+                    new QuestCount {Id = 440, NowArray = new[] {1, 0, 1, 1, 1}}
                 }
             };
             var countList = new QuestCountList();
@@ -181,13 +183,18 @@ namespace KancolleSniffer.Test
                 new {api_id = 5, api_name = "海上護衛任務"},
                 new {api_id = 9, api_name = "タンカー護衛任務"},
                 new {api_id = 10, api_name = "強行偵察任務"},
+                new {api_id = 11, api_name = "ボーキサイト輸送任務"},
+                new {api_id = 40, api_name = "水上機前線輸送"},
+                new {api_id = 46, api_name = "南西海域戦闘哨戒"},
+                new {api_id = 71, api_name = "ブルネイ泊地沖哨戒"},
                 new {api_id = 100, api_name = "兵站強化任務"},
                 new {api_id = 101, api_name = "海峡警備行動"},
                 new {api_id = 102, api_name = "長時間対潜警戒"},
                 new {api_id = 104, api_name = "小笠原沖哨戒線"},
                 new {api_id = 105, api_name = "小笠原沖戦闘哨戒"},
                 new {api_id = 110, api_name = "南西方面航空偵察作戦"},
-                new {api_id = 114, api_name = "南西諸島捜索撃滅戦"}
+                new {api_id = 114, api_name = "南西諸島捜索撃滅戦"},
+                new {api_id = 142, api_name = "強行鼠輸送作戦"}
             }));
             new QuestInfo(countList).LoadState(status);
             Assert.AreEqual("2/3", status.QuestCountList[0].ToString());
@@ -238,6 +245,12 @@ namespace KancolleSniffer.Test
             var q438 = status.QuestCountList.First(q => q.Id == 438);
             Assert.AreEqual("1\u200a0\u200a1\u200a1", q438.ToString());
             Assert.AreEqual("対潜警戒任務1 兵站強化任務0 タンカー護衛任務1 南西諸島捜索撃滅戦1", q438.ToToolTip());
+            var q439 = status.QuestCountList.First(q => q.Id == 439);
+            Assert.AreEqual("1\u200a0\u200a1\u200a1", q439.ToString());
+            Assert.AreEqual("海上護衛任務1 兵站強化任務0 ボーキサイト輸送任務1 南西方面航空偵察作戦1", q439.ToToolTip());
+            var q440 = status.QuestCountList.First(q => q.Id == 440);
+            Assert.AreEqual("1\u200a0\u200a1\u200a1\u200a1", q440.ToString());
+            Assert.AreEqual("海上護衛任務1 ブルネイ泊地沖哨戒0 南西海域戦闘哨戒1 水上機前線輸送1 強行鼠輸送作戦1", q440.ToToolTip());
         }
     }
 
@@ -1730,6 +1743,66 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 439: 兵站強化遠征任務【基本作戦】
+        /// </summary>
+        [TestMethod]
+        public void MissionResult_439()
+        {
+            var count = InjectQuest(439);
+
+            _questCounter.InspectDeck(Js(
+                new[]
+                {
+                    new {api_id = 2, api_mission = new[] {2, 5}},
+                    new {api_id = 3, api_mission = new[] {2, 100}},
+                    new {api_id = 4, api_mission = new[] {2, 11}}
+                }));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=4", Js(new {api_clear_result = 1}));
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0}));
+
+            _questCounter.InspectDeck(Js(
+                new[]
+                {
+                    new {api_id = 2, api_mission = new[] {2, 110}}
+                }));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));
+        }
+
+        /// <summary>
+        /// 440: 兵站強化遠征任務【拡張作戦】
+        /// </summary>
+        [TestMethod]
+        public void MissionResult_440()
+        {
+            var count = InjectQuest(440);
+
+            _questCounter.InspectDeck(Js(
+                new[]
+                {
+                    new {api_id = 2, api_mission = new[] {2, 71}},
+                    new {api_id = 3, api_mission = new[] {2, 5}},
+                    new {api_id = 4, api_mission = new[] {2, 40}}
+                }));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=4", Js(new {api_clear_result = 1}));
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0, 1, 0}));
+
+            _questCounter.InspectDeck(Js(
+                new[]
+                {
+                    new {api_id = 2, api_mission = new[] {2, 142}},
+                    new {api_id = 3, api_mission = new[] {2, 46}}
+                }));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));
+            _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new { api_clear_result = 1 }));
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 1}));
+        }
+
+        /// <summary>
         /// 503: 艦隊大整備！
         /// 504: 艦隊酒保祭り！
         /// </summary>

--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -33,34 +33,36 @@ namespace KancolleSniffer.Test
                 new DateTime(2017, 11, 1, 5, 0, 0), new DateTime(2017, 11, 6, 5, 0, 0),
                 new DateTime(2017, 12, 1, 5, 0, 0), new DateTime(2018, 2, 1, 5, 0, 0),
                 new DateTime(2018, 3, 1, 5, 0, 0), new DateTime(2018, 5, 1, 5, 0, 0),
-                new DateTime(2018, 8, 1, 5, 0, 0)
+                new DateTime(2018, 8, 1, 5, 0, 0), new DateTime(2018, 9, 1, 5, 0, 0)
             });
             var questInfo = MakeQuestInfo(() => queue.Dequeue());
             var status = new Status
             {
                 QuestCountList = new[]
                 {
-                    new QuestCount {Id = 201, Now = 1}, new QuestCount {Id = 213, Now = 1},
+                    new QuestCount {Id = 201, Now = 1},
                     new QuestCount {Id = 265, Now = 1},
+                    new QuestCount {Id = 213, Now = 1},
+                    new QuestCount {Id = 822, Now = 1},
+                    new QuestCount {Id = 904, NowArray = new[] {1, 1, 1, 1}},
                     new QuestCount {Id = 436, NowArray = new[] {1, 1, 1, 1, 0}},
                     new QuestCount {Id = 437, NowArray = new[] {1, 1, 1, 1}},
                     new QuestCount {Id = 438, NowArray = new[] {1, 1, 1, 1}},
-                    new QuestCount {Id = 822, Now = 1},
-                    new QuestCount {Id = 904, NowArray = new[] {1, 1, 1, 1}}
                 },
                 QuestLastReset = new DateTime(2017, 10, 31, 5, 0, 0)
             };
+            var ids = status.QuestCountList.Select(qc => qc.Id).ToArray();
             questInfo.LoadState(status);
-            CheckQuestCountList(questInfo, status, new[] {213, 436, 437, 438, 822, 904}); // デイリーとマンスリーが消える
-            CheckQuestCountList(questInfo, status, new[] {436, 437, 438, 822, 904}); // ウィークリーが消える
-            CheckQuestCountList(questInfo, status, new[] {436, 437, 438, 904}); // クォータリーが消える
-            CheckQuestCountList(questInfo, status, new[] {436, 437, 438}); // イヤーリー2月が消える
-            CheckQuestCountList(questInfo, status, new[] {437, 438}); // イヤーリー3月が消える
-            CheckQuestCountList(questInfo, status, new[] {438}); // イヤーリー5月が消える
-            CheckQuestCountList(questInfo, status, new int[0]); // イヤーリー8月が消える
+            CheckQuestCountList(questInfo, status, ids.Skip(2)); // デイリーとマンスリーが消える
+            CheckQuestCountList(questInfo, status, ids.Skip(3)); // ウィークリーが消える
+            CheckQuestCountList(questInfo, status, ids.Skip(4)); // クォータリーが消える
+            CheckQuestCountList(questInfo, status, ids.Skip(5)); // イヤーリー2月が消える
+            CheckQuestCountList(questInfo, status, ids.Skip(6)); // イヤーリー3月が消える
+            CheckQuestCountList(questInfo, status, ids.Skip(7)); // イヤーリー5月が消える
+            CheckQuestCountList(questInfo, status, ids.Skip(8)); // イヤーリー8月が消える
         }
 
-        private void CheckQuestCountList(QuestInfo questInfo, Status status, int[] quests)
+        private void CheckQuestCountList(QuestInfo questInfo, Status status, IEnumerable<int> quests)
         {
             InspectQuestList(questInfo, new[] {201});
             questInfo.SaveState(status);

--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -27,6 +27,7 @@ namespace KancolleSniffer.Model
         private const QuestInterval Yearly3 = QuestInterval.Yearly3;
         private const QuestInterval Yearly5 = QuestInterval.Yearly5;
         private const QuestInterval Yearly8 = QuestInterval.Yearly8;
+        private const QuestInterval Yearly9 = QuestInterval.Yearly9;
 
         /// <summary>
         /// このテーブルは七四式電子観測儀を参考に作成した。
@@ -103,6 +104,8 @@ namespace KancolleSniffer.Model
             {436, new QuestMission {Interval = Yearly3, MaxArray = new[] {1, 1, 1, 1, 1}, Ids = new[] {1, 2, 3, 4, 10}, Material = new [] {0, 4, 0, 0}}}, // 436: 練習航海及び警備任務を実施せよ！
             {437, new QuestMission {Interval = Yearly5, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {4, 104, 105, 110}, Material = new [] {0, 0, 7, 3}, Shift = 1}}, // 437: 小笠原沖哨戒線の強化を実施せよ！
             {438, new QuestMission {Interval = Yearly8, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {4, 100, 9, 114}, Material = new[] {0, 0, 5, 4}, Shift = 1}}, // 438: 南西諸島方面の海上護衛を強化せよ！
+            {439, new QuestMission {Interval = Yearly9, MaxArray = new[] {1, 1, 1, 1}, Ids = new[] {5, 100, 11, 110}, Material = new[] {0, 0, 5, 4}, Shift = 1}}, // 439: 兵站強化遠征任務【基本作戦】
+            {440, new QuestMission {Interval = Yearly9, MaxArray = new[] {1, 1, 1, 1, 1}, Ids = new[] {5, 71, 46, 40, 142}, Material = new[] {0, 0, 0, 4}}}, // 440: 兵站強化遠征任務【拡張作戦】
 
             {503, new QuestSpec {Interval = Daily, Max = 5, Material = new[] {0, 2, 0, 0}}}, // 503: 艦隊大整備！
             {504, new QuestSpec {Interval = Daily, Max = 15, Material = new[] {1, 0, 1, 0}}}, // 504: 艦隊酒保祭り！

--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -65,7 +65,8 @@ namespace KancolleSniffer.Model
         Yearly2,
         Yearly3,
         Yearly5,
-        Yearly8
+        Yearly8,
+        Yearly9
     }
 
     public class QuestInfo : IHaveState
@@ -199,6 +200,7 @@ namespace KancolleSniffer.Model
                 QuestInterval.Yearly3 => CrossBoundary(new DateTime(_now.Year, 3, 1, 5, 0, 0)),
                 QuestInterval.Yearly5 => CrossBoundary(new DateTime(_now.Year, 5, 1, 5, 0, 0)),
                 QuestInterval.Yearly8 => CrossBoundary(new DateTime(_now.Year, 8, 1, 5, 0, 0)),
+                QuestInterval.Yearly9 => CrossBoundary(new DateTime(_now.Year, 9, 1, 5, 0, 0)),
                 _ => false
             };
         }