[KLD] Added 7 blue cards.

Mage.Sets/src/mage/sets/kaladesh/HightideHermit.java

@@ -0,0 +1,74 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.PayEnergyCost;
+import mage.abilities.effects.common.combat.CanAttackAsThoughItDidntHaveDefenderSourceEffect;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.abilities.keyword.DefenderAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class HightideHermit extends CardImpl {
+
+    public HightideHermit(UUID ownerId) {
+        super(ownerId, 51, "Hightide Hermit", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Crab");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Defender
+        this.addAbility(DefenderAbility.getInstance());
+        // When Hightide Hermit enters the battlefield, you get {E}{E}{E}{E}.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4)));
+
+        // Pay {E}{E}: Hightide Hermit can attack this turn as though it didn't have defender.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new PayEnergyCost(2)));
+    }
+
+    public HightideHermit(final HightideHermit card) {
+        super(card);
+    }
+
+    @Override
+    public HightideHermit copy() {
+        return new HightideHermit(this);
+    }
+}

Mage.Sets/src/mage/sets/kaladesh/JanjeetSentry.java

@@ -0,0 +1,89 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.PayEnergyCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.MayTapOrUntapTargetEffect;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class JanjeetSentry extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("artifact or creature");
+
+    static {
+        filter.add(Predicates.or(
+                new CardTypePredicate(CardType.ARTIFACT),
+                new CardTypePredicate(CardType.CREATURE)
+        ));
+    }
+
+    public JanjeetSentry(UUID ownerId) {
+        super(ownerId, 53, "Janjeet Sentry", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Vedalken");
+        this.subtype.add("Soldier");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+
+        // When Janjeet Sentry enters the battlefield, you get {E}{E}.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
+
+        // Tap, Pay {E}{E}: You may tap or untap target artifact or creature.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost());
+        ability.addCost(new PayEnergyCost(2));
+        this.addAbility(ability);
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+    }
+
+    public JanjeetSentry(final JanjeetSentry card) {
+        super(card);
+    }
+
+    @Override
+    public JanjeetSentry copy() {
+        return new JanjeetSentry(this);
+    }
+}

Mage.Sets/src/mage/sets/kaladesh/Malfunction.java

@@ -0,0 +1,89 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect;
+import mage.abilities.effects.common.TapEnchantedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class Malfunction extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("artifact or creature");
+
+    static {
+        filter.add(Predicates.or(
+                new CardTypePredicate(CardType.ARTIFACT),
+                new CardTypePredicate(CardType.CREATURE)));
+    }
+
+    public Malfunction(UUID ownerId) {
+        super(ownerId, 55, "Malfunction", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Aura");
+
+        // Enchant artifact or creature.
+        TargetPermanent auraTarget = new TargetPermanent(filter);
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+
+        // When Malfunction enters the battlefield, tap enchanted permanent.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()));
+
+        // Enchanted permanent doesn't untap during its controller's untap step.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent")));
+    }
+
+    public Malfunction(final Malfunction card) {
+        super(card);
+    }
+
+    @Override
+    public Malfunction copy() {
+        return new Malfunction(this);
+    }
+}

Mage.Sets/src/mage/sets/kaladesh/MinisterOfInquiries.java

@@ -0,0 +1,78 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.PayEnergyCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class MinisterOfInquiries extends CardImpl {
+
+    public MinisterOfInquiries(UUID ownerId) {
+        super(ownerId, 57, "Minister of Inquiries", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{U}");
+        this.expansionSetCode = "KLD";
+        this.subtype.add("Vedalken");
+        this.subtype.add("Advisor");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(2);
+
+        // When Minister of Inquiries enters the the battlefield, you get {E}{E}.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
+
+        // {T}. Pay {E}: Target player puts the top three cards of his or her library into his or her graveyard.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new TapSourceCost());
+        ability.addCost(new PayEnergyCost(1));
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
+
+    }
+
+    public MinisterOfInquiries(final MinisterOfInquiries card) {
+        super(card);
+    }
+
+    @Override
+    public MinisterOfInquiries copy() {
+        return new MinisterOfInquiries(this);
+    }
+}

Mage.Sets/src/mage/sets/kaladesh/PadeemConsulOfInnovation.java

@@ -0,0 +1,83 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.ControlsPermanentGreatestCMCCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.keyword.HexproofAbility;
+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.common.FilterArtifactPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class PadeemConsulOfInnovation extends CardImpl {
+
+    public PadeemConsulOfInnovation(UUID ownerId) {
+        super(ownerId, 59, "Padeem, Consul of Innovation", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}");
+        this.expansionSetCode = "KLD";
+        this.supertype.add("Lengendary");
+        this.subtype.add("Veldalken");
+        this.subtype.add("Artificer");
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(4);
+
+        // Artifacts you control have hexproof.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
+                new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterArtifactPermanent(), false)));
+
+        // At the beginning of your upkeep, if you control the artifact with the highest converted mana cost or tied for the highest converted mana cost, draw a card.
+        Ability ability = new ConditionalTriggeredAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false),
+                new ControlsPermanentGreatestCMCCondition(new FilterArtifactPermanent()),
+                "At the beginning of your upkeep, if you control the artifact with the highest converted mana cost or tied for the highest converted mana cost, draw a card.");
+
+        this.addAbility(ability);
+    }
+
+    public PadeemConsulOfInnovation(final PadeemConsulOfInnovation card) {
+        super(card);
+    }
+
+    @Override
+    public PadeemConsulOfInnovation copy() {
+        return new PadeemConsulOfInnovation(this);
+    }
+}

