特殊攻撃の発動済みフラグが次の海戦で消えるのを直す

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index c190925..8163f51 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -266,6 +266,10 @@ namespace KancolleSniffer.Test
             var night = new Sniffer();\r
             SniffLogFile(night, "nelsontouch_003");\r
             PAssert.That(() => night.Battle.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);\r
+            // 海戦をまたがってフラグを引き継ぐ\r
+            var fired = new Sniffer();\r
+            SniffLogFile(fired, "nelsontouch_004");\r
+            PAssert.That(() => fired.Fleets[0].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 277cebc..4f915f5 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 277cebc9ccabcb716943cb0f3a67ad8b7f84e84a
+Subproject commit 4f915f58976ac96320fd84933a3b8c3a6949642a

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index b5fd518..2ab0ab7 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -761,9 +761,8 @@ namespace KancolleSniffer.Model
                 ship.NowHp = NowHp;\r
                 ship.Slot = _status.Slot;\r
                 ship.SlotEx = _status.SlotEx;\r
-                ship.SpecialAttack = _status.SpecialAttack == ShipStatus.Attack.Fire\r
-                    ? ShipStatus.Attack.Fired\r
-                    : ShipStatus.Attack.None;\r
+                if (_status.SpecialAttack == ShipStatus.Attack.Fire)\r
+                    ship.SpecialAttack = ShipStatus.Attack.Fired;\r
             }\r
         }\r
 \r