Commit: 46c1ac9256b5dae27c0f7196d1f61ca38d1ba9be - KancolleSniffer (git)

Commit MetaInfo

• Revision: 46c1ac9256b5dae27c0f7196d1f61ca38d1ba9be (tree)
• Zeit: 2020-05-09 17:16:44
• 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
@@ -1075,6 +1075,51 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 拡張「六水戦」、最前線へ！
+        /// </summary>
+        [TestMethod]
+        public void BattleResult_903()
+        {
+            var count = InjectQuest(903);
+            _battleInfo.InjectResultStatus(new[] {ShipStatus("夕張改二"), ShipStatus("睦月"), ShipStatus("綾波")},
+                new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);
+
+            InjectMapNext(51, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}), "六水戦駆逐が1隻");
+
+            _battleInfo.Result.Friend.Main[2] = 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}), "5-1");
+
+            InjectMapNext(54, 4);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0}), "ボス以外はカウントしない");
+
+            _battleInfo.Result.Friend.Main = new[] {ShipStatus("睦月"), ShipStatus("如月"), ShipStatus("夕張改二")};
+            InjectMapNext(54, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0}), "旗艦が夕張改二ではない");
+
+            _battleInfo.Result.Friend.Main = new[] {ShipStatus("夕張改二"), ShipStatus("弥生"), ShipStatus("卯月")};
+            InjectMapNext(54, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0, 0}), "5-4");
+
+            _battleInfo.Result.Friend.Main = new[] {ShipStatus("夕張改二"), ShipStatus("菊月"), ShipStatus("望月")};
+            InjectMapNext(64, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0}), "6-4");
+
+            InjectMapNext(65, 5);
+            InjectBattleResult("S");
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}), "6-5");
+        }
+
+        /// <summary>
         /// 904: 精鋭「十九駆」、躍り出る！
         /// </summary>
         [TestMethod]

--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -72,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: 空母戦力の投入による兵站線戦闘哨戒
+            {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 = Yearly, 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 = Yearly, MaxArray = new[] {1, 1, 1, 1, 1}, Rank = "A", Maps = new[] {11, 12, 13, 15, 16}, Material = new[] {0, 6, 8, 0}}}, // 905: 「海防艦」、海を護る！
 

--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -311,6 +311,13 @@ namespace KancolleSniffer.Model
                     return specs.Names.Count("鳥海", "青葉", "衣笠", "加古", "古鷹", "天龍", "夕張") >= 4;
                 case 894:
                     return specs.Specs.Any(spec => spec.IsAircraftCarrier);
+                case 903:
+                    return specs.Flagship.Name.StartsWith("夕張改二") &&
+                           specs.Names.Count("睦月", "如月", "弥生", "卯月", "菊月", "望月") >= 2;
+                case 904:
+                    return specs.Names.Count("綾波改二", "敷波改二") == 2;
+                case 905:
+                    return specs.Types.Count(type => type == 1) >= 3 && specs.Types.Length <= 5;
                 case 318:
                     return specs.Types.Count(type => type == 3) >= 2;
                 case 330:
@@ -321,10 +328,6 @@ namespace KancolleSniffer.Model
                     return specs.Names.Count("陽炎", "不知火", "霰", "霞") == 4;
                 case 339:
                     return specs.Names.Count("磯波", "浦波", "綾波", "敷波") == 4;
-                case 904:
-                    return specs.Names.Count("綾波改二", "敷波改二") == 2;
-                case 905:
-                    return specs.Types.Count(type => type == 1) >= 3 && specs.Types.Length <= 5;
                 default:
                     return true;
             }