Commit: bdea6a71b3c92da88ed2ca8e80fdcb4ba95bce5b - KancolleSniffer (git)

Commit MetaInfo

• Revision: bdea6a71b3c92da88ed2ca8e80fdcb4ba95bce5b (tree)
• Zeit: 2020-03-03 21:14:04
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

精鋭「十九駆」、躍り出る！のカウンターを実装する

Ändern Zusammenfassung

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

Diff

--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1046,6 +1046,45 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 904: 精鋭「十九駆」、躍り出る！
+        /// </summary>
+        [TestMethod]
+        public void BattleResult_904()
+        {
+            var count = InjectQuest(904);
+            _battleInfo.InjectResultStatus(
+                new []{ShipStatus("綾波改二"), ShipStatus("敷波")},
+                new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);
+
+            InjectMapNext(25, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}), "敷波はカウントしない");
+
+            _battleInfo.Result.Friend.Main[1] = ShipStatus("敷波改二");
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}), "A勝利はカウントしない");
+
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0}), "2-5");
+
+            InjectMapNext(34, 4);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0}), "ボス以外はカウントしない");
+
+            InjectMapNext(34, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0, 0}), "3-4");
+
+            InjectMapNext(45, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0}), "4-5");
+
+            InjectMapNext(53, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}), "5-3");
+        }
+
+        /// <summary>
         /// 280と854以降を同時に遂行していると854以降がカウントされないことがある
         /// </summary>
         [TestMethod]

--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -31,7 +31,7 @@ namespace KancolleSniffer.Test
             var queue = new Queue<DateTime>(new[]
             {
                 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(2017, 12, 1, 5, 0, 0), new DateTime(2018, 2, 1, 5, 0, 0)
             });
             var questInfo = new QuestInfo(() => queue.Dequeue());
             var status = new Status
@@ -39,7 +39,8 @@ namespace KancolleSniffer.Test
                 QuestCountList = new[]
                 {
                     new QuestCount {Id = 201, Now = 1}, new QuestCount {Id = 213, Now = 1},
-                    new QuestCount {Id = 265, Now = 1}, new QuestCount {Id = 822, Now = 1}
+                    new QuestCount {Id = 265, Now = 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)
             };
@@ -47,16 +48,16 @@ namespace KancolleSniffer.Test
             questInfo.InspectQuestList(CreateQuestList(new[] {201}));
             questInfo.SaveState(status);
             PAssert.That(() =>
-                status.QuestCountList.Select(qc => new {qc.Id, qc.Now}).SequenceEqual(new[]
-                    {new {Id = 213, Now = 1}, new {Id = 822, Now = 1}})); // デイリーとマンスリーが消える
+                status.QuestCountList.Select(qc => qc.Id).SequenceEqual(new[] {213, 822, 904})); // デイリーとマンスリーが消える
             questInfo.InspectQuestList(CreateQuestList(new[] {201}));
             questInfo.SaveState(status);
-            PAssert.That(() =>
-                status.QuestCountList.Select(qc => new {qc.Id, qc.Now}).SequenceEqual(new[]
-                    {new {Id = 822, Now = 1}})); // ウィークリーが消える
+            PAssert.That(() => status.QuestCountList.Select(qc => qc.Id).SequenceEqual(new[] {822, 904})); // ウィークリーが消える
+            questInfo.InspectQuestList(CreateQuestList(new[] {201}));
+            questInfo.SaveState(status);
+            PAssert.That(() => status.QuestCountList.Select(qc => qc.Id).SequenceEqual(new[] {904})); // クォータリーが消える
             questInfo.InspectQuestList(CreateQuestList(new[] {201}));
             questInfo.SaveState(status);
-            PAssert.That(() => status.QuestCountList.Length == 0); // クォータリーが消える
+            PAssert.That(() => status.QuestCountList.Length == 0); // イヤーリーが消える
         }
 
         [TestMethod]

--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -23,6 +23,7 @@ namespace KancolleSniffer.Model
         private const QuestInterval Weekly = QuestInterval.Weekly;
         private const QuestInterval Monthly = QuestInterval.Monthly;
         private const QuestInterval Quarterly = QuestInterval.Quarterly;
+        private const QuestInterval Yearly = QuestInterval.Yearly;
 
         /// <summary>
         /// このテーブルは七四式電子観測儀を参考に作成した。
@@ -71,6 +72,7 @@ namespace KancolleSniffer.Model
             {888, new QuestSortie {Interval = Quarterly, MaxArray = new[] {1, 1, 1}, Rank = "S", Maps = new[] {51, 53, 54}, Material = new[] {0, 0, 0, 0}}}, // 888: 新編成「三川艦隊」、鉄底海峡に突入せよ！
             {893, new QuestSortie {Interval = Quarterly, MaxArray = new[] {3, 3, 3, 3}, Rank = "S", Maps = new[] {15, 71, 721, 722}, Material = new[] {0, 0, 0, 0}}}, // 893: 泊地周辺海域の安全確保を徹底せよ！
             {894, new QuestSortie {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1, 1}, Rank = "S", Maps = new[] {13, 14, 21, 22, 23}, Material = new[] {0, 0, 0, 0}}}, // 894: 空母戦力の投入による兵站線戦闘哨戒
