Commit: f5a864721d45c2e816bf43d12c99a322da182950 - KancolleSniffer (git)

Commit MetaInfo

• Revision: f5a864721d45c2e816bf43d12c99a322da182950 (tree)
• Zeit: 2020-05-10 17:58:40
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

工作艦「明石」護衛任務のカウンターを実装する

Ändern Zusammenfassung

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

Diff

--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1210,6 +1210,55 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 912: 工作艦「明石」護衛任務
+        /// </summary>
+        [TestMethod]
+        public void BattleResult_912()
+        {
+            var count = InjectQuest(912);
+            _battleInfo.InjectResultStatus(
+                new []{ShipStatus("明石"), ShipStatus(2), ShipStatus(2), ShipStatus(1)},
+                new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);
+
+            InjectMapNext(13, 5);
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0, 0}), "駆逐艦2隻はカウントしない");
+
+            _battleInfo.Result.Friend.Main[3] = ShipStatus(2);
+            InjectBattleResult("B");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0, 0}), "B勝利はカウントしない");
+
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0, 0}), "1-3");
+
+            InjectMapNext(21, 4);
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0, 0}), "ボス以外はカウントしない");
+
+            _battleInfo.Result.Friend.Main[0] = ShipStatus(2);
+            _battleInfo.Result.Friend.Main[1] = ShipStatus("明石");
+            InjectMapNext(21, 5);
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0, 0}), "旗艦明石以外はカウントしない");
+
+            _battleInfo.Result.Friend.Main[0] = ShipStatus("明石");
+            _battleInfo.Result.Friend.Main[1] = ShipStatus(2);
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0, 0, 0}), "2-1");
+
+            InjectMapNext(22, 5);
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0, 0}), "2-2");
+
+            InjectMapNext(23, 5);
+            InjectBattleResult("A");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 0}), "2-3");
+
+            InjectMapNext(16, 8);
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 1}), "1-6");
+        }
+
+        /// <summary>
         /// 280と854以降を同時に遂行していると854以降がカウントされないことがある
         /// </summary>
         [TestMethod]

--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -76,6 +76,7 @@ namespace KancolleSniffer.Model
             {903, new QuestSortie {Interval = Quarterly, MaxArray = new[] {1, 1, 1, 1}, Rank = "S", Maps = new[] {51, 54, 64, 65}, Material = new[] {0, 10, 0, 0}}}, // 903: 拡張「六水戦」、最前線へ！
             {904, new QuestSortie {Interval = Yearly2, MaxArray = new[] {1, 1, 1, 1}, Rank = "S", Maps = new[] {25, 34, 45, 53}, Material = new[] {0, 8, 10, 4}}}, // 904: 精鋭「十九駆」、躍り出る！
             {905, new QuestSortie {Interval = Yearly2, MaxArray = new[] {1, 1, 1, 1, 1}, Rank = "A", Maps = new[] {11, 12, 13, 15, 16}, Material = new[] {0, 6, 8, 0}}}, // 905: 「海防艦」、海を護る！
+            {912, new QuestSortie {Interval = Yearly3, MaxArray = new[] {1, 1, 1, 1, 1}, Rank = "A", Maps = new[] {13, 21, 22, 23, 16}, Material = new[] {0, 5, 6, 0}}}, // 912: 工作艦「明石」護衛任務
 
             {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
@@ -319,6 +319,8 @@ namespace KancolleSniffer.Model
                     return specs.Names.Count("綾波改二", "敷波改二") == 2;
                 case 905:
                     return specs.Types.Count(type => type == 1) >= 3 && specs.Types.Length <= 5;
+                case 912:
+                    return specs.Flagship.Name.StartsWith("明石") && specs.Types.Count(type => type == 2) >= 3;
                 case 318:
                     return specs.Types.Count(type => type == 3) >= 2;
                 case 330: