Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed #11426

Browse source
This commit is contained in:
Jeff Wadsworth 2023-11-22 10:22:34 -06:00
parent a4073a83c6
commit c7007a3de3
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -116,7 +116,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
if (hand.size() < 6 if (hand.size() < 6
|| isTestsMode() // ignore mulligan in tests || isTestsMode() // ignore mulligan in tests
|| game.getClass().getName().contains("Momir") // ignore mulligan in Momir games || game.getClass().getName().contains("Momir") // ignore mulligan in Momir games
) { ) {
return false; return false;
} }
Set<Card> lands = hand.getCards(new FilterLandCard(), game); Set<Card> lands = hand.getCards(new FilterLandCard(), game);
@ -135,7 +135,6 @@ public class ComputerPlayer extends PlayerImpl implements Player {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("choose: " + outcome.toString() + ':' + target.toString()); log.debug("choose: " + outcome.toString() + ':' + target.toString());
} }
// controller hints: // controller hints:
// - target.getTargetController(), this.getId() -- player that must makes choices (must be same with this.getId) // - target.getTargetController(), this.getId() -- player that must makes choices (must be same with this.getId)
// - target.getAbilityController(), abilityControllerId -- affected player/controller for all actions/filters // - target.getAbilityController(), abilityControllerId -- affected player/controller for all actions/filters
@ -395,7 +394,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
} }
return false; return false;
} }
if (target.getOriginalTarget() instanceof TargetCardInASingleGraveyard) { if (target.getOriginalTarget() instanceof TargetCardInASingleGraveyard) {
List<Card> cards = new ArrayList<>(); List<Card> cards = new ArrayList<>();
for (Player player : game.getPlayers().values()) { for (Player player : game.getPlayers().values()) {
@ -525,6 +524,26 @@ public class ComputerPlayer extends PlayerImpl implements Player {
return target.isChosen(); return target.isChosen();
} }
if (target.getOriginalTarget() instanceof TargetCard
&& (target.getZone() == Zone.COMMAND)) { // Hellkite Courser
List<Card> cardsInCommandZone = new ArrayList<>();
for (Player player : game.getPlayers().values()) {
for (Card card : game.getCommanderCardsFromCommandZone(player, CommanderCardType.COMMANDER_OR_OATHBREAKER)) {
if (target.canTarget(abilityControllerId, card.getId(), null, game)) {
cardsInCommandZone.add(card);
}
}
}
while (!target.isChosen() && !cardsInCommandZone.isEmpty()) {
Card pick = pickTarget(abilityControllerId, cardsInCommandZone, outcome, target, null, game);
if (pick != null) {
target.addTarget(pick.getId(), null, game);
cardsInCommandZone.remove(pick);
}
}
return target.isChosen();
}
throw new IllegalStateException("Target wasn't handled in computer's choose method: " + target.getClass().getCanonicalName()); throw new IllegalStateException("Target wasn't handled in computer's choose method: " + target.getClass().getCanonicalName());
} //end of choose method } //end of choose method
@ -2746,7 +2765,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
} }
protected void findBestPermanentTargets(Outcome outcome, UUID abilityControllerId, UUID sourceId, Ability source, FilterPermanent filter, Game game, Target target, protected void findBestPermanentTargets(Outcome outcome, UUID abilityControllerId, UUID sourceId, Ability source, FilterPermanent filter, Game game, Target target,
List<Permanent> goodList, List<Permanent> badList, List<Permanent> allList) { List<Permanent> goodList, List<Permanent> badList, List<Permanent> allList) {
// searching for most valuable/powerfull permanents // searching for most valuable/powerfull permanents
goodList.clear(); goodList.clear();
badList.clear(); badList.clear();