Merge https://github.com/magefree/mage

Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java

@@ -0,0 +1,113 @@
+/*
+ *  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.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.permanent.CommanderPredicate;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author spjspj
+ */
+public class CrimsonHonorGuard extends CardImpl {
+
+    public CrimsonHonorGuard(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
+
+        this.subtype.add("Vampire");
+        this.subtype.add("Knight");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(5);
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+
+        // At the beginning of each player's end step, Crimson Honor Guard deals 4 damage to that player unless he or she controls a commander.
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(new CrimsonHonorGuardEffect(), TargetController.ANY, false));
+    }
+
+    public CrimsonHonorGuard(final CrimsonHonorGuard card) {
+        super(card);
+    }
+
+    @Override
+    public CrimsonHonorGuard copy() {
+        return new CrimsonHonorGuard(this);
+    }
+}
+
+class CrimsonHonorGuardEffect extends OneShotEffect {
+
+    private final static FilterPermanent filter = new FilterPermanent("Commander");
+
+    static {
+        filter.add(new CommanderPredicate());
+    }
+
+    public CrimsonHonorGuardEffect() {
+        super(Outcome.Damage);
+    }
+
+    @Override
+    public Effect copy() {
+        return new CrimsonHonorGuardEffect();
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(game.getActivePlayerId());
+        if (player != null) {
+            int numCommanders = game.getBattlefield().getActivePermanents(filter, player.getId(), game).size();
+            if (numCommanders == 0) {
+                player.damage(4, source.getSourceId(), game, false, true);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getText(Mode mode) {
+        return "{this} deals 4 damage to that player unless he or she controls a commander";
+    }
+}

Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java

@@ -0,0 +1,146 @@
+/*
+ *  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.n;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.TapTargetEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutInHandOrOnBattlefieldEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.constants.TargetController;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerIdPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.filter.predicate.permanent.EquippedPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCardInLibrary;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author spjspj
+ */
+public class NazahnReveredBladesmith extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent equippedFilter = new FilterControlledCreaturePermanent("equipped creatures you control");
+
+    static {
+        equippedFilter.add(new EquippedPredicate());
+        equippedFilter.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    private static final FilterCard filter = new FilterCard("Equipment card");
+
+    static {
+        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+        filter.add(new SubtypePredicate(SubType.EQUIPMENT));
+    }
+
+    public NazahnReveredBladesmith(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{W}");
+
+        addSuperType(SuperType.LEGENDARY);
+        this.subtype.add("Cat");
+        this.subtype.add("Artificer");
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(4);
+
+        // When Nazahn, Revered Bladesmith enters the battlefield, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle your library.
+        TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter);
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandOrOnBattlefieldEffect(target, true, true, "Hammer of Nazahn"), true));
+
+        // Whenever an equipped creature you control attacks, you may tap target creature defending player controls.
+        Ability ability = new AttacksCreatureYouControlTriggeredAbility(new NazahnTapEffect(), false, equippedFilter, true);
+        ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature defending player controls")));
+        this.addAbility(ability);
+    }
+
+    @Override
+    public void adjustTargets(Ability ability, Game game) {
+        if (ability instanceof AttacksCreatureYouControlTriggeredAbility) {
+            FilterCreaturePermanent filterDefender = new FilterCreaturePermanent("creature defending player controls");
+            for (Effect effect : ability.getEffects()) {
+                if (effect instanceof NazahnTapEffect) {
+                    filterDefender.add(new ControllerIdPredicate(game.getCombat().getDefendingPlayerId(effect.getTargetPointer().getFirst(game, ability), game)));
+                    break;
+                }
+            }
+            ability.getTargets().clear();
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filterDefender);
+            ability.addTarget(target);
+        }
+    }
+
+    public NazahnReveredBladesmith(final NazahnReveredBladesmith card) {
+        super(card);
+    }
+
+    @Override
+    public NazahnReveredBladesmith copy() {
+        return new NazahnReveredBladesmith(this);
+    }
+}
+
+class NazahnTapEffect extends TapTargetEffect {
+
+    NazahnTapEffect() {
+        super();
+    }
+
+    NazahnTapEffect(final NazahnTapEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public NazahnTapEffect copy() {
+        return new NazahnTapEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(source.getFirstTarget());
+        if (permanent != null) {
+            permanent.tap(game);
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/p/PatronOfTheVein.java

@@ -0,0 +1,189 @@
+/*
+ *  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.p;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.effects.common.ExileTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author spjspj
+ */
+public class PatronOfTheVein extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
+
+    public PatronOfTheVein(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}");
+
+        this.subtype.add("Vampire");
+        this.subtype.add("Shaman");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When Patron of the Vein enters the battlefield, destroy target creature an opponent controls.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
+        ability.addTarget(new TargetCreaturePermanent(filter));
+        this.addAbility(ability);
+
+        // Whenever a creature an opponent controls dies, exile it and put a +1/+1 counter on each Vampire you control.
+        Ability ability2 = new PatronOfTheVeinCreatureDiesTriggeredAbility();
+        this.addAbility(ability2);
+    }
+
+    public PatronOfTheVein(final PatronOfTheVein card) {
+        super(card);
+    }
+
+    @Override
+    public PatronOfTheVein copy() {
+        return new PatronOfTheVein(this);
+    }
+}
+
+class PatronOfTheVeinCreatureDiesTriggeredAbility extends TriggeredAbilityImpl {
+
+    public PatronOfTheVeinCreatureDiesTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new PatronOfTheVeinExileCreatureEffect(), false);
+    }
+
+    public PatronOfTheVeinCreatureDiesTriggeredAbility(final PatronOfTheVeinCreatureDiesTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public PatronOfTheVeinCreatureDiesTriggeredAbility copy() {
+        return new PatronOfTheVeinCreatureDiesTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.ZONE_CHANGE;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (((ZoneChangeEvent) event).isDiesEvent()) {
+            if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
+                Card creature = game.getPermanentOrLKIBattlefield(event.getTargetId());
+                if (creature != null && creature.isCreature()) {
+                    for (Effect effect : this.getEffects()) {
+                        effect.setTargetPointer(new FixedTarget(creature.getId()));
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever a creature an opponent controls dies, exile it and put a +1/+1 counter on each Vampire you control";
+    }
+}
+
+class PatronOfTheVeinExileCreatureEffect extends OneShotEffect {
+
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
+
+    static {
+        filter.add(new SubtypePredicate(SubType.VAMPIRE));
+    }
+
+    public PatronOfTheVeinExileCreatureEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "exile it and put a +1/+1 counter on each Vampire you control";
+    }
+
+    public PatronOfTheVeinExileCreatureEffect(final PatronOfTheVeinExileCreatureEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public PatronOfTheVeinExileCreatureEffect copy() {
+        return new PatronOfTheVeinExileCreatureEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        MageObject sourceObject = source.getSourceObject(game);
+        Card card = game.getCard(this.getTargetPointer().getFirst(game, source));
+
+        if (card != null) {
+            Effect effect = new ExileTargetEffect();
+            effect.setTargetPointer(new FixedTarget(card.getId()));
+            effect.apply(game, source);
+        }
+
+        for (Permanent permanent : game.getState().getBattlefield().getAllActivePermanents(filter, controller.getId(), game)) {
+            permanent.addCounters(CounterType.P1P1.createInstance(), source, game);
+            game.informPlayers(sourceObject.getName() + ": Put a +1/+1 counter on " + permanent.getLogName());
+        }
+        return true;
+
+    }
+}

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

@@ -0,0 +1,116 @@
+/*
+ *  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.TriggeredAbilityImpl;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.keyword.ReachAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author spjspj
+ */
+public class QasaliSlingers extends CardImpl {
+
+    public QasaliSlingers(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}");
+
+        this.subtype.add("Cat");
+        this.subtype.add("Warrior");
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(5);
+
+        // Reach
+        this.addAbility(ReachAbility.getInstance());
+
+        // Whenever Qasali Slingers or another Cat enters the battlefield under your control, you may destroy target artifact or enchantment.
+        this.addAbility(new QasaliSlingersTriggeredAbility());
+    }
+
+    public QasaliSlingers(final QasaliSlingers card) {
+        super(card);
+    }
+
+    @Override
+    public QasaliSlingers copy() {
+        return new QasaliSlingers(this);
+    }
+}
+
+class QasaliSlingersTriggeredAbility extends TriggeredAbilityImpl {
+
+    public QasaliSlingersTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true);
+        this.addTarget(new TargetPermanent(StaticFilters.ARTIFACT_OR_ENCHANTMENT_PERMANENT));
+    }
+
+    public QasaliSlingersTriggeredAbility(final QasaliSlingersTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public QasaliSlingersTriggeredAbility copy() {
+        return new QasaliSlingersTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent permanent = game.getPermanent(event.getTargetId());
+        if (permanent != null) {
+            if (permanent.getId().equals(this.getSourceId())) {
+                return true;
+            }
+            if (permanent.hasSubtype(SubType.CAT, game) && permanent.getControllerId().equals(this.getControllerId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever {this} or another Cat enters the battlefield under your control, you may destroy target artifact or enchantment.";
+    }
+}

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

@@ -48,7 +48,11 @@ public class Commander2017 extends ExpansionSet {
         this.blockName = "Command Zone";
 
         cards.add(new SetCardInfo("Balan, Wandering Knight", 2, Rarity.RARE, mage.cards.b.BalanWanderingKnight.class));
+        cards.add(new SetCardInfo("Crimson Honor Guard", 23, Rarity.RARE, mage.cards.c.CrimsonHonorGuard.class));
+        cards.add(new SetCardInfo("Nazahn, Revered Bladesmith", 44, Rarity.MYTHIC, mage.cards.n.NazahnReveredBladesmith.class));
         cards.add(new SetCardInfo("O-Kagachi, Vengeful Kami", 45, Rarity.MYTHIC, mage.cards.o.OKagachiVengefulKami.class));
+        cards.add(new SetCardInfo("Patron of the Vein", 20, Rarity.RARE, mage.cards.p.PatronOfTheVein.class));
+        cards.add(new SetCardInfo("Qasali Slingers", 33, Rarity.RARE, mage.cards.q.QasaliSlingers.class));
         cards.add(new SetCardInfo("Ramos, Dragon Engine", 55, Rarity.MYTHIC, mage.cards.r.RamosDragonEngine.class));
         cards.add(new SetCardInfo("Scalelord Reckoner", 6, Rarity.RARE, mage.cards.s.ScalelordReckoner.class));
         cards.add(new SetCardInfo("Taigam, Ojutai Master", 46, Rarity.MYTHIC, mage.cards.t.TaigamOjutaiMaster.class));

Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java

@@ -0,0 +1,159 @@
+/*
+ *  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.abilities.effects.common.search;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.SearchEffect;
+import mage.cards.Card;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.common.TargetCardInLibrary;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author LokiX, BetaSteward_at_googlemail.com (spjspj)
+ */
+public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
+
+    private boolean revealCards = false;
+    private boolean forceShuffle;
+    private String rulePrefix;
+    private String nameToPutOnBattlefield = null;
+
+    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, String nameToPutOnBattlefield) {
+        this(target, false, true, nameToPutOnBattlefield);
+    }
+
+    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, boolean revealCards, String nameToPutOnBattlefield) {
+        this(target, revealCards, true, nameToPutOnBattlefield);
+    }
+
+    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, boolean revealCards, boolean forceShuffle, String nameToPutOnBattlefield) {
+        this(target, revealCards, forceShuffle, "search your library for ", nameToPutOnBattlefield);
+    }
+
+    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, boolean revealCards, boolean forceShuffle, String rulePrefix, String nameToPutOnBattlefield) {
+        super(target, Outcome.DrawCard);
+        this.revealCards = revealCards;
+        this.forceShuffle = forceShuffle;
+        this.rulePrefix = rulePrefix;
+        this.nameToPutOnBattlefield = nameToPutOnBattlefield;
+        setText();
+    }
+
+    public SearchLibraryPutInHandOrOnBattlefieldEffect(final SearchLibraryPutInHandOrOnBattlefieldEffect effect) {
+        super(effect);
+        this.revealCards = effect.revealCards;
+        this.forceShuffle = effect.forceShuffle;
+        this.rulePrefix = effect.rulePrefix;
+        this.nameToPutOnBattlefield = effect.nameToPutOnBattlefield;
+    }
+
+    @Override
+    public SearchLibraryPutInHandOrOnBattlefieldEffect copy() {
+        return new SearchLibraryPutInHandOrOnBattlefieldEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null) {
+            return false;
+        }
+        target.clearChosen();
+        if (controller.searchLibrary(target, game)) {
+            if (!target.getTargets().isEmpty()) {
+                Cards cards = new CardsImpl();
+                boolean askToPutOntoBf = false;
+                Card cardToPutOnBf = null;
+                for (UUID cardId : target.getTargets()) {
+                    Card card = game.getCard(cardId);
+                    if (card != null) {
+                        if (card.getName().equals(nameToPutOnBattlefield)) {
+                            askToPutOntoBf = true;
+                            cardToPutOnBf = card;
+                        } else {
+                            cards.add(card);
+                        }
+                    }
+                }
+                if (askToPutOntoBf && cardToPutOnBf != null) {
+                    if (controller.chooseUse(Outcome.PutCardInPlay, "Put " + cardToPutOnBf.getLogName() + " onto the battlefield instead?", source, game)) {
+                        controller.moveCards(cards, Zone.BATTLEFIELD, source, game);
+                    } else {
+                        controller.moveCards(cards, Zone.HAND, source, game);
+                    }
+                } else {
+                    controller.moveCards(cards, Zone.HAND, source, game);
+                }
+
+                if (revealCards) {
+                    String name = "Reveal";
+                    Card sourceCard = game.getCard(source.getSourceId());
+                    if (sourceCard != null) {
+                        name = sourceCard.getIdName();
+                    }
+                    controller.revealCards(name, cards, game);
+                }
+            }
+            controller.shuffleLibrary(source, game);
+            return true;
+        }
+        if (forceShuffle) {
+            controller.shuffleLibrary(source, game);
+        }
+        return false;
+    }
+
+    private void setText() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(rulePrefix);
+        if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
+            sb.append("up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
+            sb.append(target.getTargetName()).append(revealCards ? ", reveal them," : "").append(" and put them into your hand");
+        } else {
+            sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it," : "").append(" and put that card into your hand");
+        }
+        if (nameToPutOnBattlefield != null) {
+            sb.append(". If you reveal a card named " + nameToPutOnBattlefield + " you may put it onto the battlefield instead");
+        }
+        if (forceShuffle) {
+            sb.append(". Then shuffle your library");
+        } else {
+            sb.append(". If you do, shuffle your library");
+        }
+        staticText = sb.toString();
+    }
+
+}