先制対潜攻撃に対応する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index cad0bcc..38ad4d2 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -364,6 +364,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 先制対潜攻撃を正しく処理する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void OpeningTaisen()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "opening_taisen_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
+        }\r
+\r
+        /// <summary>\r
         /// 熟練度込みの制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 052c235..e6ccbe3 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 052c235be571f8df3119e6269c7b2890ae0bc3d5
+Subproject commit e6ccbe3b09140130f97eceed737bda87f200dc95

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index fa44cbc..c209885 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -231,6 +231,11 @@ namespace KancolleSniffer
                 return;\r
             if (json.api_support_info() && json.api_support_info != null)\r
                 CalcSupportDamage(json.api_support_info);\r
+            if (json.api_opening_taisen() && json.api_opening_taisen != null)\r
+            {\r
+                var friend = combined ? _guard : _friend; // 先制対潜攻撃の対象は護衛(たぶん)\r
+                CalcHougekiDamage(json.api_opening_taisen, friend, _enemyHp);\r
+            }\r
             if (json.api_opening_atack != null)\r
             {\r
                 var friend = combined ? _guard : _friend; // 雷撃の対象は護衛\r