From 36bcacbf0d331602d210607d25e6b9b59ae5131d Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 6 Jan 2019 16:34:34 +0900
Subject: [PATCH] =?utf8?q?=E9=80=A3=E5=90=88=E8=89=A6=E9=9A=8A=E3=81=AE?=
 =?utf8?q?=E9=9B=B7=E6=92=83=E6=88=A6=E3=81=A7=E7=AC=AC=E4=BA=8C=E8=89=A6?=
 =?utf8?q?=E9=9A=8A=E3=81=AE=E3=83=80=E3=83=A1=E3=82=B3=E3=83=B3=E7=99=BA?=
 =?utf8?q?=E5=8B=95=E3=81=8C=E8=A8=88=E4=B8=8A=E3=81=95=E3=82=8C=E3=81=AA?=
 =?utf8?q?=E3=81=84=E3=81=AE=E3=82=92=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/BattleBriefTest.cs | 16 +++++++++++++++-
 KancolleSniffer.Test/logs               |  2 +-
 KancolleSniffer/Model/BattleInfo.cs     |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/KancolleSniffer.Test/BattleBriefTest.cs b/KancolleSniffer.Test/BattleBriefTest.cs
index 01cd6a9..35ecef7 100644
--- a/KancolleSniffer.Test/BattleBriefTest.cs
+++ b/KancolleSniffer.Test/BattleBriefTest.cs
@@ -163,7 +163,7 @@ namespace KancolleSniffer.Test
         /// 機動対敵連合の雷撃戦でダメコンが発動する
         /// </summary>
         [TestMethod]
-        public void TriggerDameConInCombinedBattle()
+        public void TorpedoTriggerDameConInCombinedBattleAir()
         {
             var logs = ReadAllLines("damecon_002");
             var battle = Data(logs[3]);
@@ -173,5 +173,19 @@ namespace KancolleSniffer.Test
             _battleInfo.InspectBattleResult(Data(logs[9]));
             PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);
         }
+
+        /// <summary>
+        /// 水上対敵連合の雷撃戦でダメコンが発動する
+        /// </summary>
+        [TestMethod]
+        public void TorpedoTriggerDamageControlInCombinedBattleWater()
+        {
+            var logs = ReadAllLines("damecon_003");
+            var battle = Data(logs[3]);
+            InjectShips(battle, JsonParser.Parse(logs[0]));
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);
+            _battleInfo.InspectBattleResult(Data(logs[6]));
+            PAssert.That(() => _shipInfo.Fleets[1].Ships[5].NowHp == 6);
+        }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index a1e70eb..aa434af 160000
--- 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
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -437,7 +437,10 @@ namespace KancolleSniffer.Model
             if (guard == null)
                 return;
             for (var i = 0; i < guard.Length; i++)
+            {
                 guard[i].ApplyDamage(damage[i + 6]);
+                guard[i].CheckDamageControl();
+            }
         }
 
         private void CalcDamageByTurn(dynamic json, bool ignoreFriendDamage = false)
-- 
2.11.0