連合艦隊の第二艦隊の旗艦の大破警告を出さない

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 5d088b2..a231bf2 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -453,6 +453,18 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 連合艦隊の第二艦隊の旗艦の大破警告を出さない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NotWarnDamagedFlagshipInGuardFleet()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "taiha_003");\r
+            PAssert.That(() => sniffer.GetShipStatuses(1)[0].NowHp == 12);\r
+            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
+        }\r
+\r
+        /// <summary>\r
         /// 熟練度込みの制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 8a7773d..3d4d8cc 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 8a7773d0959f0c040eb06b7cb31f1940828dd02a
+Subproject commit 3d4d8ccf9739fc9a16b30415b9467aab4f805dbf

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 5c51beb..97bac52 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -614,7 +614,11 @@ namespace KancolleSniffer
         public void SetBadlyDamagedShips()\r
         {\r
             BadlyDamagedShips =\r
-                _inSortie.SelectMany((sortie, i) => sortie ? GetShipStatuses(i) : new ShipStatus[0])\r
+                _inSortie.SelectMany((flag, i) => !flag\r
+                        ? new ShipStatus[0]\r
+                        : _combinedFleetType > 0 && i == 1\r
+                            ? GetShipStatuses(1).Skip(1) // 連合艦隊第二の旗艦を飛ばす\r
+                            : GetShipStatuses(i))\r
                     .Where(s => !s.Escaped && s.DamageLevel == ShipStatus.Damage.Badly)\r
                     .Select(s => s.Name)\r
                     .ToArray();\r