diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java b/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java index f24f7fa13d..f0c9389814 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java @@ -27,28 +27,23 @@ */ package mage.sets.dragonsmaze; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.Rarity; -import mage.constants.WatcherScope; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; -import mage.watchers.WatcherImpl; +import mage.watchers.common.CardsDrawnDuringDrawStepWatcher; /** * @@ -71,7 +66,7 @@ public class NotionThief extends CardImpl { this.addAbility(FlashAbility.getInstance()); // If an opponent would draw a card except the first one he or she draws in each of his or her draw steps, instead that player skips that draw and you draw a card. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NotionThiefReplacementEffect())); - this.addWatcher(new NotionThiefDrawWatcher()); + this.addWatcher(new CardsDrawnDuringDrawStepWatcher()); } @@ -119,70 +114,15 @@ class NotionThiefReplacementEffect extends ReplacementEffectImpl 0) { + if (game.getActivePlayerId().equals(event.getPlayerId())) { + CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get("CardsDrawnDuringDrawStep"); + if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) { + return true; + } + } else { return true; } } return false; } } - -/* - * counts cards drawn during draw step - */ -class NotionThiefDrawWatcher extends WatcherImpl { - - private Map amountOfCardsDrawnThisTurn = new HashMap(); - - public NotionThiefDrawWatcher() { - super("NotionThiefDrawWatcher", WatcherScope.GAME); - } - - public NotionThiefDrawWatcher(final NotionThiefDrawWatcher watcher) { - super(watcher); - for (Entry entry : watcher.amountOfCardsDrawnThisTurn.entrySet()) { - amountOfCardsDrawnThisTurn.put(entry.getKey(), entry.getValue()); - } - } - - @Override - public void watch(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.UNTAP_STEP_PRE) { - reset(); - } - if (event.getType() == GameEvent.EventType.DREW_CARD - && game.getPhase() != null - && game.getPhase().getStep().getType().equals(PhaseStep.DRAW)) { - UUID playerId = event.getPlayerId(); - if (playerId != null) { - Integer amount = amountOfCardsDrawnThisTurn.get(playerId); - if (amount == null) { - amount = Integer.valueOf(1); - } else { - amount = Integer.valueOf(amount + 1); - } - amountOfCardsDrawnThisTurn.put(playerId, amount); - } - } - } - - public int getAmountCardsDrawn(UUID playerId) { - Integer amount = amountOfCardsDrawnThisTurn.get(playerId); - if (amount != null) { - return amount.intValue(); - } - return 0; - } - - @Override - public void reset() { - amountOfCardsDrawnThisTurn.clear(); - } - - @Override - public NotionThiefDrawWatcher copy() { - return new NotionThiefDrawWatcher(this); - } -} diff --git a/Mage.Sets/src/mage/sets/judgment/Envelop.java b/Mage.Sets/src/mage/sets/judgment/Envelop.java new file mode 100644 index 0000000000..0afe36efcd --- /dev/null +++ b/Mage.Sets/src/mage/sets/judgment/Envelop.java @@ -0,0 +1,70 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.judgment; + +import java.util.UUID; +import mage.abilities.effects.common.CounterTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.FilterSpell; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.target.TargetSpell; + +/** + * + * @author LevelX2 + */ +public class Envelop extends CardImpl { + + private static final FilterSpell filter = new FilterSpell("Sorcery"); + + static { + filter.add(new CardTypePredicate(CardType.SORCERY)); + } + + public Envelop(UUID ownerId) { + super(ownerId, 39, "Envelop", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); + this.expansionSetCode = "JUD"; + + this.color.setBlue(true); + + // Counter target sorcery spell. + this.getSpellAbility().addEffect(new CounterTargetEffect()); + this.getSpellAbility().addTarget(new TargetSpell(filter)); + } + + public Envelop(final Envelop card) { + super(card); + } + + @Override + public Envelop copy() { + return new Envelop(this); + } +} diff --git a/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java new file mode 100644 index 0000000000..c1ce550142 --- /dev/null +++ b/Mage.Sets/src/mage/sets/legends/ChainsOfMephistopheles.java @@ -0,0 +1,130 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.legends; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.players.Player; +import mage.target.targetpointer.FixedTarget; +import mage.watchers.common.CardsDrawnDuringDrawStepWatcher; + +/** + * + * @author LevelX2 + */ +public class ChainsOfMephistopheles extends CardImpl { + + public ChainsOfMephistopheles(UUID ownerId) { + super(ownerId, 5, "Chains of Mephistopheles", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); + this.expansionSetCode = "LEG"; + + this.color.setBlack(true); + + // If a player would draw a card except the first one he or she draws in his or her draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of his or her library into his or her graveyard. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChainsOfMephistophelesReplacementEffect())); + this.addWatcher(new CardsDrawnDuringDrawStepWatcher()); + } + + public ChainsOfMephistopheles(final ChainsOfMephistopheles card) { + super(card); + } + + @Override + public ChainsOfMephistopheles copy() { + return new ChainsOfMephistopheles(this); + } +} + +class ChainsOfMephistophelesReplacementEffect extends ReplacementEffectImpl { + + public ChainsOfMephistophelesReplacementEffect() { + super(Duration.WhileOnBattlefield, Outcome.Benefit); + staticText = "If a player would draw a card except the first one he or she draws in his or her draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of his or her library into his or her graveyard"; + } + + public ChainsOfMephistophelesReplacementEffect(final ChainsOfMephistophelesReplacementEffect effect) { + super(effect); + } + + @Override + public ChainsOfMephistophelesReplacementEffect copy() { + return new ChainsOfMephistophelesReplacementEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + return true; + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + Player player = game.getPlayer(event.getPlayerId()); + if (player != null) { + if (player.getHand().isEmpty()) { + // he or she puts the top card of his or her library into his or her graveyard + Effect effect = new PutTopCardOfLibraryIntoGraveTargetEffect(1); + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + effect.apply(game, source); + return true; + } else { + // discards a card instead. If the player discards a card this way, he or she draws a card. + player.discard(1, source, game); + return false; + } + } + return false; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (event.getType() == EventType.DRAW_CARD) { + if (game.getActivePlayerId().equals(event.getPlayerId())) { + CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get("CardsDrawnDuringDrawStep"); + if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) { + return true; + } + } else { + return true; + } + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java b/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java new file mode 100644 index 0000000000..0166a3db26 --- /dev/null +++ b/Mage.Sets/src/mage/sets/urzassaga/BackToBasics.java @@ -0,0 +1,73 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.urzassaga; + +import java.util.UUID; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.SkipUntapAllEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; +import mage.filter.FilterPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.SupertypePredicate; + +/** + * + * @author LevelX2 + */ +public class BackToBasics extends CardImpl { + + private static final FilterPermanent filter = new FilterPermanent("Nonbasic lands"); + + static { + filter.add(Predicates.not(new SupertypePredicate("Basic"))); + } + + public BackToBasics(UUID ownerId) { + super(ownerId, 62, "Back to Basics", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); + this.expansionSetCode = "USG"; + + this.color.setBlue(true); + + // Nonbasic lands don't untap during their controllers' untap steps. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, filter))); + } + + public BackToBasics(final BackToBasics card) { + super(card); + } + + @Override + public BackToBasics copy() { + return new BackToBasics(this); + } +} diff --git a/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java b/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java new file mode 100644 index 0000000000..fdb883019a --- /dev/null +++ b/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java @@ -0,0 +1,99 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ + +package mage.watchers.common; + +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import mage.constants.PhaseStep; +import mage.constants.WatcherScope; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.watchers.WatcherImpl; + +/** + * + * @author LevelX2 + * + * Counts cards drawn during draw step + * + */ + +public class CardsDrawnDuringDrawStepWatcher extends WatcherImpl { + + private final Map amountOfCardsDrawnThisTurn = new HashMap<>(); + + public CardsDrawnDuringDrawStepWatcher() { + super("CardsDrawnDuringDrawStep", WatcherScope.GAME); + } + + public CardsDrawnDuringDrawStepWatcher(final CardsDrawnDuringDrawStepWatcher watcher) { + super(watcher); + for (Entry entry : watcher.amountOfCardsDrawnThisTurn.entrySet()) { + amountOfCardsDrawnThisTurn.put(entry.getKey(), entry.getValue()); + } + } + + @Override + public void watch(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.DREW_CARD + && game.getPhase() != null + && game.getPhase().getStep().getType().equals(PhaseStep.DRAW)) { + UUID playerId = event.getPlayerId(); + if (playerId != null) { + Integer amount = amountOfCardsDrawnThisTurn.get(playerId); + if (amount == null) { + amount = Integer.valueOf(1); + } else { + amount = Integer.valueOf(amount + 1); + } + amountOfCardsDrawnThisTurn.put(playerId, amount); + } + } + } + + public int getAmountCardsDrawn(UUID playerId) { + Integer amount = amountOfCardsDrawnThisTurn.get(playerId); + if (amount != null) { + return amount.intValue(); + } + return 0; + } + + @Override + public void reset() { + amountOfCardsDrawnThisTurn.clear(); + } + + @Override + public CardsDrawnDuringDrawStepWatcher copy() { + return new CardsDrawnDuringDrawStepWatcher(this); + } +}