Merge remote-tracking branch 'upstream/master'

Mage.Sets/src/mage/cards/d/DoomedDissenter.java

@@ -0,0 +1,64 @@
+/*
+ *  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.cards.d;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.game.permanent.token.ZombieToken;
+
+/**
+ *
+ * @author Styxo
+ */
+public class DoomedDissenter extends CardImpl {
+
+    public DoomedDissenter(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}");
+        
+        this.subtype.add("Human");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // When Doomed Dissenter dies, create a 2/2 black Zombie creature token.        
+        this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ZombieToken())));
+    }
+
+    public DoomedDissenter(final DoomedDissenter card) {
+        super(card);
+    }
+
+    @Override
+    public DoomedDissenter copy() {
+        return new DoomedDissenter(this);
+    }
+}

Mage.Sets/src/mage/cards/h/HeavenEarth.java

@@ -0,0 +1,52 @@
+package mage.cards.h;
+
+import java.util.UUID;
+import mage.abilities.dynamicvalue.common.ManacostVariableValue;
+import mage.abilities.effects.common.DamageAllEffect;
+import mage.abilities.keyword.AftermathAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.cards.SplitCard;
+import mage.constants.CardType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+
+/**
+ *
+ * @author Styxo
+ */
+public class HeavenEarth extends SplitCard {
+
+    private static final FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying");
+    private static final FilterCreaturePermanent filterWithouFlying = new FilterCreaturePermanent("creature without flying");
+
+    static {
+        filterFlying.add(new AbilityPredicate(FlyingAbility.class));
+        filterWithouFlying.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
+    }
+
+    public HeavenEarth(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.SORCERY}, "{X}{G}", "{X}{R}{R}", false);
+
+        // Falling
+        // Falling deals X damage to each creature with flying.
+        getLeftHalfCard().getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), filterFlying));
+
+        // to
+        // Earth
+        // Earth deals X damage to each creature without flying.
+        ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility());
+        getRightHalfCard().getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), filterWithouFlying));
+    }
+
+    public HeavenEarth(final HeavenEarth card) {
+        super(card);
+    }
+
+    @Override
+    public HeavenEarth copy() {
+        return new HeavenEarth(this);
+    }
+}

Mage.Sets/src/mage/cards/q/QuarryHauler.java

