Merge branch 'master' into 'master'

Tweak Savior of Ollenbock AI logic.

See merge request core-developers/forge!5697
This commit is contained in:
Michael Kamensky
2021-10-31 06:14:25 +00:00

View File

@@ -1304,10 +1304,11 @@ public class SpecialCardAi {
// Savior of Ollenbock // Savior of Ollenbock
public static class SaviorOfOllenbock { public static class SaviorOfOllenbock {
public static boolean consider(final Player ai, final SpellAbility sa) { public static boolean consider(final Player ai, final SpellAbility sa) {
CardCollection threats = CardLists.filter(ai.getOpponents().getCreaturesInPlay(), new Predicate<Card>() { CardCollection oppTargetables = CardLists.getTargetableCards(ai.getOpponents().getCreaturesInPlay(), sa);
CardCollection threats = CardLists.filter(oppTargetables, new Predicate<Card>() {
@Override @Override
public boolean apply(Card card) { public boolean apply(Card card) {
return !ComputerUtilCard.isUselessCreature(card.getController(), card) && sa.canTarget(card); return !ComputerUtilCard.isUselessCreature(card.getController(), card);
} }
}); });
CardCollection ownTgts = CardLists.filter(ai.getCardsIn(ZoneType.Graveyard), CardPredicates.Presets.CREATURES); CardCollection ownTgts = CardLists.filter(ai.getCardsIn(ZoneType.Graveyard), CardPredicates.Presets.CREATURES);