Mage.Sets/src/mage/sets/kaladesh/SaheelisArtistry.java

@@ -0,0 +1,75 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.abilities.Mode;
+import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.common.TargetArtifactPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SaheelisArtistry extends CardImpl {
+
+    public SaheelisArtistry(UUID ownerId) {
+        super(ownerId, 62, "Saheeli's Artistry", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{U}{U}");
+        this.expansionSetCode = "KLD";
+
+        // Choose one or both —
+        this.getSpellAbility().getModes().setMinModes(1);
+        this.getSpellAbility().getModes().setMaxModes(2);
+        // • Create a token that's a copy of target artifact.
+        this.getSpellAbility().addTarget(new TargetArtifactPermanent());
+        PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect();
+        effect.setText("Create a token that's a copy of target artifact");
+        this.getSpellAbility().addEffect(effect);
+        // • Create a token that's a copy of target creature, except that it's an artifact in addition to its other types.
+        Mode mode1 = new Mode();
+        mode1.getTargets().add(new TargetCreaturePermanent());
+        effect = new PutTokenOntoBattlefieldCopyTargetEffect();
+        effect.setBecomesArtifact(true);
+        effect.setText("Create a token that's a copy of target creature, except that it's an artifact in addition to its other types");
+        mode1.getEffects().add(effect);
+        this.getSpellAbility().addMode(mode1);
+    }
+
+    public SaheelisArtistry(final SaheelisArtistry card) {
+        super(card);
+    }
+
+    @Override
+    public SaheelisArtistry copy() {
+        return new SaheelisArtistry(this);
+    }
+}

Mage.Sets/src/mage/sets/kaladesh/SelectForInspection.java

@@ -0,0 +1,67 @@
+/*
+ *  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.kaladesh;
+
+import java.util.UUID;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.abilities.effects.keyword.ScryEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SelectForInspection extends CardImpl {
+
+    public SelectForInspection(UUID ownerId) {
+        super(ownerId, 63, "Select for Inspection", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}");
+        this.expansionSetCode = "KLD";
+
+        // Return target tapped creature to its owner's hand.  Scry 1.
+        this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
+        FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
+        filter.add(new TappedPredicate());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addEffect(new ScryEffect(1));
+
+    }
+
+    public SelectForInspection(final SelectForInspection card) {
+        super(card);
+    }
+
+    @Override
+    public SelectForInspection copy() {
+        return new SelectForInspection(this);
+    }
+}

Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java

@@ -28,17 +28,15 @@
 package mage.sets.mirrodin;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
 import mage.abilities.keyword.HexproofAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.FilterPermanent;
 import mage.filter.common.FilterArtifactPermanent;
 
 /**
@@ -46,8 +44,6 @@ import mage.filter.common.FilterArtifactPermanent;
  */
 public class LeoninAbunas extends CardImpl {
 
-    private static final FilterPermanent filter = new FilterArtifactPermanent();
-
     public LeoninAbunas(UUID ownerId) {
         super(ownerId, 8, "Leonin Abunas", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}");
         this.expansionSetCode = "MRD";
@@ -56,7 +52,9 @@ public class LeoninAbunas extends CardImpl {
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(5);
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, false)));
+
+        // Artifacts you control have hexproof.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterArtifactPermanent(), false)));
     }
 
     public LeoninAbunas(final LeoninAbunas card) {

Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java

@@ -28,13 +28,15 @@
 package mage.sets.shardsofalara;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
@@ -59,15 +61,15 @@ public class ComaVeil extends CardImpl {
         this.expansionSetCode = "ALA";
         this.subtype.add("Aura");
 
-
         // Enchant artifact or creature
         TargetPermanent auraTarget = new TargetPermanent(filter);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
-        // Enchanted permanent doesn't untap during its controller's untap step.
         EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName());
-        ability.addEffect(new DontUntapInControllersUntapStepEnchantedEffect("permanent"));
         this.addAbility(ability);
+
+        // Enchanted permanent doesn't untap during its controller's untap step.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent")));
     }
 
     public ComaVeil(final ComaVeil card) {

Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java

@@ -0,0 +1,59 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.condition.common;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ControlsPermanentGreatestCMCCondition implements Condition {
+
+    private final FilterPermanent filter;
+
+    public ControlsPermanentGreatestCMCCondition() {
+        this(new FilterPermanent());
+    }
+
+    public ControlsPermanentGreatestCMCCondition(FilterPermanent filter) {
+        super();
+        this.filter = filter;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Set<UUID> controllers = new HashSet<>();
+        Integer maxCMC = null;
+
+        List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
+        for (Permanent permanent : permanents) {
+            int cmc = permanent.getManaCost().convertedManaCost();
+            if (maxCMC == null || cmc > maxCMC) {
+                maxCMC = cmc;
+                controllers.clear();
+            }
+            if (cmc == maxCMC) {
+                controllers.add(permanent.getControllerId());
+            }
+        }
+        return controllers.contains(source.getControllerId());
+    }
+
+    @Override
+    public String toString() {
+        return "you control the " + filter.getMessage() + " with the highest converted mana cost or tied for the highest converted mana cost";
+    }
+
+}

Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java

@@ -30,10 +30,8 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect {
                 if (player.chooseUse(Outcome.Untap, "Untap that permanent?", source, game)) {
                     target.untap(game);
                 }
-            } else {
-                if (player.chooseUse(Outcome.Tap, "Tap that permanent?", source, game)) {
-                    target.tap(game);
-                }
+            } else if (player.chooseUse(Outcome.Tap, "Tap that permanent?", source, game)) {
+                target.tap(game);
             }
             return true;
         }
