diff --git a/Mage.Sets/src/mage/sets/futuresight/DustOfMoments.java b/Mage.Sets/src/mage/sets/futuresight/DustOfMoments.java index 941cf8398b0..99284d91a50 100644 --- a/Mage.Sets/src/mage/sets/futuresight/DustOfMoments.java +++ b/Mage.Sets/src/mage/sets/futuresight/DustOfMoments.java @@ -27,19 +27,28 @@ */ package mage.sets.futuresight; +import java.util.List; import java.util.UUID; +import mage.MageObject; +import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.effects.common.counter.AddRemoveAllTimeSuspentCountersEffect; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.Rarity; import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.Filter; import mage.filter.FilterCard; +import mage.filter.predicate.permanent.CardCounterPredicate; import mage.filter.predicate.permanent.CounterPredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; /** * @@ -48,26 +57,17 @@ import mage.filter.predicate.permanent.CounterPredicate; */ public class DustOfMoments extends CardImpl { - private static final Filter filter = new FilterCard("Has Time Counter Filter"); - - static { - filter.add(new CounterPredicate(CounterType.TIME)); - } - public DustOfMoments(UUID ownerId) { super(ownerId, 5, "Dust of Moments", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "FUT"; - // Choose one - Remove two time counters from each permanent and each suspended card - final Counter counter = new Counter(CounterType.TIME.getName(), 2); - this.getSpellAbility().addEffect(new AddRemoveAllTimeSuspentCountersEffect(counter, filter, true)); + // Choose one - Remove two time counters from each permanent and each suspended card with time counter + this.getSpellAbility().addEffect(new RemoveCountersEffect()); - // Or put two time counters on each permanent with a time counter on it and each suspended card + // Or put two time counters on each permanent with a time counter on it and each suspended card with time counter Mode mode = new Mode(); - mode.getEffects().add(new AddRemoveAllTimeSuspentCountersEffect(counter, filter, false)); - this.getSpellAbility().getModes().addMode(mode); - this.getSpellAbility().getModes().setMaxModes(1); - this.getSpellAbility().getModes().setMinModes(1); + mode.getEffects().add(new AddCountersEffect()); + this.getSpellAbility().addMode(mode); } public DustOfMoments(final DustOfMoments card) { @@ -78,4 +78,169 @@ public class DustOfMoments extends CardImpl { public DustOfMoments copy() { return new DustOfMoments(this); } + + + + public abstract static class DustOfMomentsEffect extends OneShotEffect { + + private final Counter counter; + private final Filter permFilter; + private final Filter exiledFilter; + + public DustOfMomentsEffect() { + super(Outcome.Benefit); + this.counter = new Counter(CounterType.TIME.getName(), 2); + this.permFilter = new FilterCard("permanent and each suspended card with time counter"); + permFilter.add(new CounterPredicate(CounterType.TIME)); + + this.exiledFilter = new FilterCard("permanent and each suspended card with time counter"); + exiledFilter.add(new CardCounterPredicate(CounterType.TIME)); + setText(); + } + + public DustOfMomentsEffect(final DustOfMomentsEffect effect) { + super(effect); + this.counter = effect.counter.copy(); + this.permFilter = effect.permFilter.copy(); + this.exiledFilter = effect.exiledFilter.copy(); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + MageObject sourceObject = game.getObject(source.getSourceId()); + if (controller != null && sourceObject != null) { + updatePermanents(game, controller, sourceObject); + updateSuspended(game, controller, sourceObject); + return true; + } + return false; + } + + private void updateSuspended(final Game game, final Player controller, final MageObject sourceObject) { + final List exiledCards = game.getExile().getAllCards(game); + execute(game, controller, sourceObject, exiledCards); + } + + private void updatePermanents(final Game game, final Player controller, final MageObject sourceObject) { + List permanents = game.getBattlefield().getAllActivePermanents(); + executeP(game, controller, sourceObject, permanents); + } + + private void executeP(final Game game, final Player controller, final MageObject sourceObject, final List cards) { + if (cards == null || cards.isEmpty()) { + return; + } + for (Permanent card : cards) { + if (permFilter.match(card, game)) { + final String counterName = counter.getName(); + if (shouldRemoveCounters()) { + final Counter existingCounterOfSameType = card.getCounters().get(counterName); + final int countersToRemove = Math.min(existingCounterOfSameType.getCount(), counter.getCount()); + final Counter modifiedCounter = new Counter(counterName, countersToRemove); + card.removeCounters(modifiedCounter, game); + } else { + card.addCounters(counter, game); + } + if (!game.isSimulation()) + game.informPlayers(new StringBuilder(sourceObject.getName()).append(": ") + .append(controller.getLogName()).append(getActionStr()).append("s") + .append(counter.getCount()).append(" ").append(counterName.toLowerCase()) + .append(" counter on ").append(card.getName()).toString()); + } + } + } + + private void execute(final Game game, final Player controller, final MageObject sourceObject, final List cards) { + if (cards == null || cards.isEmpty()) { + return; + } + for (Card card : cards) { + if (exiledFilter.match(card, game)) { + final String counterName = counter.getName(); + if (shouldRemoveCounters()) { + final Counter existingCounterOfSameType = card.getCounters(game).get(counterName); + final int countersToRemove = Math.min(existingCounterOfSameType.getCount(), counter.getCount()); + final Counter modifiedCounter = new Counter(counterName, countersToRemove); + card.removeCounters(modifiedCounter, game); + } else { + card.addCounters(counter, game); + } + if (!game.isSimulation()) + game.informPlayers(new StringBuilder(sourceObject.getName()).append(": ") + .append(controller.getLogName()).append(getActionStr()).append("s") + .append(counter.getCount()).append(" ").append(counterName.toLowerCase()) + .append(" counter on ").append(card.getName()).toString()); + } + } + } + + protected abstract boolean shouldRemoveCounters(); + + protected abstract String getActionStr(); + + private void setText() { + StringBuilder sb = new StringBuilder(); + sb.append(getActionStr()); + if (counter.getCount() > 1) { + sb.append(Integer.toString(counter.getCount())).append(" ").append(counter.getName().toLowerCase()).append(" counters on each "); + } else { + sb.append("a ").append(counter.getName().toLowerCase()).append(" counter on each "); + } + sb.append(permFilter.getMessage()); + staticText = sb.toString(); + } + } + + public static class AddCountersEffect extends DustOfMomentsEffect { + + public AddCountersEffect() { + super(); + } + + public AddCountersEffect(final DustOfMomentsEffect effect) { + super(effect); + } + + @Override + protected boolean shouldRemoveCounters() { + return false; + } + + @Override + protected String getActionStr() { + return "add"; + } + + @Override + public Effect copy() { + return new AddCountersEffect(this); + } + } + + public static class RemoveCountersEffect extends DustOfMomentsEffect { + + public RemoveCountersEffect() { + super(); + } + + public RemoveCountersEffect(final DustOfMomentsEffect effect) { + super(effect); + } + + @Override + protected boolean shouldRemoveCounters() { + return true; + } + + @Override + protected String getActionStr() { + return "remove"; + } + + @Override + public Effect copy() { + return new RemoveCountersEffect(this); + } + } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/DustOfMomentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/DustOfMomentsTest.java index f2fb41c9d8a..7859f6945e7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/DustOfMomentsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/DustOfMomentsTest.java @@ -18,6 +18,8 @@ import org.mage.test.serverside.base.CardTestPlayerBase; */ public class DustOfMomentsTest extends CardTestPlayerBase { + //TODO: why the hell is PermanentImpl.getCounters() and CardImpl.getCounters(game) don't return the same value for the same card??? + @Test public void test() throws Exception { addCard(Zone.BATTLEFIELD, playerA, "Island", 7); @@ -27,20 +29,24 @@ public class DustOfMomentsTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Dust of Moments"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Chronozoa"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Deep-Sea Kraken"); - castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Dust Of Moments"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Suspend"); // Casts Deep-Sea Kraken as Suspend + castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Dust of Moments"); setModeChoice(playerA, "1"); - setStopAt(3, PhaseStep.PRECOMBAT_MAIN); + setStopAt(3, PhaseStep.END_TURN); execute(); +// Chronozoa should have duplicated final List activeCreatures = currentGame.getBattlefield().getAllActivePermanents(CardType.CREATURE); Assert.assertEquals(2, activeCreatures.size()); for (final Permanent creature : activeCreatures) { Assert.assertEquals("Chronozoa", creature.getName()); + Assert.assertEquals(3, creature.getCounters().getCount(CounterType.TIME)); } + + // Check time counters on kraken final List exiledCards = currentGame.getExile().getAllCards(currentGame); Assert.assertEquals(1, exiledCards.size()); diff --git a/Mage/src/mage/filter/predicate/permanent/CardCounterPredicate.java b/Mage/src/mage/filter/predicate/permanent/CardCounterPredicate.java new file mode 100644 index 00000000000..04fa0123400 --- /dev/null +++ b/Mage/src/mage/filter/predicate/permanent/CardCounterPredicate.java @@ -0,0 +1,36 @@ +package mage.filter.predicate.permanent; + +import mage.cards.Card; +import mage.counters.CounterType; +import mage.filter.predicate.Predicate; +import mage.game.Game; + +/** + * Created by glerman on 3/7/15. + */ +public class CardCounterPredicate implements Predicate{ + + private final CounterType counter; + + /** + * + * @param counter if null any counter selects the permanent + */ + public CardCounterPredicate(CounterType counter) { + this.counter = counter; + } + + @Override + public boolean apply(Card input, Game game) { + if (counter == null) { + return !input.getCounters(game).keySet().isEmpty(); + } else { + return input.getCounters(game).containsKey(counter); + } + } + + @Override + public String toString() { + return "CounterType(" + counter.getName() + ')'; + } +}