歴戦「第十方面艦隊」、全力出撃！のカウンターに編成チェックがないのを直す

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 46c8907..d93ddf9 100644 (file)
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1407,10 +1407,17 @@ namespace KancolleSniffer.Test
         {\r
             var count = InjectQuest(928);\r
             _battleInfo.InjectResultStatus(\r
         {\r
             var count = InjectQuest(928);\r
             _battleInfo.InjectResultStatus(\r

-                new[] {ShipStatus("羽黒改二"), ShipStatus("那智"), ShipStatus(1), ShipStatus(1), ShipStatus(1), ShipStatus(1)},\r
+                new[]\r
+                {\r
+                    ShipStatus("羽黒改二"), ShipStatus("那智"), ShipStatus(1), ShipStatus(1), ShipStatus(1), ShipStatus(1)\r
+                },\r

                 new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
 \r
             InjectMapNext(732, 5);\r
                 new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
 \r
             InjectMapNext(732, 5);\r

+            InjectBattleResult("S");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
+\r
+            _battleInfo.Result.Friend.Main[1] = ShipStatus("妙高");\r

             InjectBattleResult("A");\r
             PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
             InjectBattleResult("S");\r
             InjectBattleResult("A");\r
             PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
             InjectBattleResult("S");\r

diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs
index 5433300..cc3e3e6 100644 (file)
--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -335,6 +335,8 @@ namespace KancolleSniffer.Model
                     return specs.Flagship.Name.StartsWith("明石") && specs.Types.Count(type => type == 2) >= 3;\r
                 case 914:\r
                     return specs.Types.Count(type => type == 5) >= 3 && specs.Types.Count(type => type == 2) >= 1;\r
                     return specs.Flagship.Name.StartsWith("明石") && specs.Types.Count(type => type == 2) >= 3;\r
                 case 914:\r
                     return specs.Types.Count(type => type == 5) >= 3 && specs.Types.Count(type => type == 2) >= 1;\r

+                case 928:\r
+                    return specs.Names.Count("羽黒", "足柄", "妙高", "高雄", "神風") >= 2;\r

                 case 318:\r
                     return specs.Types.Count(type => type == 3) >= 2;\r
                 case 329:\r
                 case 318:\r
                     return specs.Types.Count(type => type == 3) >= 2;\r
                 case 329:\r