+            {904, new QuestSortie {Interval = Yearly, MaxArray = new[] {1, 1, 1, 1}, Rank = "S", Maps = new[] {25, 34, 45, 53}, Material = new[] {0, 8, 10, 4}}}, // 904: 精鋭「十九駆」、躍り出る！
 
             {303, new QuestPractice {Interval = Daily, Max = 3, Rank = "E", Material = new[] {1, 0, 0, 0}}}, // 303: 「演習」で練度向上！
             {304, new QuestPractice {Interval = Daily, Max = 5, Rank = "B", Material = new[] {0, 0, 1, 0}}}, // 304: 「演習」で他提督を圧倒せよ！

--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -313,6 +313,8 @@ namespace KancolleSniffer.Model
                     return specs.Names.Count("陽炎", "不知火", "霰", "霞") == 4;
                 case 339:
                     return specs.Names.Count("磯波", "浦波", "綾波", "敷波") == 4;
+                case 904:
+                    return specs.Names.Count("綾波改二", "敷波改二") == 2;
                 default:
                     return true;
             }

--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -62,7 +62,8 @@ namespace KancolleSniffer.Model
         Daily,
         Weekly,
         Monthly,
-        Quarterly
+        Quarterly,
+        Yearly
     }
 
     public class QuestInfo : IHaveState
@@ -117,7 +118,7 @@ namespace KancolleSniffer.Model
         private readonly QuestInterval[] _intervals =
         {
             QuestInterval.Daily, QuestInterval.Weekly, QuestInterval.Monthly,
-            QuestInterval.Other, QuestInterval.Quarterly
+            QuestInterval.Other, QuestInterval.Quarterly, QuestInterval.Yearly
         };
 
         private readonly int[] _progress = {0, 50, 80};
@@ -194,45 +195,37 @@ namespace KancolleSniffer.Model
         private void ResetQuests()
         {
             _now = _nowFunc();
-            if (!CrossBoundary(LastMorning))
+            if (!CrossBoundary(QuestInterval.Daily))
                 return;
-            RemoveQuest(QuestInterval.Daily);
-            _countList.Remove(QuestInterval.Daily);
-            ResetWeekly();
-            ResetMonthly();
-            ResetQuarterly();
+            foreach (var interval in (QuestInterval[])typeof(QuestInterval).GetEnumValues())
+            {
+                if (!CrossBoundary(interval))
+                    continue;
+                RemoveQuest(interval);
+                _countList.Remove(interval);
+            }
             _lastReset = _now;
             NeedSave = true;
         }
 
         private DateTime LastMorning => _now.Date.AddDays(_now.Hour < 5 ? -1 : 0).AddHours(5);
 
-        private void ResetWeekly()
+        private bool CrossBoundary(QuestInterval interval)
         {
-            if (!CrossBoundary(LastMonday.AddHours(5)))
-                return;
-            RemoveQuest(QuestInterval.Weekly);
-            _countList.Remove(QuestInterval.Weekly);
+            return interval switch
+            {
+                QuestInterval.Other => false,
+                QuestInterval.Daily => CrossBoundary(LastMorning),
+                QuestInterval.Weekly => CrossBoundary(LastMonday.AddHours(5)),
+                QuestInterval.Monthly => CrossBoundary(new DateTime(_now.Year, _now.Month, 1, 5, 0, 0)),
+                QuestInterval.Quarterly => CrossBoundary(QuarterlyBoundary.AddHours(5)),
+                QuestInterval.Yearly => CrossBoundary(new DateTime(_now.Year, 2, 1, 5, 0, 0)),
+                _ => false
+            };
         }
 
         private DateTime LastMonday => _now.Date.AddDays(-((6 + (int)_now.DayOfWeek) % 7));
 
-        private void ResetMonthly()
-        {
-            if (!CrossBoundary(new DateTime(_now.Year, _now.Month, 1, 5, 0, 0)))
-                return;
-            RemoveQuest(QuestInterval.Monthly);
-            _countList.Remove(QuestInterval.Monthly);
-        }
-
-        private void ResetQuarterly()
-        {
-            if (!CrossBoundary(QuarterlyBoundary.AddHours(5)))
-                return;
-            RemoveQuest(QuestInterval.Quarterly);
-            _countList.Remove(QuestInterval.Quarterly);
-        }
-
         private DateTime QuarterlyBoundary =>
             _now.Month / 3 == 0
                 ? new DateTime(_now.Year - 1, 12, 1)
@@ -247,12 +240,19 @@ namespace KancolleSniffer.Model
         {
             foreach (var id in
                 (from kv in _quests
-                    where kv.Value.Count.Spec.Interval == interval || // 輸送5と空母3はカウンタを見ないとデイリーにならない
-                          kv.Value.Interval == interval
+                    where MatchInterval(kv.Value, interval)
                     select kv.Key).ToArray())
                 _quests.Remove(id);
         }
 
+        private bool MatchInterval(QuestStatus quest, QuestInterval interval)
+        {
+            var i = quest.Count.Spec.Interval;
+            return i == QuestInterval.Other // 定期任務の定義がない
+                ? quest.Interval == interval
+                : i == interval;
+        }
+
         public void InspectStop(string request)
         {
             var values = HttpUtility.ParseQueryString(request);
@@ -294,5 +294,4 @@ namespace KancolleSniffer.Model
             }
         }
     }
-
 }
\ No newline at end of file