| リビジョン | 3f2c1ea1dd67159b32645cb4af454a97ca8189dc (tree) |
|---|---|
| 日時 | 2017-11-28 23:43:23 |
| 作者 | Kazuhiro Fujieda <fujieda@user...> |
| コミッター | Kazuhiro Fujieda |
単艦退避がうまくいかないのを直す
KancolleSniffer.Test/SnifferTest.cs (diff) KancolleSniffer.Test/logs (diff) KancolleSniffer/BattleInfo.cs (diff) KancolleSniffer/ShipInfo.cs (diff) KancolleSniffer/Sniffer.cs (diff)| @@ -196,6 +196,18 @@ namespace KancolleSniffer.Test | ||
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /// <summary> |
| 199 | + /// 単艦退避する | |
| 200 | + /// </summary> | |
| 201 | + [TestMethod] | |
| 202 | + public void EscapeWithoutEscort() | |
| 203 | + { | |
| 204 | + var sniffer = new Sniffer(); | |
| 205 | + SniffLogFile(sniffer, "escape_002"); | |
| 206 | + PAssert.That(() => sniffer.GetShipStatuses(2)[1].Escaped); | |
| 207 | + PAssert.That(() => sniffer.WrongBattleResult.Count == 0); | |
| 208 | + } | |
| 209 | + | |
| 210 | + /// <summary> | |
| 199 | 211 | /// 出撃時に大破している艦娘がいたら警告する |
| 200 | 212 | /// </summary> |
| 201 | 213 | [TestMethod] |
| @@ -1 +1 @@ | ||
| 1 | -Subproject commit 8148b3aa3b3f941a7f28a656fea6a7dc6536b7ea | |
| 1 | +Subproject commit 17f72eb97f79b2e51c183a4bc2c8a91d4db99445 |
| @@ -561,7 +561,7 @@ namespace KancolleSniffer | ||
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | 563 | |
| 564 | - public void CauseCombinedBattleEscape() | |
| 564 | + public void CauseEscape() | |
| 565 | 565 | { |
| 566 | 566 | _shipInfo.SetEscapedShips(_escapingShips); |
| 567 | 567 | _shipInfo.SetBadlyDamagedShips(); |
| @@ -139,7 +139,7 @@ namespace KancolleSniffer | ||
| 139 | 139 | { |
| 140 | 140 | WrongBattleResult = (from assumed in _battleResult |
| 141 | 141 | let actual = GetStatus(assumed.Id) |
| 142 | - where assumed.NowHp != actual.NowHp | |
| 142 | + where !assumed.Escaped && assumed.NowHp != actual.NowHp | |
| 143 | 143 | select new ShipStatusPair(assumed, actual)).ToList(); |
| 144 | 144 | _battleResult = new ShipStatus[0]; |
| 145 | 145 | } |
| @@ -107,7 +107,7 @@ namespace KancolleSniffer | ||
| 107 | 107 | return ApiMember(url, json); |
| 108 | 108 | if (url.Contains("kousyou")) |
| 109 | 109 | return ApiKousyou(url, request, data); |
| 110 | - if (url.Contains("battle")) | |
| 110 | + if (url.Contains("battle") || url.Contains("sortie")) | |
| 111 | 111 | return ApiBattle(url, request, data); |
| 112 | 112 | return ApiOthers(url, request, data); |
| 113 | 113 | } |
| @@ -332,9 +332,9 @@ namespace KancolleSniffer | ||
| 332 | 332 | _battleInfo.InspectPracticeResult(data); |
| 333 | 333 | return Update.Ship; |
| 334 | 334 | } |
| 335 | - if (url.EndsWith("api_req_combined_battle/goback_port")) | |
| 335 | + if (url.EndsWith("/goback_port")) | |
| 336 | 336 | { |
| 337 | - _battleInfo.CauseCombinedBattleEscape(); | |
| 337 | + _battleInfo.CauseEscape(); | |
| 338 | 338 | return Update.Ship; |
| 339 | 339 | } |
| 340 | 340 | _battleInfo.BattleState = BattleState.Unknown; |
KancolleSniffer
Fork