Merge branch 'card-fixes-2' into 'master'

Fix Caller of the Untamed AI

See merge request core-developers/forge!4053
This commit is contained in:
Michael Kamensky
2021-03-01 04:31:19 +00:00

View File

@@ -31,6 +31,8 @@ import forge.util.Aggregates;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import static forge.ai.ComputerUtilCard.getBestCreatureAI;
public class AiCostDecision extends CostDecisionMakerBase { public class AiCostDecision extends CostDecisionMakerBase {
private final SpellAbility ability; private final SpellAbility ability;
private final Card source; private final Card source;
@@ -529,7 +531,11 @@ public class AiCostDecision extends CostDecisionMakerBase {
return null; return null;
} }
hand = CardLists.getValidCards(hand, type.split(";"), player, source, ability); if (cost.getRevealFrom().equals(ZoneType.Exile)) {
hand = CardLists.getValidCards(hand, type.split(";"), player, source, ability);
return PaymentDecision.card(getBestCreatureAI(hand));
}
Integer c = cost.convertAmount(); Integer c = cost.convertAmount();
if (c == null) { if (c == null) {
c = AbilityUtils.calculateAmount(source, cost.getAmount(), ability); c = AbilityUtils.calculateAmount(source, cost.getAmount(), ability);