Commit: 10ce17aecf608c6794f5046491cfabe050df1358 - KancolleSniffer (git)

Commit MetaInfo

• Revision: 10ce17aecf608c6794f5046491cfabe050df1358 (tree)
• Zeit: 2016-05-25 00:06:59
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

旗艦大破でダメコンを使って進撃した次の戦闘で大破警告が出るのを直す

Ändern Zusammenfassung

• modified: KancolleSniffer.Test/SnifferTest.cs
• modified: KancolleSniffer.Test/logs
• modified: KancolleSniffer/BattleInfo.cs

Diff

--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -260,6 +260,20 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 旗艦大破で女神を使った進撃を反映する
+        /// </summary>
+        [TestMethod]
+        public void DamageControlForFlagShip()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "damecon_005");
+            var fs = sniffer.GetShipStatuses(0)[0];
+            PAssert.That(() => fs.SlotEx.Id == -1);
+            PAssert.That(() => fs.NowHp == fs.MaxHp);
+            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);
+        }
+
+        /// <summary>
         /// 連合艦隊(水上打撃部隊)で二回目の砲撃戦がない場合を正しく処理する
         /// </summary>
         [TestMethod]

--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit ba32fb8bc4168b693e27866b20c156eb781ffdbd
+Subproject commit a2220ba0cfe0e32d974c33ef3e0eeea49eeb624b

--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -154,6 +154,8 @@ namespace KancolleSniffer
                     ConsumeSlotItem(flagship, 43); // 女神
                     break;
             }
+            if (_flagshipRecoveryType != 0)
+                _shipInfo.SetBadlyDamagedShips();
             _flagshipRecoveryType = 0;
         }