diff --git a/Mage.Sets/src/mage/sets/kaladesh/DieYoung.java b/Mage.Sets/src/mage/sets/kaladesh/DieYoung.java index 84db7f89927..02e5310f3ad 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/DieYoung.java +++ b/Mage.Sets/src/mage/sets/kaladesh/DieYoung.java @@ -93,7 +93,8 @@ class DieYoungEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { new GetEnergyCountersControllerEffect(2).apply(game, source); - int numberToPayed = controller.getAmount(0, controller.getCounters().getCount(CounterType.ENERGY), "How many {E} do you like to pay?", game); + int max = controller.getCounters().getCount(CounterType.ENERGY); + int numberToPayed = controller.getAmount(0, max, "How many energy counters do you like to pay? (maximum = " + max + ")", game); if (numberToPayed > 0) { Cost cost = new PayEnergyCost(numberToPayed); if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) { diff --git a/Mage.Sets/src/mage/sets/kaladesh/LiberatingCombustion.java b/Mage.Sets/src/mage/sets/kaladesh/LiberatingCombustion.java index 0bb00fd3708..7f7fffcf438 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/LiberatingCombustion.java +++ b/Mage.Sets/src/mage/sets/kaladesh/LiberatingCombustion.java @@ -109,7 +109,7 @@ class LiberatingCombustionEffect extends OneShotEffect { if (controller.choose(outcome, allCards, target, game)) { Card cardFound = game.getCard(target.getFirstTarget()); if (cardFound != null) { - controller.revealCards(sourceObject.getIdName(), allCards, game); + controller.revealCards(sourceObject.getIdName(), new CardsImpl(cardFound), game); controller.moveCards(cardFound, Zone.HAND, source, game); } } diff --git a/Mage.Sets/src/mage/sets/kaladesh/VerdantCrescendo.java b/Mage.Sets/src/mage/sets/kaladesh/VerdantCrescendo.java index 0822f31e10e..4e526685b92 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/VerdantCrescendo.java +++ b/Mage.Sets/src/mage/sets/kaladesh/VerdantCrescendo.java @@ -102,7 +102,7 @@ class VerdantCrescendoEffect extends OneShotEffect { allCards.addAll(controller.getGraveyard()); FilterCard filter = new FilterCard("a card named Nissa, Nature's Artisan"); filter.add(new NamePredicate("Nissa, Nature's Artisan")); - TargetCard target = new TargetCard(0, 1, Zone.ALL, new FilterCard()); + TargetCard target = new TargetCard(0, 1, Zone.ALL, filter); if (controller.choose(outcome, allCards, target, game)) { Card cardFound = game.getCard(target.getFirstTarget()); if (cardFound != null) { diff --git a/Mage.Sets/src/mage/sets/kaladesh/WildestDreams.java b/Mage.Sets/src/mage/sets/kaladesh/WildestDreams.java index c08bc410f6c..6ee0f20de85 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/WildestDreams.java +++ b/Mage.Sets/src/mage/sets/kaladesh/WildestDreams.java @@ -29,7 +29,7 @@ package mage.sets.kaladesh; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.GetXValue; +import mage.abilities.SpellAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileSpellEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; @@ -38,7 +38,6 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.filter.FilterCard; import mage.game.Game; -import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; /** @@ -62,9 +61,11 @@ public class WildestDreams extends CardImpl { @Override public void adjustTargets(Ability ability, Game game) { - int xValue = new GetXValue().calculate(game, ability, null); - Target target = new TargetCardInYourGraveyard(xValue, new FilterCard("card from your graveyard")); - ability.addTarget(target); + if (ability instanceof SpellAbility) { + int xValue = ability.getManaCostsToPay().getX(); + ability.getTargets().clear(); + ability.addTarget(new TargetCardInYourGraveyard(xValue, new FilterCard("card from your graveyard"))); + } } public WildestDreams(final WildestDreams card) {