diff --git a/Mage.Sets/src/mage/sets/kaladesh/ElegantEdgecrafters.java b/Mage.Sets/src/mage/sets/kaladesh/ElegantEdgecrafters.java
new file mode 100644
index 00000000000..7a91ba4f884
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/ElegantEdgecrafters.java
@@ -0,0 +1,77 @@
+/*
+ * 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.SimpleEvasionAbility;
+import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
+import mage.abilities.keyword.FabricateAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.filter.Filter;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.PowerPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ElegantEdgecrafters extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 2 or less");
+
+ static {
+ filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3));
+ }
+
+ public ElegantEdgecrafters(UUID ownerId) {
+ super(ownerId, 154, "Elegant Edgecrafters", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
+ this.expansionSetCode = "KLD";
+ this.subtype.add("Elf");
+ this.subtype.add("Artificer");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(4);
+
+ // Elegant Edgecrafters can't be blocked by creatures with power 2 or less.
+ this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield)));
+ // Fabricate 2
+ this.addAbility(new FabricateAbility(2));
+ }
+
+ public ElegantEdgecrafters(final ElegantEdgecrafters card) {
+ super(card);
+ }
+
+ @Override
+ public ElegantEdgecrafters copy() {
+ return new ElegantEdgecrafters(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java b/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java
new file mode 100644
index 00000000000..c50d9d05218
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java
@@ -0,0 +1,87 @@
+/*
+ * 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.dynamicvalue.common.SourcePermanentPowerCount;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetControlledCreaturePermanent;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.SecondTargetPointer;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class NaturesWay extends CardImpl {
+
+ private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
+
+ static {
+ filter.add(new ControllerPredicate(TargetController.NOT_YOU));
+ }
+
+ public NaturesWay(UUID ownerId) {
+ super(ownerId, 162, "Nature's Way", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}");
+ this.expansionSetCode = "KLD";
+
+ // Target creature you control gains vigilance and trample until end of turn. It deals damage equal to its power to target creature you don't control.
+ Effect effect = new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn);
+ effect.setText("Target creature you control gains vigilance");
+ this.getSpellAbility().addEffect(effect);
+ effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn);
+ effect.setText("and trample until end of turn");
+ this.getSpellAbility().addEffect(effect);
+ effect = new DamageTargetEffect(new SourcePermanentPowerCount(), true, null, true);
+ effect.setTargetPointer(new SecondTargetPointer());
+ effect.setText("It deals damage equal to its power to target creature you don't control");
+ this.getSpellAbility().addEffect(effect);
+ this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+ }
+
+ public NaturesWay(final NaturesWay card) {
+ super(card);
+ }
+
+ @Override
+ public NaturesWay copy() {
+ return new NaturesWay(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/OrnamentalCourage.java b/Mage.Sets/src/mage/sets/kaladesh/OrnamentalCourage.java
new file mode 100644
index 00000000000..97527d465b7
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/OrnamentalCourage.java
@@ -0,0 +1,66 @@
+/*
+ * 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.Effect;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class OrnamentalCourage extends CardImpl {
+
+ public OrnamentalCourage(UUID ownerId) {
+ super(ownerId, 164, "Ornamental Courage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}");
+ this.expansionSetCode = "KLD";
+
+ // Untap target creature. It gets +1/+3 until end of turn.
+ this.getSpellAbility().addEffect(new UntapTargetEffect());
+ Effect effect = new BoostTargetEffect(1, 3, Duration.EndOfTurn);
+ effect.setText("It gets +1/+3 until end of turn");
+ this.getSpellAbility().addEffect(effect);
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+ }
+
+ public OrnamentalCourage(final OrnamentalCourage card) {
+ super(card);
+ }
+
+ @Override
+ public OrnamentalCourage copy() {
+ return new OrnamentalCourage(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/RiparianTiger.java b/Mage.Sets/src/mage/sets/kaladesh/RiparianTiger.java
new file mode 100644
index 00000000000..ef4a054d637
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/RiparianTiger.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.common.AttacksTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.common.PayEnergyCost;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class RiparianTiger extends CardImpl {
+
+ public RiparianTiger(UUID ownerId) {
+ super(ownerId, 167, "Riparian Tiger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}");
+ this.expansionSetCode = "KLD";
+ this.subtype.add("Cat");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(4);
+
+ // Trample
+ this.addAbility(TrampleAbility.getInstance());
+ // When Riparian Tiger enters the battlefield, you get {E}{E}.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
+
+ // Whenever Riparian Tiger attacks, you may pay {E}{E}. If you do, it gets +2/+2 until end of turn.
+ Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn);
+ effect.setText("it gets +2/+2 until end of turn");
+ DoIfCostPaid doIfCostPaid = new DoIfCostPaid(effect, new PayEnergyCost(2));
+ this.addAbility(new AttacksTriggeredAbility(doIfCostPaid, false));
+ }
+
+ public RiparianTiger(final RiparianTiger card) {
+ super(card);
+ }
+
+ @Override
+ public RiparianTiger copy() {
+ return new RiparianTiger(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/SageOfShaliasClaim.java b/Mage.Sets/src/mage/sets/kaladesh/SageOfShaliasClaim.java
new file mode 100644
index 00000000000..cd086f0ecec
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/SageOfShaliasClaim.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.sets.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SageOfShaliasClaim extends CardImpl {
+
+ public SageOfShaliasClaim(UUID ownerId) {
+ super(ownerId, 168, "Sage of Shalia's Claim", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+ this.expansionSetCode = "KLD";
+ this.subtype.add("Elf");
+ this.subtype.add("Druid");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(1);
+
+ // When Sage of Shalia's Claim enters the battlefield, you get {E}{E}{E}.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(3)));
+ }
+
+ public SageOfShaliasClaim(final SageOfShaliasClaim card) {
+ super(card);
+ }
+
+ @Override
+ public SageOfShaliasClaim copy() {
+ return new SageOfShaliasClaim(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/ServantOfTheConduit.java b/Mage.Sets/src/mage/sets/kaladesh/ServantOfTheConduit.java
new file mode 100644
index 00000000000..55b0f4fbd28
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/ServantOfTheConduit.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.kaladesh;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.common.PayEnergyCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
+import mage.abilities.mana.AnyColorManaAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ServantOfTheConduit extends CardImpl {
+
+ public ServantOfTheConduit(UUID ownerId) {
+ super(ownerId, 169, "Servant of the Conduit", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+ this.expansionSetCode = "KLD";
+ this.subtype.add("Elf");
+ this.subtype.add("Druid");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // When Servant of the Conduit enters teh battlefield, you get {E}{E}.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
+
+ // {T}, Pay {E}: Add one mana of any color to your mana pool.
+ Ability ability = new AnyColorManaAbility(new TapSourceCost());
+ ability.addCost(new PayEnergyCost(1));
+ this.addAbility(ability);
+ }
+
+ public ServantOfTheConduit(final ServantOfTheConduit card) {
+ super(card);
+ }
+
+ @Override
+ public ServantOfTheConduit copy() {
+ return new ServantOfTheConduit(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java b/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java
new file mode 100644
index 00000000000..78cb358b86d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java
@@ -0,0 +1,77 @@
+/*
+ * 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.DamageAllEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class TakeDown extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying");
+
+ static {
+ filter.add(new AbilityPredicate(FlyingAbility.class));
+ }
+
+ public TakeDown(UUID ownerId) {
+ super(ownerId, 170, "Take Down", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}");
+ this.expansionSetCode = "KLD";
+
+ // Choose one —
+ // • Take Down deals 4 damage to target creature with flying.
+ this.getSpellAbility().addEffect(new DamageTargetEffect(4));
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+
+ // • Take Down deals 1 damage to each creature with flying
+ Mode mode = new Mode();
+ mode.getEffects().add(new DamageAllEffect(1, filter));
+ this.getSpellAbility().addMode(mode);
+ }
+
+ public TakeDown(final TakeDown card) {
+ super(card);
+ }
+
+ @Override
+ public TakeDown copy() {
+ return new TakeDown(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/kaladesh/VeteranMotorist.java b/Mage.Sets/src/mage/sets/kaladesh/VeteranMotorist.java
new file mode 100644
index 00000000000..81d58be7024
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/kaladesh/VeteranMotorist.java
@@ -0,0 +1,115 @@
+/*
+ * 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.TriggeredAbilityImpl;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.effects.keyword.ScryEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class VeteranMotorist extends CardImpl {
+
+ public VeteranMotorist(UUID ownerId) {
+ super(ownerId, 188, "Veteran Motorist", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{W}");
+ this.expansionSetCode = "KLD";
+ this.subtype.add("Dwarf");
+ this.subtype.add("Pilot");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(1);
+
+ // When Veteran Motorist enters the battlefield, scry 2.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(2)));
+
+ // Whenever Veteran Motorist crews a Vehicle, that Vehicle gets +1/+1 until end of turn.
+ Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn);
+ effect.setText("that Vehicle gets +1/+1 until end of turn");
+ this.addAbility(new VeteranMotoristCrewsTriggeredAbility(effect));
+ }
+
+ public VeteranMotorist(final VeteranMotorist card) {
+ super(card);
+ }
+
+ @Override
+ public VeteranMotorist copy() {
+ return new VeteranMotorist(this);
+ }
+}
+
+class VeteranMotoristCrewsTriggeredAbility extends TriggeredAbilityImpl {
+
+ public VeteranMotoristCrewsTriggeredAbility(Effect effect) {
+ super(Zone.BATTLEFIELD, effect, false);
+ }
+
+ public VeteranMotoristCrewsTriggeredAbility(final VeteranMotoristCrewsTriggeredAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public VeteranMotoristCrewsTriggeredAbility copy() {
+ return new VeteranMotoristCrewsTriggeredAbility(this);
+ }
+
+ @Override
+ public boolean checkEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.CREWED_VEHICLE;
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ if (event.getTargetId().equals(getSourceId())) {
+ for (Effect effect : getEffects()) {
+ // set the vehicle id as target
+ effect.setTargetPointer(new FixedTarget(event.getSourceId()));
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public String getRule() {
+ return "When {this} crews a Vehicle, " + super.getRule();
+ }
+}
diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt
index 59046110511..78408fb66ae 100644
--- a/Utils/mtg-cards-data.txt
+++ b/Utils/mtg-cards-data.txt
@@ -29824,7 +29824,7 @@ Peema Outrider|Kaladesh|166|C|{2}{G}{G}|Creature - Elf Artificer|3|3|Trample$Fab
Riparian Tiger|Kaladesh|167|C|{3}{G}{G}|Creature - Cat|4|4|Trample$When Riparian Tiger enters the battlefield, you get {E}{E} (two energy counters).$Whenever Riparian Tiger attacks, you may pay {E}{E}. If you do, it gets +2/+2 until end of turn.|
Sage of Shalia's Claim|Kaladesh|168|C|{1}{G}|Creature - Elf Druid|2|1|When Sage of Shalia's Claim enters the battlefield, you get {E}{E}{E} (three energy counters).|
Servant of the Conduit|Kaladesh|169|U|{1}{G}|Creature - Elf Druid|2|2|When Servant of the Conduit enters teh battlefield, you get {E}{E} (two energy counters).${T}, Pay {E}: Add one mana of any color to your mana pool.|
-Take Down|Kaladesh|170|C|{G}|Sorcery|||Choose one —$• Take Down deals 4 damage to target creature with flying.$• Take DOwn deals 1 damage to each creature with flying|
+Take Down|Kaladesh|170|C|{G}|Sorcery|||Choose one —$• Take Down deals 4 damage to target creature with flying.$• Take Down deals 1 damage to each creature with flying|
Thriving Rhino|Kaladesh|171|C|{2}{G}|Creature - Rhino|2|3|When Thriving Rhino enters the battlefield, you get {E}{E} (two energy counters).$Whenever Thriving Rhino attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it.|
Verdurous Gearhulk|Kaladesh|172|M|{3}{G}{G}|Artifact Creature - Construct|4|4|Trample$When Verdurous Gearhulk enters the battlefield, distribute four +1/+1 counters among any number of target creatures you control.|
Wild Wanderer|Kaladesh|173|C|{3}{G}|Creature - Elf Druid|3|2|When Wild Wanderer enters the battlefield, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.|