連合艦隊同士の雷撃戦のダメージ計算を間違えているのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index dd767cb..9d7a64b 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -544,6 +544,15 @@ namespace KancolleSniffer.Test
             var sniffer2 = new Sniffer();\r
             SniffLogFile(sniffer2, "both_combined_001");\r
             PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S);\r
+\r
+            // 護衛艦隊に雷撃を受ける場合\r
+            var sniffer3 = new Sniffer();\r
+            SniffLogFile(sniffer3, "both_combined_002");\r
+            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S);\r
+            PAssert.That(\r
+                () => sniffer3.GetShipStatuses(0).Select(s => s.NowHp).SequenceEqual(new[] {89, 86, 87, 78, 87, 57}));\r
+            PAssert.That(\r
+                () => sniffer3.GetShipStatuses(1).Select(s => s.NowHp).SequenceEqual(new[] {46, 37, 14, 59, 49, 63}));\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index c617d04..9b1b7ed 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit c617d04f110d073cb8f7c310b86da0b7e5fd8bac
+Subproject commit 9b1b7ed8752bb441e55eb5f233118618615d0498

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index d93be51..9502baa 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -368,7 +368,7 @@ namespace KancolleSniffer
             for (var i = 0; i < friend.Length; i++)\r
                 friend[i].ApplyDamage(damage[i + 1]);\r
             for (var i = 0; i < guard.Length; i++)\r
-                friend[i].ApplyDamage(damage[i + 6 + 1]);\r
+                guard[i].ApplyDamage(damage[i + 6 + 1]);\r
         }\r
 \r
         private void CalcSimpleDamage(dynamic rawDamage, Record[] friend)\r