updated rest of cards with cardNumber

Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java

@@ -42,7 +42,7 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
-import mage.target.common.TargetCardInGraveyard;
+import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetCreatureOrPlayer;
 
 /**
@@ -56,7 +56,7 @@ public class VengefulRebirth extends CardImpl<VengefulRebirth> {
 		this.expansionSetCode = "ARB";
 		this.color.setRed(true);
 		this.color.setGreen(true);
-		this.getSpellAbility().addTarget(new TargetCardInGraveyard());
+		this.getSpellAbility().addTarget(new TargetCardInYourGraveyard());
 		this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
 		this.getSpellAbility().addEffect(new VengefulRebirthEffect());
 		this.getSpellAbility().addEffect(ExileSpellEffect.getInstance());

Mage.Sets/src/mage/sets/magic2010/Disentomb.java

@@ -34,8 +34,7 @@ import mage.Constants.Rarity;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreatureCard;
-import mage.target.common.TargetCardInGraveyard;
+import mage.target.common.TargetCardInYourGraveyard;
-import mage.target.common.TargetCreaturePermanent;
 
 /**
  *
@@ -49,7 +48,7 @@ public class Disentomb extends CardImpl<Disentomb> {
 		super(ownerId, 92, "Disentomb", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}");
 		this.expansionSetCode = "M10";
 		this.color.setBlack(true);
-		this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
+		this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
 		this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
 	}
 

Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java

@@ -36,6 +36,7 @@ import mage.cards.CardImpl;
 import mage.filter.Filter.ComparisonScope;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInGraveyard;
+import mage.target.common.TargetCardInYourGraveyard;
 
 /**
  *
@@ -43,7 +44,7 @@ import mage.target.common.TargetCardInGraveyard;
  */
 public class NaturesSpiral extends CardImpl<NaturesSpiral> {
 
-	private static FilterCard filter = new FilterCard("permanent card in your graveyard");
+	private static FilterCard filter = new FilterCard("permanent card");
 
 	static {
 		filter.getCardType().add(CardType.ARTIFACT);
@@ -58,7 +59,7 @@ public class NaturesSpiral extends CardImpl<NaturesSpiral> {
 		super(ownerId, 196, "Nature's Spiral", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}");
 		this.expansionSetCode = "M10";
 		this.color.setGreen(true);
-		this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
+		this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
 		this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
 	}
 

Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java

@@ -0,0 +1,129 @@
+/*
+ *  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.magic2010;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.Rarity;
+import mage.Constants.SubLayer;
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
+import mage.cards.CardImpl;
+import mage.filter.common.FilterCreatureCard;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetCardInGraveyard;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class RiseFromTheGrave extends CardImpl<RiseFromTheGrave> {
+
+	private static FilterCreatureCard filter = new FilterCreatureCard();
+
+	public RiseFromTheGrave(UUID ownerId) {
+		super(ownerId, 109, "Rise from the Grave", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}");
+		this.expansionSetCode = "M10";
+		this.color.setBlack(true);
+		this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
+		this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
+		this.getSpellAbility().addEffect(new RiseFromTheGraveEffect());
+	}
+
+	public RiseFromTheGrave(final RiseFromTheGrave card) {
+		super(card);
+	}
+
+	@Override
+	public RiseFromTheGrave copy() {
+		return new RiseFromTheGrave(this);
+	}
+
+	@Override
+	public String getArt() {
+		return "";
+	}
+}
+
+class RiseFromTheGraveEffect extends ContinuousEffectImpl<RiseFromTheGraveEffect> {
+
+	public RiseFromTheGraveEffect() {
+		super(Duration.WhileOnBattlefield, Outcome.Neutral);
+	}
+
+	public RiseFromTheGraveEffect(final RiseFromTheGraveEffect effect) {
+		super(effect);
+	}
+
+	@Override
+	public RiseFromTheGraveEffect copy() {
+		return new RiseFromTheGraveEffect(this);
+	}
+
+	@Override
+	public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+		Permanent creature = game.getPermanent(source.getFirstTarget());
+		if (creature != null) {
+			switch (layer) {
+				case TypeChangingEffects_4:
+					if (sublayer == SubLayer.NA) {
+						creature.getSubtype().add("Zombie");
+					}
+					break;
+				case ColorChangingEffects_5:
+					if (sublayer == SubLayer.NA) {
+						creature.getColor().setBlack(true);
+					}
+					break;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+		return false;
+	}
+
+	@Override
+	public boolean hasLayer(Layer layer) {
+		return layer == Layer.ColorChangingEffects_5 || layer == layer.TypeChangingEffects_4;
+	}
+
+	@Override
+	public String getText(Ability source) {
+		return "That creature is a black Zombie in addition to its other colors and types.";
+	}
+}

Mage.Sets/src/mage/sets/magic2011/DrownedCatacomb.java

@@ -0,0 +1,54 @@
+/*
+ *  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.magic2011;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DrownedCatacomb extends mage.sets.magic2010.DrownedCatacomb {
+
+	public DrownedCatacomb(UUID ownerId) {
+		super(ownerId);
+		this.cardNumber = 224;
+		this.expansionSetCode = "M11";
+	}
+
+	public DrownedCatacomb(final DrownedCatacomb card) {
+		super(card);
+	}
+
+	@Override
+	public DrownedCatacomb copy() {
+		return new DrownedCatacomb(this);
+	}
+
+}

Mage.Sets/src/mage/sets/magic2011/RiseFromTheGrave.java

@@ -0,0 +1,54 @@
+/*
+ *  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.magic2011;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class RiseFromTheGrave extends mage.sets.magic2010.RiseFromTheGrave {
+
+	public RiseFromTheGrave(UUID ownerId) {
+		super(ownerId);
+		this.cardNumber = 114;
+		this.expansionSetCode = "M11";
+	}
+
+	public RiseFromTheGrave(final RiseFromTheGrave card) {
+		super(card);
+	}
+
+	@Override
+	public RiseFromTheGrave copy() {
+		return new RiseFromTheGrave(this);
+	}
+
+}

Mage.Sets/src/mage/sets/magic2011/RocEgg.java

@@ -0,0 +1,88 @@
+/*
+ *  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.magic2011;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.keyword.DefenderAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.game.permanent.token.Token;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class RocEgg extends CardImpl<RocEgg> {
+
+	private static RocEggToken rocEggToken = new RocEggToken();
+
+	public RocEgg(UUID ownerId) {
+		super(ownerId, 25, "Roc Egg", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+		this.expansionSetCode = "M11";
+		this.subtype.add("Bird");
+		this.color.setWhite(true);
+		this.power = new MageInt(0);
+		this.toughness = new MageInt(3);
+
+		this.addAbility(DefenderAbility.getInstance());
+		this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false));
+	}
+
+	public RocEgg(final RocEgg card) {
+		super(card);
+	}
+
+	@Override
+	public RocEgg copy() {
+		return new RocEgg(this);
+	}
+
+	@Override
+	public String getArt() {
+		return "";
+	}
+
+}
+class RocEggToken extends Token {
+
+	public RocEggToken() {
+		super("Bird", "3/3 white Bird creature token with flying");
+		cardType.add(CardType.CREATURE);
+		subtype.add("Bird");
+		color.setWhite(true);
+		power = new MageInt(3);
+		toughness = new MageInt(3);
+		addAbility(FlyingAbility.getInstance());
+	}
+}

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

@@ -32,7 +32,6 @@ import mage.abilities.effects.common.ReturnFromExileEffect;
 import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.Constants.TargetController;
 import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;

Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java

@@ -41,8 +41,8 @@ import mage.target.common.TargetCardInLibrary;
  */
 public class DiabolicTutor extends CardImpl<DiabolicTutor> {
 
-    public DiabolicTutor(UUID onwerId){
+    public DiabolicTutor(UUID ownerId){
-        super(onwerId, "Diabolic Tutor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT},"{2}{B}{B}");
+        super(ownerId, 135, "Diabolic Tutor", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT},"{2}{B}{B}");
         this.expansionSetCode = "10E";
         this.color.setBlack(true);
         TargetCardInLibrary target = new TargetCardInLibrary();

Mage.Sets/src/mage/sets/tenth/DragonsClaw.java

@@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType;
 public class DragonsClaw extends CardImpl<DragonsClaw> {
 
 	public DragonsClaw(UUID ownerId) {
-		super(ownerId, 0, "Dragon's Claw", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}");
+		super(ownerId, 322, "Dragon's Claw", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}");
 		this.expansionSetCode = "10E";
 		this.addAbility(new DragonsClawAbility());
 	}

Mage.Sets/src/mage/sets/tenth/Flashfreeze.java

@@ -53,7 +53,7 @@ public class Flashfreeze extends CardImpl<Flashfreeze> {
 	}
 
 	public Flashfreeze(UUID ownerId) {
-		super(ownerId, 0, "Flashfreeze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}");
+		super(ownerId, 84, "Flashfreeze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}");
 		this.expansionSetCode = "10E";
 		this.color.setBlue(true);
 		this.getSpellAbility().addTarget(new TargetSpell(filter));

Mage.Sets/src/mage/sets/tenth/Forest1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest1 extends mage.cards.basiclands.Forest {
 
 	public Forest1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 380);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Forest2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest2 extends mage.cards.basiclands.Forest {
 
 	public Forest2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 381);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Forest3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest3 extends mage.cards.basiclands.Forest {
 
 	public Forest3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 382);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Forest4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest4 extends mage.cards.basiclands.Forest {
 
 	public Forest4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 383);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/GiantGrowth.java

@@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class GiantGrowth extends CardImpl<GiantGrowth> {
 
 	public GiantGrowth(UUID ownerId) {
-		super(ownerId, 0, "Giant Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}");
+		super(ownerId, 266, "Giant Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}");
 		this.expansionSetCode = "10E";
 		this.color.setGreen(true);
 		this.getSpellAbility().addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/sets/tenth/GiantSpider.java

@@ -42,7 +42,7 @@ import mage.cards.CardImpl;
 public class GiantSpider extends CardImpl<GiantSpider> {
 
 	public GiantSpider(UUID ownerId) {
-		super(ownerId, 0, "Giant Spider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}");
+		super(ownerId, 267, "Giant Spider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Spider");
 		this.color.setGreen(true);

Mage.Sets/src/mage/sets/tenth/GoblinPiker.java

@@ -41,7 +41,7 @@ import mage.cards.CardImpl;
 public class GoblinPiker extends CardImpl<GoblinPiker> {
 
 	public GoblinPiker(UUID ownerId) {
-		super(ownerId, 0, "GoblinPiker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
+		super(ownerId, 209, "GoblinPiker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Goblin");
 		this.subtype.add("Warrier");

Mage.Sets/src/mage/sets/tenth/Gravedigger.java

@@ -36,7 +36,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
-import mage.target.common.TargetCardInGraveyard;
+import mage.target.common.TargetCardInYourGraveyard;
 
 /**
  *
@@ -45,7 +45,7 @@ import mage.target.common.TargetCardInGraveyard;
 public class Gravedigger extends CardImpl<Gravedigger> {
 
 	public Gravedigger(UUID ownerId) {
-		super(ownerId, 0, "Gravedigger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}");
+		super(ownerId, 146, "Gravedigger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Zombie");
 		this.color.setBlack(true);
@@ -53,7 +53,7 @@ public class Gravedigger extends CardImpl<Gravedigger> {
 		this.toughness = new MageInt(3);
 
 		Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
-		ability.addTarget(new TargetCardInGraveyard());
+		ability.addTarget(new TargetCardInYourGraveyard());
 		this.addAbility(ability);
 	}
 

Mage.Sets/src/mage/sets/tenth/HolyStrength.java

@@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class HolyStrength extends CardImpl<HolyStrength> {
 
 	public HolyStrength(UUID ownerId) {
-		super(ownerId, 0, "Holy Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}");
+		super(ownerId, 22, "Holy Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}");
 		this.expansionSetCode = "10E";
 		this.color.setWhite(true);
 		this.subtype.add("Aura");

Mage.Sets/src/mage/sets/tenth/Island1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island1 extends mage.cards.basiclands.Island {
 
 	public Island1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 368);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Island2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island2 extends mage.cards.basiclands.Island {
 
 	public Island2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 369);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Island3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island3 extends mage.cards.basiclands.Island {
 
 	public Island3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 370);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Island4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island4 extends mage.cards.basiclands.Island {
 
 	public Island4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 371);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Juggernaut.java

@@ -46,7 +46,7 @@ import mage.game.permanent.Permanent;
 public class Juggernaut extends CardImpl<Juggernaut> {
 
 	public Juggernaut(UUID ownerId) {
-		super(ownerId, 0, "Juggernaut", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}");
+		super(ownerId, 328, "Juggernaut", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Juggernaut");
 		this.power = new MageInt(5);

Mage.Sets/src/mage/sets/tenth/KrakensEye.java

@@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType;
 public class KrakensEye extends CardImpl<KrakensEye> {
 
 	public KrakensEye(UUID ownerId) {
-		super(ownerId, 0, "Kraken's Eye", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}");
+		super(ownerId, 329, "Kraken's Eye", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}");
 		this.expansionSetCode = "10E";
 		this.addAbility(new KrakensEyeAbility());
 	}

Mage.Sets/src/mage/sets/tenth/LavaAxe.java

@@ -42,7 +42,7 @@ import mage.target.TargetPlayer;
 public class LavaAxe extends CardImpl<LavaAxe> {
 
 	public LavaAxe(UUID ownerId) {
-		super(ownerId, 0, "Lava Axe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}");
+		super(ownerId, 215, "Lava Axe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}");
 		this.expansionSetCode = "10E";
 		this.color.setRed(true);
 		this.getSpellAbility().addTarget(new TargetPlayer());

Mage.Sets/src/mage/sets/tenth/LlanowarElves.java

@@ -42,7 +42,7 @@ import mage.cards.CardImpl;
 public class LlanowarElves extends CardImpl<LlanowarElves> {
 
 	public LlanowarElves(UUID ownerId) {
-		super(ownerId, 0, "Llanowar Elves", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
+		super(ownerId, 274, "Llanowar Elves", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Elf");
 		this.subtype.add("Druid");

Mage.Sets/src/mage/sets/tenth/MindRot.java

@@ -41,8 +41,8 @@ import mage.target.TargetPlayer;
  */
 public class MindRot extends CardImpl<MindRot> {
 
-    public MindRot(UUID onwerId){
+    public MindRot(UUID ownerId){
-        super(onwerId, "Mind Rot", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{2}{B}");
+        super(ownerId, 159, "Mind Rot", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{2}{B}");
         this.expansionSetCode = "10E";
         this.color.setBlack(true);
         this.getSpellAbility().addTarget(new TargetPlayer());

Mage.Sets/src/mage/sets/tenth/Mountain1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain1 extends mage.cards.basiclands.Mountain {
 
 	public Mountain1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 376);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Mountain2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain2 extends mage.cards.basiclands.Mountain {
 
 	public Mountain2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 377);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Mountain3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain3 extends mage.cards.basiclands.Mountain {
 
 	public Mountain3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 378);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Mountain4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain4 extends mage.cards.basiclands.Mountain {
 
 	public Mountain4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 379);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Naturalize.java

@@ -51,8 +51,8 @@ public class Naturalize extends CardImpl<Naturalize> {
 		filter.setScopeColor(ComparisonScope.Any);
 	}
 
-	public Naturalize(UUID onwerId){
+	public Naturalize(UUID ownerId){
-		super(onwerId, "Naturalize", Rarity.COMMON, new CardType[]{CardType.INSTANT},"{1}{G}");
+		super(ownerId, 282, "Naturalize", Rarity.COMMON, new CardType[]{CardType.INSTANT},"{1}{G}");
 		this.expansionSetCode = "10E";
 		this.color.setGreen(true);
 		this.getSpellAbility().addTarget(new TargetPermanent(filter));

Mage.Sets/src/mage/sets/tenth/Ornithopter.java

@@ -42,7 +42,7 @@ import mage.cards.CardImpl;
 public class Ornithopter extends CardImpl<Ornithopter> {
 
 	public Ornithopter(UUID ownerId) {
-		super(ownerId, 0, "Ornithopter", Rarity.COMMON, new CardType[]{CardType.CREATURE, CardType.ARTIFACT}, "{0}");
+		super(ownerId, 336, "Ornithopter", Rarity.COMMON, new CardType[]{CardType.CREATURE, CardType.ARTIFACT}, "{0}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Thopter");
 		this.power = new MageInt(0);

Mage.Sets/src/mage/sets/tenth/Pacifism.java

@@ -31,14 +31,11 @@ package mage.sets.tenth;
 import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
-import mage.Constants.Layer;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
-import mage.Constants.SubLayer;
 import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.keyword.EnchantAbility;
@@ -57,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class Pacifism extends CardImpl<Pacifism> {
 
 	public Pacifism(UUID ownerId) {
-		super(ownerId, 0, "Pacifism", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
+		super(ownerId, 31, "Pacifism", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
 		this.expansionSetCode = "10E";
 		this.color.setWhite(true);
 		this.subtype.add("Aura");

Mage.Sets/src/mage/sets/tenth/Plains1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains1 extends mage.cards.basiclands.Plains {
 
 	public Plains1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 364);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Plains2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains2 extends mage.cards.basiclands.Plains {
 
 	public Plains2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 365);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Plains3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains3 extends mage.cards.basiclands.Plains {
 
 	public Plains3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 366);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/Plains4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains4 extends mage.cards.basiclands.Plains {
 
 	public Plains4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 367);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java

@@ -37,7 +37,6 @@ import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -52,7 +51,7 @@ import mage.game.events.GameEvent.EventType;
 public class PlatinumAngel extends CardImpl<PlatinumAngel> {
 
 	public PlatinumAngel(UUID ownerId) {
-		super(ownerId, 0, "Platinum Angel", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}");
+		super(ownerId, 339, "Platinum Angel", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Angel");
 		this.power = new MageInt(4);

Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java

@@ -47,7 +47,7 @@ import mage.target.common.TargetCreatureOrPlayer;
 public class ProdigalPyromancer extends CardImpl<ProdigalPyromancer> {
 
 	public ProdigalPyromancer(UUID ownerId) {
-		super(ownerId, 0, "Prodigal Pyromancer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
+		super(ownerId, 221, "Prodigal Pyromancer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Human");
 		this.subtype.add("Wizard");

Mage.Sets/src/mage/sets/tenth/Pyroclasm.java

@@ -42,7 +42,7 @@ import mage.filter.common.FilterCreaturePermanent;
 public class Pyroclasm extends CardImpl<Pyroclasm> {
 
 	public Pyroclasm(UUID ownerId) {
-		super(ownerId, 0, "Pyroclasm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}");
+		super(ownerId, 222, "Pyroclasm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}");
 		this.expansionSetCode = "10E";
 		this.color.setRed(true);
 		this.getSpellAbility().addEffect(new DamageAllEffect(2, FilterCreaturePermanent.getDefault()));

Mage.Sets/src/mage/sets/tenth/RelentlessRats.java

@@ -58,7 +58,7 @@ public class RelentlessRats extends CardImpl<RelentlessRats> {
 	}
 
 	public RelentlessRats(UUID ownerId) {
-		super(ownerId, 0, "Relentless Rats", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}");
+		super(ownerId, 173, "Relentless Rats", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}");
 		this.expansionSetCode = "10E";
 		this.subtype.add("Rat");
 		this.color.setBlack(true);

Mage.Sets/src/mage/sets/tenth/Swamp1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Swamp1 extends mage.cards.basiclands.Swamp {
 
 	public Swamp1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 372);
 		this.expansionSetCode = "10E";
 	}
 

Mage.Sets/src/mage/sets/worldwake/ArborElf.java

@@ -54,7 +54,7 @@ public class ArborElf extends CardImpl<ArborElf> {
 	}
 
 	public ArborElf(UUID ownerId) {
-		super(ownerId, 0, "Arbor Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
+		super(ownerId, 95, "Arbor Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
 		this.expansionSetCode = "WWK";
 		this.subtype.add("Elf");
 		this.subtype.add("Druid");

Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java

@@ -48,7 +48,7 @@ import mage.cards.CardImpl;
 public class BasiliskCollar extends CardImpl<BasiliskCollar> {
 
 	public BasiliskCollar(UUID ownerId) {
-		super(ownerId, 0, "Basilisk Collar", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}");
+		super(ownerId, 122, "Basilisk Collar", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}");
 		this.expansionSetCode = "WWK";
 		this.subtype.add("Equipment");
 		this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2)));

Mage.Sets/src/mage/sets/worldwake/BestialMenace.java

@@ -44,7 +44,7 @@ import mage.game.permanent.token.WolfToken;
 public class BestialMenace extends CardImpl<BestialMenace> {
 
 	public BestialMenace(UUID ownerId) {
-		super(ownerId, 0, "Bestial Menace", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}");
+		super(ownerId, 97, "Bestial Menace", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}");
 		this.expansionSetCode = "WWK";
 		this.color.setGreen(true);
 		this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken()));

Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java

@@ -52,7 +52,7 @@ import mage.game.permanent.token.Token;
 public class CelestialColonnade extends CardImpl<CelestialColonnade> {
 
 	public CelestialColonnade(UUID ownerId) {
-		super(ownerId, 0, "Celestial Colonnade", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 133, "Celestial Colonnade", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new BlueManaAbility());

Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java

@@ -47,7 +47,7 @@ import mage.game.permanent.token.Token;
 public class DreadStatuary extends CardImpl<DreadStatuary> {
 
 	public DreadStatuary(UUID ownerId) {
-		super(ownerId, 0, "Dread Statuary", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 135, "Dread Statuary", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new ColorlessManaAbility());
 		this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEOTEffect(new DreadStatuaryToken(), "land"), new ManaCostsImpl("{4}")));

Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java

@@ -50,7 +50,7 @@ import mage.game.Game;
 public class EverflowingChalice extends CardImpl<EverflowingChalice> {
 
 	public EverflowingChalice(UUID ownerId) {
-		super(ownerId, 0, "Everflowing Chalice", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{0}");
+		super(ownerId, 123, "Everflowing Chalice", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{0}");
 		this.expansionSetCode = "WWK";
 		MultikickerAbility ability = new MultikickerAbility(new AddCountersSourceEffect("charge", 1), false);
 		ability.addManaCost(new GenericManaCost(2));

Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java

@@ -57,7 +57,7 @@ public class JaceTheMindSculptor extends CardImpl<JaceTheMindSculptor> {
 
 
 	public JaceTheMindSculptor(UUID ownerId) {
-		super(ownerId, 0, "Jace, the Mind Sculptor", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{U}{U}");
+		super(ownerId, 31, "Jace, the Mind Sculptor", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{U}{U}");
 		this.expansionSetCode = "WWK";
 		this.subtype.add("Jace");
 		this.color.setBlue(true);

Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java

@@ -47,7 +47,7 @@ import mage.game.permanent.token.Token;
 public class KhalniGarden extends CardImpl<KhalniGarden> {
 
 	public KhalniGarden(UUID ownerId) {
-		super(ownerId, 0, "Khalni Garden", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 138, "Khalni Garden", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PlantToken()), false));

Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java

@@ -52,7 +52,7 @@ import mage.game.permanent.token.Token;
 public class LavaclawReaches extends CardImpl<LavaclawReaches> {
 
 	public LavaclawReaches(UUID ownerId) {
-		super(ownerId, 0, "Lavaclaw Reaches", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 139, "Lavaclaw Reaches", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new BlackManaAbility());

Mage.Sets/src/mage/sets/worldwake/RagingRavine.java

@@ -52,7 +52,7 @@ import mage.game.permanent.token.Token;
 public class RagingRavine extends CardImpl<RagingRavine> {
 
 	public RagingRavine(UUID ownerId) {
-		super(ownerId, 0, "Raging Ravine", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 141, "Raging Ravine", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new GreenManaAbility());

Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java

@@ -54,7 +54,7 @@ import mage.watchers.WatcherImpl;
 public class SearingBlaze extends CardImpl<SearingBlaze> {
 
 	public SearingBlaze(UUID ownerId) {
-		super(ownerId, 0, "Searing Blaze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}{R}");
+		super(ownerId, 90, "Searing Blaze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}{R}");
 		this.expansionSetCode = "WWK";
 		this.color.setRed(true);
 		this.getSpellAbility().addTarget(new TargetPlayer());

Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java

@@ -48,7 +48,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
 public class SejiriSteppe extends CardImpl<SejiriSteppe> {
 
 	public SejiriSteppe(UUID ownerId) {
-		super(ownerId, 0, "Sejiri Steppe", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 142, "Sejiri Steppe", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), false);

Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java

@@ -51,7 +51,7 @@ import mage.game.permanent.token.Token;
 public class StirringWildwood extends CardImpl<StirringWildwood> {
 
 	public StirringWildwood(UUID ownerId) {
-		super(ownerId, 0, "Stirring Wildwood", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 144, "Stirring Wildwood", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new GreenManaAbility());

Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java

@@ -58,7 +58,7 @@ public class StoneforgeMystic extends CardImpl<StoneforgeMystic> {
 	}
 
 	public StoneforgeMystic(UUID ownerId) {
-		super(ownerId, 0, "Stoneforge Mystic", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}");
+		super(ownerId, 20, "Stoneforge Mystic", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}");
 		this.expansionSetCode = "WWK";
 		this.color.setWhite(true);
 		this.subtype.add("Kor");

Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java

@@ -54,7 +54,7 @@ import mage.target.common.TargetNonBasicLandPermanent;
 public class TectonicEdge extends CardImpl<TectonicEdge> {
 
 	public TectonicEdge(UUID ownerId) {
-		super(ownerId, 0, "Tectonic Edge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 145, "Tectonic Edge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "WWK";
 		this.addAbility(new ColorlessManaAbility());
 		Costs costs = new CostsImpl();

Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java

@@ -46,7 +46,7 @@ import mage.game.permanent.token.WolfToken;
 public class WolfbriarElemental extends CardImpl<WolfbriarElemental> {
 
 	public WolfbriarElemental(UUID ownerId) {
-		super(ownerId, 0, "Wolfbriar Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
+		super(ownerId, 118, "Wolfbriar Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
 		this.expansionSetCode = "WWK";
 		this.subtype.add("Elemental");
 		this.color.setGreen(true);

Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java

@@ -46,7 +46,7 @@ import mage.cards.CardImpl;
 public class AdventuringGear extends CardImpl<AdventuringGear> {
 
 	public AdventuringGear(UUID ownerId) {
-		super(ownerId, 0, "Adventuring Gear", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}");
+		super(ownerId, 195, "Adventuring Gear", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}");
 		this.expansionSetCode = "ZEN";
 		this.subtype.add("Equipment");
 		this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1)));

Mage.Sets/src/mage/sets/zendikar/AetherFigment.java

@@ -44,7 +44,7 @@ import mage.cards.CardImpl;
 public class AetherFigment extends CardImpl<AetherFigment> {
 
 	public AetherFigment(UUID ownerId) {
-		super(ownerId, 0, "Æther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
+		super(ownerId, 40, "Æther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
 		this.expansionSetCode = "ZEN";
 		this.subtype.add("Illusion");
 		this.color.setBlue(true);

Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java

@@ -50,7 +50,7 @@ import mage.watchers.WatcherImpl;
 public class ArchiveTrap extends CardImpl<ArchiveTrap> {
 
 	public ArchiveTrap(UUID ownerId) {
-		super(ownerId, 0, "Archive Trap", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}");
+		super(ownerId, 41, "Archive Trap", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}");
 		this.expansionSetCode = "ZEN";
 		this.color.setBlue(true);
 		this.getSpellAbility().addTarget(new TargetOpponent());

Mage.Sets/src/mage/sets/zendikar/AridMesa.java

@@ -41,7 +41,7 @@ import mage.cards.CardImpl;
 public class AridMesa extends CardImpl<AridMesa> {
 
 	public AridMesa(UUID ownerId) {
-		super(ownerId, 0, "Arid Mesa", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 211, "Arid Mesa", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new FetchLandActivatedAbility(new String[] {"Mountain", "Plains"}));
 	}

Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java

@@ -51,7 +51,7 @@ import mage.game.permanent.Permanent;
 public class BeastmasterAscension extends CardImpl<BeastmasterAscension> {
 
 	public BeastmasterAscension(UUID ownerId) {
-		super(ownerId, 0, "Beastmaster Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
+		super(ownerId, 159, "Beastmaster Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
 		this.expansionSetCode = "ZEN";
 		this.color.setGreen(true);
 

Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java

@@ -49,7 +49,7 @@ import mage.game.permanent.Permanent;
 public class BraveTheElements extends CardImpl<BraveTheElements> {
 
 	public BraveTheElements(UUID ownerId) {
-		super(ownerId, 0, "Brave the Elements", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}");
+		super(ownerId, 4, "Brave the Elements", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}");
 		this.expansionSetCode = "ZEN";
 		this.color.setWhite(true);
 		this.getSpellAbility().addChoice(new ChoiceColor());

Mage.Sets/src/mage/sets/zendikar/BurstLightning.java

@@ -44,7 +44,7 @@ import mage.target.common.TargetCreatureOrPlayer;
 public class BurstLightning extends CardImpl<BurstLightning> {
 
 	public BurstLightning(UUID ownerId) {
-		super(ownerId, 0, "Burst Lightning", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}");
+		super(ownerId, 119, "Burst Lightning", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}");
 		this.expansionSetCode = "ZEN";
 		this.color.setRed(true);
 		this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());

Mage.Sets/src/mage/sets/zendikar/Cancel.java

@@ -37,7 +37,8 @@ import java.util.UUID;
 public class Cancel extends mage.sets.shardsofalara.Cancel {
 
 	public Cancel(UUID ownerId) {
-		super(ownerId);this.cardNumber = 0;
+		super(ownerId);
+		this.cardNumber = 44;
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java

@@ -45,7 +45,7 @@ import mage.game.permanent.token.Token;
 public class ConquerorsPledge extends CardImpl<ConquerorsPledge> {
 
 	public ConquerorsPledge(UUID ownerId) {
-		super(ownerId, 0, "Conquerors Pledge", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}{W}");
+		super(ownerId, 8, "Conquerors Pledge", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}{W}");
 		this.expansionSetCode = "ZEN";
 		this.color.setWhite(true);
 		this.getSpellAbility().addEffect(new CreateTokenEffect(new KorSoldierToken(), 6));

Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java

@@ -42,7 +42,7 @@ import mage.filter.common.FilterCreaturePermanent;
 public class DayOfJudgment extends CardImpl<DayOfJudgment> {
 
 	public DayOfJudgment(UUID ownerId) {
-		super(ownerId, 0, "Day of Judgment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}");
+		super(ownerId, 9, "Day of Judgment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}");
 		this.expansionSetCode = "ZEN";
 		this.color.setWhite(true);
 		this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterCreaturePermanent("creatures")));

Mage.Sets/src/mage/sets/zendikar/Demolish.java

@@ -37,7 +37,8 @@ import java.util.UUID;
 public class Demolish extends mage.sets.tenth.Demolish {
 
 	public Demolish(UUID ownerId) {
-		super(ownerId);this.cardNumber = 0;
+		super(ownerId);
+		this.cardNumber = 121;
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java

@@ -58,7 +58,7 @@ import mage.target.common.TargetControlledPermanent;
 public class EldraziMonument extends CardImpl<EldraziMonument> {
 
 	public EldraziMonument(UUID ownerId) {
-		super(ownerId, 0, "Eldrazi Monument", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{5}");
+		super(ownerId, 199, "Eldrazi Monument", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{5}");
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, FilterCreaturePermanent.getDefault(), false)));
 		this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, FilterCreaturePermanent.getDefault())));

Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java

@@ -45,7 +45,7 @@ import mage.game.permanent.token.Token;
 public class EmeriaAngel extends CardImpl<EmeriaAngel> {
 
 	public EmeriaAngel(UUID ownerId) {
-		super(ownerId, 0, "Emeria Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
+		super(ownerId, 11, "Emeria Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
 		this.expansionSetCode = "ZEN";
 		this.subtype.add("Angel");
 		this.color.setWhite(true);

Mage.Sets/src/mage/sets/zendikar/Forest1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest1 extends mage.cards.basiclands.Forest {
 
 	public Forest1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 246);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Forest2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest2 extends mage.cards.basiclands.Forest {
 
 	public Forest2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 247);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Forest3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest3 extends mage.cards.basiclands.Forest {
 
 	public Forest3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 248);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Forest4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Forest4 extends mage.cards.basiclands.Forest {
 
 	public Forest4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 249);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java

@@ -53,7 +53,7 @@ import mage.players.Player;
 public class GoblinGuide extends CardImpl<GoblinGuide> {
 
 	public GoblinGuide(UUID ownerId) {
-		super(ownerId, 0, "Goblin Guide", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}");
+		super(ownerId, 126, "Goblin Guide", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}");
 		this.expansionSetCode = "ZEN";
 		this.color.setRed(true);
 		this.subtype.add("Goblin");

Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java

@@ -52,7 +52,7 @@ import mage.target.common.TargetNonBasicLandPermanent;
 public class GoblinRuinblaster extends CardImpl<GoblinRuinblaster> {
 
 	public GoblinRuinblaster(UUID ownerId) {
-		super(ownerId, 0, "Goblin Ruinblaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
+		super(ownerId, 127, "Goblin Ruinblaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
 		this.expansionSetCode = "ZEN";
 		this.color.setRed(true);
 		this.subtype.add("Goblin");

Mage.Sets/src/mage/sets/zendikar/Island1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island1 extends mage.cards.basiclands.Island {
 
 	public Island1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 234);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Island2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island2 extends mage.cards.basiclands.Island {
 
 	public Island2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 235);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Island3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island3 extends mage.cards.basiclands.Island {
 
 	public Island3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 236);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Island4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Island4 extends mage.cards.basiclands.Island {
 
 	public Island4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 237);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java

@@ -45,7 +45,7 @@ import mage.cards.CardImpl;
 public class KabiraCrossroads extends CardImpl<KabiraCrossroads> {
 
 	public KabiraCrossroads(UUID ownerId) {
-		super(ownerId, 0, "Kabira Crossroads", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 216, "Kabira Crossroads", Rarity.COMMON, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2), false));

Mage.Sets/src/mage/sets/zendikar/LotusCobra.java

@@ -44,7 +44,7 @@ import mage.choices.ChoiceColor;
 public class LotusCobra extends CardImpl<LotusCobra> {
 
 	public LotusCobra(UUID ownerId) {
-		super(ownerId, 0, "Lotus Cobra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}");
+		super(ownerId, 168, "Lotus Cobra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}");
 		this.expansionSetCode = "ZEN";
 		this.subtype.add("Snake");
 		this.color.setGreen(true);

Mage.Sets/src/mage/sets/zendikar/MarshFlats.java

@@ -41,7 +41,7 @@ import mage.cards.CardImpl;
 public class MarshFlats extends CardImpl<MarshFlats> {
 
 	public MarshFlats(UUID ownerId) {
-		super(ownerId, 0, "Marsh Flats", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 219, "Marsh Flats", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new FetchLandActivatedAbility(new String[] {"Swamp", "Plains"}));
 	}

Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java

@@ -41,7 +41,7 @@ import mage.cards.CardImpl;
 public class MistyRainforest extends CardImpl<MistyRainforest> {
 
 	public MistyRainforest(UUID ownerId) {
-		super(ownerId, 0, "Misty Rainforest", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 220, "Misty Rainforest", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new FetchLandActivatedAbility(new String[] {"Forest", "Island"}));
 	}

Mage.Sets/src/mage/sets/zendikar/Mountain1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain1 extends mage.cards.basiclands.Mountain {
 
 	public Mountain1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 242);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Mountain2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain2 extends mage.cards.basiclands.Mountain {
 
 	public Mountain2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 243);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Mountain3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain3 extends mage.cards.basiclands.Mountain {
 
 	public Mountain3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 244);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Mountain4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Mountain4 extends mage.cards.basiclands.Mountain {
 
 	public Mountain4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 245);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java

@@ -53,7 +53,7 @@ import mage.game.permanent.Permanent;
 public class OranRiefTheVastwood extends CardImpl<OranRiefTheVastwood> {
 
 	public OranRiefTheVastwood(UUID ownerId) {
-		super(ownerId, 0, "Oran-Rief, the Vastwood", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 221, "Oran-Rief, the Vastwood", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped"));
 		this.addAbility(new GreenManaAbility());

Mage.Sets/src/mage/sets/zendikar/Plains1.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains1 extends mage.cards.basiclands.Plains {
 
 	public Plains1(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 230);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Plains2.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains2 extends mage.cards.basiclands.Plains {
 
 	public Plains2(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 231);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Plains3.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains3 extends mage.cards.basiclands.Plains {
 
 	public Plains3(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 232);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/Plains4.java

@@ -37,7 +37,7 @@ import java.util.UUID;
 public class Plains4 extends mage.cards.basiclands.Plains {
 
 	public Plains4(UUID ownerId) {
-		super(ownerId, 0);
+		super(ownerId, 233);
 		this.expansionSetCode = "ZEN";
 	}
 

Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java

@@ -45,7 +45,7 @@ import mage.game.permanent.token.Token;
 public class RampagingBaloths extends CardImpl<RampagingBaloths> {
 
 	public RampagingBaloths(UUID ownerId) {
-		super(ownerId, 0, "Rampaging Baloths", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
+		super(ownerId, 178, "Rampaging Baloths", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
 		this.expansionSetCode = "ZEN";
 		this.subtype.add("Beast");
 		this.color.setGreen(true);

Mage.Sets/src/mage/sets/zendikar/RiverBoa.java

@@ -55,7 +55,7 @@ public class RiverBoa extends CardImpl<RiverBoa> {
 	}
 
 	public RiverBoa(UUID ownerId) {
-		super(ownerId, 0, "River Boa", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+		super(ownerId, 180, "River Boa", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
 		this.expansionSetCode = "ZEN";
 		this.color.setGreen(true);
 		this.subtype.add("Snake");

Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java

@@ -41,7 +41,7 @@ import mage.cards.CardImpl;
 public class ScaldingTarn extends CardImpl<ScaldingTarn> {
 
 	public ScaldingTarn(UUID ownerId) {
-		super(ownerId, 0, "Scalding Tarn", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		super(ownerId, 223, "Scalding Tarn", Rarity.RARE, new CardType[]{CardType.LAND}, null);
 		this.expansionSetCode = "ZEN";
 		this.addAbility(new FetchLandActivatedAbility(new String[] {"Island", "Mountain"}));
 	}