連合艦隊の雷撃戦で第二艦隊のダメコン発動が計上されないのを直す

diff --git a/KancolleSniffer.Test/BattleBriefTest.cs b/KancolleSniffer.Test/BattleBriefTest.cs
index 01cd6a9..35ecef7 100644 (file)
--- a/KancolleSniffer.Test/BattleBriefTest.cs
+++ b/KancolleSniffer.Test/BattleBriefTest.cs
@@ -163,7 +163,7 @@ namespace KancolleSniffer.Test
         /// 機動対敵連合の雷撃戦でダメコンが発動する\r
         /// </summary>\r
         [TestMethod]\r
         /// 機動対敵連合の雷撃戦でダメコンが発動する\r
         /// </summary>\r
         [TestMethod]\r

-        public void TriggerDameConInCombinedBattle()\r
+        public void TorpedoTriggerDameConInCombinedBattleAir()\r

         {\r
             var logs = ReadAllLines("damecon_002");\r
             var battle = Data(logs[3]);\r
         {\r
             var logs = ReadAllLines("damecon_002");\r
             var battle = Data(logs[3]);\r


@@ -173,5 +173,19 @@ namespace KancolleSniffer.Test
             _battleInfo.InspectBattleResult(Data(logs[9]));\r
             PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
         }\r
             _battleInfo.InspectBattleResult(Data(logs[9]));\r
             PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
         }\r

+\r
+        /// <summary>\r
+        /// 水上対敵連合の雷撃戦でダメコンが発動する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void TorpedoTriggerDamageControlInCombinedBattleWater()\r
+        {\r
+            var logs = ReadAllLines("damecon_003");\r
+            var battle = Data(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattleResult(Data(logs[6]));\r
+            PAssert.That(() => _shipInfo.Fleets[1].Ships[5].NowHp == 6);\r
+        }\r

     }\r
 }
\ No newline at end of file
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index a1e70eb..aa434af 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit a1e70eb79b837ee58b8a1867aa1120dc3a5b8330
+Subproject commit aa434af1e9da0eca2ae43ad6820fe7e72930be5f

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index a3ca5fa..5f20f6e 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -437,7 +437,10 @@ namespace KancolleSniffer.Model
             if (guard == null)\r
                 return;\r
             for (var i = 0; i < guard.Length; i++)\r
             if (guard == null)\r
                 return;\r
             for (var i = 0; i < guard.Length; i++)\r

+            {\r

                 guard[i].ApplyDamage(damage[i + 6]);\r
                 guard[i].ApplyDamage(damage[i + 6]);\r

+                guard[i].CheckDamageControl();\r
+            }\r

         }\r
 \r
         private void CalcDamageByTurn(dynamic json, bool ignoreFriendDamage = false)\r
         }\r
 \r
         private void CalcDamageByTurn(dynamic json, bool ignoreFriendDamage = false)\r