diff --git a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java index b129f07d810..13bd3204360 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java @@ -50,7 +50,7 @@ import mage.cards.CardImpl; public class BehemothSledge extends CardImpl { public BehemothSledge(UUID ownerId) { - super(ownerId, "Behemoth Sledge", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}{G}{W}"); + super(ownerId, 65, "Behemoth Sledge", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}{G}{W}"); this.expansionSetCode = "ARB"; this.subtype.add("Equipment"); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java index 425668c1318..51d9d0f14bf 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; public class BituminousBlast extends CardImpl { public BituminousBlast(UUID ownerId) { - super(ownerId, "Bituminous Blast", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{B}{R}"); + super(ownerId, 34, "Bituminous Blast", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{B}{R}"); this.expansionSetCode = "ARB"; this.color.setBlack(true); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java b/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java index 9fa2dd82279..a0fa6fe6200 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class BloodbraidElf extends CardImpl { public BloodbraidElf(UUID ownerId) { - super(ownerId, "Bloodbraid Elf", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{G}"); + super(ownerId, 50, "Bloodbraid Elf", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{G}"); this.expansionSetCode = "ARB"; this.color.setRed(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java index fad5e30dab3..166df51fb8e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; public class FinestHour extends CardImpl { public FinestHour(UUID ownerId) { - super(ownerId, "Finest Hour", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{W}{U}"); + super(ownerId, 126, "Finest Hour", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{W}{U}"); this.expansionSetCode = "ARB"; this.color.setWhite(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java index 38ecbb7880c..4a256a4aeee 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java @@ -43,7 +43,7 @@ import mage.target.common.TargetNonlandPermanent; public class MaelstromPulse extends CardImpl { public MaelstromPulse(UUID ownerId) { - super(ownerId, "Maelstrom Pulse", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{B}{G}"); + super(ownerId, 92, "Maelstrom Pulse", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{B}{G}"); this.expansionSetCode = "ARB"; this.color.setBlack(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java index b50d5ad19d4..89bb6a1efa2 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class PutridLeech extends CardImpl { public PutridLeech(UUID ownerId) { - super(ownerId, "Putrid Leech", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}{G}"); + super(ownerId, 95, "Putrid Leech", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}{G}"); this.expansionSetCode = "ARB"; this.color.setBlack(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java b/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java index 05ea48f8f20..a5815735d00 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java @@ -55,7 +55,7 @@ public class SpellbreakerBehemoth extends CardImpl { } public SpellbreakerBehemoth(UUID ownerId) { - super(ownerId, "Spellbreaker Behemoth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{G}{G}"); + super(ownerId, 60, "Spellbreaker Behemoth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{G}{G}"); this.expansionSetCode = "ARB"; this.color.setRed(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java index 3b7165f6fb1..7b28b631def 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; public class Terminate extends CardImpl { public Terminate(UUID ownerId) { - super(ownerId, "Terminate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{R}"); + super(ownerId, 46, "Terminate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{R}"); this.expansionSetCode = "ARB"; this.color.setBlack(true); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java index 8ff4c1855ac..a860dbf3a19 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class VengefulRebirth extends CardImpl { public VengefulRebirth(UUID ownerId) { - super(ownerId, "Vengeful Rebirth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{G}"); + super(ownerId, 62, "Vengeful Rebirth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{G}"); this.expansionSetCode = "ARB"; this.color.setRed(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java index fafee853159..970e2290bc0 100644 --- a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java +++ b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java @@ -50,7 +50,7 @@ public class AerieMystics extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures"); public AerieMystics(UUID ownerId) { - super(ownerId, "Aerie Mystics", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); + super(ownerId, 1, "Aerie Mystics", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.subtype.add("Bird"); diff --git a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java index 581862760cd..f83215d7377 100644 --- a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java +++ b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java @@ -43,7 +43,7 @@ import mage.cards.CardImpl; public class AvenSquire extends CardImpl { public AvenSquire(UUID ownerId) { - super(ownerId, "Aven Squire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); + super(ownerId, 3, "Aven Squire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.subtype.add("Bird"); diff --git a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java index 9096bddf4ad..596d561e691 100644 --- a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java +++ b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class BoneSaw extends CardImpl { public BoneSaw(UUID ownerId) { - super(ownerId, "Bone Saw", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); + super(ownerId, 135, "Bone Saw", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "CON"; this.subtype.add("Equipment"); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java index b088d91b171..8c4aa0c68fc 100644 --- a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class CanyonMinotaur extends CardImpl { public CanyonMinotaur(UUID ownerId) { - super(ownerId, "Canyon Minotaur", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); + super(ownerId, 60, "Canyon Minotaur", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "CON"; this.color.setRed(true); this.subtype.add("Minotaur"); diff --git a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java index 0f85e1b0733..cb86a2222b0 100644 --- a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java @@ -55,7 +55,7 @@ public class CelestialPurge extends CardImpl { } public CelestialPurge(UUID ownerId) { - super(ownerId, "Celestial Purge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); + super(ownerId, 5, "Celestial Purge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java index 94d10daac0e..f8275d5b6f3 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class DarklitGargoyle extends CardImpl { public DarklitGargoyle(UUID ownerId) { - super(ownerId, "Darklit Gargoyle", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{W}"); + super(ownerId, 7, "Darklit Gargoyle", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.subtype.add("Gargoyle"); diff --git a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java index d66ae7d1de8..d485bdbcd0f 100644 --- a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java +++ b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java @@ -48,7 +48,7 @@ import mage.cards.CardImpl; public class Dreadwing extends CardImpl { public Dreadwing(UUID ownerId) { - super(ownerId, "Dreadwing", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}"); + super(ownerId, 43, "Dreadwing", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "CON"; this.subtype.add("Zombie"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java index 6edcb1a64d4..91ab6bd406c 100644 --- a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java +++ b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class EsperCormorants extends CardImpl { public EsperCormorants(UUID ownerId) { - super(ownerId, "Esper Cormorants", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{W}{U}"); + super(ownerId, 105, "Esper Cormorants", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{W}{U}"); this.expansionSetCode = "CON"; this.subtype.add("Bird"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java index 9faf7f73ef8..478c63e8f13 100644 --- a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java @@ -61,7 +61,7 @@ public class EtherswornAdjudicator extends CardImpl { } public EtherswornAdjudicator(UUID ownerId) { - super(ownerId, "Ethersworn Adjudicator", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}{W}"); + super(ownerId, 26, "Ethersworn Adjudicator", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "CON"; this.supertype.add("Legendary"); this.subtype.add("Vedalken"); diff --git a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java index b0b60065c49..c57a570177d 100644 --- a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java +++ b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java @@ -48,7 +48,7 @@ import mage.target.TargetPlayer; public class FontOfMythos extends CardImpl { public FontOfMythos(UUID ownerId) { - super(ownerId, "Font of Mythos", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); + super(ownerId, 136, "Font of Mythos", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "CON"; this.addAbility(new FontOfMythosAbility()); } diff --git a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java index 006fa6027f2..a5e2266fa5d 100644 --- a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class FusionElemental extends CardImpl { public FusionElemental(UUID ownerId) { - super(ownerId, "Fusion Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{U}{B}{R}{G}"); + super(ownerId, 107, "Fusion Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{U}{B}{R}{G}"); this.expansionSetCode = "CON"; this.subtype.add("Elemental"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java index 19145f1e869..93156d68636 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java @@ -48,7 +48,7 @@ import mage.game.events.GameEvent.EventType; public class HellsparkElemental extends CardImpl { public HellsparkElemental(UUID ownerId) { - super(ownerId, "Hellspark Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); + super(ownerId, 65, "Hellspark Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "CON"; this.subtype.add("Elemental"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java index 039f79cf96a..de585b856fe 100644 --- a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java +++ b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java @@ -53,7 +53,7 @@ public class InkwellLeviathan extends CardImpl { } public InkwellLeviathan(UUID ownerId) { - super(ownerId, "Inkwell Leviathan", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}{U}{U}" ); + super(ownerId, 30, "Inkwell Leviathan", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}{U}{U}" ); this.expansionSetCode = "CON"; this.subtype.add("Leviathan"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java b/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java index a9a86de6732..b1231ed5d58 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java @@ -73,7 +73,7 @@ public class KnightOfTheReliquary extends CardImpl { } public KnightOfTheReliquary(UUID ownerId) { - super(ownerId, "Knight of the Reliquary", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{W}"); + super(ownerId, 113, "Knight of the Reliquary", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java index b56f401f10f..defb92a36ed 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java +++ b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java @@ -31,12 +31,9 @@ package mage.sets.conflux; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ManaEffect; import mage.abilities.mana.BasicManaAbility; @@ -49,7 +46,7 @@ import mage.cards.CardImpl; public class KnotvineMystic extends CardImpl{ public KnotvineMystic(UUID ownerId) { - super(ownerId, "Knotvine Mystic", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{R}{G}"); + super(ownerId, 114, "Knotvine Mystic", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{R}{G}"); this.expansionSetCode = "CON"; this.color.setRed(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java index 8678765ff0d..b56e03e3bec 100644 --- a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java +++ b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class Kranioceros extends CardImpl { public Kranioceros(UUID ownerId) { - super(ownerId, "Kranioceros", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); + super(ownerId, 67, "Kranioceros", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "CON"; this.subtype.add("Beast"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java index 0b34126e96c..1e8278d0b89 100644 --- a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java +++ b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java @@ -49,7 +49,7 @@ import mage.players.Player; public class MartialCoup extends CardImpl { public MartialCoup(UUID ownerId) { - super(ownerId, "Martial Coup", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W}{W}"); + super(ownerId, 11, "Martial Coup", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.getSpellAbility().addEffect(new MartialCoupEffect()); diff --git a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java index 652ab9b83f6..b5bf3224b69 100644 --- a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java +++ b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class NobleHierarch extends CardImpl { public NobleHierarch(UUID ownerId) { - super(ownerId, "Noble Hierarch", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 87, "Noble Hierarch", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "CON"; this.color.setGreen(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/conflux/PathToExile.java b/Mage.Sets/src/mage/sets/conflux/PathToExile.java index 1583edcb7e8..1853f45195e 100644 --- a/Mage.Sets/src/mage/sets/conflux/PathToExile.java +++ b/Mage.Sets/src/mage/sets/conflux/PathToExile.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent; public class PathToExile extends CardImpl { public PathToExile(UUID ownerId) { - super(ownerId, "Path To Exile", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); + super(ownerId, 15, "Path To Exile", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java index ad9ed4351e0..a4b44264a38 100644 --- a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java +++ b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java @@ -49,7 +49,7 @@ import mage.cards.CardImpl; public class PestilentKathari extends CardImpl { public PestilentKathari(UUID ownerId) { - super(ownerId, "Pestilent Kathari", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 50, "Pestilent Kathari", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "CON"; this.subtype.add("Bird"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java index 5a852d6e69f..cd2b7a7f37d 100644 --- a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java +++ b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java @@ -54,7 +54,7 @@ import mage.target.TargetPlayer; public class QuenchableFire extends CardImpl { public QuenchableFire(UUID ownerId) { - super(ownerId, "Quenchable Fire", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); + super(ownerId, 70, "Quenchable Fire", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "CON"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java index 3b1858c7306..a35025f81f2 100644 --- a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java +++ b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java @@ -51,7 +51,7 @@ public class RakkaMar extends CardImpl { private static ElementalToken token = new ElementalToken(); public RakkaMar(UUID ownerId) { - super(ownerId, "Rakka Mar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); + super(ownerId, 71, "Rakka Mar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "CON"; this.supertype.add("Legendary"); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java index efecfdb48d5..7a866b57ef6 100644 --- a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java +++ b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class RhoxBodyguard extends CardImpl { public RhoxBodyguard(UUID ownerId) { - super(ownerId, "Rhox Bodyguard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{W}"); + super(ownerId, 122, "Rhox Bodyguard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{W}"); this.expansionSetCode = "CON"; this.color.setGreen(true); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java index 83b3834ab71..3c92d4548de 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java +++ b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class ScarlandThrinax extends CardImpl { public ScarlandThrinax(UUID ownerId) { - super(ownerId, "Scarland Thrinax", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); + super(ownerId, 123, "Scarland Thrinax", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); this.expansionSetCode = "CON"; this.color.setBlack(true); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java index 518397ffefe..9d9d8e54c78 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; public class ScepterOfDominance extends CardImpl { public ScepterOfDominance(UUID ownerId) { - super(ownerId, "Scepter of Dominance", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}{W}{W}"); + super(ownerId, 17, "Scepter of Dominance", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}{W}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java index fac1267a675..28f374bd0fd 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class ScepterOfInsight extends CardImpl { public ScepterOfInsight(UUID ownerId) { - super(ownerId, "Scepter of Insight", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}{U}{U}"); + super(ownerId, 33, "Scepter of Insight", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}{U}{U}"); this.expansionSetCode = "CON"; this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java index 1d7bc349196..ad2c092d0b1 100644 --- a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java +++ b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java @@ -51,7 +51,7 @@ import mage.game.permanent.token.Token; public class SigilOfTheEmptyThrone extends CardImpl { public SigilOfTheEmptyThrone(UUID ownerId) { - super(ownerId, "Sigil of the Empty Throne", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); + super(ownerId, 18, "Sigil of the Empty Throne", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.addAbility(new SigilOfTheEmptyThroneAbility()); diff --git a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java index c72e1e825cf..1e9721d2af1 100644 --- a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java +++ b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class SoulsMajesty extends CardImpl { public SoulsMajesty(UUID ownerId) { - super(ownerId, "Soul's Majesty", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{G}"); + super(ownerId, 92, "Soul's Majesty", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "CON"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/conflux/Thornling.java b/Mage.Sets/src/mage/sets/conflux/Thornling.java index 05b1f7209a5..e16c3f312d9 100644 --- a/Mage.Sets/src/mage/sets/conflux/Thornling.java +++ b/Mage.Sets/src/mage/sets/conflux/Thornling.java @@ -51,7 +51,7 @@ import mage.cards.CardImpl; public class Thornling extends CardImpl { public Thornling(UUID ownerId) { - super(ownerId, "Thornling", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + super(ownerId, 95, "Thornling", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "CON"; this.color.setGreen(true); this.subtype.add("Elemental"); diff --git a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java index 69bd3f8b482..49568a9d835 100644 --- a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java +++ b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.Token; public class TukatongueThallid extends CardImpl { public TukatongueThallid(UUID ownerId) { - super(ownerId, "Tukatongue Thallid", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 96, "Tukatongue Thallid", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "CON"; this.color.setGreen(true); this.subtype.add("Fungus"); diff --git a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java index d24910918f3..6dcbdd6e42c 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java @@ -49,7 +49,7 @@ public class ValeronOutlander extends CardImpl { } public ValeronOutlander(UUID ownerId) { - super(ownerId, "Valeron Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{W}"); + super(ownerId, 130, "Valeron Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{W}"); this.expansionSetCode = "CON"; this.color.setGreen(true); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java index 42fa007f906..019ed870ba9 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java +++ b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class ValiantGuard extends CardImpl { public ValiantGuard(UUID ownerId) { - super(ownerId, "Valiant Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); + super(ownerId, 19, "Valiant Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java index c48bd4efed0..4058d0a3ce7 100644 --- a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java +++ b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java @@ -49,7 +49,7 @@ import mage.cards.CardImpl; public class VectisAgents extends CardImpl { public VectisAgents(UUID ownerId) { - super(ownerId, "Vectis Agents", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U}{B}"); + super(ownerId, 131, "Vectis Agents", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U}{B}"); this.expansionSetCode = "CON"; this.color.setBlue(true); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java index 4293db05a1a..f1ed8f917fc 100644 --- a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java @@ -49,7 +49,7 @@ public class VedalkenOutlander extends CardImpl { } public VedalkenOutlander(UUID ownerId) { - super(ownerId, "Vedalken Outlander", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{W}{U}"); + super(ownerId, 132, "Vedalken Outlander", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{W}{U}"); this.expansionSetCode = "CON"; this.color.setWhite(true); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java index 6f59fc0b4ee..94c2e2ec28f 100644 --- a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java @@ -49,7 +49,7 @@ public class ZombieOutlander extends CardImpl { } public ZombieOutlander(UUID ownerId) { - super(ownerId, "Zombie Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}{B}"); + super(ownerId, 133, "Zombie Outlander", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}{B}"); this.expansionSetCode = "CON"; this.color.setBlack(true); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java index a558d7f585b..dde34ffe356 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java @@ -31,7 +31,6 @@ package mage.sets.magic2010; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.TargetController; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -59,7 +58,7 @@ public class AcidicSlime extends CardImpl { } public AcidicSlime(UUID ownerId) { - super(ownerId, "Acidic Slime", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + super(ownerId, 165, "Acidic Slime", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Ooze"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java index 765ce34d0cd..2351913d318 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java @@ -48,7 +48,7 @@ import mage.target.TargetPlayer; public class AcolyteOfXathrid extends CardImpl { public AcolyteOfXathrid(UUID ownerId) { - super(ownerId, "Acolyte Of Xathrid", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); + super(ownerId, 83, "Acolyte Of Xathrid", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java index 1d6d8dbe568..825b4c018c5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; public class ActOfTreason extends CardImpl { public ActOfTreason(UUID ownerId) { - super(ownerId, "Act Of Treason", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); + super(ownerId, 124, "Act Of Treason", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java index 169357947d9..d7263b5afe9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java +++ b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class AirElemental extends CardImpl { public AirElemental(UUID ownerId) { - super(ownerId, "Air Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); + super(ownerId, 42, "Air Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Elemental"); diff --git a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java index 2b54fa48de3..9deaca0f734 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java @@ -61,7 +61,7 @@ import mage.players.Player; public class AjaniGoldmane extends CardImpl { public AjaniGoldmane(UUID ownerId) { - super(ownerId, "Ajani Goldmane", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); + super(ownerId, 1, "Ajani Goldmane", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Ajani"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java index eaa973e32f1..3f91805e453 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java +++ b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java @@ -58,7 +58,7 @@ public class AlluringSiren extends CardImpl { } public AlluringSiren(UUID ownerId) { - super(ownerId, "Alluring Siren", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + super(ownerId, 43, "Alluring Siren", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Siren"); diff --git a/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java b/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java index 9b615a5c214..1d842bb8ea2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java +++ b/Mage.Sets/src/mage/sets/magic2010/AngelsFeather.java @@ -37,7 +37,8 @@ import java.util.UUID; public class AngelsFeather extends mage.sets.tenth.AngelsFeather { public AngelsFeather(UUID ownerId) { - super(ownerId); + super(ownerId);this.cardNumber = 0; + this.cardNumber = 206; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java index a106c2d2047..e15e9cdd1a0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java +++ b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class AngelsMercy extends CardImpl { public AngelsMercy(UUID ownerId) { - super(ownerId, "Angel's Mercy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); + super(ownerId, 2, "Angel's Mercy", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.getSpellAbility().addEffect(new GainLifeEffect(7)); diff --git a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java index 25212936f61..78e32624d96 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java +++ b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java @@ -48,7 +48,7 @@ public class AntQueen extends CardImpl { private static InsectToken insectToken = new InsectToken(); public AntQueen(UUID ownerId) { - super(ownerId, "Ant Queen", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + super(ownerId, 166, "Ant Queen", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Insect"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java index aa7a32d6c97..3d83c4add47 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java +++ b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java @@ -56,7 +56,7 @@ import mage.target.common.TargetCreaturePermanent; public class ArmoredAscension extends CardImpl { public ArmoredAscension(UUID ownerId) { - super(ownerId, "Armored Ascension", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); + super(ownerId, 3, "Armored Ascension", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Assassinate.java b/Mage.Sets/src/mage/sets/magic2010/Assassinate.java index d764cc6badf..ec62f1d5b15 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Assassinate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Assassinate.java @@ -38,6 +38,7 @@ public class Assassinate extends mage.sets.tenth.Assassinate { public Assassinate(UUID ownerId) { super(ownerId); + this.cardNumber = 84; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java index f8bb9b7371b..da00d86bf32 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java @@ -59,7 +59,7 @@ public class AwakenerDruid extends CardImpl { } public AwakenerDruid(UUID ownerId) { - super(ownerId, "Awakener Druid", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); + super(ownerId, 167, "Awakener Druid", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java index 4a255aae153..d2329cedde3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java +++ b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java @@ -46,7 +46,7 @@ import mage.game.events.GameEvent.EventType; public class BallLightning extends CardImpl { public BallLightning(UUID ownerId) { - super(ownerId, "Ball Lightning", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}{R}{R}"); + super(ownerId, 125, "Ball Lightning", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Elemental"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java index 0432cb4de06..ebdddc9f3a1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterCreaturePermanent; public class BaneslayerAngel extends CardImpl { public BaneslayerAngel(UUID ownerId) { - super(ownerId, "Baneslayer Angel", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); + super(ownerId, 4, "Baneslayer Angel", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Angel"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java index 7b61e355505..adbfbf64349 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class BerserkersOfBloodRidge extends CardImpl { public BerserkersOfBloodRidge(UUID ownerId) { - super(ownerId, "Berserkers of Blood Ridge", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); + super(ownerId, 126, "Berserkers of Blood Ridge", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java index f1000f61481..217617225ac 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/magic2010/BirdsOfParadise.java @@ -38,6 +38,7 @@ public class BirdsOfParadise extends mage.sets.tenth.BirdsOfParadise { public BirdsOfParadise(UUID ownerId) { super(ownerId); + this.cardNumber = 168; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java index bcdea932dbe..f91de6907c4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java @@ -51,7 +51,7 @@ public class BlackKnight extends CardImpl { } public BlackKnight(UUID ownerId) { - super(ownerId, "Black Knight", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{B}"); + super(ownerId, 85, "Black Knight", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java index 7a145662048..466a7fe0175 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; public class BlindingMage extends CardImpl { public BlindingMage(UUID ownerId) { - super(ownerId, "Blinding Mage", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); + super(ownerId, 5, "Blinding Mage", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java index 78de7c62456..0fbb2207107 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java @@ -51,7 +51,7 @@ public class BogWraith extends CardImpl { } public BogWraith(UUID ownerId) { - super(ownerId, "Bog Wraith", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); + super(ownerId, 86, "Bog Wraith", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.subtype.add("Wraith"); diff --git a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java index 8c03890a630..91b7d4462f9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreatureOrPlayerAmount; public class BogardanHellkite extends CardImpl { public BogardanHellkite(UUID ownerId) { - super(ownerId, "Bogardan Hellkite", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); + super(ownerId, 127, "Bogardan Hellkite", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Dragon"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/Cancel.java b/Mage.Sets/src/mage/sets/magic2010/Cancel.java index a6733249590..c2e405dd8a6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Cancel.java +++ b/Mage.Sets/src/mage/sets/magic2010/Cancel.java @@ -38,6 +38,7 @@ public class Cancel extends mage.sets.shardsofalara.Cancel { public Cancel(UUID ownerId) { super(ownerId); + this.cardNumber = 44; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java index e3b01d02a14..e88d4f980cc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/sets/magic2010/CanyonMinotaur.java @@ -38,6 +38,7 @@ public class CanyonMinotaur extends mage.sets.conflux.CanyonMinotaur { public CanyonMinotaur(UUID ownerId) { super(ownerId); + this.cardNumber = 130; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java b/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java index 54525cc1d7d..4038973dea7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/magic2010/CelestialPurge.java @@ -38,6 +38,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge { public CelestialPurge(UUID ownerId) { super(ownerId); + this.cardNumber = 7; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index 5289d61ed1d..7de3a6a0ea6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; public class ChandraNalaar extends CardImpl { public ChandraNalaar(UUID ownerId) { - super(ownerId, "Chandra Nalaar", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}{R}"); + super(ownerId, 132, "Chandra Nalaar", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Chandra "); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java index 65bcec80394..15c4ae14e23 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class ChildOfNight extends CardImpl { public ChildOfNight(UUID ownerId) { - super(ownerId, "Child Of Night", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); + super(ownerId, 88, "Child Of Night", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.subtype.add("Vampire"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Clone.java b/Mage.Sets/src/mage/sets/magic2010/Clone.java index b2df3251316..0ecc9b9c0ad 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Clone.java +++ b/Mage.Sets/src/mage/sets/magic2010/Clone.java @@ -38,6 +38,7 @@ public class Clone extends mage.sets.tenth.Clone { public Clone(UUID ownerId) { super(ownerId); + this.cardNumber = 45; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java index a4fcf599798..7238ecbf79d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java +++ b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class CoralMerfolk extends CardImpl { public CoralMerfolk(UUID ownerId) { - super(ownerId, "Coral Merfolk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + super(ownerId, 47, "Coral Merfolk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Merfolk"); diff --git a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java index 26663fa4465..9807a9e345c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java +++ b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java @@ -36,7 +36,6 @@ import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; -import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; /** @@ -46,7 +45,7 @@ import mage.cards.CardImpl; public class CudgelTroll extends CardImpl { public CudgelTroll(UUID ownerId) { - super(ownerId, "Cudgel Troll", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + super(ownerId, 174, "Cudgel Troll", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); this.subtype.add("Troll"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Deathmark.java b/Mage.Sets/src/mage/sets/magic2010/Deathmark.java index 2eb803c0b44..b1a5b2c1731 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Deathmark.java +++ b/Mage.Sets/src/mage/sets/magic2010/Deathmark.java @@ -38,6 +38,7 @@ public class Deathmark extends mage.sets.tenth.Deathmark { public Deathmark(UUID ownerId) { super(ownerId); + this.cardNumber = 90; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java b/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java index 2a5d2adfa50..fabd9818a52 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java +++ b/Mage.Sets/src/mage/sets/magic2010/DemonsHorn.java @@ -38,6 +38,7 @@ public class DemonsHorn extends mage.sets.tenth.DemonsHorn { public DemonsHorn(UUID ownerId) { super(ownerId); + this.cardNumber = 209; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java b/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java index f31b78c6492..a3ea5925d9c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java +++ b/Mage.Sets/src/mage/sets/magic2010/DiabolicTutor.java @@ -38,6 +38,7 @@ public class DiabolicTutor extends mage.sets.tenth.DiabolicTutor { public DiabolicTutor(UUID ownerId) { super(ownerId); + this.cardNumber = 91; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java index ed2e696c3c0..9a8941cd540 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java @@ -46,7 +46,7 @@ public class Disentomb extends CardImpl { private static FilterCreatureCard filter = new FilterCreatureCard(); public Disentomb(UUID ownerId) { - super(ownerId, "Disentomb", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); + super(ownerId, 92, "Disentomb", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index cc0565d1603..3c172dbe2c2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disorient.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disorient.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; public class Disorient extends CardImpl { public Disorient(UUID ownerId) { - super(ownerId, "Disorient", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); + super(ownerId, 48, "Disorient", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java index 25166c922e4..24d377078a2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java +++ b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java @@ -50,8 +50,8 @@ public class DoomBlade extends CardImpl { filter.setNotColor(true); } - public DoomBlade(UUID onwerId){ - super(onwerId, "Doom Blade", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); + public DoomBlade(UUID ownerId){ + super(ownerId, 93, "Doom Blade", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java b/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java index f16b716bf9b..1789448c974 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonsClaw.java @@ -38,6 +38,7 @@ public class DragonsClaw extends mage.sets.tenth.DragonsClaw { public DragonsClaw(UUID ownerId) { super(ownerId); + this.cardNumber = 210; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java index 07b174bfc00..dfcf3f77951 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java @@ -55,7 +55,7 @@ public class DragonskullSummit extends CardImpl { } public DragonskullSummit(UUID ownerId) { - super(ownerId, "Dragonskull Summit", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 223, "Dragonskull Summit", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceUnlessControlsEffect(filter), "tapped unless you control a " + filter.getMessage())); this.addAbility(new BlackManaAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java index 9108860562c..72477de8316 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java @@ -55,7 +55,7 @@ public class DrownedCatacomb extends CardImpl { } public DrownedCatacomb(UUID ownerId) { - super(ownerId, "Drowned Catacomb", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 224, "Drowned Catacomb", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceUnlessControlsEffect(filter), "tapped unless you control a " + filter.getMessage())); this.addAbility(new BlackManaAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java index 7249b48e5f6..a248e66ceb3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class DrudgeSkeletons extends CardImpl{ public DrudgeSkeletons(UUID ownerId) { - super(ownerId, "Drudge Skeletons", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); + super(ownerId, 95, "Drudge Skeletons", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Skeleton"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/Duress.java b/Mage.Sets/src/mage/sets/magic2010/Duress.java index 3ca664d315f..2245a8dd5de 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Duress.java +++ b/Mage.Sets/src/mage/sets/magic2010/Duress.java @@ -50,8 +50,8 @@ import mage.target.common.TargetOpponent; */ public class Duress extends CardImpl { - public Duress(UUID onwerId){ - super(onwerId, "Duress", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{B}"); + public Duress(UUID ownerId){ + super(ownerId, 96, "Duress", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java index 14a4955a41d..a692970d854 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java +++ b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java @@ -48,7 +48,7 @@ import mage.players.Player; public class Earthquake extends CardImpl { public Earthquake(UUID ownerId) { - super(ownerId, "Earthquake", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); + super(ownerId, 134, "Earthquake", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); this.getSpellAbility().addEffect(new EarthquakeEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java index 6c2a2fc2d60..25f703a1c3d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java +++ b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class EliteVanguard extends CardImpl { public EliteVanguard(UUID ownerId) { - super(ownerId, "Elite Vanguard", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}"); + super(ownerId, 9, "Elite Vanguard", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java index 943bfbf17e4..37ff2c5c3a6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java @@ -58,7 +58,7 @@ public class ElvishArchdruid extends CardImpl { } public ElvishArchdruid(UUID ownerId) { - super(ownerId, "Elvish Archdruid", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); + super(ownerId, 176, "Elvish Archdruid", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java b/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java index 88c0c25c71d..6fb64edf359 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Excommunicate.java @@ -38,6 +38,7 @@ public class Excommunicate extends mage.sets.shardsofalara.Excommunicate { public Excommunicate(UUID ownerId) { super(ownerId); + this.cardNumber = 10; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java index 7a1513ba00c..89a135f74d6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java +++ b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class FieryHellhound extends CardImpl { public FieryHellhound(UUID ownerId) { - super(ownerId, "Fiery Hellhound", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); + super(ownerId, 135, "Fiery Hellhound", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Elemental"); this.subtype.add("Hound"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java index 71d461830f8..0d4fb9d3d98 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class Fireball extends CardImpl { public Fireball(UUID ownerId) { - super(ownerId, "Fireball", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}"); + super(ownerId, 136, "Fireball", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(0, 0)); diff --git a/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java b/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java index 05fed602499..57de3832b04 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java +++ b/Mage.Sets/src/mage/sets/magic2010/Flashfreeze.java @@ -38,6 +38,7 @@ public class Flashfreeze extends mage.sets.tenth.Flashfreeze { public Flashfreeze(UUID ownerId) { super(ownerId); + this.cardNumber = 53; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Fog.java b/Mage.Sets/src/mage/sets/magic2010/Fog.java index 775113f49bc..20c36472ddb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fog.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fog.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class Fog extends CardImpl { public Fog(UUID ownerId) { - super(ownerId, "Fog", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); + super(ownerId, 182, "Fog", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); this.getSpellAbility().addEffect(new PreventAllCombatDamageEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest1.java b/Mage.Sets/src/mage/sets/magic2010/Forest1.java index 4a0d7256de6..676d7e25849 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest1 extends mage.cards.basiclands.Forest { public Forest1(UUID ownerId) { - super(ownerId); + super(ownerId, 246); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest2.java b/Mage.Sets/src/mage/sets/magic2010/Forest2.java index 13feba8e7a8..4c6f881e7e4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest2 extends mage.cards.basiclands.Forest { public Forest2(UUID ownerId) { - super(ownerId); + super(ownerId, 247); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest3.java b/Mage.Sets/src/mage/sets/magic2010/Forest3.java index 0214346c9ed..9c67b0a2626 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest3 extends mage.cards.basiclands.Forest { public Forest3(UUID ownerId) { - super(ownerId); + super(ownerId, 248); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest4.java b/Mage.Sets/src/mage/sets/magic2010/Forest4.java index 13989a8cb93..a5fb6859435 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest4 extends mage.cards.basiclands.Forest { public Forest4(UUID ownerId) { - super(ownerId); + super(ownerId, 249); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java index 8bb790d5e11..a7116fd2cfe 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java +++ b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java @@ -50,7 +50,7 @@ import mage.game.permanent.token.Token; public class GargoyleCastle extends CardImpl { public GargoyleCastle(UUID ownerId) { - super(ownerId, "Gargoyle Castle", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 225, "Gargoyle Castle", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new ColorlessManaAbility()); this.addAbility(new GargoyleCastleAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java index 503a5593654..5502cf14e27 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java @@ -54,7 +54,7 @@ public class GarrukWildspeaker extends CardImpl { private static BeastToken beastToken = new BeastToken(); public GarrukWildspeaker(UUID ownerId) { - super(ownerId, "Garruk Wildspeaker", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{G}{G}"); + super(ownerId, 183, "Garruk Wildspeaker", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Garruk"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java b/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java index 1692fa636b7..60b05ac9dba 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2010/GiantGrowth.java @@ -38,6 +38,7 @@ public class GiantGrowth extends mage.sets.tenth.GiantGrowth { public GiantGrowth(UUID ownerId) { super(ownerId); + this.cardNumber = 184; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java b/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java index bd257a00673..ca4f210b2ee 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/magic2010/GiantSpider.java @@ -38,6 +38,7 @@ public class GiantSpider extends mage.sets.tenth.GiantSpider { public GiantSpider(UUID ownerId) { super(ownerId); + this.cardNumber = 185; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java index a28bd186e44..b8ac1dc3aab 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java +++ b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java @@ -55,7 +55,7 @@ public class GlacialFortress extends CardImpl { } public GlacialFortress(UUID ownerId) { - super(ownerId, "Glacial Fortress", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 226, "Glacial Fortress", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceUnlessControlsEffect(filter), "tapped unless you control a " + filter.getMessage())); this.addAbility(new BlueManaAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java index 863436e992b..c593f8bceac 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java @@ -54,7 +54,7 @@ public class GoblinChieftain extends CardImpl { } public GoblinChieftain(UUID ownerId) { - super(ownerId, "Goblin Chieftain", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); + super(ownerId, 139, "Goblin Chieftain", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Goblin"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java b/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java index 654b3b203f6..dff93532a25 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinPiker.java @@ -38,6 +38,7 @@ public class GoblinPiker extends mage.sets.tenth.GoblinPiker { public GoblinPiker(UUID ownerId) { super(ownerId); + this.cardNumber = 140; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java b/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java index 7449ad4a6b4..cf51340b3de 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/magic2010/Gravedigger.java @@ -38,6 +38,7 @@ public class Gravedigger extends mage.sets.tenth.Gravedigger { public Gravedigger(UUID ownerId) { super(ownerId); + this.cardNumber = 97; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java index d759f7335df..ac1f39ddbce 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java +++ b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java @@ -46,7 +46,7 @@ import mage.filter.FilterCard; public class GreatSableStag extends CardImpl { public GreatSableStag(UUID ownerId) { - super(ownerId, "Great Sable Stag", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); + super(ownerId, 186, "Great Sable Stag", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Elk"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java index 62e6d126268..3de1e5f5efb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java @@ -43,7 +43,7 @@ import mage.cards.CardImpl; public class GriffinSentinel extends CardImpl { public GriffinSentinel(UUID ownerId) { - super(ownerId, "Griffin Sentinel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); + super(ownerId, 12, "Griffin Sentinel", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Griffin"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java index ca8ddb1d5ed..52ca8be8093 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java +++ b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java @@ -53,7 +53,7 @@ import mage.target.TargetPlayer; public class HauntingEchoes extends CardImpl { public HauntingEchoes(UUID ownerId) { - super(ownerId, "Haunting Echoes", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); + super(ownerId, 98, "Haunting Echoes", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java b/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java index 9bf3e2ef0b5..da27e9fd5e8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java +++ b/Mage.Sets/src/mage/sets/magic2010/HolyStrength.java @@ -38,6 +38,7 @@ public class HolyStrength extends mage.sets.tenth.HolyStrength { public HolyStrength(UUID ownerId) { super(ownerId); + this.cardNumber = 15; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java index a69ee772c95..612578f8d46 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java +++ b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java @@ -52,7 +52,7 @@ public class HonorOfThePure extends CardImpl { } public HonorOfThePure(UUID ownerId) { - super(ownerId, "Honor of the Pure", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); + super(ownerId, 16, "Honor of the Pure", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java b/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java index 76a93f550e4..7cc43c052d3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java +++ b/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class HornedTurtle extends CardImpl{ public HornedTurtle(UUID ownerId) { - super(ownerId, "Horned Turtle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); + super(ownerId, 55, "Horned Turtle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Turtle"); diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java b/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java index 66c6aacaa74..444b5c4f401 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java @@ -48,7 +48,7 @@ import mage.players.Player; public class HowlingBanshee extends CardImpl { public HowlingBanshee(UUID ownerId) { - super(ownerId, "Howling Banshee", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); + super(ownerId, 99, "Howling Banshee", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Spirit"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java b/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java index 8352ecfb20d..39cd9bc30d9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java @@ -47,7 +47,7 @@ import mage.target.TargetPlayer; public class HowlingMine extends CardImpl { public HowlingMine(UUID ownerId) { - super(ownerId, "Howling Mine", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, 212, "Howling Mine", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "M10"; this.addAbility(new HowlingMineAbility()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/IceCage.java b/Mage.Sets/src/mage/sets/magic2010/IceCage.java index 6b7ba704afe..e074bda9712 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IceCage.java +++ b/Mage.Sets/src/mage/sets/magic2010/IceCage.java @@ -56,7 +56,7 @@ import mage.target.common.TargetCreaturePermanent; public class IceCage extends CardImpl { public IceCage(UUID ownerId) { - super(ownerId, "Ice Cage", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); + super(ownerId, 56, "Ice Cage", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Island1.java b/Mage.Sets/src/mage/sets/magic2010/Island1.java index 8c42a3378fd..f3532127a95 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island1 extends mage.cards.basiclands.Island { public Island1(UUID ownerId) { - super(ownerId); + super(ownerId, 234); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Island2.java b/Mage.Sets/src/mage/sets/magic2010/Island2.java index 357e968eaa2..3ec4271305d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island2 extends mage.cards.basiclands.Island { public Island2(UUID ownerId) { - super(ownerId); + super(ownerId, 235); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Island3.java b/Mage.Sets/src/mage/sets/magic2010/Island3.java index 08b5877ad91..bcd94638ba5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island3 extends mage.cards.basiclands.Island { public Island3(UUID ownerId) { - super(ownerId); + super(ownerId, 236); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Island4.java b/Mage.Sets/src/mage/sets/magic2010/Island4.java index e8247895841..d5aa2223dc6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island4 extends mage.cards.basiclands.Island { public Island4(UUID ownerId) { - super(ownerId); + super(ownerId, 237); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java index 88ee8aa665d..ff564adb4e5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java +++ b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java @@ -46,7 +46,7 @@ import mage.target.TargetPlayer; public class JaceBeleren extends CardImpl { public JaceBeleren(UUID ownerId) { - super(ownerId, "Jace Beleren", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{1}{U}{U}"); + super(ownerId, 58, "Jace Beleren", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{1}{U}{U}"); this.expansionSetCode = "M10"; this.subtype.add("Jace"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java index d802e2fa3d8..389e3f414c9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java +++ b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class KelinoreBat extends CardImpl { public KelinoreBat(UUID ownerId) { - super(ownerId, "Kelinore Bat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 101, "Kelinore Bat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Bat"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java b/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java index c5303079a48..f51f9a4b702 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java +++ b/Mage.Sets/src/mage/sets/magic2010/KrakensEye.java @@ -38,6 +38,7 @@ public class KrakensEye extends mage.sets.tenth.KrakensEye { public KrakensEye(UUID ownerId) { super(ownerId); + this.cardNumber = 213; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java index b101fb3f0de..6cc59248b29 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/magic2010/LavaAxe.java @@ -38,6 +38,7 @@ public class LavaAxe extends mage.sets.tenth.LavaAxe { public LavaAxe(UUID ownerId) { super(ownerId); + this.cardNumber = 145; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java index 7c703c3e959..72e83e0f035 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class LightningBolt extends CardImpl { public LightningBolt(UUID ownerId) { - super(ownerId, "Lightning Bolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); + super(ownerId, 146, "Lightning Bolt", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M10"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index 2d1524bbda7..6d6ad8afad2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java @@ -56,7 +56,7 @@ import mage.target.common.TargetCardInLibrary; public class LilianaVess extends CardImpl { public LilianaVess(UUID ownerId) { - super(ownerId, "Liliana Vess", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{B}{B}"); + super(ownerId, 102, "Liliana Vess", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{B}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Liliana"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java b/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java index 737c656b9f0..e4cbbab207b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/magic2010/LlanowarElves.java @@ -38,6 +38,7 @@ public class LlanowarElves extends mage.sets.tenth.LlanowarElves { public LlanowarElves(UUID ownerId) { super(ownerId); + this.cardNumber = 189; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java index c39dbf91617..825ae8a7139 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java +++ b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class LoomingShade extends CardImpl { public LoomingShade(UUID ownerId) { - super(ownerId, "Looming Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 103, "Looming Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Shade"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java index e608380098a..89b99a4b9b6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java @@ -48,7 +48,7 @@ import mage.cards.CardImpl; public class MagmaPhoenix extends CardImpl { public MagmaPhoenix(UUID ownerId) { - super(ownerId, "Magma Phoenix", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); + super(ownerId, 148, "Magma Phoenix", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "M10"; this.subtype.add("Phoenix"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java index 35f6cd4a457..c43f600715e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java @@ -60,7 +60,7 @@ public class MasterOfTheWildHunt extends CardImpl { private static WolfToken wolfToken = new WolfToken(); public MasterOfTheWildHunt(UUID ownerId) { - super(ownerId, "Master of the Wild Hunt", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + super(ownerId, 191, "Master of the Wild Hunt", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java index 54d0d31b430..0c5d968a5f7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java @@ -62,7 +62,7 @@ public class MerfolkSovereign extends CardImpl { } public MerfolkSovereign(UUID ownerId) { - super(ownerId, "Merfolk Sovereign", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); + super(ownerId, 62, "Merfolk Sovereign", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "M10"; this.subtype.add("Merfolk"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index 0c7f6801610..a120990eaa3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java +++ b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java @@ -42,8 +42,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class MightOfOaks extends CardImpl { - public MightOfOaks(UUID onwerId){ - super(onwerId, "Might of Oaks", Rarity.RARE, new CardType[]{CardType.INSTANT},"{3}{G}"); + public MightOfOaks(UUID ownerId){ + super(ownerId, 192, "Might of Oaks", Rarity.RARE, new CardType[]{CardType.INSTANT},"{3}{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2010/MindControl.java b/Mage.Sets/src/mage/sets/magic2010/MindControl.java index 26d1ad4b0ed..856398a8709 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindControl.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; public class MindControl extends CardImpl { public MindControl(UUID ownerId) { - super(ownerId, "Mind Control", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); + super(ownerId, 63, "Mind Control", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2010/MindRot.java b/Mage.Sets/src/mage/sets/magic2010/MindRot.java index 62e2b875b8b..b68527d5669 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindRot.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindRot.java @@ -38,6 +38,7 @@ public class MindRot extends mage.sets.tenth.MindRot { public MindRot(UUID ownerId) { super(ownerId); + this.cardNumber = 105; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java index 7679af42622..2a1fc1c417b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java @@ -45,7 +45,7 @@ import mage.players.Player; public class MindSpring extends CardImpl { public MindSpring(UUID ownerId) { - super(ownerId, "Mind Spring", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); + super(ownerId, 64, "Mind Spring", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.getSpellAbility().addEffect(new MindSpringEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain1.java b/Mage.Sets/src/mage/sets/magic2010/Mountain1.java index dc819ceb33e..261c174c5b4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain1 extends mage.cards.basiclands.Mountain { public Mountain1(UUID ownerId) { - super(ownerId); + super(ownerId, 242); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain2.java b/Mage.Sets/src/mage/sets/magic2010/Mountain2.java index 2545fa28ccb..b797de6755c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain2 extends mage.cards.basiclands.Mountain { public Mountain2(UUID ownerId) { - super(ownerId); + super(ownerId, 243); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain3.java b/Mage.Sets/src/mage/sets/magic2010/Mountain3.java index 1eaeff720b0..293231b3690 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain3 extends mage.cards.basiclands.Mountain { public Mountain3(UUID ownerId) { - super(ownerId); + super(ownerId, 244); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain4.java b/Mage.Sets/src/mage/sets/magic2010/Mountain4.java index 5eb98ed1b0b..6c9443b2713 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain4 extends mage.cards.basiclands.Mountain { public Mountain4(UUID ownerId) { - super(ownerId); + super(ownerId, 245); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Naturalize.java b/Mage.Sets/src/mage/sets/magic2010/Naturalize.java index 0bc79fde906..90285111ea6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Naturalize.java +++ b/Mage.Sets/src/mage/sets/magic2010/Naturalize.java @@ -38,6 +38,7 @@ public class Naturalize extends mage.sets.tenth.Naturalize { public Naturalize(UUID ownerId) { super(ownerId); + this.cardNumber = 195; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java index eeb4cdc2fba..ff2c2da0319 100644 --- a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java +++ b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java @@ -55,7 +55,7 @@ public class NaturesSpiral extends CardImpl { } public NaturesSpiral(UUID ownerId) { - super(ownerId, "Nature's Spiral", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); + 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)); diff --git a/Mage.Sets/src/mage/sets/magic2010/Negate.java b/Mage.Sets/src/mage/sets/magic2010/Negate.java index fa6e4ad60c3..10de6800722 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Negate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Negate.java @@ -50,7 +50,7 @@ public class Negate extends CardImpl { } public Negate(UUID ownerId) { - super(ownerId, "Negate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); + super(ownerId, 65, "Negate", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java index 06a826c97ce..9c1d8971332 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java @@ -38,6 +38,7 @@ public class Ornithopter extends mage.sets.tenth.Ornithopter { public Ornithopter(UUID ownerId) { super(ownerId); + this.cardNumber = 216; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Overrun.java b/Mage.Sets/src/mage/sets/magic2010/Overrun.java index fa49f714fb9..8caf54c1dd6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Overrun.java +++ b/Mage.Sets/src/mage/sets/magic2010/Overrun.java @@ -44,8 +44,8 @@ import mage.filter.common.FilterCreaturePermanent; */ public class Overrun extends CardImpl { - public Overrun(UUID onwerId) { - super(onwerId, "Overrun", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{2}{G}{G}{G}"); + public Overrun(UUID ownerId) { + super(ownerId, 198, "Overrun", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{2}{G}{G}{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/Pacifism.java b/Mage.Sets/src/mage/sets/magic2010/Pacifism.java index 21fe541780e..61ea736216a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Pacifism.java +++ b/Mage.Sets/src/mage/sets/magic2010/Pacifism.java @@ -38,6 +38,7 @@ public class Pacifism extends mage.sets.tenth.Pacifism { public Pacifism(UUID ownerId) { super(ownerId); + this.cardNumber = 22; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java index 2a70a97f858..f0588b7dd1d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java +++ b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java @@ -51,7 +51,7 @@ import mage.game.permanent.Permanent; public class PalaceGuard extends CardImpl { public PalaceGuard(UUID ownerId) { - super(ownerId, "Palace Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); + super(ownerId, 23, "Palace Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains1.java b/Mage.Sets/src/mage/sets/magic2010/Plains1.java index 93896025c9e..f475508d20b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains1 extends mage.cards.basiclands.Plains { public Plains1(UUID ownerId) { - super(ownerId); + super(ownerId, 230); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains2.java b/Mage.Sets/src/mage/sets/magic2010/Plains2.java index 9360314f505..144a655697d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains2 extends mage.cards.basiclands.Plains { public Plains2(UUID ownerId) { - super(ownerId); + super(ownerId, 231); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains3.java b/Mage.Sets/src/mage/sets/magic2010/Plains3.java index be8e7444453..db3e6a00b33 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains3 extends mage.cards.basiclands.Plains { public Plains3(UUID ownerId) { - super(ownerId); + super(ownerId, 232); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains4.java b/Mage.Sets/src/mage/sets/magic2010/Plains4.java index d815dcca608..15e2fe180f9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains4 extends mage.cards.basiclands.Plains { public Plains4(UUID ownerId) { - super(ownerId); + super(ownerId, 233); this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java b/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java index d7797beb10c..0f14af89dfc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/PlatinumAngel.java @@ -39,6 +39,7 @@ public class PlatinumAngel extends mage.sets.tenth.PlatinumAngel { public PlatinumAngel(UUID ownerId) { super(ownerId); + this.cardNumber = 218; this.expansionSetCode = "M10"; this.rarity = Rarity.MYTHIC; } diff --git a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java index 45f74e1734d..efb65e65825 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class PrizedUnicorn extends CardImpl { public PrizedUnicorn(UUID ownerId) { - super(ownerId, "Prized Unicorn", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); + super(ownerId, 199, "Prized Unicorn", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Unicorn"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java index 640af38a6cd..c72879aad95 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProdigalPyromancer.java @@ -39,6 +39,7 @@ public class ProdigalPyromancer extends mage.sets.tenth.ProdigalPyromancer { public ProdigalPyromancer(UUID ownerId) { super(ownerId); + this.cardNumber = 151; this.expansionSetCode = "M10"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java index e6b9612ecac..37f5a8dfa47 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java @@ -58,7 +58,7 @@ import mage.game.permanent.Permanent; public class ProteanHydra extends CardImpl { public ProteanHydra(UUID ownerId) { - super(ownerId, "Protean Hydra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{X}{G}"); + super(ownerId, 200, "Protean Hydra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{X}{G}"); this.expansionSetCode = "M10"; this.subtype.add("Hydra"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java b/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java index 5b1ba17ea06..ce870b06a56 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java +++ b/Mage.Sets/src/mage/sets/magic2010/Pyroclasm.java @@ -38,6 +38,7 @@ public class Pyroclasm extends mage.sets.tenth.Pyroclasm { public Pyroclasm(UUID ownerId) { super(ownerId); + this.cardNumber = 152; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java index 2aa51b9ce22..5997c603c97 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCardInLibrary; public class RampantGrowth extends CardImpl { public RampantGrowth(UUID ownerId){ - super(ownerId, "Rampant Growth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); + super(ownerId, 201, "Rampant Growth", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard()); diff --git a/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java b/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java index 2de79f15c97..6ad261eabed 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/magic2010/RelentlessRats.java @@ -38,6 +38,7 @@ public class RelentlessRats extends mage.sets.tenth.RelentlessRats { public RelentlessRats(UUID ownerId) { super(ownerId); + this.cardNumber = 108; this.expansionSetCode = "M10"; } diff --git a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java index 43311e8c398..35e87ef9498 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java @@ -53,7 +53,7 @@ public class RhoxPikemaster extends CardImpl { } public RhoxPikemaster(UUID ownerId) { - super(ownerId, "Rhox Pikemaster", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); + super(ownerId, 26, "Rhox Pikemaster", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.subtype.add("Rhino"); diff --git a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java index bfd0f0d5bc9..495faf01cf1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java +++ b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java @@ -55,7 +55,7 @@ public class RootboundCrag extends CardImpl { } public RootboundCrag(UUID ownerId) { - super(ownerId, "Rootbound Crag", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 227, "Rootbound Crag", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceUnlessControlsEffect(filter), "tapped unless you control a " + filter.getMessage())); this.addAbility(new RedManaAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java b/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java index a9d0469239e..5d29ebe5874 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java +++ b/Mage.Sets/src/mage/sets/magic2010/RoyalAssassin.java @@ -54,8 +54,8 @@ public class RoyalAssassin extends CardImpl { filter.setTapped(true); } - public RoyalAssassin(UUID onwerId){ - super(onwerId,"Royal Assassin", Rarity.RARE, new CardType[]{CardType.CREATURE},"{1}{B}{B}"); + public RoyalAssassin(UUID ownerId){ + super(ownerId, 110, "Royal Assassin", Rarity.RARE, new CardType[]{CardType.CREATURE},"{1}{B}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java index 611aa71df88..fbfc73a84d2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java +++ b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterCreatureOrPlayer; public class SafePassage extends CardImpl { public SafePassage(UUID ownerId) { - super(ownerId, "Safe Passage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); + super(ownerId, 28, "Safe Passage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.getSpellAbility().addEffect(new PreventAllDamageToEffect(Duration.EndOfTurn, new FilterCreatureOrPlayer("you and creatures you control", ownerId))); diff --git a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java index 62a0cd5aefb..97464a287e2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class SnappingDrake extends CardImpl{ public SnappingDrake(UUID ownerId) { - super(ownerId, "Snapping Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); + super(ownerId, 72, "Snapping Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.subtype.add("Drake"); diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java index 9497e989b9d..d5737b17cd7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java @@ -49,7 +49,7 @@ import mage.game.permanent.Permanent; public class SoulWarden extends CardImpl { public SoulWarden(UUID ownerId) { - super(ownerId, "Soul Warden", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); + super(ownerId, 34, "Soul Warden", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java index 36e37b9915d..259fa0a8020 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java +++ b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java @@ -55,7 +55,7 @@ public class SunpetalGrove extends CardImpl { } public SunpetalGrove(UUID ownerId) { - super(ownerId, "Sunpetal Grove", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 228, "Sunpetal Grove", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceUnlessControlsEffect(filter), "tapped unless you control a " + filter.getMessage())); this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java index d5d8ac3828e..8817fcc6b13 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java +++ b/Mage.Sets/src/mage/sets/magic2010/TerramorphicExpanse.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCardInLibrary; public class TerramorphicExpanse extends CardImpl { public TerramorphicExpanse(UUID ownerId) { - super(ownerId, "Terramorphic Expanse", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 229, "Terramorphic Expanse", Rarity.COMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M10"; this.addAbility(new TerramorphicExpanseAbility()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java index 534c6c88a32..c4cedae4b6e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java +++ b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java @@ -46,7 +46,7 @@ import mage.target.TargetPlayer; public class TimeWarp extends CardImpl { public TimeWarp(UUID ownerId) { - super(ownerId, "Time Warp", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); + super(ownerId, 75, "Time Warp", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 9b4f5b194ec..3097eb41775 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class VampireAristocrat extends CardImpl { public VampireAristocrat(UUID ownerId) { - super(ownerId, "Vampire Aristocrat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 117, "Vampire Aristocrat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Vampire"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java index 027795cb626..5eb179d97bb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class WallOfBone extends CardImpl { public WallOfBone(UUID ownerId) { - super(ownerId, "Wall of Bone", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 119, "Wall of Bone", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Skeleton"); this.subtype.add("Wall"); diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java index b0712dcf1b2..13c0115a921 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class WallOfFaith extends CardImpl { public WallOfFaith(UUID ownerId) { - super(ownerId, "Wall of Faith", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); + super(ownerId, 40, "Wall of Faith", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); this.subtype.add("Wall"); diff --git a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java index 0ca9803afc6..7fef9722d9c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class WarpathGhoul extends CardImpl { public WarpathGhoul(UUID ownerId) { - super(ownerId, "Warpath Ghoul", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 120, "Warpath Ghoul", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M10"; this.subtype.add("Zombie"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/Weakness.java b/Mage.Sets/src/mage/sets/magic2010/Weakness.java index db919cc6080..2ce6a16b729 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Weakness.java +++ b/Mage.Sets/src/mage/sets/magic2010/Weakness.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; public class Weakness extends CardImpl { public Weakness(UUID ownerId) { - super(ownerId, "Weakness", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); + super(ownerId, 121, "Weakness", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java index e2556395cf8..2f69346f35c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java @@ -44,7 +44,7 @@ import mage.filter.FilterCard; public class WhiteKnight extends CardImpl { public WhiteKnight(UUID ownerId) { - super(ownerId, "White Knight", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}"); + super(ownerId, 41, "White Knight", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}"); this.expansionSetCode = "M10"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java index ac7ea562857..ce94b6d37c7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class WindDrake extends CardImpl { public WindDrake(UUID ownerId) { - super(ownerId, "Wind Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); + super(ownerId, 81, "Wind Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "M10"; this.subtype.add("Drake"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java index 9fcedfc4aae..008dbf20435 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java +++ b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class ZephyrSprite extends CardImpl { public ZephyrSprite(UUID ownerId) { - super(ownerId, "Zephyr Sprite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); + super(ownerId, 82, "Zephyr Sprite", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "M10"; this.subtype.add("Faerie"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java index c5135f41660..acc1851cec3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java +++ b/Mage.Sets/src/mage/sets/magic2011/AcidicSlime.java @@ -38,6 +38,7 @@ public class AcidicSlime extends mage.sets.magic2010.AcidicSlime { public AcidicSlime(UUID ownerId) { super(ownerId); + this.cardNumber = 161; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java index c1b2bdd384d..d6be12db722 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2011/ActOfTreason.java @@ -37,7 +37,7 @@ import java.util.UUID; public class ActOfTreason extends mage.sets.magic2010.ActOfTreason { public ActOfTreason(UUID ownerId) { - super(ownerId); + super(ownerId);this.cardNumber = 121; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index 721e40b48af..e9edf6fd8ec 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; public class AetherAdept extends CardImpl { public AetherAdept(UUID ownerId) { - super(ownerId, "Æther Adept", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); + super(ownerId, 41, "Æther Adept", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/sets/magic2011/AirServant.java b/Mage.Sets/src/mage/sets/magic2011/AirServant.java index 8ecceb096e1..8db8fd91c5e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AirServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/AirServant.java @@ -55,7 +55,7 @@ public class AirServant extends CardImpl { } public AirServant(UUID ownerId) { - super(ownerId, "Air Servant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); + super(ownerId, 42, "Air Servant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.subtype.add("Elemental"); diff --git a/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java index 5eaa594787e..399077515d7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjaniGoldmane.java @@ -38,6 +38,7 @@ public class AjaniGoldmane extends mage.sets.magic2010.AjaniGoldmane { public AjaniGoldmane(UUID ownerId) { super(ownerId); + this.cardNumber = 1; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java index 2c5e6275691..3fecf2500dc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java @@ -43,7 +43,7 @@ import mage.game.events.GameEvent.EventType; public class AjanisMantra extends CardImpl { public AjanisMantra(UUID ownerId) { - super(ownerId, "Ajani's Mantra", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); + super(ownerId, 2, "Ajani's Mantra", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "M11"; this.getColor().setWhite(true); this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new GainLifeEffect(1), true)); diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java index b051f94cad9..623648550d6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java @@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType; public class AjanisPridemate extends CardImpl { public AjanisPridemate(UUID ownerId) { - super(ownerId, "Ajani's Pridemate", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "1}{W}"); + super(ownerId, 3, "Ajani's Pridemate", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "1}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Cat"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java index a958cfb2f93..9cf6756b03a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java +++ b/Mage.Sets/src/mage/sets/magic2011/AlluringSiren.java @@ -38,6 +38,7 @@ public class AlluringSiren extends mage.sets.magic2010.AlluringSiren { public AlluringSiren(UUID ownerId) { super(ownerId); + this.cardNumber = 43; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java index ef33c01d913..f7c403552b2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; public class AncientHellkite extends CardImpl { public AncientHellkite(UUID ownerId) { - super(ownerId, "Ancient Hellkite", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}{R}"); + super(ownerId, 122, "Ancient Hellkite", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Dragon"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java index 12fffb45e0c..3fb1a46df1c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java @@ -53,7 +53,7 @@ import mage.watchers.WatcherImpl; public class AngelicArbiter extends CardImpl { public AngelicArbiter(UUID ownerId) { - super(ownerId, "Angelic Arbiter", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); + super(ownerId, 4, "Angelic Arbiter", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Angel"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java b/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java index b6ce1ae2a95..f1c9388d955 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelsFeather.java @@ -38,6 +38,7 @@ public class AngelsFeather extends mage.sets.tenth.AngelsFeather { public AngelsFeather(UUID ownerId) { super(ownerId); + this.cardNumber = 201; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java index f1133be61ba..562bf85773d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java @@ -45,7 +45,7 @@ import mage.game.events.GameEvent.EventType; public class ArcRunner extends CardImpl { public ArcRunner(UUID ownerId) { - super(ownerId, "Arc Runner", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); + super(ownerId, 123, "Arc Runner", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.subtype.add("Ox"); diff --git a/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java index d07de98bf70..359eba31a74 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArmoredAscension.java @@ -38,6 +38,7 @@ public class ArmoredAscension extends mage.sets.magic2010.ArmoredAscension { public ArmoredAscension(UUID ownerId) { super(ownerId); + this.cardNumber = 5; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java index 363f2990acb..5ca74c2029e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class ArmoredCancrix extends CardImpl { public ArmoredCancrix(UUID ownerId) { - super(ownerId, "Armored Cancrix", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); + super(ownerId, 44, "Armored Cancrix", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.subtype.add("Crab"); diff --git a/Mage.Sets/src/mage/sets/magic2011/Assassinate.java b/Mage.Sets/src/mage/sets/magic2011/Assassinate.java index 8f86bde3ed1..a49f66441e2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Assassinate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Assassinate.java @@ -38,6 +38,7 @@ public class Assassinate extends mage.sets.tenth.Assassinate { public Assassinate(UUID ownerId) { super(ownerId); + this.cardNumber = 81; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java index ba777227a6e..981088cf9bf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class AssaultGriffin extends CardImpl { public AssaultGriffin(UUID ownerId) { - super(ownerId, "Assault Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); + super(ownerId, 6, "Assault Griffin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "M11"; this.color.setWhite(true); this.subtype.add("Griffin"); diff --git a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java index 8b5bf878d89..e4c3cf06e58 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java +++ b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class AuguryOwl extends CardImpl { public AuguryOwl(UUID ownerId) { - super(ownerId, "Augury Owl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + super(ownerId, 45, "Augury Owl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Bird"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java index 08955c2e353..1f428413c8c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java +++ b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java @@ -58,7 +58,7 @@ public class AutumnsVeil extends CardImpl { } public AutumnsVeil(UUID ownerId) { - super(ownerId, "Autumn's Veil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); + super(ownerId, 162, "Autumn's Veil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addEffect(new CantCounterControlledEffect(filterTarget1, filterSource, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java b/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java index ceeaabf3de8..6d0f5c96971 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java +++ b/Mage.Sets/src/mage/sets/magic2011/AwakenerDruid.java @@ -38,6 +38,7 @@ public class AwakenerDruid extends mage.sets.magic2010.AwakenerDruid { public AwakenerDruid(UUID ownerId) { super(ownerId); + this.cardNumber = 163; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java index 91981f72ba7..12f0b31b189 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class AzureDrake extends CardImpl { public AzureDrake(UUID ownerId) { - super(ownerId, "Azure Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); + super(ownerId, 46, "Azure Drake", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.subtype.add("Drake"); diff --git a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java index 7d737ddc21f..69df9552bd2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java +++ b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java @@ -48,7 +48,7 @@ public class BackToNature extends CardImpl { } public BackToNature(UUID ownerId) { - super(ownerId, "Back to Nature", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); + super(ownerId, 164, "Back to Nature", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java index b8e8cedd5b6..efeb8331efc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/sets/magic2011/BaneslayerAngel.java @@ -38,6 +38,7 @@ public class BaneslayerAngel extends mage.sets.magic2010.BaneslayerAngel { public BaneslayerAngel(UUID ownerId) { super(ownerId); + this.cardNumber = 7; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java index ec9162cb2ac..be8e11e8c7b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class BaronyVampire extends CardImpl { public BaronyVampire(UUID ownerId) { - super(ownerId, "Barony Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 82, "Barony Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.subtype.add("Vampire"); diff --git a/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java index 27ffd6f2ecd..84946ddd970 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/sets/magic2011/BerserkersOfBloodRidge.java @@ -38,6 +38,7 @@ public class BerserkersOfBloodRidge extends mage.sets.magic2010.BerserkersOfBloo public BerserkersOfBloodRidge(UUID ownerId) { super(ownerId); + this.cardNumber = 124; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java index 5e3597bcc7d..4999ce980c0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/magic2011/BirdsOfParadise.java @@ -38,6 +38,7 @@ public class BirdsOfParadise extends mage.sets.tenth.BirdsOfParadise { public BirdsOfParadise(UUID ownerId) { super(ownerId); + this.cardNumber = 165; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java b/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java index f00c42128b6..b586761c648 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java +++ b/Mage.Sets/src/mage/sets/magic2011/BlackKnight.java @@ -38,6 +38,7 @@ public class BlackKnight extends mage.sets.magic2010.BlackKnight { public BlackKnight(UUID ownerId) { super(ownerId); + this.cardNumber = 83; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java index e614b936d43..5c88af38249 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java +++ b/Mage.Sets/src/mage/sets/magic2011/BlindingMage.java @@ -38,6 +38,7 @@ public class BlindingMage extends mage.sets.magic2010.BlindingMage { public BlindingMage(UUID ownerId) { super(ownerId); + this.cardNumber = 8; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java index b17c19b6d56..604c0ac0e11 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java @@ -44,7 +44,7 @@ import mage.game.Game; public class BloodTithe extends CardImpl { public BloodTithe(UUID ownerId) { - super(ownerId, "Blood Tithe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); + super(ownerId, 84, "Blood Tithe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{B}"); this.expansionSetCode = "M11"; this.getColor().setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java index 1561dbc01ed..8429452f584 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java @@ -52,7 +52,7 @@ import mage.watchers.WatcherImpl; public class BloodcrazedGoblin extends CardImpl { public BloodcrazedGoblin(UUID ownerId) { - super(ownerId, "Bloodcrazed Goblin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); + super(ownerId, 125, "Bloodcrazed Goblin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "M11"; this.subtype.add("Goblin"); this.subtype.add("Berserker"); diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java index 188e4254835..2890866f921 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodthroneVampire.java @@ -38,6 +38,7 @@ public class BloodthroneVampire extends mage.sets.riseoftheeldrazi.BloodthroneVa public BloodthroneVampire(UUID ownerId) { super(ownerId); + this.cardNumber = 85; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java index 5a15fc65ffa..78f7ca6ee1f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java +++ b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java @@ -51,7 +51,7 @@ public class BogRaiders extends CardImpl { } public BogRaiders(UUID ownerId) { - super(ownerId, "Bog Raiders", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); + super(ownerId, 86, "Bog Raiders", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.subtype.add("Zombie"); diff --git a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java index 02c0f246f79..a7176c7656a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class BrindleBoar extends CardImpl { public BrindleBoar(UUID ownerId) { - super(ownerId, "Brindle Boar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); + super(ownerId, 166, "Brindle Boar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.subtype.add("Boar"); diff --git a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java index eeda4687518..339d039bb17 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; public class BrittleEffigy extends CardImpl { public BrittleEffigy(UUID ownerId) { - super(ownerId, "Brittle Effigy", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}"); + super(ownerId, 202, "Brittle Effigy", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "M11"; Costs costs = new CostsImpl(); costs.add(new GenericManaCost(4)); diff --git a/Mage.Sets/src/mage/sets/magic2011/CallToMind.java b/Mage.Sets/src/mage/sets/magic2011/CallToMind.java index eefe66218b9..ac47ca4ce27 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CallToMind.java +++ b/Mage.Sets/src/mage/sets/magic2011/CallToMind.java @@ -54,7 +54,7 @@ public class CallToMind extends CardImpl { } public CallToMind(UUID ownerId) { - super(ownerId, "CallToMind", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); + super(ownerId, 47, "CallToMind", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Cancel.java b/Mage.Sets/src/mage/sets/magic2011/Cancel.java index 652acb743b6..db82c0faadb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Cancel.java +++ b/Mage.Sets/src/mage/sets/magic2011/Cancel.java @@ -38,6 +38,7 @@ public class Cancel extends mage.sets.shardsofalara.Cancel { public Cancel(UUID ownerId) { super(ownerId); + this.cardNumber = 48; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java index 895314234d0..22c37dcb51f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/sets/magic2011/CanyonMinotaur.java @@ -38,6 +38,7 @@ public class CanyonMinotaur extends mage.sets.conflux.CanyonMinotaur { public CanyonMinotaur(UUID ownerId) { super(ownerId); + this.cardNumber = 126; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index aee882f18de..942c7f44f3c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java @@ -71,7 +71,7 @@ public class CaptivatingVampire extends CardImpl { } public CaptivatingVampire(UUID ownerId) { - super(ownerId, "Captivating Vampire", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); + super(ownerId, 87, "Captivating Vampire", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.subtype.add("Vampire"); diff --git a/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java b/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java index b7e0d53cc4b..08af68d6de7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/magic2011/CelestialPurge.java @@ -38,6 +38,7 @@ public class CelestialPurge extends mage.sets.conflux.CelestialPurge { public CelestialPurge(UUID ownerId) { super(ownerId); + this.cardNumber = 9; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java index 5302cf3a926..9f3c4bbc7e4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandraNalaar.java @@ -38,6 +38,7 @@ public class ChandraNalaar extends mage.sets.magic2010.ChandraNalaar { public ChandraNalaar(UUID ownerId) { super(ownerId); + this.cardNumber = 127; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java index 4dfbf7df503..80968b0135a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent; public class ChandrasOutrage extends CardImpl { public ChandrasOutrage(UUID ownerId) { - super(ownerId, "Chandra's Outrage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); + super(ownerId, 128, "Chandra's Outrage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addEffect(new ChandrasOutrageEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java index 333a1a8feb9..f6e095a6d3e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java @@ -51,7 +51,7 @@ import mage.game.events.GameEvent.EventType; public class ChandrasSpitfire extends CardImpl { public ChandrasSpitfire(UUID ownerId) { - super(ownerId, "Chandra's Spitfire", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); + super(ownerId, 129, "Chandra's Spitfire", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java index e411ba9daac..7764cdcbcd3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChildOfNight.java @@ -38,6 +38,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight { public ChildOfNight(UUID ownerId) { super(ownerId); + this.cardNumber = 88; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Clone.java b/Mage.Sets/src/mage/sets/magic2011/Clone.java index d01067fa51c..7754043566c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Clone.java +++ b/Mage.Sets/src/mage/sets/magic2011/Clone.java @@ -38,6 +38,7 @@ public class Clone extends mage.sets.tenth.Clone { public Clone(UUID ownerId) { super(ownerId); + this.cardNumber = 49; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java index d2a4eb0e954..10b9a65830d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java +++ b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java @@ -43,7 +43,7 @@ import mage.cards.CardImpl; public class CloudCrusader extends CardImpl { public CloudCrusader(UUID ownerId) { - super(ownerId, "Cloud Crusader", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); + super(ownerId, 10, "Cloud Crusader", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java b/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java index c357109f8cb..8cacdbfb536 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java +++ b/Mage.Sets/src/mage/sets/magic2011/CloudElemental.java @@ -38,6 +38,7 @@ public class CloudElemental extends mage.sets.tenth.CloudElemental { public CloudElemental(UUID ownerId) { super(ownerId); + this.cardNumber = 50; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Combust.java b/Mage.Sets/src/mage/sets/magic2011/Combust.java index 8de0326b3be..0895c0916d3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Combust.java +++ b/Mage.Sets/src/mage/sets/magic2011/Combust.java @@ -54,7 +54,7 @@ public class Combust extends CardImpl { } public Combust(UUID ownerId) { - super(ownerId, "Combust", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); + super(ownerId, 130, "Combust", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(5, false)); diff --git a/Mage.Sets/src/mage/sets/magic2011/Condemn.java b/Mage.Sets/src/mage/sets/magic2011/Condemn.java index dfd2e34c093..46f553f3604 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Condemn.java +++ b/Mage.Sets/src/mage/sets/magic2011/Condemn.java @@ -38,6 +38,7 @@ public class Condemn extends mage.sets.tenth.Condemn { public Condemn(UUID ownerId) { super(ownerId); + this.cardNumber = 11; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java index 19a879fe50b..918219de2c3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java +++ b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java @@ -57,7 +57,7 @@ import mage.sets.Sets; public class ConundrumSphinx extends CardImpl { public ConundrumSphinx(UUID ownerId) { - super(ownerId, "Conundrum Sphinx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); + super(ownerId, 51, "Conundrum Sphinx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Sphinx"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java index 1fb66d51332..c1b443b12a0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java +++ b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class Corrupt extends CardImpl { public Corrupt(UUID ownerId) { - super(ownerId, "Corrupt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{B}"); + super(ownerId, 89, "Corrupt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java index 1aa2db16650..deef362db98 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java +++ b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class CrystalBall extends CardImpl { public CrystalBall(UUID ownerId) { - super(ownerId, "Crystal Ball", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); + super(ownerId, 203, "Crystal Ball", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "M11"; Costs costs = new CostsImpl(); costs.add(new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java index 6a75e3fb86e..82f942d6ce3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java +++ b/Mage.Sets/src/mage/sets/magic2011/CudgelTroll.java @@ -38,6 +38,7 @@ public class CudgelTroll extends mage.sets.magic2010.CudgelTroll { public CudgelTroll(UUID ownerId) { super(ownerId); + this.cardNumber = 167; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java index cc1e1a3f227..d32e61520c8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java @@ -55,7 +55,7 @@ import mage.target.common.TargetCardInLibrary; public class Cultivate extends CardImpl { public Cultivate(UUID ownerId) { - super(ownerId, "Cultivate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); + super(ownerId, 168, "Cultivate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addEffect(new CultivateEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index 6ff3e95df79..5ccb698b88d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -42,7 +42,6 @@ import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.Target; import mage.target.common.TargetCreaturePermanent; /** @@ -52,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; public class CyclopsGladiator extends CardImpl { public CyclopsGladiator(UUID ownerId) { - super(ownerId, "Cyclops Gladiator", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}{R}"); + super(ownerId, 131, "Cyclops Gladiator", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Cyclops"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java index 0d3380ec2a1..512174ef181 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java +++ b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java @@ -51,7 +51,7 @@ import mage.players.Player; public class DarkTutelage extends CardImpl { public DarkTutelage(UUID ownerId) { - super(ownerId, "DarkTutelage", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); + super(ownerId, 90, "DarkTutelage", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "M11"; this.getColor().setBlack(true); this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new DarkTutelageEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java b/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java index 97fd81e0b3a..db73178d22d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java +++ b/Mage.Sets/src/mage/sets/magic2011/DayOfJudgment.java @@ -38,6 +38,7 @@ public class DayOfJudgment extends mage.sets.zendikar.DayOfJudgment { public DayOfJudgment(UUID ownerId) { super(ownerId); + this.cardNumber = 12; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Deathmark.java b/Mage.Sets/src/mage/sets/magic2011/Deathmark.java index 64047dc776c..2f3376b79ad 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Deathmark.java +++ b/Mage.Sets/src/mage/sets/magic2011/Deathmark.java @@ -38,6 +38,7 @@ public class Deathmark extends mage.sets.magic2010.Deathmark { public Deathmark(UUID ownerId) { super(ownerId); + this.cardNumber = 91; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Demolish.java b/Mage.Sets/src/mage/sets/magic2011/Demolish.java index 27f9e3b6c51..6735a805d25 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Demolish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Demolish.java @@ -38,6 +38,7 @@ public class Demolish extends mage.sets.zendikar.Demolish { public Demolish(UUID ownerId) { super(ownerId); + this.cardNumber = 132; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java index a47f31c1ae5..2535d61ac5e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java +++ b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java @@ -38,10 +38,7 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; -import mage.filter.Filter.ComparisonScope; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.common.FilterControlledPermanent; -import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetControlledPermanent; /** @@ -51,7 +48,7 @@ import mage.target.common.TargetControlledPermanent; public class DemonOfDeathsGate extends CardImpl { public DemonOfDeathsGate(UUID ownerId) { - super(ownerId, "Demon Of Death's Gate", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{B}{B}{B}"); + super(ownerId, 92, "Demon Of Death's Gate", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{B}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Demon"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java b/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java index 93882ff0e1c..7c032e277b8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java +++ b/Mage.Sets/src/mage/sets/magic2011/DemonsHorn.java @@ -38,6 +38,7 @@ public class DemonsHorn extends mage.sets.tenth.DemonsHorn { public DemonsHorn(UUID ownerId) { super(ownerId); + this.cardNumber = 204; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java index 10b9700ec17..09ddb38252f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java +++ b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterLandPermanent; public class DestructiveForce extends CardImpl { public DestructiveForce(UUID ownerId) { - super(ownerId, "Destructive Force", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); + super(ownerId, 133, "Destructive Force", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addEffect(new SacrificeAllEffect(5, new FilterLandPermanent())); diff --git a/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java b/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java index c816b45310b..fb5e2aca98f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java +++ b/Mage.Sets/src/mage/sets/magic2011/DiabolicTutor.java @@ -38,6 +38,7 @@ public class DiabolicTutor extends mage.sets.tenth.DiabolicTutor { public DiabolicTutor(UUID ownerId) { super(ownerId); + this.cardNumber = 93; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index 44af8008d75..6db434d8d3b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Diminish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Diminish.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; public class Diminish extends CardImpl { public Diminish(UUID ownerId) { - super(ownerId, "Diminish", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); + super(ownerId, 52, "Diminish", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2011/Disentomb.java b/Mage.Sets/src/mage/sets/magic2011/Disentomb.java index a4ac4e85344..1436706fcc0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Disentomb.java +++ b/Mage.Sets/src/mage/sets/magic2011/Disentomb.java @@ -38,6 +38,7 @@ public class Disentomb extends mage.sets.magic2010.Disentomb { public Disentomb(UUID ownerId) { super(ownerId); + this.cardNumber = 94; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java index 74a6720e2ff..c80c2d7fbb1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java +++ b/Mage.Sets/src/mage/sets/magic2011/DoomBlade.java @@ -38,6 +38,7 @@ public class DoomBlade extends mage.sets.magic2010.DoomBlade { public DoomBlade(UUID ownerId) { super(ownerId); + this.cardNumber = 95; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java b/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java index cdff22916d7..e16a157dea6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java +++ b/Mage.Sets/src/mage/sets/magic2011/DragonsClaw.java @@ -38,6 +38,7 @@ public class DragonsClaw extends mage.sets.tenth.DragonsClaw { public DragonsClaw(UUID ownerId) { super(ownerId); + this.cardNumber = 205; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java index 80470ef4e61..c5607decb06 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java +++ b/Mage.Sets/src/mage/sets/magic2011/DragonskullSummit.java @@ -38,6 +38,7 @@ public class DragonskullSummit extends mage.sets.magic2010.DragonskullSummit { public DragonskullSummit(UUID ownerId) { super(ownerId); + this.cardNumber = 223; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java index a3efe488cbb..5d68f69bccb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java +++ b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java @@ -57,7 +57,7 @@ import mage.target.common.TargetCreaturePermanent; public class DryadsFavor extends CardImpl { public DryadsFavor(UUID ownerId) { - super(ownerId, "Dryad's Favor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); + super(ownerId, 169, "Dryad's Favor", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2011/Duress.java b/Mage.Sets/src/mage/sets/magic2011/Duress.java index 8fc1f5c7da4..7cdbe9cffe9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Duress.java +++ b/Mage.Sets/src/mage/sets/magic2011/Duress.java @@ -38,6 +38,7 @@ public class Duress extends mage.sets.magic2010.Duress { public Duress(UUID ownerId) { super(ownerId); + this.cardNumber = 96; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java index c1091053897..08d54797d1f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class DuskdaleWurm extends CardImpl { public DuskdaleWurm(UUID ownerId) { - super(ownerId, "Duskdale Wurm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); + super(ownerId, 170, "Duskdale Wurm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Wurm"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java index ebf58fc8542..35d0d15799f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java @@ -52,7 +52,7 @@ import mage.game.permanent.Permanent; public class EarthServant extends CardImpl { public EarthServant(UUID ownerId) { - super(ownerId, "Earth Servant", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{R}"); + super(ownerId, 134, "Earth Servant", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java index 837692eb463..d1085a743b1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java +++ b/Mage.Sets/src/mage/sets/magic2011/EliteVanguard.java @@ -38,6 +38,7 @@ public class EliteVanguard extends mage.sets.magic2010.EliteVanguard { public EliteVanguard(UUID ownerId) { super(ownerId); + this.cardNumber = 13; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java index 31425658cb8..6d7b6e08bb5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java +++ b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java @@ -53,7 +53,7 @@ import mage.players.Player; public class ElixirOfImmortality extends CardImpl { public ElixirOfImmortality(UUID ownerId) { - super(ownerId, "Elixir Of Immortality", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); + super(ownerId, 206, "Elixir Of Immortality", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "M11"; Costs costs = new CostsImpl(); costs.add(new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java index 0faa33ff4d1..f604cd53023 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/sets/magic2011/ElvishArchdruid.java @@ -38,6 +38,7 @@ public class ElvishArchdruid extends mage.sets.magic2010.ElvishArchdruid { public ElvishArchdruid(UUID ownerId) { super(ownerId); + this.cardNumber = 171; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java index a4acc672612..6ea970a84af 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java +++ b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java @@ -39,7 +39,6 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; import mage.abilities.costs.CostsImpl; import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -52,7 +51,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class EmberHauler extends CardImpl { public EmberHauler(UUID ownerId) { - super(ownerId, "Ember Hauler", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{R}"); + super(ownerId, 135, "Ember Hauler", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Goblin"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java b/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java index 188ded8c0fa..bc31bd190fa 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Excommunicate.java @@ -38,6 +38,7 @@ public class Excommunicate extends mage.sets.shardsofalara.Excommunicate { public Excommunicate(UUID ownerId) { super(ownerId); + this.cardNumber = 14; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java index 07c49f5899f..bd7bd651955 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java +++ b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java @@ -55,7 +55,7 @@ import mage.target.common.TargetCardInLibrary; public class FaunaShaman extends CardImpl { public FaunaShaman(UUID ownerId) { - super(ownerId, "Fauna Shaman", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}"); + super(ownerId, 172, "Fauna Shaman", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Elf"); this.subtype.add("Shaman"); diff --git a/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java index 5ca4178a403..6543b903488 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java +++ b/Mage.Sets/src/mage/sets/magic2011/FieryHellhound.java @@ -38,6 +38,7 @@ public class FieryHellhound extends mage.sets.magic2010.FieryHellhound { public FieryHellhound(UUID ownerId) { super(ownerId); + this.cardNumber = 136; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/FireServant.java b/Mage.Sets/src/mage/sets/magic2011/FireServant.java index f3cd9cff2fa..4f05024f2b7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FireServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/FireServant.java @@ -50,7 +50,7 @@ import mage.game.stack.StackObject; public class FireServant extends CardImpl { public FireServant(UUID ownerId) { - super(ownerId, "Fire Servant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); + super(ownerId, 137, "Fire Servant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Fireball.java b/Mage.Sets/src/mage/sets/magic2011/Fireball.java index 4f6baa798e6..e0d699b010e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fireball.java @@ -38,6 +38,7 @@ public class Fireball extends mage.sets.magic2010.Fireball { public Fireball(UUID ownerId) { super(ownerId); + this.cardNumber = 138; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java b/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java index 885b15f932b..09a1450fb1f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java +++ b/Mage.Sets/src/mage/sets/magic2011/Flashfreeze.java @@ -38,6 +38,7 @@ public class Flashfreeze extends mage.sets.tenth.Flashfreeze { public Flashfreeze(UUID ownerId) { super(ownerId); + this.cardNumber = 53; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Fling.java b/Mage.Sets/src/mage/sets/magic2011/Fling.java index a6fd31dcb2d..76c2b94cb0b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fling.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fling.java @@ -37,12 +37,10 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; -import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreatureOrPlayer; /** @@ -52,7 +50,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class Fling extends CardImpl { public Fling(UUID ownerId) { - super(ownerId, "Fling", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); + super(ownerId, 139, "Fling", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/magic2011/Fog.java b/Mage.Sets/src/mage/sets/magic2011/Fog.java index 5002e504a4a..4a5d8f51aa1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fog.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fog.java @@ -38,6 +38,7 @@ public class Fog extends mage.sets.magic2010.Fog { public Fog(UUID ownerId) { super(ownerId); + this.cardNumber = 173; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Foresee.java b/Mage.Sets/src/mage/sets/magic2011/Foresee.java index a9008a6f5ef..709304a2d60 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Foresee.java +++ b/Mage.Sets/src/mage/sets/magic2011/Foresee.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class Foresee extends CardImpl { public Foresee(UUID ownerId) { - super(ownerId, "Foresee", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); + super(ownerId, 54, "Foresee", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addEffect(new ScryEffect(4)); diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest1.java b/Mage.Sets/src/mage/sets/magic2011/Forest1.java index c08d586ccc5..6996c5c91f1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest1 extends mage.cards.basiclands.Forest { public Forest1(UUID ownerId) { - super(ownerId); + super(ownerId, 246); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest2.java b/Mage.Sets/src/mage/sets/magic2011/Forest2.java index 0ed11256adf..cadf83210ee 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest2 extends mage.cards.basiclands.Forest { public Forest2(UUID ownerId) { - super(ownerId); + super(ownerId, 247); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest3.java b/Mage.Sets/src/mage/sets/magic2011/Forest3.java index be1ad129170..6eca0ec3c3f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest3 extends mage.cards.basiclands.Forest { public Forest3(UUID ownerId) { - super(ownerId); + super(ownerId, 248); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest4.java b/Mage.Sets/src/mage/sets/magic2011/Forest4.java index 46306043b40..3a5f8a553ae 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest4 extends mage.cards.basiclands.Forest { public Forest4(UUID ownerId) { - super(ownerId); + super(ownerId, 249); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java index d52e122e99a..fa8392d35bf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java @@ -53,7 +53,7 @@ import mage.target.TargetStackObject; public class FrostTitan extends CardImpl { public FrostTitan(UUID ownerId) { - super(ownerId, "FrostTitan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); + super(ownerId, 55, "FrostTitan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java index 90072dcb530..944563c81f9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java +++ b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java @@ -56,7 +56,7 @@ public class GaeasRevenge extends CardImpl { } public GaeasRevenge(UUID ownerId) { - super(ownerId, "GaeasRevenge", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); + super(ownerId, 174, "GaeasRevenge", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java index 153cfbfd4ce..321a75b15d0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java @@ -54,7 +54,7 @@ import mage.game.permanent.Permanent; public class GargoyleSentinel extends CardImpl { public GargoyleSentinel(UUID ownerId) { - super(ownerId, "Gargoyle Sentinel", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); + super(ownerId, 207, "Gargoyle Sentinel", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); this.expansionSetCode = "M11"; this.subtype.add("Gargoyle"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java index d27ad525c16..7ddf2489a28 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarrukWildspeaker.java @@ -38,6 +38,7 @@ public class GarrukWildspeaker extends mage.sets.magic2010.GarrukWildspeaker { public GarrukWildspeaker(UUID ownerId) { super(ownerId); + this.cardNumber = 175; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java index af20fd49444..1d2d0b3a91f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class GarruksCompanion extends CardImpl { public GarruksCompanion(UUID ownerId) { - super(ownerId, "Garruk's Companion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{G}"); + super(ownerId, 176, "Garruk's Companion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Beast"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java index 1c07a831eea..ff194589020 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java @@ -49,7 +49,7 @@ import mage.game.permanent.Permanent; public class GarruksPackleader extends CardImpl { public GarruksPackleader(UUID ownerId) { - super(ownerId, "Garruks Packleader", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); + super(ownerId, 177, "Garruks Packleader", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Beast"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java b/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java index b2dd0102756..187a33da299 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2011/GiantGrowth.java @@ -38,6 +38,7 @@ public class GiantGrowth extends mage.sets.tenth.GiantGrowth { public GiantGrowth(UUID ownerId) { super(ownerId); + this.cardNumber = 178; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java b/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java index 9dd05044719..6942349c09d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/magic2011/GiantSpider.java @@ -38,6 +38,7 @@ public class GiantSpider extends mage.sets.tenth.GiantSpider { public GiantSpider(UUID ownerId) { super(ownerId); + this.cardNumber = 179; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java index 02516151b17..10e4082bb26 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java +++ b/Mage.Sets/src/mage/sets/magic2011/GlacialFortress.java @@ -38,6 +38,7 @@ public class GlacialFortress extends mage.sets.magic2010.GlacialFortress { public GlacialFortress(UUID ownerId) { super(ownerId); + this.cardNumber = 225; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java index 4210152a882..56a121e9b25 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class GoblinBalloonBrigade extends CardImpl { public GoblinBalloonBrigade(UUID ownerId) { - super(ownerId, "Goblin Balloon Brigade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); + super(ownerId, 140, "Goblin Balloon Brigade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "M11"; this.subtype.add("Goblin"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java index 5b4eebd007a..6db3ba87d42 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinChieftain.java @@ -38,6 +38,7 @@ public class GoblinChieftain extends mage.sets.magic2010.GoblinChieftain { public GoblinChieftain(UUID ownerId) { super(ownerId); + this.cardNumber = 141; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java b/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java index 434eed797b5..04b3e5e7e15 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinPiker.java @@ -38,6 +38,7 @@ public class GoblinPiker extends mage.sets.tenth.GoblinPiker { public GoblinPiker(UUID ownerId) { super(ownerId); + this.cardNumber = 142; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java b/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java index 0363d741a3a..4cad553b475 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinTunneler.java @@ -38,6 +38,7 @@ public class GoblinTunneler extends mage.sets.riseoftheeldrazi.GoblinTunneler { public GoblinTunneler(UUID ownerId) { super(ownerId); + this.cardNumber = 143; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java index 95837f326fa..a2fb00df135 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class GoldenglowMoth extends CardImpl { public GoldenglowMoth(UUID ownerId) { - super(ownerId, "Goldenglow Moth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); + super(ownerId, 15, "Goldenglow Moth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "M11"; this.subtype.add("Insect"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java index 8f106f6d144..b2f124616a9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java @@ -50,7 +50,7 @@ import mage.game.permanent.token.ZombieToken; public class GraveTitan extends CardImpl { public GraveTitan(UUID ownerId) { - super(ownerId, "Grave Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); + super(ownerId, 97, "Grave Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java b/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java index d659c284d83..f5d66e587b2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/magic2011/Gravedigger.java @@ -38,6 +38,7 @@ public class Gravedigger extends mage.sets.tenth.Gravedigger { public Gravedigger(UUID ownerId) { super(ownerId); + this.cardNumber = 98; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java index 1533e95f81d..c4e51fee13e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java +++ b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class GreaterBasilisk extends CardImpl { public GreaterBasilisk(UUID ownerId) { - super(ownerId, "Greater Basilisk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + super(ownerId, 180, "Greater Basilisk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Basilisk"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java index 75fe6d101b9..c4f04bc91fc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java +++ b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java @@ -58,7 +58,7 @@ public class HarborSerpent extends CardImpl { } public HarborSerpent(UUID ownerId) { - super(ownerId, "Harbor Serpent", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); + super(ownerId, 56, "Harbor Serpent", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Serpent"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java index dff6a90ddde..78f5212072e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java +++ b/Mage.Sets/src/mage/sets/magic2011/HauntingEchoes.java @@ -38,6 +38,7 @@ public class HauntingEchoes extends mage.sets.magic2010.HauntingEchoes { public HauntingEchoes(UUID ownerId) { super(ownerId); + this.cardNumber = 99; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java index eb7d62769ef..7fde378cb83 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java @@ -60,7 +60,7 @@ public class HoardingDragon extends CardImpl { } public HoardingDragon(UUID ownerId) { - super(ownerId, "Hoarding Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); + super(ownerId, 144, "Hoarding Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Dragon"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java b/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java index c47c51dfa71..b9cc50279da 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java +++ b/Mage.Sets/src/mage/sets/magic2011/HolyStrength.java @@ -38,6 +38,7 @@ public class HolyStrength extends mage.sets.tenth.HolyStrength { public HolyStrength(UUID ownerId) { super(ownerId); + this.cardNumber = 16; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java index 77bf41d1d77..3751bb1bdf5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java +++ b/Mage.Sets/src/mage/sets/magic2011/HonorOfThePure.java @@ -38,6 +38,7 @@ public class HonorOfThePure extends mage.sets.magic2010.HonorOfThePure { public HonorOfThePure(UUID ownerId) { super(ownerId); + this.cardNumber = 17; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java index 4f0c5a7b1fc..6bce8c1e4af 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java +++ b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class HornetSting extends CardImpl { public HornetSting(UUID ownerId) { - super(ownerId, "Hornet Sting", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); + super(ownerId, 181, "Hornet Sting", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java b/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java index b7282e48185..7e4d10fdebc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java +++ b/Mage.Sets/src/mage/sets/magic2011/HowlingBanshee.java @@ -38,6 +38,7 @@ public class HowlingBanshee extends mage.sets.magic2010.HowlingBanshee { public HowlingBanshee(UUID ownerId) { super(ownerId); + this.cardNumber = 100; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java index 6a6d205e1c1..08acc5c8504 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java @@ -42,7 +42,7 @@ import mage.target.TargetPlayer; public class HuntersFeast extends CardImpl { public HuntersFeast(UUID ownerId) { - super(ownerId, "Hunters' Feast", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); + super(ownerId, 182, "Hunters' Feast", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetPlayer(0)); diff --git a/Mage.Sets/src/mage/sets/magic2011/IceCage.java b/Mage.Sets/src/mage/sets/magic2011/IceCage.java index 73aa863b481..be90658c897 100644 --- a/Mage.Sets/src/mage/sets/magic2011/IceCage.java +++ b/Mage.Sets/src/mage/sets/magic2011/IceCage.java @@ -38,6 +38,7 @@ public class IceCage extends mage.sets.magic2010.IceCage { public IceCage(UUID ownerId) { super(ownerId); + this.cardNumber = 57; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Incite.java b/Mage.Sets/src/mage/sets/magic2011/Incite.java index 13168663936..773bf16c8ba 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Incite.java +++ b/Mage.Sets/src/mage/sets/magic2011/Incite.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; public class Incite extends CardImpl { public Incite(UUID ownerId) { - super(ownerId, "Incite", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); + super(ownerId, 145, "Incite", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java index badaefd3dfd..f9a108f5c3c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java @@ -48,7 +48,7 @@ import mage.target.common.TargetAttackingCreature; public class InfantryVeteran extends CardImpl { public InfantryVeteran(UUID ownerId) { - super(ownerId, "Infantry Veteran", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); + super(ownerId, 18, "Infantry Veteran", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java index 99c113ac406..f1755f5fc3a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java @@ -52,7 +52,7 @@ import mage.game.events.ZoneChangeEvent; public class InfernoTitan extends CardImpl { public InfernoTitan(UUID ownerId) { - super(ownerId, "Inferno Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); + super(ownerId, 146, "Inferno Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java index c33fff5fe40..2525ecc1ac8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java +++ b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class InspiredCharge extends CardImpl { public InspiredCharge(UUID ownerId) { - super(ownerId, "Inspired Charge", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); + super(ownerId, 19, "Inspired Charge", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); this.expansionSetCode = "M11"; this.color.setWhite(true); this.getSpellAbility().addEffect(new BoostControlledEffect(2, 1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2011/Island1.java b/Mage.Sets/src/mage/sets/magic2011/Island1.java index 08dd57370b9..93673086a3f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island1 extends mage.cards.basiclands.Island { public Island1(UUID ownerId) { - super(ownerId); + super(ownerId, 234); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island2.java b/Mage.Sets/src/mage/sets/magic2011/Island2.java index b9a3df13597..ddaa091ac1e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island2 extends mage.cards.basiclands.Island { public Island2(UUID ownerId) { - super(ownerId); + super(ownerId, 235); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island3.java b/Mage.Sets/src/mage/sets/magic2011/Island3.java index 5f59faa0b13..b930b6a63a9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island3 extends mage.cards.basiclands.Island { public Island3(UUID ownerId) { - super(ownerId); + super(ownerId, 236); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island4.java b/Mage.Sets/src/mage/sets/magic2011/Island4.java index b17d12c228e..39a06b62a28 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island4 extends mage.cards.basiclands.Island { public Island4(UUID ownerId) { - super(ownerId); + super(ownerId, 237); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java b/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java index 3c3f5b55a99..9f8ea8f7489 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java +++ b/Mage.Sets/src/mage/sets/magic2011/JaceBeleren.java @@ -38,6 +38,7 @@ public class JaceBeleren extends mage.sets.magic2010.JaceBeleren { public JaceBeleren(UUID ownerId) { super(ownerId); + this.cardNumber = 58; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java index 59a3390444d..79f5cde4099 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java @@ -48,7 +48,7 @@ import mage.target.TargetPlayer; public class JacesErasure extends CardImpl { public JacesErasure(UUID ownerId) { - super(ownerId, "Jace's Erasure", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); + super(ownerId, 59, "Jace's Erasure", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); Ability ability = new JacesErasureAbility(); diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java index 903626983fc..9cdcba5d166 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class JacesIngenuity extends CardImpl { public JacesIngenuity(UUID ownerId) { - super(ownerId, "Jace's Ingenuity", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); + super(ownerId, 60, "Jace's Ingenuity", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardControllerEffect(3)); diff --git a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java index 99b10ce6e03..51c434be3ac 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java +++ b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java @@ -56,7 +56,7 @@ import mage.target.common.TargetOpponent; public class JinxedIdol extends CardImpl { public JinxedIdol(UUID ownerId) { - super(ownerId, "Jinxed Idol", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, 208, "Jinxed Idol", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "M11"; this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new DamageControllerEffect(2))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedIdolEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java b/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java index bf9dc0780bb..22b906fe743 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java @@ -38,6 +38,7 @@ public class Juggernaut extends mage.sets.tenth.Juggernaut { public Juggernaut(UUID ownerId) { super(ownerId); + this.cardNumber = 209; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java index 2e7c81d846c..138723d0a73 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java +++ b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java @@ -55,7 +55,7 @@ public class KnightExemplar extends CardImpl { } public KnightExemplar(UUID ownerId) { - super(ownerId, "Knight Exemplar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); + super(ownerId, 20, "Knight Exemplar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java b/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java index 325924a34ba..8f18a62f530 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java +++ b/Mage.Sets/src/mage/sets/magic2011/KrakensEye.java @@ -38,6 +38,7 @@ public class KrakensEye extends mage.sets.tenth.KrakensEye { public KrakensEye(UUID ownerId) { super(ownerId); + this.cardNumber = 210; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java b/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java index 2b2876754ce..b6bbba2af2b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/magic2011/LavaAxe.java @@ -38,6 +38,7 @@ public class LavaAxe extends mage.sets.tenth.LavaAxe { public LavaAxe(UUID ownerId) { super(ownerId); + this.cardNumber = 147; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java index 2d4c037f7e4..5aa15a3ded4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java @@ -50,7 +50,7 @@ import mage.game.Game; public class LeylineOfAnticipation extends CardImpl { public LeylineOfAnticipation(UUID ownerId) { - super(ownerId, "Leyline of Anticipation", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); + super(ownerId, 61, "Leyline of Anticipation", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java index fcfd8a0cb29..28e96b38b66 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java @@ -50,7 +50,7 @@ import mage.game.events.GameEvent.EventType; public class LeylineOfPunishment extends CardImpl { public LeylineOfPunishment(UUID ownerId) { - super(ownerId, "Leyline of Punishment", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); + super(ownerId, 148, "Leyline of Punishment", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java index 312757d3f98..1c95bff6a9e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java @@ -53,7 +53,7 @@ public class LeylineOfSanctity extends CardImpl { } public LeylineOfSanctity(UUID ownerId) { - super(ownerId, "Leyline of Sanctity", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); + super(ownerId, 21, "Leyline of Sanctity", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.expansionSetCode = "M11"; this.color.setWhite(true); this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java index a1faa715033..3197671c50c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java @@ -51,7 +51,7 @@ import mage.game.events.ZoneChangeEvent; public class LeylineOfTheVoid extends CardImpl { public LeylineOfTheVoid(UUID ownerId) { - super(ownerId, "Leyline of the Void", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); + super(ownerId, 101, "Leyline of the Void", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java index 66e0fd062e8..25771ef25af 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java @@ -53,7 +53,7 @@ import mage.game.permanent.Permanent; public class LeylineOfVitality extends CardImpl { public LeylineOfVitality(UUID ownerId) { - super(ownerId, "Leyline of Vitality", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); + super(ownerId, 183, "Leyline of Vitality", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.addAbility(LeylineAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java b/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java index 236672a946f..02645f15efb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java +++ b/Mage.Sets/src/mage/sets/magic2011/LightningBolt.java @@ -38,6 +38,7 @@ public class LightningBolt extends mage.sets.magic2010.LightningBolt { public LightningBolt(UUID ownerId) { super(ownerId); + this.cardNumber = 149; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java index 6b7c5319215..b9cf8d34ee3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianaVess.java @@ -37,7 +37,7 @@ import java.util.UUID; public class LilianaVess extends mage.sets.magic2010.LilianaVess { public LilianaVess(UUID ownerId) { - super(ownerId); + super(ownerId);this.cardNumber = 102; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java index 55db6f4380d..7f32f53da6f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java @@ -47,7 +47,7 @@ import mage.target.TargetPlayer; public class LilianasCaress extends CardImpl { public LilianasCaress(UUID ownerId) { - super(ownerId, "Liliana's Caress", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); + super(ownerId, 103, "Liliana's Caress", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.addAbility(new LilianasCaressAbility()); diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java index 98039413c7d..569099aa6f9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java @@ -48,7 +48,7 @@ import mage.players.Player; public class LilianasSpecter extends CardImpl { public LilianasSpecter(UUID ownerId) { - super(ownerId, "Liliana's Specter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); + super(ownerId, 104, "Liliana's Specter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Specter"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java b/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java index 83c36af92e5..eea38590985 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/magic2011/LlanowarElves.java @@ -38,6 +38,7 @@ public class LlanowarElves extends mage.sets.tenth.LlanowarElves { public LlanowarElves(UUID ownerId) { super(ownerId); + this.cardNumber = 184; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java index 0cbfb3f2d8a..7466a0f8bb5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2011/MagmaPhoenix.java @@ -38,6 +38,7 @@ public class MagmaPhoenix extends mage.sets.magic2010.MagmaPhoenix { public MagmaPhoenix(UUID ownerId) { super(ownerId); + this.cardNumber = 150; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java index a5d86a17d90..617587fa6c8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java @@ -36,7 +36,6 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.CounterTargetEffect; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; @@ -48,7 +47,7 @@ import mage.target.TargetSpell; public class ManaLeak extends CardImpl { public ManaLeak(UUID ownerId) { - super(ownerId, "Mana Leak", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); + super(ownerId, 62, "Mana Leak", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java index c3dbbde2e68..520ba100f66 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java @@ -55,7 +55,7 @@ public class ManicVandal extends CardImpl { } public ManicVandal(UUID ownerId) { - super(ownerId, "Manic Vandal", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); + super(ownerId, 151, "Manic Vandal", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java index 82475e8b86f..d77c9d57673 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java +++ b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class MaritimeGuard extends CardImpl { public MaritimeGuard(UUID ownerId) { - super(ownerId, "Maritime Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + super(ownerId, 63, "Maritime Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.subtype.add("Merfolk"); diff --git a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java index 297c9095230..c7b134e3d9e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java +++ b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java @@ -52,7 +52,7 @@ import mage.players.Player; public class MassPolymorph extends CardImpl { public MassPolymorph(UUID ownerId) { - super(ownerId, "Mass Polymorph", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{U}"); + super(ownerId, 64, "Mass Polymorph", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addEffect(new MassPolymorphEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java index 346a3bcd1db..6e0555a74f0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2011/MerfolkSovereign.java @@ -38,6 +38,7 @@ public class MerfolkSovereign extends mage.sets.magic2010.MerfolkSovereign { public MerfolkSovereign(UUID ownerId) { super(ownerId); + this.cardNumber = 65; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java index 12e936d5c90..316a89d755b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java +++ b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java @@ -63,7 +63,7 @@ public class MerfolkSpy extends CardImpl { } public MerfolkSpy(UUID ownerId) { - super(ownerId, "Merfolk Spy", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); + super(ownerId, 66, "Merfolk Spy", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "M11"; this.subtype.add("Merfolk"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java index 9aba019a617..3f360ffb33e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java +++ b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; public class MightyLeap extends CardImpl { public MightyLeap(UUID ownerId) { - super(ownerId, "Mighty Leap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); + super(ownerId, 22, "Mighty Leap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "M11"; this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/magic2011/MindControl.java b/Mage.Sets/src/mage/sets/magic2011/MindControl.java index 2aed3d79632..27d13a5cb9e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2011/MindControl.java @@ -38,6 +38,7 @@ public class MindControl extends mage.sets.magic2010.MindControl { public MindControl(UUID ownerId) { super(ownerId); + this.cardNumber = 67; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/MindRot.java b/Mage.Sets/src/mage/sets/magic2011/MindRot.java index 807bc833ae7..0f3c6ea038d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MindRot.java +++ b/Mage.Sets/src/mage/sets/magic2011/MindRot.java @@ -38,6 +38,7 @@ public class MindRot extends mage.sets.magic2010.MindRot { public MindRot(UUID ownerId) { super(ownerId); + this.cardNumber = 105; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java index fef6e22e682..338bc092b06 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java +++ b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.Token; public class MitoticSlime extends CardImpl { public MitoticSlime(UUID ownerId) { - super(ownerId, "Mitotic Slime", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}"); + super(ownerId, 185, "Mitotic Slime", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Ooze"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain1.java b/Mage.Sets/src/mage/sets/magic2011/Mountain1.java index 26b2daccf57..248d279d31f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain1 extends mage.cards.basiclands.Mountain { public Mountain1(UUID ownerId) { - super(ownerId); + super(ownerId, 242); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain2.java b/Mage.Sets/src/mage/sets/magic2011/Mountain2.java index 8ba2b05524f..b215bd0687a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain2 extends mage.cards.basiclands.Mountain { public Mountain2(UUID ownerId) { - super(ownerId); + super(ownerId, 243); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain3.java b/Mage.Sets/src/mage/sets/magic2011/Mountain3.java index 1a5748de722..0b08f509eed 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain3 extends mage.cards.basiclands.Mountain { public Mountain3(UUID ownerId) { - super(ownerId); + super(ownerId, 244); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain4.java b/Mage.Sets/src/mage/sets/magic2011/Mountain4.java index 808eda384a1..7dedc49eed7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain4 extends mage.cards.basiclands.Mountain { public Mountain4(UUID ownerId) { - super(ownerId); + super(ownerId, 245); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java index 5dee1193a7a..ca7066fa27d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java +++ b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java @@ -63,7 +63,7 @@ public class MystifyingMaze extends CardImpl { } public MystifyingMaze(UUID ownerId) { - super(ownerId, "Mystifying Maze", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 226, "Mystifying Maze", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "M11"; this.addAbility(new ColorlessManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MystifyingMazeEffect(), new ManaCostsImpl("{4}")); diff --git a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java index aaecbe2977b..53f5aa6336c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class NantukoShade extends CardImpl { public NantukoShade(UUID ownerId) { - super(ownerId, "Nantuko Shade", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{B}"); + super(ownerId, 106, "Nantuko Shade", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Insect"); this.subtype.add("Shade"); diff --git a/Mage.Sets/src/mage/sets/magic2011/Naturalize.java b/Mage.Sets/src/mage/sets/magic2011/Naturalize.java index 6fa1d7c6f73..c3b917ece65 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Naturalize.java +++ b/Mage.Sets/src/mage/sets/magic2011/Naturalize.java @@ -38,6 +38,7 @@ public class Naturalize extends mage.sets.tenth.Naturalize { public Naturalize(UUID ownerId) { super(ownerId); + this.cardNumber = 186; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java b/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java index 0012a9093ee..3a573c7beea 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java +++ b/Mage.Sets/src/mage/sets/magic2011/NaturesSpiral.java @@ -38,6 +38,7 @@ public class NaturesSpiral extends mage.sets.magic2010.NaturesSpiral { public NaturesSpiral(UUID ownerId) { super(ownerId); + this.cardNumber = 187; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index 08d57a7ce7e..3de92a4d528 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -63,7 +63,7 @@ import mage.target.common.TargetCreaturePermanent; public class NecroticPlague extends CardImpl { public NecroticPlague(UUID ownerId) { - super(ownerId, "Necrotic Plague", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); + super(ownerId, 107, "Necrotic Plague", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2011/Negate.java b/Mage.Sets/src/mage/sets/magic2011/Negate.java index d387d34026b..4f546646753 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Negate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Negate.java @@ -38,6 +38,7 @@ public class Negate extends mage.sets.magic2010.Negate { public Negate(UUID ownerId) { super(ownerId); + this.cardNumber = 68; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java index 44aa46d1c0a..d2c258b7d88 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java +++ b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class NetherHorror extends CardImpl { public NetherHorror(UUID ownerId) { - super(ownerId, "Nether Horror", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); + super(ownerId, 108, "Nether Horror", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Horror"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java index 20de7655d14..7eba6da5c18 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class NightwingShade extends CardImpl { public NightwingShade(UUID ownerId) { - super(ownerId, "Nightwing Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); + super(ownerId, 109, "Nightwing Shade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Shade"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java index 17a076a1ff9..6a4518c8a52 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java @@ -56,7 +56,7 @@ import mage.players.Player; public class ObstinateBaloth extends CardImpl { public ObstinateBaloth(UUID ownerId) { - super(ownerId, "Obstinate Baloth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + super(ownerId, 188, "Obstinate Baloth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Beast"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java index 793d40a2014..10778cc7dec 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/magic2011/Ornithopter.java @@ -38,6 +38,7 @@ public class Ornithopter extends mage.sets.magic2010.Ornithopter { public Ornithopter(UUID ownerId) { super(ownerId); + this.cardNumber = 211; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java b/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java index 9f41d518d92..7155212ccd1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java +++ b/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java @@ -50,7 +50,7 @@ import mage.game.permanent.Permanent; public class OverwhelmingStampede extends CardImpl { public OverwhelmingStampede(UUID ownerId) { - super(ownerId, "Overwhelming Stampede", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); + super(ownerId, 189, "Overwhelming Stampede", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addEffect(new OverwhelmingStampedeEffect()); diff --git a/Mage.Sets/src/mage/sets/magic2011/Pacifism.java b/Mage.Sets/src/mage/sets/magic2011/Pacifism.java index 6144a15f39d..b0352d2acf5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Pacifism.java +++ b/Mage.Sets/src/mage/sets/magic2011/Pacifism.java @@ -38,6 +38,7 @@ public class Pacifism extends mage.sets.tenth.Pacifism { public Pacifism(UUID ownerId) { super(ownerId); + this.cardNumber = 23; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java index a975093be62..b22d63021d5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java +++ b/Mage.Sets/src/mage/sets/magic2011/PalaceGuard.java @@ -38,6 +38,7 @@ public class PalaceGuard extends mage.sets.magic2010.PalaceGuard { public PalaceGuard(UUID ownerId) { super(ownerId); + this.cardNumber = 24; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java index ed409143cb8..64232a88f98 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java @@ -48,7 +48,7 @@ import mage.game.permanent.Permanent; public class PhantomBeast extends CardImpl { public PhantomBeast(UUID ownerId) { - super(ownerId, "Phantom Beast", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); + super(ownerId, 69, "Phantom Beast", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "M11"; this.subtype.add("Illusion"); this.subtype.add("Beast"); diff --git a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java index b94b447f715..c31e5ec603a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java @@ -61,7 +61,7 @@ public class PhylacteryLich extends CardImpl { } public PhylacteryLich(UUID ownerId) { - super(ownerId, "Phylactery Lich", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{B}{B}"); + super(ownerId, 110, "Phylactery Lich", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{B}{B}"); this.expansionSetCode = "M11"; this.subtype.add("Zombie"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains1.java b/Mage.Sets/src/mage/sets/magic2011/Plains1.java index ed95eabdf66..31df21c6e9c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains1 extends mage.cards.basiclands.Plains { public Plains1(UUID ownerId) { - super(ownerId); + super(ownerId, 230); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains2.java b/Mage.Sets/src/mage/sets/magic2011/Plains2.java index 34420da8651..f57030c913d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains2 extends mage.cards.basiclands.Plains { public Plains2(UUID ownerId) { - super(ownerId); + super(ownerId, 231); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains3.java b/Mage.Sets/src/mage/sets/magic2011/Plains3.java index 0f918d236ea..dbc5b6f4fde 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains3 extends mage.cards.basiclands.Plains { public Plains3(UUID ownerId) { - super(ownerId); + super(ownerId, 232); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains4.java b/Mage.Sets/src/mage/sets/magic2011/Plains4.java index 5900cbea930..9115c612958 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains4 extends mage.cards.basiclands.Plains { public Plains4(UUID ownerId) { - super(ownerId); + super(ownerId, 233); this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java b/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java index 2cdf1a736e9..54e6bce064a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/magic2011/PlatinumAngel.java @@ -38,6 +38,7 @@ public class PlatinumAngel extends mage.sets.magic2010.PlatinumAngel { public PlatinumAngel(UUID ownerId) { super(ownerId); + this.cardNumber = 212; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plummet.java b/Mage.Sets/src/mage/sets/magic2011/Plummet.java index 1ba52d044b5..da9c3719d90 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plummet.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plummet.java @@ -56,7 +56,7 @@ public class Plummet extends CardImpl { } public Plummet(UUID ownerId) { - super(ownerId, "Plummet", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); + super(ownerId, 190, "Plummet", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2011/Preordain.java b/Mage.Sets/src/mage/sets/magic2011/Preordain.java index 4c3726f7ba5..50444a21338 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Preordain.java +++ b/Mage.Sets/src/mage/sets/magic2011/Preordain.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class Preordain extends CardImpl { public Preordain(UUID ownerId) { - super(ownerId, "Preordain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); + super(ownerId, 70, "Preordain", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addEffect(new ScryEffect(2)); diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index 164af8bce05..ea9c9a3555e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; public class PrimalCocoon extends CardImpl { public PrimalCocoon(UUID ownerId) { - super(ownerId, "Primal Cocoon", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); + super(ownerId, 191, "Primal Cocoon", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java index df31be7c3a4..ac9dbb37fd6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java @@ -58,7 +58,7 @@ import mage.target.common.TargetCardInLibrary; public class PrimevalTitan extends CardImpl { public PrimevalTitan(UUID ownerId) { - super(ownerId, "Primeval Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); + super(ownerId, 192, "Primeval Titan", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Giant"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java index 77644c94555..a11b34e985a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrizedUnicorn.java @@ -38,6 +38,7 @@ public class PrizedUnicorn extends mage.sets.magic2010.PrizedUnicorn { public PrizedUnicorn(UUID ownerId) { super(ownerId); + this.cardNumber = 193; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java index b97b5df45a1..8679526424c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/magic2011/ProdigalPyromancer.java @@ -38,6 +38,7 @@ public class ProdigalPyromancer extends mage.sets.magic2010.ProdigalPyromancer { public ProdigalPyromancer(UUID ownerId) { super(ownerId); + this.cardNumber = 152; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java index 4dd5a1c68c0..17486328b66 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2011/ProteanHydra.java @@ -39,6 +39,7 @@ public class ProteanHydra extends mage.sets.magic2010.ProteanHydra { public ProteanHydra(UUID ownerId) { super(ownerId); + this.cardNumber = 194; this.expansionSetCode = "M11"; this.rarity = Rarity.RARE; } diff --git a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java index 9cd19f141a4..78433284137 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java +++ b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class PyreticRitual extends CardImpl { public PyreticRitual(UUID ownerId) { - super(ownerId, "Pyretic Ritual", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); + super(ownerId, 153, "Pyretic Ritual", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addEffect(new ManaEffect(Mana.RedMana(3))); diff --git a/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java b/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java index f15348ae6ce..1a72ea28750 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java +++ b/Mage.Sets/src/mage/sets/magic2011/Pyroclasm.java @@ -38,6 +38,7 @@ public class Pyroclasm extends mage.sets.tenth.Pyroclasm { public Pyroclasm(UUID ownerId) { super(ownerId); + this.cardNumber = 154; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java index cc9f5e35ec2..42eda559922 100644 --- a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java +++ b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java @@ -55,7 +55,7 @@ import mage.target.common.TargetCreaturePermanent; public class QuagSickness extends CardImpl { public QuagSickness(UUID ownerId) { - super(ownerId, "Quag Sickness", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); + super(ownerId, 111, "Quag Sickness", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java index 243225d8495..c6fb55fa1fb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java +++ b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class ReassemblingSkeleton extends CardImpl { public ReassemblingSkeleton(UUID ownerId) { - super(ownerId, "Reassembling Skeleton", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); + super(ownerId, 112, "Reassembling Skeleton", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "M11"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/magic2011/Redirect.java b/Mage.Sets/src/mage/sets/magic2011/Redirect.java index d06ea8e26fc..fa1d02321f1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Redirect.java +++ b/Mage.Sets/src/mage/sets/magic2011/Redirect.java @@ -42,7 +42,7 @@ import mage.target.TargetSpell; public class Redirect extends CardImpl { public Redirect(UUID ownerId) { - super(ownerId, "Redirect", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); + super(ownerId, 71, "Redirect", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java b/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java index 559f6ed3232..6547bac7a1e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/magic2011/RelentlessRats.java @@ -38,6 +38,7 @@ public class RelentlessRats extends mage.sets.tenth.RelentlessRats { public RelentlessRats(UUID ownerId) { super(ownerId); + this.cardNumber = 113; this.expansionSetCode = "M11"; } diff --git a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java index 9efca509884..954b413f70e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java @@ -52,7 +52,7 @@ public class Reverberate extends CardImpl { } public Reverberate(UUID ownerId) { - super(ownerId, "Reverberate", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{R}"); + super(ownerId, 155, "Reverberate", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{R}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/planechase/OblivionRing.java b/Mage.Sets/src/mage/sets/planechase/OblivionRing.java index ff8fdb8e050..bbeb1025d2f 100644 --- a/Mage.Sets/src/mage/sets/planechase/OblivionRing.java +++ b/Mage.Sets/src/mage/sets/planechase/OblivionRing.java @@ -38,6 +38,7 @@ public class OblivionRing extends mage.sets.shardsofalara.OblivionRing { public OblivionRing(UUID ownerId) { super(ownerId); + this.cardNumber = 4; this.expansionSetCode = "HOP"; } diff --git a/Mage.Sets/src/mage/sets/planechase/SoulWarden.java b/Mage.Sets/src/mage/sets/planechase/SoulWarden.java index 869d080c644..b847899c5a0 100644 --- a/Mage.Sets/src/mage/sets/planechase/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/planechase/SoulWarden.java @@ -38,6 +38,7 @@ public class SoulWarden extends mage.sets.magic2010.SoulWarden { public SoulWarden(UUID ownerId) { super(ownerId); + this.cardNumber = 7; this.expansionSetCode = "HOP"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java index 5431e96f18f..cc1eb6163ed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.EldraziSpawnToken; public class AwakeningZone extends CardImpl { public AwakeningZone(UUID ownerId) { - super(ownerId, "Awakening Zone", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); + super(ownerId, 176, "Awakening Zone", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ROE"; this.getColor().setGreen(true); this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CreateTokenEffect(new EldraziSpawnToken()), true)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index 5c971d011df..fdfaa93cfb1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class BloodthroneVampire extends CardImpl { public BloodthroneVampire(UUID ownerId) { - super(ownerId, "Bloodthrone Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); + super(ownerId, 98, "Bloodthrone Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.expansionSetCode = "ROE"; this.color.setBlack(true); this.subtype.add("Vampire"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java index fc00249c7ba..be167910fb0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java @@ -53,7 +53,7 @@ public class Deprive extends CardImpl { } public Deprive(UUID ownerId) { - super(ownerId, "Deprive", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); + super(ownerId, 59, "Deprive", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}{U}"); this.expansionSetCode = "ROE"; this.color.setBlue(true); this.getSpellAbility().addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java index 788df0ebb91..1fc2cc9de08 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.EldraziSpawnToken; public class EmrakulsHatcher extends CardImpl { public EmrakulsHatcher(UUID ownerId) { - super(ownerId, "Emrakul's Hatcher", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); + super(ownerId, 142, "Emrakul's Hatcher", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java index 15ff8d76c6f..00204c921d9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCardInLibrary; public class EvolvingWilds extends CardImpl { public EvolvingWilds(UUID ownerId) { - super(ownerId, "Evolving Wilds", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 228, "Evolving Wilds", Rarity.COMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ROE"; this.addAbility(new EvolvingWildsAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java index e75e2c6df2f..1e0b2784528 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; public class FlameSlash extends CardImpl { public FlameSlash(UUID ownerId) { - super(ownerId, "Flame Slash", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); + super(ownerId, 145, "Flame Slash", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ROE"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java index 25162caf811..6179f4df45f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest1 extends mage.cards.basiclands.Forest { public Forest1(UUID ownerId) { - super(ownerId); + super(ownerId, 245); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java index 77da27e2b73..4a627d906cd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest2 extends mage.cards.basiclands.Forest { public Forest2(UUID ownerId) { - super(ownerId); + super(ownerId, 246); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java index fd459535bf7..4e30a8056c2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest3 extends mage.cards.basiclands.Forest { public Forest3(UUID ownerId) { - super(ownerId); + super(ownerId, 247); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java index 0f1e9719537..b9b6a72d80b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest4 extends mage.cards.basiclands.Forest { public Forest4(UUID ownerId) { - super(ownerId); + super(ownerId, 248); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index 44c777c8d65..a67f35f2f25 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -64,7 +64,7 @@ public class GideonJura extends CardImpl { } public GideonJura(UUID ownerId) { - super(ownerId, "Gideon Jura", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{W}{W}"); + super(ownerId, 21, "Gideon Jura", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{W}{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Gideon"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index 1fa90a29ab2..4fcf97bf4f2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -58,7 +58,7 @@ public class GoblinTunneler extends CardImpl { } public GoblinTunneler(UUID ownerId) { - super(ownerId, "Goblin Tunneler", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); + super(ownerId, 148, "Goblin Tunneler", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "ROE"; this.subtype.add("Goblin"); this.subtype.add("Rogue"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java index e7ed05785b4..791d69605d1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island1 extends mage.cards.basiclands.Island { public Island1(UUID ownerId) { - super(ownerId); + super(ownerId, 233); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java index 739d0b9933a..73f5290ce52 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island2 extends mage.cards.basiclands.Island { public Island2(UUID ownerId) { - super(ownerId); + super(ownerId, 234); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java index 9d610e2be54..754be840c7a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island3 extends mage.cards.basiclands.Island { public Island3(UUID ownerId) { - super(ownerId); + super(ownerId, 235); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java index 00ca7c2a48c..3b9e5a64738 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island4 extends mage.cards.basiclands.Island { public Island4(UUID ownerId) { - super(ownerId); + super(ownerId, 236); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java index 82dfa378b26..22881a50090 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java @@ -61,7 +61,7 @@ public class JoragaTreespeaker extends LevelerCard { } public JoragaTreespeaker(UUID ownerId) { - super(ownerId, "Joraga Treespeaker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 190, "Joraga Treespeaker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java index 6ace278d3d1..880fb5207d8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java @@ -53,7 +53,7 @@ import mage.cards.LevelerCard; public class KarganDragonlord extends LevelerCard { public KarganDragonlord(UUID ownerId) { - super(ownerId, "Kargan Dragonlord", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{R}{R}"); + super(ownerId, 152, "Kargan Dragonlord", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{R}{R}"); this.expansionSetCode = "ROE"; this.subtype.add("Human"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java index 4bed3ce2cfc..4fa84ebae02 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.EldraziSpawnToken; public class KozileksPredator extends CardImpl { public KozileksPredator(UUID ownerId) { - super(ownerId, "Kozilek's Predator", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); + super(ownerId, 193, "Kozilek's Predator", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java index f7b170d699b..f2673f6584a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain1 extends mage.cards.basiclands.Mountain { public Mountain1(UUID ownerId) { - super(ownerId); + super(ownerId, 241); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java index 2eef4e98fe4..04bfb912f35 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain2 extends mage.cards.basiclands.Mountain { public Mountain2(UUID ownerId) { - super(ownerId); + super(ownerId, 242); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java index 06d855a053b..f42727d7d14 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain3 extends mage.cards.basiclands.Mountain { public Mountain3(UUID ownerId) { - super(ownerId); + super(ownerId, 243); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java index 5b4f7a8608e..bd6d3ea82dd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain4 extends mage.cards.basiclands.Mountain { public Mountain4(UUID ownerId) { - super(ownerId); + super(ownerId, 244); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java index dd12c95f1d8..8519ee5c184 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java @@ -34,10 +34,11 @@ import java.util.UUID; * * @author BetaSteward_at_googlemail.com */ -public class Naturalize extends mage.cards.basiclands.Mountain { +public class Naturalize extends mage.sets.tenth.Naturalize { public Naturalize(UUID ownerId) { super(ownerId); + this.cardNumber = 199; this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java index 091ad1928a7..7fa72b26539 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.EldraziSpawnToken; public class NestInvader extends CardImpl { public NestInvader(UUID ownerId) { - super(ownerId, "Nest Invader", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); + super(ownerId, 201, "Nest Invader", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); this.subtype.add("Drone"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java index 763ca136e68..8a1a3f02224 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains1 extends mage.cards.basiclands.Plains { public Plains1(UUID ownerId) { - super(ownerId); + super(ownerId, 229); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java index c5dc04537a0..359615839c9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains2 extends mage.cards.basiclands.Plains { public Plains2(UUID ownerId) { - super(ownerId); + super(ownerId, 230); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java index 7f70f40f13f..0063258b086 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains3 extends mage.cards.basiclands.Plains { public Plains3(UUID ownerId) { - super(ownerId); + super(ownerId, 231); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java index 14af4d243ec..97ed92f3566 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains4 extends mage.cards.basiclands.Plains { public Plains4(UUID ownerId) { - super(ownerId); + super(ownerId, 232); this.expansionSetCode = "ROE"; } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java index 18b2648967c..702d3977cde 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java @@ -53,7 +53,7 @@ import mage.target.TargetCard; public class SeaGateOracle extends CardImpl { public SeaGateOracle(UUID ownerId) { - super(ownerId, "Sea Gate Oracle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); + super(ownerId, 85, "Sea Gate Oracle", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "ROE"; this.color.setBlue(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java index 94a01845ec4..c652a953274 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java @@ -49,7 +49,7 @@ import mage.target.TargetCard; public class SeeBeyond extends CardImpl { public SeeBeyond(UUID ownerId) { - super(ownerId, "See Beyond", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); + super(ownerId, 86, "See Beyond", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{U}"); this.expansionSetCode = "ROE"; this.color.setBlue(true); this.getSpellAbility().addEffect(new SeeBeyondEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java index 8a334a383f1..d694bde656d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java @@ -46,7 +46,7 @@ import mage.target.TargetSpell; public class UnifiedWill extends CardImpl { public UnifiedWill(UUID ownerId) { - super(ownerId, "Unified Will", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); + super(ownerId, 92, "Unified Will", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "ROE"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java index 5515f39846c..723e05dd4f0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java @@ -51,7 +51,7 @@ import mage.watchers.WatcherImpl; public class Vengevine extends CardImpl { public Vengevine(UUID ownerId) { - super(ownerId, "Vengevine", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + super(ownerId, 212, "Vengevine", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "ROE"; this.subtype.add("Elemental"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java index 31c07b758d4..ae469402a81 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class WallOfOmens extends CardImpl { public WallOfOmens(UUID ownerId) { - super(ownerId, "Wall Of Omens", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); + super(ownerId, 53, "Wall Of Omens", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Wall"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java index fc9b4d88833..6b04c455061 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class AjaniVengeant extends CardImpl { public AjaniVengeant(UUID ownerId) { - super(ownerId, "Ajani Vengeant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{W}"); + super(ownerId, 154, "Ajani Vengeant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Ajani"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java index d84bab7a52d..559d47e1a91 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class Angelsong extends CardImpl { public Angelsong(UUID ownerId) { - super(ownerId, "Angelsong", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); + super(ownerId, 4, "Angelsong", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "ALA"; this.color.setWhite(true); this.getSpellAbility().addEffect(new PreventAllCombatDamageEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java index 9f2bb86f5b6..d0c6bdc4c14 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java @@ -43,7 +43,7 @@ import mage.target.TargetPlayer; public class Blightning extends CardImpl { public Blightning(UUID ownerId) { - super(ownerId, "Blightning", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{R}"); + super(ownerId, 156, "Blightning", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{R}"); this.expansionSetCode = "ALA"; this.color.setBlack(true); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java index 04bba6d2cdc..383348c53f4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java @@ -47,7 +47,7 @@ public class BroodmateDragon extends CardImpl { private static DragonToken dragonToken = new DragonToken(); public BroodmateDragon(UUID ownerId) { - super(ownerId, "Broodmate Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{R}{G}"); + super(ownerId, 160, "Broodmate Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{R}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Dragon"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java b/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java index 60d55c189cb..8f87cfaa28e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java @@ -38,6 +38,7 @@ public class Cancel extends mage.sets.tenth.Cancel { public Cancel(UUID ownerId) { super(ownerId); + this.cardNumber = 33; this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java b/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java index ca03e642593..b2db79c0bd4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class CrumblingNecropolis extends CardImpl { public CrumblingNecropolis(UUID ownerId) { - super(ownerId, "Crumbling Necropolis", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 222, "Crumbling Necropolis", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ALA"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); this.addAbility(new RedManaAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index 81441ecd4eb..d6cd76c00de 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java @@ -55,7 +55,7 @@ public class ElspethKnightErrant extends CardImpl { private static SoldierToken soldierToken = new SoldierToken(); public ElspethKnightErrant(UUID ownerId) { - super(ownerId, "Elspeth, Knight-Errant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); + super(ownerId, 9, "Elspeth, Knight-Errant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Elspeth"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java index e863c1f56fd..35f532f25c0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; public class Excommunicate extends CardImpl { public Excommunicate(UUID ownerId) { - super(ownerId, "Excommunicate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); + super(ownerId, 11, "Excommunicate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "ALA"; this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java index c44981e6d9f..f1fab1b66f5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest1 extends mage.cards.basiclands.Forest { public Forest1(UUID ownerId) { - super(ownerId); + super(ownerId, 246); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java index 4a05622116b..37772338179 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest2 extends mage.cards.basiclands.Forest { public Forest2(UUID ownerId) { - super(ownerId); + super(ownerId, 247); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java index 18f8a3e84c7..39c6b49d156 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest3 extends mage.cards.basiclands.Forest { public Forest3(UUID ownerId) { - super(ownerId); + super(ownerId, 248); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java index 02bd97a6e01..39aae211e2a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Forest4 extends mage.cards.basiclands.Forest { public Forest4(UUID ownerId) { - super(ownerId); + super(ownerId, 249); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java index eaa772970ef..e8a725fa5cc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java @@ -48,7 +48,7 @@ import mage.game.events.GameEvent.EventType; public class HellsThunder extends CardImpl { public HellsThunder(UUID ownerId) { - super(ownerId, "Hell's Thunder", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); + super(ownerId, 103, "Hell's Thunder", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.expansionSetCode = "ALA"; this.subtype.add("Elemental"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island1.java b/Mage.Sets/src/mage/sets/shardsofalara/Island1.java index 8a7a7db7707..378d0428e4f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island1 extends mage.cards.basiclands.Island { public Island1(UUID ownerId) { - super(ownerId); + super(ownerId, 234); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island2.java b/Mage.Sets/src/mage/sets/shardsofalara/Island2.java index 3959add766c..16038d6663c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island2 extends mage.cards.basiclands.Island { public Island2(UUID ownerId) { - super(ownerId); + super(ownerId, 235); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island3.java b/Mage.Sets/src/mage/sets/shardsofalara/Island3.java index 03bc06bc044..add1cc7e84e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island3 extends mage.cards.basiclands.Island { public Island3(UUID ownerId) { - super(ownerId); + super(ownerId, 236); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island4.java b/Mage.Sets/src/mage/sets/shardsofalara/Island4.java index 5851ac4e77c..92a1df5fb53 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Island4 extends mage.cards.basiclands.Island { public Island4(UUID ownerId) { - super(ownerId); + super(ownerId, 237); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java index 95843cf67f7..5d668cf8577 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCardInLibrary; public class JundPanorama extends CardImpl { public JundPanorama(UUID ownerId) { - super(ownerId, "Jund Panorama", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 225, "Jund Panorama", Rarity.COMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ALA"; this.addAbility(new ColorlessManaAbility()); this.addAbility(new JundPanoramaAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java index 674a993df22..c39a280fbfe 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java @@ -53,7 +53,7 @@ import mage.target.common.TargetCardInLibrary; public class KnightOfTheWhiteOrchid extends CardImpl { public KnightOfTheWhiteOrchid(UUID ownerId) { - super(ownerId, "Knight of the White Orchid", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}{W}"); + super(ownerId, 16, "Knight of the White Orchid", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java index c55350b025f..165147116b5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain1 extends mage.cards.basiclands.Mountain { public Mountain1(UUID ownerId) { - super(ownerId); + super(ownerId, 242); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java index e9b3676fc42..b329005c753 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain2 extends mage.cards.basiclands.Mountain { public Mountain2(UUID ownerId) { - super(ownerId); + super(ownerId, 243); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java index 1f6eb8f8200..3ba5d6ffaa4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain3 extends mage.cards.basiclands.Mountain { public Mountain3(UUID ownerId) { - super(ownerId); + super(ownerId, 244); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java index 5cb20f32e94..88875f0028f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Mountain4 extends mage.cards.basiclands.Mountain { public Mountain4(UUID ownerId) { - super(ownerId); + super(ownerId, 245); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java b/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java index 65098c3d299..bfd13089b07 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java @@ -38,6 +38,7 @@ public class Naturalize extends mage.sets.magic2010.Naturalize { public Naturalize(UUID ownerId) { super(ownerId); + this.cardNumber = 141; this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java b/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java index e6119df5579..ca118ded958 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; public class OblivionRing extends CardImpl { public OblivionRing(UUID ownerId) { - super(ownerId, "Oblivion Ring", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); + super(ownerId, 20, "Oblivion Ring", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "ALA"; this.color.setWhite(true); FilterNonlandPermanent filter = new FilterNonlandPermanent(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java index bcd9b32002f..3c6164e19dc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains1 extends mage.cards.basiclands.Plains { public Plains1(UUID ownerId) { - super(ownerId); + super(ownerId, 230); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java index e263e98e5ae..1823a8e3f46 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains2 extends mage.cards.basiclands.Plains { public Plains2(UUID ownerId) { - super(ownerId); + super(ownerId, 231); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java index 3891767e3d3..0f00655b8b8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains3 extends mage.cards.basiclands.Plains { public Plains3(UUID ownerId) { - super(ownerId); + super(ownerId, 232); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java index 9789c92b16d..4490ccc370e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Plains4 extends mage.cards.basiclands.Plains { public Plains4(UUID ownerId) { - super(ownerId); + super(ownerId, 233); this.expansionSetCode = "ALA"; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java index 535216e5cc7..999a684708a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; public class RafiqOfTheMany extends CardImpl { public RafiqOfTheMany(UUID ownerId) { - super(ownerId, "Rafiq of the Many", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}{W}{U}"); + super(ownerId, 185, "Rafiq of the Many", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}{W}{U}"); this.expansionSetCode = "ALA"; this.color.setGreen(true); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java index 446417baac8..f075480f335 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java @@ -54,7 +54,7 @@ public class RangerOfEos extends CardImpl { } public RangerOfEos(UUID ownerId) { - super(ownerId, "Ranger Of Eos", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}"); + super(ownerId, 21, "Ranger Of Eos", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "ALA"; this.color.setWhite(true); this.subtype.add("Human"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java index 19531ffdb6e..e2816e86440 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class RhoxWarMonk extends CardImpl { public RhoxWarMonk(UUID ownerId) { - super(ownerId, "Rhox War Monk", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}{W}{U}"); + super(ownerId, 188, "Rhox War Monk", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}{W}{U}"); this.expansionSetCode = "ALA"; this.subtype.add("Rhino"); this.subtype.add("Monk"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java index a38f538f67c..02f52a6243b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java @@ -56,7 +56,7 @@ public class SarkhanVol extends CardImpl { private static DragonToken dragonToken = new DragonToken(); public SarkhanVol(UUID ownerId) { - super(ownerId, "Sarkhan Vol", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{G}"); + super(ownerId, 191, "Sarkhan Vol", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Sarkhan"); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java b/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java index d83cb93cc47..bf8a62cf660 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class SavageLands extends CardImpl { public SavageLands(UUID ownerId) { - super(ownerId, "Savage Lands", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 228, "Savage Lands", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ALA"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); this.addAbility(new RedManaAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java index 247ef1918f8..876a406fe95 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java @@ -46,7 +46,7 @@ public class SproutingThrinax extends CardImpl { private static SaprolingToken saprolingToken = new SaprolingToken(); public SproutingThrinax(UUID ownerId) { - super(ownerId, "Sprouting Thrinax", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); + super(ownerId, 197, "Sprouting Thrinax", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); this.expansionSetCode = "ALA"; this.color.setBlack(true); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java index 5ec0d409a0d..69fb10bd48c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java @@ -48,7 +48,7 @@ public class WildNacatl extends CardImpl { private FilterPermanent filter2 = new FilterPermanent("Plains"); public WildNacatl(UUID ownerId) { - super(ownerId, "Wild Nacatl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 152, "Wild Nacatl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "ALA"; this.color.setGreen(true); this.subtype.add("Cat"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java index 3605eb2fd7e..099d14810df 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class WoollyThoctar extends CardImpl { public WoollyThoctar(UUID ownerId) { - super(ownerId, "Woolly Thoctar", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{G}{W}"); + super(ownerId, 209, "Woolly Thoctar", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}{G}{W}"); this.expansionSetCode = "ALA"; this.color.setRed(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java index 90d094d0149..f3ef9665efe 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java @@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType; public class AngelsFeather extends CardImpl { public AngelsFeather(UUID ownerId) { - super(ownerId, "Angel's Feather", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, 311, "Angel's Feather", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "10E"; this.addAbility(new AngelsFeatherAbility()); } diff --git a/Mage.Sets/src/mage/sets/tenth/Assassinate.java b/Mage.Sets/src/mage/sets/tenth/Assassinate.java index 0731f157c7b..0965f518e7b 100644 --- a/Mage.Sets/src/mage/sets/tenth/Assassinate.java +++ b/Mage.Sets/src/mage/sets/tenth/Assassinate.java @@ -50,7 +50,7 @@ public class Assassinate extends CardImpl { } public Assassinate(UUID ownerId) { - super(ownerId, "Assassinate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); + super(ownerId, 128, "Assassinate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java index cdd0a9f252c..810bf4354e0 100644 --- a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java @@ -47,7 +47,7 @@ import mage.cards.CardImpl; public class BirdsOfParadise extends CardImpl { public BirdsOfParadise(UUID ownerId) { - super(ownerId, "Birds of Paradise", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 252, "Birds of Paradise", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "M10"; this.subtype.add("Bird"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/tenth/Cancel.java b/Mage.Sets/src/mage/sets/tenth/Cancel.java index 4faeadbad62..5c2aadbdcba 100644 --- a/Mage.Sets/src/mage/sets/tenth/Cancel.java +++ b/Mage.Sets/src/mage/sets/tenth/Cancel.java @@ -42,7 +42,7 @@ import mage.target.TargetSpell; public class Cancel extends CardImpl { public Cancel(UUID ownerId) { - super(ownerId, "Cancel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); + super(ownerId, 71, "Cancel", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}{U}"); this.expansionSetCode = "10E"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/sets/tenth/Clone.java b/Mage.Sets/src/mage/sets/tenth/Clone.java index e1583cc2610..f630467cbec 100644 --- a/Mage.Sets/src/mage/sets/tenth/Clone.java +++ b/Mage.Sets/src/mage/sets/tenth/Clone.java @@ -31,14 +31,12 @@ package mage.sets.tenth; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.TargetController; import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CopyEffect; import mage.cards.CardImpl; -import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; /** @@ -48,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; public class Clone extends CardImpl { public Clone(UUID ownerId) { - super(ownerId, "Clone", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}"); + super(ownerId, 73, "Clone", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "10E"; this.color.setBlue(true); this.subtype.add("Shapeshifter"); diff --git a/Mage.Sets/src/mage/sets/tenth/CloudElemental.java b/Mage.Sets/src/mage/sets/tenth/CloudElemental.java index 676edb2cb1d..99c4f018d70 100644 --- a/Mage.Sets/src/mage/sets/tenth/CloudElemental.java +++ b/Mage.Sets/src/mage/sets/tenth/CloudElemental.java @@ -52,7 +52,7 @@ import mage.game.permanent.Permanent; public class CloudElemental extends CardImpl { public CloudElemental(UUID ownerId) { - super(ownerId, "Cloud Elemental", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); + super(ownerId, 74, "Cloud Elemental", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.expansionSetCode = "10E"; this.subtype.add("Elemental"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/tenth/Condemn.java b/Mage.Sets/src/mage/sets/tenth/Condemn.java index 97aabb9d6fc..8fe5533f6e8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Condemn.java +++ b/Mage.Sets/src/mage/sets/tenth/Condemn.java @@ -48,7 +48,7 @@ import mage.target.common.TargetAttackingCreature; public class Condemn extends CardImpl { public Condemn(UUID ownerId) { - super(ownerId, "Condemn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); + super(ownerId, 13, "Condemn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); this.getSpellAbility().addTarget(new TargetAttackingCreature()); diff --git a/Mage.Sets/src/mage/sets/tenth/Deathmark.java b/Mage.Sets/src/mage/sets/tenth/Deathmark.java index e5d42bc4aa9..cd6972082f2 100644 --- a/Mage.Sets/src/mage/sets/tenth/Deathmark.java +++ b/Mage.Sets/src/mage/sets/tenth/Deathmark.java @@ -51,7 +51,7 @@ public class Deathmark extends CardImpl { } public Deathmark(UUID ownerId) { - super(ownerId, "Deathmark", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); + super(ownerId, 134, "Deathmark", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/tenth/Demolish.java b/Mage.Sets/src/mage/sets/tenth/Demolish.java index 357e2eef84a..167a06754f5 100644 --- a/Mage.Sets/src/mage/sets/tenth/Demolish.java +++ b/Mage.Sets/src/mage/sets/tenth/Demolish.java @@ -52,7 +52,7 @@ public class Demolish extends CardImpl { } public Demolish(UUID ownerId) { - super(ownerId, "Demolish", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); + super(ownerId, 196, "Demolish", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java index 61a54512dff..5f7529f2c9b 100644 --- a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java +++ b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java @@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType; public class DemonsHorn extends CardImpl { public DemonsHorn(UUID ownerId) { - super(ownerId, "Demon's Horn", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, 320, "Demon's Horn", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "10E"; this.addAbility(new DemonsHornAbility()); } diff --git a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java index 4c5c8578b4b..27de75e322b 100644 --- a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java +++ b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java @@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType; public class DragonsClaw extends CardImpl { public DragonsClaw(UUID ownerId) { - super(ownerId, "Dragon's Claw", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, 0, "Dragon's Claw", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "10E"; this.addAbility(new DragonsClawAbility()); } diff --git a/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java b/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java index 92d009ef7bd..d7330013563 100644 --- a/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java +++ b/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java @@ -53,7 +53,7 @@ public class Flashfreeze extends CardImpl { } public Flashfreeze(UUID ownerId) { - super(ownerId, "Flashfreeze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); + super(ownerId, 0, "Flashfreeze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "10E"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/tenth/Forest1.java b/Mage.Sets/src/mage/sets/tenth/Forest1.java index b5cb7d7f8f8..750aceb23e0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest2.java b/Mage.Sets/src/mage/sets/tenth/Forest2.java index a3e053476d8..714d9e8024f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest3.java b/Mage.Sets/src/mage/sets/tenth/Forest3.java index 76d860c3e63..18581ad7311 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest4.java b/Mage.Sets/src/mage/sets/tenth/Forest4.java index 134f37fa291..fd5ed3b119c 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java index 0f23603983b..d825eb3a167 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; public class GiantGrowth extends CardImpl { public GiantGrowth(UUID ownerId) { - super(ownerId, "Giant Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); + super(ownerId, 0, "Giant Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "10E"; this.color.setGreen(true); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/tenth/GiantSpider.java b/Mage.Sets/src/mage/sets/tenth/GiantSpider.java index e0b618519fe..189ae2bb971 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantSpider.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class GiantSpider extends CardImpl { public GiantSpider(UUID ownerId) { - super(ownerId, "Giant Spider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); + super(ownerId, 0, "Giant Spider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "10E"; this.subtype.add("Spider"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java b/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java index ca40cf30e0c..e9f0245161b 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class GoblinPiker extends CardImpl { public GoblinPiker(UUID ownerId) { - super(ownerId, "GoblinPiker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); + super(ownerId, 0, "GoblinPiker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Goblin"); this.subtype.add("Warrier"); diff --git a/Mage.Sets/src/mage/sets/tenth/Gravedigger.java b/Mage.Sets/src/mage/sets/tenth/Gravedigger.java index 970a834d976..9e75cf8fd7f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/tenth/Gravedigger.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInGraveyard; public class Gravedigger extends CardImpl { public Gravedigger(UUID ownerId) { - super(ownerId, "Gravedigger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); + super(ownerId, 0, "Gravedigger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Zombie"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/tenth/HolyStrength.java b/Mage.Sets/src/mage/sets/tenth/HolyStrength.java index ffbfd42c9f3..bc589e0e25e 100644 --- a/Mage.Sets/src/mage/sets/tenth/HolyStrength.java +++ b/Mage.Sets/src/mage/sets/tenth/HolyStrength.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; public class HolyStrength extends CardImpl { public HolyStrength(UUID ownerId) { - super(ownerId, "Holy Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); + super(ownerId, 0, "Holy Strength", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/tenth/Island1.java b/Mage.Sets/src/mage/sets/tenth/Island1.java index d5d714ea15c..3c9357a4dc8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Island2.java b/Mage.Sets/src/mage/sets/tenth/Island2.java index 5b118dfde16..ea492557d3e 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Island3.java b/Mage.Sets/src/mage/sets/tenth/Island3.java index b7e7ee5b0e8..b9b61308bb8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Island4.java b/Mage.Sets/src/mage/sets/tenth/Island4.java index 30a998436c2..aebd3bbfb2f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java index e319a732d8c..a22b88307c0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java @@ -46,7 +46,7 @@ import mage.game.permanent.Permanent; public class Juggernaut extends CardImpl { public Juggernaut(UUID ownerId) { - super(ownerId, "Juggernaut", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); + super(ownerId, 0, "Juggernaut", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); this.expansionSetCode = "10E"; this.subtype.add("Juggernaut"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java index dba55438c17..b32ea48c339 100644 --- a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java +++ b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java @@ -47,7 +47,7 @@ import mage.game.events.GameEvent.EventType; public class KrakensEye extends CardImpl { public KrakensEye(UUID ownerId) { - super(ownerId, "Kraken's Eye", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + super(ownerId, 0, "Kraken's Eye", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "10E"; this.addAbility(new KrakensEyeAbility()); } diff --git a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java index 038ff5bf06b..21c7bae8709 100644 --- a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java @@ -42,7 +42,7 @@ import mage.target.TargetPlayer; public class LavaAxe extends CardImpl { public LavaAxe(UUID ownerId) { - super(ownerId, "Lava Axe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); + super(ownerId, 0, "Lava Axe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "10E"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java b/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java index bca503ebab0..24648cb7eae 100644 --- a/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class LlanowarElves extends CardImpl { public LlanowarElves(UUID ownerId) { - super(ownerId, "Llanowar Elves", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 0, "Llanowar Elves", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "10E"; this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain1.java b/Mage.Sets/src/mage/sets/tenth/Mountain1.java index 3ff63d8c323..f76fa4a321c 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain2.java b/Mage.Sets/src/mage/sets/tenth/Mountain2.java index b42adf4e31b..69c9b6e94e1 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain3.java b/Mage.Sets/src/mage/sets/tenth/Mountain3.java index c9f4926e4a0..45b0affdee9 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain4.java b/Mage.Sets/src/mage/sets/tenth/Mountain4.java index 8dd369b5421..aee70a7e646 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Ornithopter.java b/Mage.Sets/src/mage/sets/tenth/Ornithopter.java index f9a20f33f5f..db56309b855 100644 --- a/Mage.Sets/src/mage/sets/tenth/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/tenth/Ornithopter.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; public class Ornithopter extends CardImpl { public Ornithopter(UUID ownerId) { - super(ownerId, "Ornithopter", Rarity.COMMON, new CardType[]{CardType.CREATURE, CardType.ARTIFACT}, "{0}"); + super(ownerId, 0, "Ornithopter", Rarity.COMMON, new CardType[]{CardType.CREATURE, CardType.ARTIFACT}, "{0}"); this.expansionSetCode = "10E"; this.subtype.add("Thopter"); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/sets/tenth/Pacifism.java b/Mage.Sets/src/mage/sets/tenth/Pacifism.java index cb84a67942c..f8a8eac9063 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pacifism.java +++ b/Mage.Sets/src/mage/sets/tenth/Pacifism.java @@ -57,7 +57,7 @@ import mage.target.common.TargetCreaturePermanent; public class Pacifism extends CardImpl { public Pacifism(UUID ownerId) { - super(ownerId, "Pacifism", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); + super(ownerId, 0, "Pacifism", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "10E"; this.color.setWhite(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/tenth/Plains1.java b/Mage.Sets/src/mage/sets/tenth/Plains1.java index c6f6ccbe2b4..30af0cbb3df 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Plains2.java b/Mage.Sets/src/mage/sets/tenth/Plains2.java index 9da5f11619a..56020d68c60 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Plains3.java b/Mage.Sets/src/mage/sets/tenth/Plains3.java index c3dc761beba..cc0de7257f0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/Plains4.java b/Mage.Sets/src/mage/sets/tenth/Plains4.java index a645105787f..162d928320d 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java index c16648d3d29..5f6357e2e53 100644 --- a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java @@ -52,7 +52,7 @@ import mage.game.events.GameEvent.EventType; public class PlatinumAngel extends CardImpl { public PlatinumAngel(UUID ownerId) { - super(ownerId, "Platinum Angel", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}"); + super(ownerId, 0, "Platinum Angel", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}"); this.expansionSetCode = "10E"; this.subtype.add("Angel"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java index bf873c7b6ba..86979945ac6 100644 --- a/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class ProdigalPyromancer extends CardImpl { public ProdigalPyromancer(UUID ownerId) { - super(ownerId, "Prodigal Pyromancer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); + super(ownerId, 0, "Prodigal Pyromancer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "10E"; this.subtype.add("Human"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java b/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java index b18ae80ed3b..d8c8db9bdf8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java +++ b/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterCreaturePermanent; public class Pyroclasm extends CardImpl { public Pyroclasm(UUID ownerId) { - super(ownerId, "Pyroclasm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); + super(ownerId, 0, "Pyroclasm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}"); this.expansionSetCode = "10E"; this.color.setRed(true); this.getSpellAbility().addEffect(new DamageAllEffect(2, FilterCreaturePermanent.getDefault())); diff --git a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java index ec0f9bf19f5..58f61f0694e 100644 --- a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java @@ -58,7 +58,7 @@ public class RelentlessRats extends CardImpl { } public RelentlessRats(UUID ownerId) { - super(ownerId, "Relentless Rats", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); + super(ownerId, 0, "Relentless Rats", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.expansionSetCode = "10E"; this.subtype.add("Rat"); this.color.setBlack(true); diff --git a/Mage.Sets/src/mage/sets/tenth/Swamp1.java b/Mage.Sets/src/mage/sets/tenth/Swamp1.java index 72f2f283d09..2828af1be63 100644 --- a/Mage.Sets/src/mage/sets/tenth/Swamp1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "10E"; } diff --git a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java index 862e05fdb90..423f8eae0df 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java +++ b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java @@ -54,7 +54,7 @@ public class ArborElf extends CardImpl { } public ArborElf(UUID ownerId) { - super(ownerId, "Arbor Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 0, "Arbor Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "WWK"; this.subtype.add("Elf"); this.subtype.add("Druid"); diff --git a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java index 3f3987f5589..a5dc01a3fe4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java +++ b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java @@ -48,7 +48,7 @@ import mage.cards.CardImpl; public class BasiliskCollar extends CardImpl { public BasiliskCollar(UUID ownerId) { - super(ownerId, "Basilisk Collar", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{1}"); + super(ownerId, 0, "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))); diff --git a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java index e57b682c40d..3abbc241883 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java +++ b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.WolfToken; public class BestialMenace extends CardImpl { public BestialMenace(UUID ownerId) { - super(ownerId, "Bestial Menace", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}{G}"); + super(ownerId, 0, "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())); diff --git a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java index 433b7c483c8..74a90f0bb48 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java +++ b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java @@ -52,7 +52,7 @@ import mage.game.permanent.token.Token; public class CelestialColonnade extends CardImpl { public CelestialColonnade(UUID ownerId) { - super(ownerId, "Celestial Colonnade", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Celestial Colonnade", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "WWK"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); this.addAbility(new BlueManaAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java index 0db68895cd9..64f75233d61 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java +++ b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java @@ -47,7 +47,7 @@ import mage.game.permanent.token.Token; public class DreadStatuary extends CardImpl { public DreadStatuary(UUID ownerId) { - super(ownerId, "Dread Statuary", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "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}"))); diff --git a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java index a1705c532c3..3130a282d66 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java +++ b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java @@ -50,7 +50,7 @@ import mage.game.Game; public class EverflowingChalice extends CardImpl { public EverflowingChalice(UUID ownerId) { - super(ownerId, "Everflowing Chalice", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{0}"); + super(ownerId, 0, "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)); diff --git a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java index 2b8f027d476..a7c25619370 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java +++ b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java @@ -57,7 +57,7 @@ public class JaceTheMindSculptor extends CardImpl { public JaceTheMindSculptor(UUID ownerId) { - super(ownerId, "Jace, the Mind Sculptor", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{U}{U}"); + super(ownerId, 0, "Jace, the Mind Sculptor", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{U}{U}"); this.expansionSetCode = "WWK"; this.subtype.add("Jace"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java b/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java index efe07b6a037..453b6b081d4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java +++ b/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java @@ -47,7 +47,7 @@ import mage.game.permanent.token.Token; public class KhalniGarden extends CardImpl { public KhalniGarden(UUID ownerId) { - super(ownerId, "Khalni Garden", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "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)); diff --git a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java index dff5440f959..22d97c40056 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java +++ b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java @@ -52,7 +52,7 @@ import mage.game.permanent.token.Token; public class LavaclawReaches extends CardImpl { public LavaclawReaches(UUID ownerId) { - super(ownerId, "Lavaclaw Reaches", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Lavaclaw Reaches", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "WWK"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); this.addAbility(new BlackManaAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java index 656933fb323..aa64cc64038 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java +++ b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java @@ -52,7 +52,7 @@ import mage.game.permanent.token.Token; public class RagingRavine extends CardImpl { public RagingRavine(UUID ownerId) { - super(ownerId, "Raging Ravine", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Raging Ravine", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "WWK"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index 2d303de5de9..032a9e30418 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -54,7 +54,7 @@ import mage.watchers.WatcherImpl; public class SearingBlaze extends CardImpl { public SearingBlaze(UUID ownerId) { - super(ownerId, "Searing Blaze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}{R}"); + super(ownerId, 0, "Searing Blaze", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}{R}"); this.expansionSetCode = "WWK"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java index 68ed8324657..46a3d3ed374 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class SejiriSteppe extends CardImpl { public SejiriSteppe(UUID ownerId) { - super(ownerId, "Sejiri Steppe", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "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); diff --git a/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java b/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java index f75bd33b61d..472f7752c49 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java +++ b/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java @@ -51,7 +51,7 @@ import mage.game.permanent.token.Token; public class StirringWildwood extends CardImpl { public StirringWildwood(UUID ownerId) { - super(ownerId, "Stirring Wildwood", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Stirring Wildwood", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "WWK"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); this.addAbility(new GreenManaAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java index e485f96c395..f06b177c185 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java @@ -58,7 +58,7 @@ public class StoneforgeMystic extends CardImpl { } public StoneforgeMystic(UUID ownerId) { - super(ownerId, "Stoneforge Mystic", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}"); + super(ownerId, 0, "Stoneforge Mystic", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "WWK"; this.color.setWhite(true); this.subtype.add("Kor"); diff --git a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java index c59557b6b65..07b41470300 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java +++ b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java @@ -54,7 +54,7 @@ import mage.target.common.TargetNonBasicLandPermanent; public class TectonicEdge extends CardImpl { public TectonicEdge(UUID ownerId) { - super(ownerId, "Tectonic Edge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Tectonic Edge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "WWK"; this.addAbility(new ColorlessManaAbility()); Costs costs = new CostsImpl(); diff --git a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java index 53db89717bb..9bbceee845d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java @@ -46,7 +46,7 @@ import mage.game.permanent.token.WolfToken; public class WolfbriarElemental extends CardImpl { public WolfbriarElemental(UUID ownerId) { - super(ownerId, "Wolfbriar Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); + super(ownerId, 0, "Wolfbriar Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "WWK"; this.subtype.add("Elemental"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java index d2468a74c00..133eedfc3a3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java +++ b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; public class AdventuringGear extends CardImpl { public AdventuringGear(UUID ownerId) { - super(ownerId, "Adventuring Gear", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); + super(ownerId, 0, "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))); diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index f1b5f1279d5..c3884f1575d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class AetherFigment extends CardImpl { public AetherFigment(UUID ownerId) { - super(ownerId, "Æther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + super(ownerId, 0, "Æther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "ZEN"; this.subtype.add("Illusion"); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index bc8adca9a81..4f3e2683c26 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -50,7 +50,7 @@ import mage.watchers.WatcherImpl; public class ArchiveTrap extends CardImpl { public ArchiveTrap(UUID ownerId) { - super(ownerId, "Archive Trap", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); + super(ownerId, 0, "Archive Trap", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); this.expansionSetCode = "ZEN"; this.color.setBlue(true); this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java index 825cea823e7..024f113fb60 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java +++ b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class AridMesa extends CardImpl { public AridMesa(UUID ownerId) { - super(ownerId, "Arid Mesa", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Arid Mesa", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ZEN"; this.addAbility(new FetchLandActivatedAbility(new String[] {"Mountain", "Plains"})); } diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java index 370f7d69a71..312154938ab 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java @@ -51,7 +51,7 @@ import mage.game.permanent.Permanent; public class BeastmasterAscension extends CardImpl { public BeastmasterAscension(UUID ownerId) { - super(ownerId, "Beastmaster Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); + super(ownerId, 0, "Beastmaster Ascension", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); this.expansionSetCode = "ZEN"; this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java index 45d7a18a0dd..af4a61086bf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java +++ b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java @@ -49,7 +49,7 @@ import mage.game.permanent.Permanent; public class BraveTheElements extends CardImpl { public BraveTheElements(UUID ownerId) { - super(ownerId, "Brave the Elements", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); + super(ownerId, 0, "Brave the Elements", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "ZEN"; this.color.setWhite(true); this.getSpellAbility().addChoice(new ChoiceColor()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java index d6cb700ab36..e52f7b8de9f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java +++ b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class BurstLightning extends CardImpl { public BurstLightning(UUID ownerId) { - super(ownerId, "Burst Lightning", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); + super(ownerId, 0, "Burst Lightning", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); this.expansionSetCode = "ZEN"; this.color.setRed(true); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/zendikar/Cancel.java b/Mage.Sets/src/mage/sets/zendikar/Cancel.java index e583a634f3d..443d7784a70 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Cancel.java +++ b/Mage.Sets/src/mage/sets/zendikar/Cancel.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Cancel extends mage.sets.shardsofalara.Cancel { public Cancel(UUID ownerId) { - super(ownerId); + super(ownerId);this.cardNumber = 0; this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java index 7bc87daff8d..04bc0cc692b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.Token; public class ConquerorsPledge extends CardImpl { public ConquerorsPledge(UUID ownerId) { - super(ownerId, "Conquerors Pledge", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}{W}"); + super(ownerId, 0, "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)); diff --git a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java index 359f9a17154..c6b20e1d29b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java +++ b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterCreaturePermanent; public class DayOfJudgment extends CardImpl { public DayOfJudgment(UUID ownerId) { - super(ownerId, "Day of Judgment", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{W}{W}"); + super(ownerId, 0, "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"))); diff --git a/Mage.Sets/src/mage/sets/zendikar/Demolish.java b/Mage.Sets/src/mage/sets/zendikar/Demolish.java index 07776fc6ec9..908c276b6f3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Demolish.java +++ b/Mage.Sets/src/mage/sets/zendikar/Demolish.java @@ -37,7 +37,7 @@ import java.util.UUID; public class Demolish extends mage.sets.tenth.Demolish { public Demolish(UUID ownerId) { - super(ownerId); + super(ownerId);this.cardNumber = 0; this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java index e15b0e2bb88..2be0c93b8aa 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java +++ b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java @@ -58,7 +58,7 @@ import mage.target.common.TargetControlledPermanent; public class EldraziMonument extends CardImpl { public EldraziMonument(UUID ownerId) { - super(ownerId, "Eldrazi Monument", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{5}"); + super(ownerId, 0, "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()))); diff --git a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java index afa064fd080..0f43ef0f6ab 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java +++ b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.Token; public class EmeriaAngel extends CardImpl { public EmeriaAngel(UUID ownerId) { - super(ownerId, "Emeria Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); + super(ownerId, 0, "Emeria Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Angel"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest1.java b/Mage.Sets/src/mage/sets/zendikar/Forest1.java index 725725d7131..05622a18868 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest2.java b/Mage.Sets/src/mage/sets/zendikar/Forest2.java index eecbd0443c0..c618711d946 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest3.java b/Mage.Sets/src/mage/sets/zendikar/Forest3.java index e7e551a0ef7..17e8f4cda06 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest4.java b/Mage.Sets/src/mage/sets/zendikar/Forest4.java index f9c993e289f..3e76d1b984e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java index 05ef6dd3587..c51021e6322 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java @@ -53,7 +53,7 @@ import mage.players.Player; public class GoblinGuide extends CardImpl { public GoblinGuide(UUID ownerId) { - super(ownerId, "Goblin Guide", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}"); + super(ownerId, 0, "Goblin Guide", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{R}"); this.expansionSetCode = "ZEN"; this.color.setRed(true); this.subtype.add("Goblin"); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java index e3eb1595164..a5c39ac267a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java @@ -52,7 +52,7 @@ import mage.target.common.TargetNonBasicLandPermanent; public class GoblinRuinblaster extends CardImpl { public GoblinRuinblaster(UUID ownerId) { - super(ownerId, "Goblin Ruinblaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); + super(ownerId, 0, "Goblin Ruinblaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "ZEN"; this.color.setRed(true); this.subtype.add("Goblin"); diff --git a/Mage.Sets/src/mage/sets/zendikar/Island1.java b/Mage.Sets/src/mage/sets/zendikar/Island1.java index 14b0a11137e..cff5a69b79e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island2.java b/Mage.Sets/src/mage/sets/zendikar/Island2.java index 381342c242c..c69d77e880b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island3.java b/Mage.Sets/src/mage/sets/zendikar/Island3.java index 39f21042ebc..7cc36d92635 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island4.java b/Mage.Sets/src/mage/sets/zendikar/Island4.java index 8c2d8bd70ea..fb2ec6ae9b4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java b/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java index 900683b2603..bc9b1db0685 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java +++ b/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java @@ -45,7 +45,7 @@ import mage.cards.CardImpl; public class KabiraCrossroads extends CardImpl { public KabiraCrossroads(UUID ownerId) { - super(ownerId, "Kabira Crossroads", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "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)); diff --git a/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java b/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java index f97950091fa..edb79d2eb9e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java +++ b/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java @@ -44,7 +44,7 @@ import mage.choices.ChoiceColor; public class LotusCobra extends CardImpl { public LotusCobra(UUID ownerId) { - super(ownerId, "Lotus Cobra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}"); + super(ownerId, 0, "Lotus Cobra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ZEN"; this.subtype.add("Snake"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java index 735890adf98..480d4bdab2a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class MarshFlats extends CardImpl { public MarshFlats(UUID ownerId) { - super(ownerId, "Marsh Flats", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Marsh Flats", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ZEN"; this.addAbility(new FetchLandActivatedAbility(new String[] {"Swamp", "Plains"})); } diff --git a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java index caf9cf7134b..f00c8d3446a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java +++ b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class MistyRainforest extends CardImpl { public MistyRainforest(UUID ownerId) { - super(ownerId, "Misty Rainforest", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Misty Rainforest", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ZEN"; this.addAbility(new FetchLandActivatedAbility(new String[] {"Forest", "Island"})); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain1.java b/Mage.Sets/src/mage/sets/zendikar/Mountain1.java index 4877bc27603..0ef217217e8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain2.java b/Mage.Sets/src/mage/sets/zendikar/Mountain2.java index be668dcf74c..51d3639747b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain3.java b/Mage.Sets/src/mage/sets/zendikar/Mountain3.java index 7500f0456c7..a8f7ea5fd3e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain4.java b/Mage.Sets/src/mage/sets/zendikar/Mountain4.java index e7cb66bb8ad..5289c27f19c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java index d48bd456ae9..e7a64891661 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java @@ -53,7 +53,7 @@ import mage.game.permanent.Permanent; public class OranRiefTheVastwood extends CardImpl { public OranRiefTheVastwood(UUID ownerId) { - super(ownerId, "Oran-Rief, the Vastwood", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "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()); diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains1.java b/Mage.Sets/src/mage/sets/zendikar/Plains1.java index d0a9e9b6431..bd034e10bb6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains1.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains2.java b/Mage.Sets/src/mage/sets/zendikar/Plains2.java index 796ac5a6681..a7a5c2704a4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains2.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains3.java b/Mage.Sets/src/mage/sets/zendikar/Plains3.java index f49e3d71721..9dd5c01238b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains3.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains4.java b/Mage.Sets/src/mage/sets/zendikar/Plains4.java index 3dbb52f9ed2..da2799b1529 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains4.java +++ b/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); + super(ownerId, 0); this.expansionSetCode = "ZEN"; } diff --git a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java index 00a58c098fa..b5b826f4c28 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java +++ b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.Token; public class RampagingBaloths extends CardImpl { public RampagingBaloths(UUID ownerId) { - super(ownerId, "Rampaging Baloths", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); + super(ownerId, 0, "Rampaging Baloths", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "ZEN"; this.subtype.add("Beast"); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java index 752adce748f..1257db1da1b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java @@ -55,7 +55,7 @@ public class RiverBoa extends CardImpl { } public RiverBoa(UUID ownerId) { - super(ownerId, "River Boa", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); + super(ownerId, 0, "River Boa", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ZEN"; this.color.setGreen(true); this.subtype.add("Snake"); diff --git a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java index 0b716725443..cbfb042a978 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class ScaldingTarn extends CardImpl { public ScaldingTarn(UUID ownerId) { - super(ownerId, "Scalding Tarn", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Scalding Tarn", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ZEN"; this.addAbility(new FetchLandActivatedAbility(new String[] {"Island", "Mountain"})); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java index 6e90031e565..b75f08aa7fa 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java @@ -48,7 +48,7 @@ import mage.game.events.GameEvent.EventType; public class ScuteMob extends CardImpl { public ScuteMob(UUID ownerId) { - super(ownerId, "Scute Mob", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); + super(ownerId, 0, "Scute Mob", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}"); this.expansionSetCode = "ZEN"; this.color.setGreen(true); this.subtype.add("Insect"); diff --git a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java index 1dbea502589..4d39cbe6c3c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java @@ -57,7 +57,7 @@ import mage.target.common.TargetLandPermanent; public class SpreadingSeas extends CardImpl { public SpreadingSeas(UUID ownerId) { - super(ownerId, "Spreading Seas", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); + super(ownerId, 0, "Spreading Seas", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "ZEN"; this.color.setBlue(true); this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java index 29d3bec7820..1bf3d18d8f5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java +++ b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; public class SteppeLynx extends CardImpl { public SteppeLynx(UUID ownerId) { - super(ownerId, "Steppe Lynx", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); + super(ownerId, 0, "Steppe Lynx", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Cat"); this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java index 8042e902460..c386d3f2218 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java @@ -50,7 +50,7 @@ import mage.cards.CardImpl; public class SunspringExpedition extends CardImpl { public SunspringExpedition(UUID ownerId) { - super(ownerId, "Sunspring Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); + super(ownerId, 0, "Sunspring Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}"); this.expansionSetCode = "ZEN"; this.color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java index 29bf3bcb077..2ffa5f2accb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java +++ b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; public class TeeteringPeaks extends CardImpl { public TeeteringPeaks(UUID ownerId) { - super(ownerId, "Teetering Peaks", Rarity.COMMON, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Teetering Peaks", Rarity.COMMON, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ZEN"; this.addAbility(new EntersBattlefieldStaticAbility(new TapSourceEffect(), "tapped")); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java index a0fc570097f..14043cdb7fe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java +++ b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; public class VerdantCatacombs extends CardImpl { public VerdantCatacombs(UUID ownerId) { - super(ownerId, "Verdant Catacombs", Rarity.RARE, new CardType[]{CardType.LAND}, null); + super(ownerId, 0, "Verdant Catacombs", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "ZEN"; this.addAbility(new FetchLandActivatedAbility(new String[] {"Forest", "Swamp"})); } diff --git a/Mage/src/mage/cards/Card.java b/Mage/src/mage/cards/Card.java index 7d832da62c9..00622c4b60c 100644 --- a/Mage/src/mage/cards/Card.java +++ b/Mage/src/mage/cards/Card.java @@ -42,6 +42,7 @@ import mage.watchers.Watchers; public interface Card extends MageObject { public UUID getOwnerId(); + public int getCardNumber(); public String getArt(); public Rarity getRarity(); public void setRarity(Rarity rarity); diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index fdc5f6a55d6..46b674078cc 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -53,13 +53,15 @@ public abstract class CardImpl> extends MageObjectImpl private final static Logger logger = Logging.getLogger(CardImpl.class.getName()); protected UUID ownerId; + protected int cardNumber; protected Watchers watchers = new Watchers(); protected String expansionSetCode; protected Rarity rarity; - public CardImpl(UUID ownerId, String name, Rarity rarity, CardType[] cardTypes, String costs) { + public CardImpl(UUID ownerId, int cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs) { this(ownerId, name); this.rarity = rarity; + this.cardNumber = cardNumber; for (CardType newCardType: cardTypes) this.cardType.add(newCardType); this.manaCost.load(costs); @@ -83,6 +85,7 @@ public abstract class CardImpl> extends MageObjectImpl public CardImpl(final CardImpl card) { super(card); ownerId = card.ownerId; + cardNumber = card.cardNumber; expansionSetCode = card.expansionSetCode; rarity = card.rarity; watchers = card.watchers.copy(); @@ -107,6 +110,11 @@ public abstract class CardImpl> extends MageObjectImpl return ownerId; } + @Override + public int getCardNumber() { + return cardNumber; + } + @Override public Rarity getRarity() { return rarity; diff --git a/Mage/src/mage/cards/LevelerCard.java b/Mage/src/mage/cards/LevelerCard.java index be24715103a..176745bf444 100644 --- a/Mage/src/mage/cards/LevelerCard.java +++ b/Mage/src/mage/cards/LevelerCard.java @@ -43,8 +43,8 @@ public abstract class LevelerCard> extends CardImpl protected List levels = new ArrayList(); - public LevelerCard(UUID ownerId, String name, Rarity rarity, CardType[] cardTypes, String costs) { - super(ownerId, name, rarity, cardTypes, costs); + public LevelerCard(UUID ownerId, int cardNumber, String name, Rarity rarity, CardType[] cardTypes, String costs) { + super(ownerId, cardNumber, name, rarity, cardTypes, costs); } public LevelerCard(LevelerCard card) { diff --git a/Mage/src/mage/cards/basiclands/BasicLand.java b/Mage/src/mage/cards/basiclands/BasicLand.java index 95f7df34985..bf07bd1c46c 100644 --- a/Mage/src/mage/cards/basiclands/BasicLand.java +++ b/Mage/src/mage/cards/basiclands/BasicLand.java @@ -40,12 +40,11 @@ import mage.cards.CardImpl; */ public abstract class BasicLand> extends CardImpl { - public BasicLand(UUID ownerId, String name, ManaAbility mana) { - super(ownerId, name, Rarity.LAND, new CardType[]{CardType.LAND}, null); + public BasicLand(UUID ownerId, int cardNumber, String name, ManaAbility mana) { + super(ownerId, cardNumber, name, Rarity.LAND, new CardType[]{CardType.LAND}, null); this.supertype.add("Basic"); this.subtype.add(name); this.addAbility(mana); - setExpansionSetCode("M11"); } public BasicLand(BasicLand land) { diff --git a/Mage/src/mage/cards/basiclands/Forest.java b/Mage/src/mage/cards/basiclands/Forest.java index 9d0ac3d62df..ead4d6a4e37 100644 --- a/Mage/src/mage/cards/basiclands/Forest.java +++ b/Mage/src/mage/cards/basiclands/Forest.java @@ -37,8 +37,8 @@ import mage.abilities.mana.GreenManaAbility; */ public abstract class Forest extends BasicLand { - public Forest(UUID ownerId) { - super(ownerId, "Forest", new GreenManaAbility()); + public Forest(UUID ownerId, int cardNumber) { + super(ownerId, cardNumber, "Forest", new GreenManaAbility()); } public Forest(final Forest land) { diff --git a/Mage/src/mage/cards/basiclands/Island.java b/Mage/src/mage/cards/basiclands/Island.java index 4d3dbb29209..19b724038b4 100644 --- a/Mage/src/mage/cards/basiclands/Island.java +++ b/Mage/src/mage/cards/basiclands/Island.java @@ -37,8 +37,8 @@ import mage.abilities.mana.BlueManaAbility; */ public abstract class Island extends BasicLand { - public Island(UUID ownerId) { - super(ownerId, "Island", new BlueManaAbility()); + public Island(UUID ownerId, int cardNumber) { + super(ownerId, cardNumber, "Island", new BlueManaAbility()); } public Island(Island land) { diff --git a/Mage/src/mage/cards/basiclands/Mountain.java b/Mage/src/mage/cards/basiclands/Mountain.java index 996b046794b..a443b88af56 100644 --- a/Mage/src/mage/cards/basiclands/Mountain.java +++ b/Mage/src/mage/cards/basiclands/Mountain.java @@ -37,8 +37,8 @@ import mage.abilities.mana.RedManaAbility; */ public abstract class Mountain extends BasicLand { - public Mountain(UUID ownerId) { - super(ownerId, "Mountain", new RedManaAbility()); + public Mountain(UUID ownerId, int cardNumber) { + super(ownerId, cardNumber, "Mountain", new RedManaAbility()); } public Mountain(Mountain land) { diff --git a/Mage/src/mage/cards/basiclands/Plains.java b/Mage/src/mage/cards/basiclands/Plains.java index 37c7d7d6736..8585444f2cf 100644 --- a/Mage/src/mage/cards/basiclands/Plains.java +++ b/Mage/src/mage/cards/basiclands/Plains.java @@ -37,8 +37,8 @@ import mage.abilities.mana.WhiteManaAbility; */ public abstract class Plains extends BasicLand { - public Plains(UUID ownerId) { - super(ownerId, "Plains", new WhiteManaAbility()); + public Plains(UUID ownerId, int cardNumber) { + super(ownerId, cardNumber, "Plains", new WhiteManaAbility()); } public Plains(Plains land) { diff --git a/Mage/src/mage/cards/basiclands/Swamp.java b/Mage/src/mage/cards/basiclands/Swamp.java index 8dac8ade5a8..c2166b75503 100644 --- a/Mage/src/mage/cards/basiclands/Swamp.java +++ b/Mage/src/mage/cards/basiclands/Swamp.java @@ -37,8 +37,8 @@ import mage.abilities.mana.BlackManaAbility; */ public abstract class Swamp extends BasicLand { - public Swamp(UUID ownerId) { - super(ownerId, "Swamp", new BlackManaAbility()); + public Swamp(UUID ownerId, int cardNumber) { + super(ownerId, cardNumber, "Swamp", new BlackManaAbility()); } public Swamp(Swamp land) { diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java index 22c31913eaa..7805bc17c08 100644 --- a/Mage/src/mage/game/stack/Spell.java +++ b/Mage/src/mage/game/stack/Spell.java @@ -309,4 +309,9 @@ public class Spell> implements StackObject, Card { public boolean putOntoBattlefield(Game game, Zone fromZone, UUID controllerId) { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public int getCardNumber() { + return card.getCardNumber(); + } }