コミットメタ情報

リビジョン36bcacbf0d331602d210607d25e6b9b59ae5131d (tree)
日時2019-01-06 16:34:34
作者Kazuhiro Fujieda <fujieda@user...>
コミッターKazuhiro Fujieda

ログメッセージ

連合艦隊の雷撃戦で第二艦隊のダメコン発動が計上されないのを直す

変更サマリ

差分

--- a/KancolleSniffer.Test/BattleBriefTest.cs
+++ b/KancolleSniffer.Test/BattleBriefTest.cs
@@ -163,7 +163,7 @@ namespace KancolleSniffer.Test
163163 /// 機動対敵連合の雷撃戦でダメコンが発動する
164164 /// </summary>
165165 [TestMethod]
166- public void TriggerDameConInCombinedBattle()
166+ public void TorpedoTriggerDameConInCombinedBattleAir()
167167 {
168168 var logs = ReadAllLines("damecon_002");
169169 var battle = Data(logs[3]);
@@ -173,5 +173,19 @@ namespace KancolleSniffer.Test
173173 _battleInfo.InspectBattleResult(Data(logs[9]));
174174 PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);
175175 }
176+
177+ /// <summary>
178+ /// 水上対敵連合の雷撃戦でダメコンが発動する
179+ /// </summary>
180+ [TestMethod]
181+ public void TorpedoTriggerDamageControlInCombinedBattleWater()
182+ {
183+ var logs = ReadAllLines("damecon_003");
184+ var battle = Data(logs[3]);
185+ InjectShips(battle, JsonParser.Parse(logs[0]));
186+ _battleInfo.InspectBattle(logs[1], logs[2], battle);
187+ _battleInfo.InspectBattleResult(Data(logs[6]));
188+ PAssert.That(() => _shipInfo.Fleets[1].Ships[5].NowHp == 6);
189+ }
176190 }
177191 }
\ No newline at end of file
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
1-Subproject commit a1e70eb79b837ee58b8a1867aa1120dc3a5b8330
1+Subproject commit aa434af1e9da0eca2ae43ad6820fe7e72930be5f
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -437,7 +437,10 @@ namespace KancolleSniffer.Model
437437 if (guard == null)
438438 return;
439439 for (var i = 0; i < guard.Length; i++)
440+ {
440441 guard[i].ApplyDamage(damage[i + 6]);
442+ guard[i].CheckDamageControl();
443+ }
441444 }
442445
443446 private void CalcDamageByTurn(dynamic json, bool ignoreFriendDamage = false)
旧リポジトリブラウザで表示