轟沈した艦娘について大破警告を出さない

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index c48fe62..fbee858 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -297,6 +297,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 轟沈した艦娘に大破警告を出さない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NotWarnToSunkShip()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "sunk_001");\r
+            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new [] {"磯波"}));\r
+        }\r
+\r
+        /// <summary>\r
         /// 連合艦隊(水上打撃部隊)で二回目の砲撃戦がない場合を正しく処理する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index e2b2bea..5b95506 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit e2b2beaf1d91f2d7b61d24dd12e8c32b4fa49bbb
+Subproject commit 5b95506a58dd16180981ecca3968e522595d1272

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 2949f24..6a52a6b 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -67,11 +67,14 @@ namespace KancolleSniffer
             Minor,\r
             Small,\r
             Half,\r
-            Badly\r
+            Badly,\r
+            Sunk\r
         }\r
 \r
         public static Damage CalcDamage(int now, int max)\r
         {\r
+            if (now == 0 && max > 0)\r
+                return Damage.Sunk;\r
             var ratio = max == 0 ? 1 : (double)now / max;\r
             return ratio > 0.75 ? Damage.Minor : ratio > 0.5 ? Damage.Small : ratio > 0.25 ? Damage.Half : Damage.Badly;\r
         }\r
@@ -194,7 +197,7 @@ namespace KancolleSniffer
         }\r
 \r
         public int PreparedDamageControl =>\r
-            (DamageLevel < Damage.Badly)\r
+            DamageLevel != Damage.Badly\r
                 ? -1\r
                 : SlotEx.Spec.Id == 42 || SlotEx.Spec.Id == 43\r
                     ? SlotEx.Spec.Id\r

diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs
index 389ff9b..7181e42 100644 (file)
--- a/KancolleSniffer/ShipLabels.cs
+++ b/KancolleSniffer/ShipLabels.cs
@@ -446,6 +446,8 @@ namespace KancolleSniffer
         {\r
             switch (status.DamageLevel)\r
             {\r
+                case ShipStatus.Damage.Sunk:\r
+                    return Color.CornflowerBlue;\r
                 case ShipStatus.Damage.Badly:\r
                     return Color.Red;\r
                 case ShipStatus.Damage.Half:\r