@@ -0,0 +1,126 @@
+/*
+ *  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.cards.q;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.counters.Counter;
+import mage.counters.CounterType;
+import mage.counters.Counters;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author Styxo
+ */
+public class QuarryHauler extends CardImpl {
+
+    public QuarryHauler(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
+
+        this.subtype.add("Camel");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(3);
+
+        // When Quarry Hauler enters the battlefield, for each kind of counter on target permanent, put another counter of that kind on it or remove one from it.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new QuarryHaulerEffect());
+        ability.addTarget(new TargetPermanent());
+        this.addAbility(ability);
+    }
+
+    public QuarryHauler(final QuarryHauler card) {
+        super(card);
+    }
+
+    @Override
+    public QuarryHauler copy() {
+        return new QuarryHauler(this);
+    }
+}
+
+class QuarryHaulerEffect extends OneShotEffect {
+
+    public QuarryHaulerEffect() {
+        super(Outcome.BoostCreature);
+        this.staticText = "for each kind of counter on target permanent, put another counter of that kind on it or remove one from it";
+
+    }
+
+    public QuarryHaulerEffect(final QuarryHaulerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public QuarryHaulerEffect copy() {
+        return new QuarryHaulerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+        if (controller != null) {
+            if (permanent != null) {
+                Counters counters = permanent.getCounters(game).copy();
+                CounterType counterType;
+                for (Counter counter : counters.values()) {
+                    if (controller.chooseUse(Outcome.BoostCreature, "Do you want to add or remove a " + counter.getName() + " counter?", null, "add", "remove", source, game)) {
+                        counterType = CounterType.findByName(counter.getName());
+                        Counter counterToAdd;
+                        if (counterType != null) {
+                            counterToAdd = counterType.createInstance();
+                        } else {
+                            counterToAdd = new Counter(counter.getName());
+                        }
+                        permanent.addCounters(counterToAdd, source, game);
+                    } else {
+                        counterType = CounterType.findByName(counter.getName());
+                        if (counterType != null) {
+                            permanent.removeCounters(counterType.createInstance(), game);
+                        } else {
+                            permanent.removeCounters(counter.getName(), 1, game);
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+}

Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java

@@ -0,0 +1,198 @@
+/*
+ *  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.cards.v;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.effects.AsThoughManaEffect;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.AsThoughEffectType;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.ManaType;
+import mage.constants.Outcome;
+import mage.constants.SubLayer;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.ManaPoolItem;
+import mage.players.Player;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class VizierOfTheMenagerie extends CardImpl {
+
+    public VizierOfTheMenagerie(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
+        this.subtype.add("Naga");
+        this.subtype.add("Cleric");
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(4);
+
+        // You may look at the top card of your library. (You may do this at any time.)
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VizierOfTheMenagerieTopCardRevealedEffect()));
+
+        // You may cast the top card of your library if it's a creature card.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VizierOfTheMenagerieTopCardCastEffect()));
+
+        // You may spend mana as though it were mana of any type to cast creature spells.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VizierOfTheMenagerieManaEffect()));
+
+    }
+
+    public VizierOfTheMenagerie(final VizierOfTheMenagerie card) {
+        super(card);
+    }
+
+    @Override
+    public VizierOfTheMenagerie copy() {
+        return new VizierOfTheMenagerie(this);
+    }
+}
+
+class VizierOfTheMenagerieTopCardRevealedEffect extends ContinuousEffectImpl {
+
+    public VizierOfTheMenagerieTopCardRevealedEffect() {
+        super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Benefit);
+        staticText = "You may look at the top card of your library. (You may do this at any time.)";
+    }
+
+    public VizierOfTheMenagerieTopCardRevealedEffect(final VizierOfTheMenagerieTopCardRevealedEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            Card topCard = controller.getLibrary().getFromTop(game);
+            if (topCard != null) {
+                MageObject vizierOfTheMenagerie = source.getSourceObject(game);
+                if (vizierOfTheMenagerie != null) {
+                    controller.lookAtCards("Top card of " + vizierOfTheMenagerie.getLogName() + " controller's library", topCard, game);
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public VizierOfTheMenagerieTopCardRevealedEffect copy() {
+        return new VizierOfTheMenagerieTopCardRevealedEffect(this);
+    }
+}
+
+class VizierOfTheMenagerieTopCardCastEffect extends AsThoughEffectImpl {
+
+    public VizierOfTheMenagerieTopCardCastEffect() {
+        super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
+        staticText = "You may cast the top card of your library if it's a creature card";
+    }
+
+    public VizierOfTheMenagerieTopCardCastEffect(final VizierOfTheMenagerieTopCardCastEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public VizierOfTheMenagerieTopCardCastEffect copy() {
+        return new VizierOfTheMenagerieTopCardCastEffect(this);
+    }
+
+    @Override
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        if (affectedControllerId.equals(source.getControllerId())) {
+            Card card = game.getCard(objectId);
+            if (card != null) {
+                Player controller = game.getPlayer(affectedControllerId);
+                if (controller != null) {
+                    Card topCard = controller.getLibrary().getFromTop(game);
+                    MageObject vizierOfTheMenagerie = game.getObject(source.getSourceId());
+                    if (vizierOfTheMenagerie != null
+                            && topCard != null) {
+                        if (topCard == card
+                                && topCard.isCreature()) {
+                            return controller.cast(topCard.getSpellAbility(), game, false);
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
+
+class VizierOfTheMenagerieManaEffect extends AsThoughEffectImpl implements AsThoughManaEffect {
+
+    public VizierOfTheMenagerieManaEffect() {
+        super(AsThoughEffectType.SPEND_OTHER_MANA, Duration.WhileOnBattlefield, Outcome.Benefit);
+        staticText = "You may spend mana as though it were mana of any type to cast creature spells";
+    }
+
+    public VizierOfTheMenagerieManaEffect(final VizierOfTheMenagerieManaEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public VizierOfTheMenagerieManaEffect copy() {
+        return new VizierOfTheMenagerieManaEffect(this);
+    }
+
+    @Override
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        if (source.getControllerId().equals(affectedControllerId)) {
+            MageObject mageObject = game.getObject(objectId);
+            return mageObject != null
+                    && mageObject.isCreature();
+        }
+        return false;
+    }
+
+    @Override
+    public ManaType getAsThoughManaType(ManaType manaType, ManaPoolItem mana, UUID affectedControllerId, Ability source, Game game) {
+        return mana.getFirstAvailable();
+    }
+}

Mage.Sets/src/mage/sets/Amonkhet.java

@@ -97,6 +97,7 @@ public class Amonkhet extends ExpansionSet {
         cards.add(new SetCardInfo("Destined // Lead", 217, Rarity.UNCOMMON, mage.cards.d.DestinedLead.class));
         cards.add(new SetCardInfo("Dissenter's Deliverance", 164, Rarity.COMMON, mage.cards.d.DissentersDeliverance.class));
         cards.add(new SetCardInfo("Djeru's Resolve", 11, Rarity.COMMON, mage.cards.d.DjerusResolve.class));
+        cards.add(new SetCardInfo("Doomed Dissenter", 87, Rarity.COMMON, mage.cards.d.DoomedDissenter.class));
         cards.add(new SetCardInfo("Drake Haven", 51, Rarity.RARE, mage.cards.d.DrakeHaven.class));
         cards.add(new SetCardInfo("Dune Beetle", 89, Rarity.COMMON, mage.cards.d.DuneBeetle.class));
         cards.add(new SetCardInfo("Dusk // Dawn", 210, Rarity.RARE, mage.cards.d.DuskDawn.class));
@@ -122,6 +123,7 @@ public class Amonkhet extends ExpansionSet {
         cards.add(new SetCardInfo("Hazoret the Fervent", 136, Rarity.MYTHIC, mage.cards.h.HazoretTheFervent.class));
         cards.add(new SetCardInfo("Hazoret's Favor", 137, Rarity.RARE, mage.cards.h.HazoretsFavor.class));
         cards.add(new SetCardInfo("Hazoret's Monument", 229, Rarity.UNCOMMON, mage.cards.h.HazoretsMonument.class));
+        cards.add(new SetCardInfo("Heaven // Earth", 224, Rarity.RARE, mage.cards.h.HeavenEarth.class));
         cards.add(new SetCardInfo("Honored Hydra", 172, Rarity.RARE, mage.cards.h.HonoredHydra.class));
         cards.add(new SetCardInfo("Hyena Pack", 139, Rarity.COMMON, mage.cards.h.HyenaPack.class));
         cards.add(new SetCardInfo("Impeccable Timing", 18, Rarity.COMMON, mage.cards.i.ImpeccableTiming.class));
@@ -165,6 +167,7 @@ public class Amonkhet extends ExpansionSet {
         cards.add(new SetCardInfo("Prepared // Fight", 220, Rarity.RARE, mage.cards.p.PreparedFight.class));
         cards.add(new SetCardInfo("Prowling Serpopard", 180, Rarity.RARE, mage.cards.p.ProwlingSerpopard.class));
         cards.add(new SetCardInfo("Pull from Tomorrow", 65, Rarity.RARE, mage.cards.p.PullFromTomorrow.class));
+        cards.add(new SetCardInfo("Quarry Hauler", 181, Rarity.COMMON, mage.cards.q.QuarryHauler.class));
         cards.add(new SetCardInfo("Rags // Riches", 222, Rarity.RARE, mage.cards.r.RagsRiches.class));
         cards.add(new SetCardInfo("Reduce // Rubble", 216, Rarity.UNCOMMON, mage.cards.r.ReduceRubble.class));
         cards.add(new SetCardInfo("Regal Caracal", 24, Rarity.RARE, mage.cards.r.RegalCaracal.class));
@@ -194,6 +197,7 @@ public class Amonkhet extends ExpansionSet {
         cards.add(new SetCardInfo("Trueheart Duelist", 35, Rarity.UNCOMMON, mage.cards.t.TrueheartDuelist.class));
         cards.add(new SetCardInfo("Unburden", 114, Rarity.COMMON, mage.cards.u.Unburden.class));
         cards.add(new SetCardInfo("Unwavering Initiate", 36, Rarity.COMMON, mage.cards.u.UnwaveringInitiate.class));
+        cards.add(new SetCardInfo("Vizier of the Menagerie", 192, Rarity.MYTHIC, mage.cards.v.VizierOfTheMenagerie.class));
         cards.add(new SetCardInfo("Watchful Naga", 193, Rarity.UNCOMMON, mage.cards.w.WatchfulNaga.class));
         cards.add(new SetCardInfo("Winged Shepherd", 39, Rarity.COMMON, mage.cards.w.WingedShepherd.class));
     }