夜戦でNelson Touchが識別されないのを直す

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index 9137bd1..d8fe2be 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -261,6 +261,10 @@ namespace KancolleSniffer.Test
             // ship_deckでフラグを引き継ぐ\r
             SniffLogFile(sniffer, "nelsontouch_002");\r
             PAssert.That(() => sniffer.Fleets[0].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);\r
+            // 夜戦\r
+            var night = new Sniffer();\r
+            SniffLogFile(night, "nelsontouch_003");\r
+            PAssert.That(() => night.Battle.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index 5fea3f2..b127553 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -449,7 +449,7 @@ namespace KancolleSniffer.Model
 \r
             var eFlags = (int[])json.api_at_eflag;\r
             var sources = (int[])json.api_at_list;\r
-            var types = json.api_at_type() ? (int[])json.api_at_type : null;\r
+            var types = json.api_at_type() ? (int[])json.api_at_type : (int[])json.api_sp_list;\r
             var targets = (int[][])json.api_df_list;\r
             var damages = (int[][])json.api_damage;\r
             var records = new[] {new Record[12], new Record[12]};\r
@@ -461,7 +461,7 @@ namespace KancolleSniffer.Model
             {\r
                 if (ignoreFriendDamage && eFlags[turn] == 1)\r
                     continue;\r
-                if (types != null && types[turn] == 100) // Nelson Touch\r
+                if (types[turn] == 100) // Nelson Touch\r
                     records[eFlags[turn] ^ 1][sources[turn]].TriggerSpecialAttack();\r
                 for (var shot = 0; shot < targets[turn].Length; shot++)\r
                 {\r