単艦退避するとエラーになるのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 2bb1684..8219876 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -161,6 +161,18 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 護衛退避する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void EscapeWithEscort()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "escape_001");\r
+            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped &&\r
+            sniffer.GetShipStatuses(1)[2].Escaped);\r
+        }\r
+\r
+        /// <summary>\r
         /// 出撃時に大破している艦娘がいたら警告する\r
         /// </summary>\r
         [TestMethod]\r
@@ -553,7 +565,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},\r
                 new[] {288194, 282623, 299496, 295958, 3000, 2968, 2997, 7},\r
                 new[] {288185, 282623, 299496, 295943, 3000, 2968, 2997, 7},\r
-                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7},\r
+                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7}\r
             };\r
             PAssert.That(() => SequenceOfSequenceEqual(expected3, result3), "航空機の補充");\r
 \r
@@ -577,7 +589,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},\r
                 new[] {261012, 252252, 298492, 279622, 3000, 2842, 3000, 22},\r
                 new[] {261012, 252252, 298492, 279538, 3000, 2842, 3000, 22},\r
-                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22},\r
+                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22}\r
             };\r
             PAssert.That(() => SequenceOfSequenceEqual(expected4, result4), "航空機の配備");\r
         }\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 5827b6c..0703212 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 5827b6cae69e6be85e7d4ba19561a41512cd9924
+Subproject commit 0703212fa06ef74f0816da8eb5b3d28254188385

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index c5de9b0..40315a8 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -513,9 +513,16 @@ namespace KancolleSniffer
             if (!json.api_escape_flag() || (int)json.api_escape_flag == 0)\r
                 return;\r
             var damaged = (int)json.api_escape.api_escape_idx[0] - 1;\r
-            _escapingShips.Add(_shipInfo.GetDeck(damaged / 6)[damaged % 6]);\r
-            var escort = (int)json.api_escape.api_tow_idx[0] - 1;\r
-            _escapingShips.Add(_shipInfo.GetDeck(escort / 6)[escort % 6]);\r
+            if (json.api_escape.api_tow_idx())\r
+            {\r
+                _escapingShips.Add(_shipInfo.GetDeck(damaged / 6)[damaged % 6]);\r
+                var escort = (int)json.api_escape.api_tow_idx[0] - 1;\r
+                _escapingShips.Add(_shipInfo.GetDeck(escort / 6)[escort % 6]);\r
+            }\r
+            else\r
+            {\r
+                _escapingShips.Add(_shipInfo.GetDeck(2)[damaged]);\r
+            }\r
         }\r
 \r
         public void CauseCombinedBattleEscape()\r