Commit: 80966cecc482e952cadbc8c6a3c12927557cb371 - KancolleSniffer (git)

Commit MetaInfo

• Revisión: 80966cecc482e952cadbc8c6a3c12927557cb371 (tree)
• Tiempo: 2020-02-24 15:23:20
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

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

Cambiar Resumen

• modified: KancolleSniffer.Test/BattleTest.cs
• modified: KancolleSniffer.Test/logs
• modified: KancolleSniffer/Model/BattleInfo.cs

Diferencia incremental

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

--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 277cebc9ccabcb716943cb0f3a67ad8b7f84e84a
+Subproject commit 4f915f58976ac96320fd84933a3b8c3a6949642a

--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -761,9 +761,8 @@ namespace KancolleSniffer.Model
                 ship.NowHp = NowHp;
                 ship.Slot = _status.Slot;
                 ship.SlotEx = _status.SlotEx;
-                ship.SpecialAttack = _status.SpecialAttack == ShipStatus.Attack.Fire
-                    ? ShipStatus.Attack.Fired
-                    : ShipStatus.Attack.None;
+                if (_status.SpecialAttack == ShipStatus.Attack.Fire)
+                    ship.SpecialAttack = ShipStatus.Attack.Fired;
             }
         }