@@ -47,6 +45,9 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect {
 
     @Override
     public String getText(Mode mode) {
+        if (!staticText.isEmpty()) {
+            return staticText;
+        }
         if (mode.getTargets().isEmpty()) {
             return "you may tap or untap it";
         } else {

Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java

@@ -66,6 +66,7 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
     private final int tokenPower;
     private final int tokenToughness;
     private boolean gainsFlying;
+    private boolean becomesArtifact;
 
     public PutTokenOntoBattlefieldCopyTargetEffect() {
         super(Outcome.PutCreatureInPlay);
@@ -78,6 +79,7 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
         this.tokenPower = Integer.MIN_VALUE;
         this.tokenToughness = Integer.MIN_VALUE;
         this.gainsFlying = false;
+        this.becomesArtifact = false;
     }
 
     public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId) {
@@ -139,6 +141,11 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
         this.tokenPower = effect.tokenPower;
         this.tokenToughness = effect.tokenToughness;
         this.gainsFlying = effect.gainsFlying;
+        this.becomesArtifact = effect.becomesArtifact;
+    }
+
+    public void setBecomesArtifact(boolean becomesArtifact) {
+        this.becomesArtifact = becomesArtifact;
     }
 
     @Override
@@ -182,7 +189,9 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
         EmptyToken token = new EmptyToken();
         CardUtil.copyTo(token).from(copyFrom); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer)
         applier.apply(game, token);
-
+        if (becomesArtifact) {
+            token.getCardType().add(CardType.ARTIFACT);
+        }
         if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) {
             token.getCardType().add(additionalCardType);
         }

Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java

@@ -39,12 +39,13 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-
 public class CanAttackAsThoughItDidntHaveDefenderSourceEffect extends AsThoughEffectImpl {
 
     public CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration duration) {
         super(AsThoughEffectType.ATTACK, duration, Outcome.Benefit);
-        staticText = "{this} can attack as though it didn't have defender";
+        staticText = "{this} can attack "
+                + (duration.equals(Duration.EndOfTurn) ? "this turn " : "")
+                + "as though it didn't have defender";
     }
 
     public CanAttackAsThoughItDidntHaveDefenderSourceEffect(final CanAttackAsThoughItDidntHaveDefenderSourceEffect effect) {

Utils/mtg-cards-data.txt

@@ -1,4 +1,4 @@
-Ardent Plea|Alara Reborn|1|U|{1}{W}{U}|Enchantment|||Exalted <i>(Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)</i>$Cascade <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>|
+Ardent Plea|Alara Reborn|1|U|{1}{W}{U}|Enchantment|||Exalted <i>(Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)</i>$Cascade <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>|
 Aven Mimeomancer|Alara Reborn|2|R|{1}{W}{U}|Creature - Bird Wizard|3|1|Flying$At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it.|
 Ethercaste Knight|Alara Reborn|3|C|{W}{U}|Artifact Creature - Human Knight|1|3|Exalted <i>(Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)</i>|
 Ethersworn Shieldmage|Alara Reborn|4|C|{1}{W}{U}|Artifact Creature - Vedalken Wizard|2|2|Flash$When Ethersworn Shieldmage enters the battlefield, prevent all damage that would be dealt to artifact creatures this turn.|
@@ -29705,7 +29705,7 @@ Failed Inspection|Kaladesh|47|C|{2}{U}{U}|Instant|||Costner target spell.  Draw
 Gearseeker Serpent|Kaladesh|48|C|{5}{U}{U}|Creature - Serpent|5|6|Gearseeker Serpent costs one less man to cast for each artifact you control$5U: Gearseeker Serpent can't be blocked this turn.|
 Glimmer of Genius|Kaladesh|49|U|{3}{U}|instant|||Scry 2, then draw two card.  you get {E}{E}.|
 Glint-Nest Crane|Kaladesh|50|U|{1}{U}|Creature - Bird|1|3|Flying$When Glint-Nest Crane enters the battlefield, look at the top four cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in any order.|
-Hightide Hermit |Kaladesh|51|C|{4}{U}|Creature - Crab|4|4|Defender$When Hightide Hermit enters the battlefield, you get {E}{E}{E}{E}.$Pay {E}{E}: Hightide Hermit can attack as though it didn't have defender.|
+Hightide Hermit|Kaladesh|51|C|{4}{U}|Creature - Crab|4|4|Defender$When Hightide Hermit enters the battlefield, you get {E}{E}{E}{E}.$Pay {E}{E}: Hightide Hermit can attack as though it didn't have defender.|
 Insidious Will|Kaladesh|52|R|{2}{U}{U}|Instant|||Choose one—$• Counter target spell.$• You may choose new targets for target spell.$• Copy target instant or sorcery spell. You may choose new targets for the copy.|
 Janjeet Sentry|Kaladesh|53|U|{2}{U}|Creature - Vedalken Soldier|2|3|When Janjeet Sentry enters the battlefield, you get {E}{E}.$Tap, Pay {E}: Tap or untap target artifact or creature.|
 Long-Finned Skywhale|Kaladesh|54|U|{2}{U}{U}|Creature - Whale|4|3|Flying$Long-Finned Skywhale can only block creatures with flying.|