From 8191a9cba0128ce5e8d06ac1280f5bb53b494da2 Mon Sep 17 00:00:00 2001 From: JOAC69 Date: Fri, 28 Oct 2016 21:01:35 -0500 Subject: [PATCH] Basic lands with multiple art not showing up #2430 --- .../a/{AbbeyMatron1.java => AbbeyMatron.java} | 10 +- ...AesthirGlider1.java => AesthirGlider.java} | 10 +- ...fStromgald1.java => AgentOfStromgald.java} | 10 +- .../{AlibansTower1.java => AlibansTower.java} | 10 +- .../a/{ArmorThrull1.java => ArmorThrull.java} | 10 +- .../a/{ArmyOfAllah1.java => ArmyOfAllah.java} | 10 +- ...arMakers1.java => BalduvianWarMakers.java} | 10 +- .../b/{BasalThrull1.java => BasalThrull.java} | 10 +- ...BrassclawOrcs1.java => BrassclawOrcs.java} | 10 +- ...rsYamazaki1.java => BrothersYamazaki.java} | 10 +- ...rrierPigeons1.java => CarrierPigeons.java} | 10 +- .../{CemeteryGate1.java => CemeteryGate.java} | 10 +- .../c/{CombatMedic1.java => CombatMedic.java} | 10 +- .../cards/d/{DrySpell1.java => DrySpell.java} | 10 +- ...arvenSoldier1.java => DwarvenSoldier.java} | 10 +- ...DwarvenTrader1.java => DwarvenTrader.java} | 10 +- ...eCatWarrior1.java => EliteCatWarrior.java} | 10 +- ...ElvenFortress1.java => ElvenFortress.java} | 10 +- .../{ElvishHunter1.java => ElvishHunter.java} | 10 +- .../e/{ElvishScout1.java => ElvishScout.java} | 10 +- ...EnslavedScout1.java => EnslavedScout.java} | 10 +- ...Corrupted1.java => ErtaiTheCorrupted.java} | 10 +- ...FarrelsZealot1.java => FarrelsZealot.java} | 10 +- ...heUnicorn1.java => FeastOfTheUnicorn.java} | 10 +- ...redStrength1.java => FeveredStrength.java} | 10 +- .../{FishliverOil1.java => FishliverOil.java} | 10 +- ...FolkOfAnHavva1.java => FolkOfAnHavva.java} | 10 +- ...Chirurgeon1.java => GoblinChirurgeon.java} | 10 +- ...GoblinGrenade1.java => GoblinGrenade.java} | 10 +- ...blinWarDrums1.java => GoblinWarDrums.java} | 10 +- ...erserkers1.java => GorillaBerserkers.java} | 10 +- ...GorillaShaman1.java => GorillaShaman.java} | 10 +- .../cards/h/{HighTide1.java => HighTide.java} | 10 +- .../cards/h/{Homarid1.java => Homarid.java} | 10 +- ...maridWarrior1.java => HomaridWarrior.java} | 10 +- ...HymnToTourach1.java => HymnToTourach.java} | 10 +- ...elineers1.java => IcatianJavelineers.java} | 10 +- ...changer1.java => IcatianMoneychanger.java} | 10 +- .../{IcatianScout1.java => IcatianScout.java} | 10 +- ...Hand1.java => InitiatesOfTheEbonHand.java} | 10 +- ...ookworms1.java => InsidiousBookworms.java} | 10 +- ...sHighGuard1.java => LimDulsHighGuard.java} | 10 +- .../m/{MesaFalcon1.java => MesaFalcon.java} | 10 +- ...ndstabThrull1.java => MindstabThrull.java} | 10 +- .../cards/n/{NafsAsp1.java => NafsAsp.java} | 10 +- .../cards/n/{Necrite1.java => Necrite.java} | 12 +- .../n/{NightSoil1.java => NightSoil.java} | 10 +- .../o/{OrcishSpy1.java => OrcishSpy.java} | 10 +- ...OrcishVeteran1.java => OrcishVeteran.java} | 10 +- ...derOfLeitbur1.java => OrderOfLeitbur.java} | 10 +- ...EbonHand1.java => OrderOfTheEbonHand.java} | 10 +- .../o/{Oubliette1.java => Oubliette.java} | 14 +- ...nWarBeast1.java => PhyrexianWarBeast.java} | 10 +- .../mage/cards/p/{Piety1.java => Piety.java} | 10 +- .../r/{ReefPirates1.java => ReefPirates.java} | 10 +- ...yalHerbalist1.java => RoyalHerbalist.java} | 10 +- .../cards/r/{RukhEgg1.java => RukhEgg.java} | 10 +- .../s/{SengirBats2.java => SengirBats.java} | 10 +- ...erlight1.java => SkyshipWeatherlight.java} | 10 +- ...SoldeviAdnate1.java => SoldeviAdnate.java} | 10 +- .../s/{SoldeviSage1.java => SoldeviSage.java} | 10 +- ...gDevils1.java => StoneThrowingDevils.java} | 10 +- .../s/{StormShaman1.java => StormShaman.java} | 10 +- ...SwampMosquito1.java => SwampMosquito.java} | 10 +- ...umHero1.java => TahngarthTalruumHero.java} | 10 +- .../{ThornThallid1.java => ThornThallid.java} | 10 +- .../cards/t/{Torture1.java => Torture.java} | 10 +- .../{VodalianMage1.java => VodalianMage.java} | 10 +- ...anSoldiers1.java => VodalianSoldiers.java} | 10 +- ...rriorsCharge1.java => WarriorsCharge.java} | 10 +- .../cards/w/{Wastes1.java => Wastes.java} | 10 +- .../cards/w/{WhipVine1.java => WhipVine.java} | 10 +- .../{WillowFaerie1.java => WillowFaerie.java} | 10 +- Mage.Sets/src/mage/sets/Alliances.java | 85 ++++--- Mage.Sets/src/mage/sets/ArabianNights.java | 35 +-- .../src/mage/sets/ChampionsOfKamigawa.java | 5 +- .../src/mage/sets/ClassicSixthEdition.java | 15 +- Mage.Sets/src/mage/sets/Commander2013.java | 3 +- Mage.Sets/src/mage/sets/EighthEdition.java | 6 +- Mage.Sets/src/mage/sets/ElspethVsKiora.java | 3 +- Mage.Sets/src/mage/sets/EternalMasters.java | 3 +- Mage.Sets/src/mage/sets/FTVTwenty.java | 3 +- Mage.Sets/src/mage/sets/FallenEmpires.java | 234 ++++++++++-------- Mage.Sets/src/mage/sets/FifthEdition.java | 36 ++- Mage.Sets/src/mage/sets/FourthEdition.java | 6 +- Mage.Sets/src/mage/sets/Homelands.java | 60 +++-- Mage.Sets/src/mage/sets/Magic2012.java | 3 +- Mage.Sets/src/mage/sets/MastersEdition.java | 36 ++- Mage.Sets/src/mage/sets/MastersEditionII.java | 36 ++- .../src/mage/sets/MastersEditionIII.java | 3 +- Mage.Sets/src/mage/sets/MastersEditionIV.java | 6 +- Mage.Sets/src/mage/sets/MediaInserts.java | 7 +- Mage.Sets/src/mage/sets/NinthEdition.java | 6 +- .../src/mage/sets/OathOfTheGatewatch.java | 5 +- Mage.Sets/src/mage/sets/Planeshift.java | 15 +- Mage.Sets/src/mage/sets/Portal.java | 13 +- Mage.Sets/src/mage/sets/SeventhEdition.java | 6 +- Mage.Sets/src/mage/sets/Shadowmoor.java | 3 +- Mage.Sets/src/mage/sets/StarWars.java | 6 +- .../src/mage/sets/TimeSpiralTimeshifted.java | 6 +- Mage.Sets/src/mage/sets/VintageMasters.java | 6 +- Mage.Sets/src/mage/sets/WPNGateway.java | 3 +- .../main/java/mage/cards/ExpansionSet.java | 10 - .../java/mage/cards/repository/CardInfo.java | 9 +- .../mage/cards/repository/CardRepository.java | 2 +- 105 files changed, 770 insertions(+), 641 deletions(-) rename Mage.Sets/src/mage/cards/a/{AbbeyMatron1.java => AbbeyMatron.java} (92%) rename Mage.Sets/src/mage/cards/a/{AesthirGlider1.java => AesthirGlider.java} (90%) rename Mage.Sets/src/mage/cards/a/{AgentOfStromgald1.java => AgentOfStromgald.java} (90%) rename Mage.Sets/src/mage/cards/a/{AlibansTower1.java => AlibansTower.java} (91%) rename Mage.Sets/src/mage/cards/a/{ArmorThrull1.java => ArmorThrull.java} (92%) rename Mage.Sets/src/mage/cards/a/{ArmyOfAllah1.java => ArmyOfAllah.java} (91%) rename Mage.Sets/src/mage/cards/b/{BalduvianWarMakers1.java => BalduvianWarMakers.java} (89%) rename Mage.Sets/src/mage/cards/b/{BasalThrull1.java => BasalThrull.java} (92%) rename Mage.Sets/src/mage/cards/b/{BrassclawOrcs1.java => BrassclawOrcs.java} (92%) rename Mage.Sets/src/mage/cards/b/{BrothersYamazaki1.java => BrothersYamazaki.java} (95%) rename Mage.Sets/src/mage/cards/c/{CarrierPigeons1.java => CarrierPigeons.java} (92%) rename Mage.Sets/src/mage/cards/c/{CemeteryGate1.java => CemeteryGate.java} (91%) rename Mage.Sets/src/mage/cards/c/{CombatMedic1.java => CombatMedic.java} (92%) rename Mage.Sets/src/mage/cards/d/{DrySpell1.java => DrySpell.java} (91%) rename Mage.Sets/src/mage/cards/d/{DwarvenSoldier1.java => DwarvenSoldier.java} (91%) rename Mage.Sets/src/mage/cards/d/{DwarvenTrader1.java => DwarvenTrader.java} (89%) rename Mage.Sets/src/mage/cards/e/{EliteCatWarrior1.java => EliteCatWarrior.java} (89%) rename Mage.Sets/src/mage/cards/e/{ElvenFortress1.java => ElvenFortress.java} (91%) rename Mage.Sets/src/mage/cards/e/{ElvishHunter1.java => ElvishHunter.java} (92%) rename Mage.Sets/src/mage/cards/e/{ElvishScout1.java => ElvishScout.java} (94%) rename Mage.Sets/src/mage/cards/e/{EnslavedScout1.java => EnslavedScout.java} (91%) rename Mage.Sets/src/mage/cards/e/{ErtaiTheCorrupted1.java => ErtaiTheCorrupted.java} (92%) rename Mage.Sets/src/mage/cards/f/{FarrelsZealot1.java => FarrelsZealot.java} (92%) rename Mage.Sets/src/mage/cards/f/{FeastOfTheUnicorn1.java => FeastOfTheUnicorn.java} (91%) rename Mage.Sets/src/mage/cards/f/{FeveredStrength1.java => FeveredStrength.java} (91%) rename Mage.Sets/src/mage/cards/f/{FishliverOil1.java => FishliverOil.java} (92%) rename Mage.Sets/src/mage/cards/f/{FolkOfAnHavva1.java => FolkOfAnHavva.java} (90%) rename Mage.Sets/src/mage/cards/g/{GoblinChirurgeon1.java => GoblinChirurgeon.java} (91%) rename Mage.Sets/src/mage/cards/g/{GoblinGrenade1.java => GoblinGrenade.java} (91%) rename Mage.Sets/src/mage/cards/g/{GoblinWarDrums1.java => GoblinWarDrums.java} (91%) rename Mage.Sets/src/mage/cards/g/{GorillaBerserkers1.java => GorillaBerserkers.java} (91%) rename Mage.Sets/src/mage/cards/g/{GorillaShaman1.java => GorillaShaman.java} (94%) rename Mage.Sets/src/mage/cards/h/{HighTide1.java => HighTide.java} (95%) rename Mage.Sets/src/mage/cards/h/{Homarid1.java => Homarid.java} (96%) rename Mage.Sets/src/mage/cards/h/{HomaridWarrior1.java => HomaridWarrior.java} (92%) rename Mage.Sets/src/mage/cards/h/{HymnToTourach1.java => HymnToTourach.java} (90%) rename Mage.Sets/src/mage/cards/i/{IcatianJavelineers1.java => IcatianJavelineers.java} (92%) rename Mage.Sets/src/mage/cards/i/{IcatianMoneychanger1.java => IcatianMoneychanger.java} (93%) rename Mage.Sets/src/mage/cards/i/{IcatianScout1.java => IcatianScout.java} (92%) rename Mage.Sets/src/mage/cards/i/{InitiatesOfTheEbonHand1.java => InitiatesOfTheEbonHand.java} (93%) rename Mage.Sets/src/mage/cards/i/{InsidiousBookworms1.java => InsidiousBookworms.java} (90%) rename Mage.Sets/src/mage/cards/l/{LimDulsHighGuard1.java => LimDulsHighGuard.java} (90%) rename Mage.Sets/src/mage/cards/m/{MesaFalcon1.java => MesaFalcon.java} (92%) rename Mage.Sets/src/mage/cards/m/{MindstabThrull1.java => MindstabThrull.java} (91%) rename Mage.Sets/src/mage/cards/n/{NafsAsp1.java => NafsAsp.java} (93%) rename Mage.Sets/src/mage/cards/n/{Necrite1.java => Necrite.java} (92%) rename Mage.Sets/src/mage/cards/n/{NightSoil1.java => NightSoil.java} (92%) rename Mage.Sets/src/mage/cards/o/{OrcishSpy1.java => OrcishSpy.java} (92%) rename Mage.Sets/src/mage/cards/o/{OrcishVeteran1.java => OrcishVeteran.java} (93%) rename Mage.Sets/src/mage/cards/o/{OrderOfLeitbur1.java => OrderOfLeitbur.java} (93%) rename Mage.Sets/src/mage/cards/o/{OrderOfTheEbonHand1.java => OrderOfTheEbonHand.java} (92%) rename Mage.Sets/src/mage/cards/o/{Oubliette1.java => Oubliette.java} (95%) rename Mage.Sets/src/mage/cards/p/{PhyrexianWarBeast1.java => PhyrexianWarBeast.java} (91%) rename Mage.Sets/src/mage/cards/p/{Piety1.java => Piety.java} (93%) rename Mage.Sets/src/mage/cards/r/{ReefPirates1.java => ReefPirates.java} (92%) rename Mage.Sets/src/mage/cards/r/{RoyalHerbalist1.java => RoyalHerbalist.java} (91%) rename Mage.Sets/src/mage/cards/r/{RukhEgg1.java => RukhEgg.java} (94%) rename Mage.Sets/src/mage/cards/s/{SengirBats2.java => SengirBats.java} (92%) rename Mage.Sets/src/mage/cards/s/{SkyshipWeatherlight1.java => SkyshipWeatherlight.java} (94%) rename Mage.Sets/src/mage/cards/s/{SoldeviAdnate1.java => SoldeviAdnate.java} (93%) rename Mage.Sets/src/mage/cards/s/{SoldeviSage1.java => SoldeviSage.java} (95%) rename Mage.Sets/src/mage/cards/s/{StoneThrowingDevils1.java => StoneThrowingDevils.java} (88%) rename Mage.Sets/src/mage/cards/s/{StormShaman1.java => StormShaman.java} (91%) rename Mage.Sets/src/mage/cards/s/{SwampMosquito1.java => SwampMosquito.java} (91%) rename Mage.Sets/src/mage/cards/t/{TahngarthTalruumHero1.java => TahngarthTalruumHero.java} (91%) rename Mage.Sets/src/mage/cards/t/{ThornThallid1.java => ThornThallid.java} (93%) rename Mage.Sets/src/mage/cards/t/{Torture1.java => Torture.java} (94%) rename Mage.Sets/src/mage/cards/v/{VodalianMage1.java => VodalianMage.java} (92%) rename Mage.Sets/src/mage/cards/v/{VodalianSoldiers1.java => VodalianSoldiers.java} (89%) rename Mage.Sets/src/mage/cards/w/{WarriorsCharge1.java => WarriorsCharge.java} (89%) rename Mage.Sets/src/mage/cards/w/{Wastes1.java => Wastes.java} (91%) rename Mage.Sets/src/mage/cards/w/{WhipVine1.java => WhipVine.java} (94%) rename Mage.Sets/src/mage/cards/w/{WillowFaerie1.java => WillowFaerie.java} (90%) diff --git a/Mage.Sets/src/mage/cards/a/AbbeyMatron1.java b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java similarity index 92% rename from Mage.Sets/src/mage/cards/a/AbbeyMatron1.java rename to Mage.Sets/src/mage/cards/a/AbbeyMatron.java index 1874975bda..c85d1cea25 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyMatron1.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java @@ -44,9 +44,9 @@ import mage.constants.Zone; * * @author Sir-Speshkitty */ -public class AbbeyMatron1 extends CardImpl { +public class AbbeyMatron extends CardImpl { - public AbbeyMatron1(UUID ownerId, CardSetInfo setInfo) { + public AbbeyMatron(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); this.subtype.add("Human"); this.subtype.add("Cleric"); @@ -59,12 +59,12 @@ public class AbbeyMatron1 extends CardImpl { this.addAbility(ability); } - public AbbeyMatron1(final AbbeyMatron1 card) { + public AbbeyMatron(final AbbeyMatron card) { super(card); } @Override - public AbbeyMatron1 copy() { - return new AbbeyMatron1(this); + public AbbeyMatron copy() { + return new AbbeyMatron(this); } } diff --git a/Mage.Sets/src/mage/cards/a/AesthirGlider1.java b/Mage.Sets/src/mage/cards/a/AesthirGlider.java similarity index 90% rename from Mage.Sets/src/mage/cards/a/AesthirGlider1.java rename to Mage.Sets/src/mage/cards/a/AesthirGlider.java index a0ebf79f0f..a33ef3abdd 100644 --- a/Mage.Sets/src/mage/cards/a/AesthirGlider1.java +++ b/Mage.Sets/src/mage/cards/a/AesthirGlider.java @@ -39,9 +39,9 @@ import mage.constants.CardType; * * @author Sir-Speshkitty */ -public class AesthirGlider1 extends CardImpl { +public class AesthirGlider extends CardImpl { - public AesthirGlider1(UUID ownerId, CardSetInfo setInfo) { + public AesthirGlider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); this.subtype.add("Bird"); this.power = new MageInt(2); @@ -53,12 +53,12 @@ public class AesthirGlider1 extends CardImpl { this.addAbility(new CantBlockAbility()); } - public AesthirGlider1(final AesthirGlider1 card) { + public AesthirGlider(final AesthirGlider card) { super(card); } @Override - public AesthirGlider1 copy() { - return new AesthirGlider1(this); + public AesthirGlider copy() { + return new AesthirGlider(this); } } diff --git a/Mage.Sets/src/mage/cards/a/AgentOfStromgald1.java b/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java similarity index 90% rename from Mage.Sets/src/mage/cards/a/AgentOfStromgald1.java rename to Mage.Sets/src/mage/cards/a/AgentOfStromgald.java index 7b0fe83592..22bd45bf40 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfStromgald1.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java @@ -41,9 +41,9 @@ import mage.constants.Zone; * * @author LoneFox */ -public class AgentOfStromgald1 extends CardImpl { +public class AgentOfStromgald extends CardImpl { - public AgentOfStromgald1(UUID ownerId, CardSetInfo setInfo) { + public AgentOfStromgald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); this.subtype.add("Human"); this.subtype.add("Knight"); @@ -54,12 +54,12 @@ public class AgentOfStromgald1 extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new ManaCostsImpl("{R}"))); } - public AgentOfStromgald1(final AgentOfStromgald1 card) { + public AgentOfStromgald(final AgentOfStromgald card) { super(card); } @Override - public AgentOfStromgald1 copy() { - return new AgentOfStromgald1(this); + public AgentOfStromgald copy() { + return new AgentOfStromgald(this); } } diff --git a/Mage.Sets/src/mage/cards/a/AlibansTower1.java b/Mage.Sets/src/mage/cards/a/AlibansTower.java similarity index 91% rename from Mage.Sets/src/mage/cards/a/AlibansTower1.java rename to Mage.Sets/src/mage/cards/a/AlibansTower.java index e6f7a5d9a2..ce93cdf349 100644 --- a/Mage.Sets/src/mage/cards/a/AlibansTower1.java +++ b/Mage.Sets/src/mage/cards/a/AlibansTower.java @@ -40,9 +40,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class AlibansTower1 extends CardImpl { +public class AlibansTower extends CardImpl { - public AlibansTower1(UUID ownerId, CardSetInfo setInfo) { + public AlibansTower(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); // Target blocking creature gets +3/+1 until end of turn. @@ -50,12 +50,12 @@ public class AlibansTower1 extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); } - public AlibansTower1(final AlibansTower1 card) { + public AlibansTower(final AlibansTower card) { super(card); } @Override - public AlibansTower1 copy() { - return new AlibansTower1(this); + public AlibansTower copy() { + return new AlibansTower(this); } } diff --git a/Mage.Sets/src/mage/cards/a/ArmorThrull1.java b/Mage.Sets/src/mage/cards/a/ArmorThrull.java similarity index 92% rename from Mage.Sets/src/mage/cards/a/ArmorThrull1.java rename to Mage.Sets/src/mage/cards/a/ArmorThrull.java index 6ed4be6f35..f6024162a6 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorThrull1.java +++ b/Mage.Sets/src/mage/cards/a/ArmorThrull.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class ArmorThrull1 extends CardImpl { +public class ArmorThrull extends CardImpl { - public ArmorThrull1(UUID ownerId, CardSetInfo setInfo) { + public ArmorThrull(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); this.subtype.add("Thrull"); this.power = new MageInt(1); @@ -60,12 +60,12 @@ public class ArmorThrull1 extends CardImpl { this.addAbility(ability); } - public ArmorThrull1(final ArmorThrull1 card) { + public ArmorThrull(final ArmorThrull card) { super(card); } @Override - public ArmorThrull1 copy() { - return new ArmorThrull1(this); + public ArmorThrull copy() { + return new ArmorThrull(this); } } diff --git a/Mage.Sets/src/mage/cards/a/ArmyOfAllah1.java b/Mage.Sets/src/mage/cards/a/ArmyOfAllah.java similarity index 91% rename from Mage.Sets/src/mage/cards/a/ArmyOfAllah1.java rename to Mage.Sets/src/mage/cards/a/ArmyOfAllah.java index 00a4d14cd5..29843672ab 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyOfAllah1.java +++ b/Mage.Sets/src/mage/cards/a/ArmyOfAllah.java @@ -39,23 +39,23 @@ import mage.filter.common.FilterAttackingCreature; * * @author fireshoes */ -public class ArmyOfAllah1 extends CardImpl { +public class ArmyOfAllah extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("Attacking creatures"); - public ArmyOfAllah1(UUID ownerId, CardSetInfo setInfo) { + public ArmyOfAllah(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}{W}"); // Attacking creatures get +2/+0 until end of turn. this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Duration.EndOfTurn, filter, false)); } - public ArmyOfAllah1(final ArmyOfAllah1 card) { + public ArmyOfAllah(final ArmyOfAllah card) { super(card); } @Override - public ArmyOfAllah1 copy() { - return new ArmyOfAllah1(this); + public ArmyOfAllah copy() { + return new ArmyOfAllah(this); } } diff --git a/Mage.Sets/src/mage/cards/b/BalduvianWarMakers1.java b/Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java similarity index 89% rename from Mage.Sets/src/mage/cards/b/BalduvianWarMakers1.java rename to Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java index 2127503fac..753371ef4e 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianWarMakers1.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianWarMakers.java @@ -39,9 +39,9 @@ import mage.constants.CardType; * * @author LoneFox */ -public class BalduvianWarMakers1 extends CardImpl { +public class BalduvianWarMakers extends CardImpl { - public BalduvianWarMakers1(UUID ownerId, CardSetInfo setInfo) { + public BalduvianWarMakers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); this.subtype.add("Human"); this.subtype.add("Barbarian"); @@ -54,12 +54,12 @@ public class BalduvianWarMakers1 extends CardImpl { this.addAbility(new RampageAbility(1)); } - public BalduvianWarMakers1(final BalduvianWarMakers1 card) { + public BalduvianWarMakers(final BalduvianWarMakers card) { super(card); } @Override - public BalduvianWarMakers1 copy() { - return new BalduvianWarMakers1(this); + public BalduvianWarMakers copy() { + return new BalduvianWarMakers(this); } } diff --git a/Mage.Sets/src/mage/cards/b/BasalThrull1.java b/Mage.Sets/src/mage/cards/b/BasalThrull.java similarity index 92% rename from Mage.Sets/src/mage/cards/b/BasalThrull1.java rename to Mage.Sets/src/mage/cards/b/BasalThrull.java index 1ec4a5ed20..fbc9f91344 100644 --- a/Mage.Sets/src/mage/cards/b/BasalThrull1.java +++ b/Mage.Sets/src/mage/cards/b/BasalThrull.java @@ -44,9 +44,9 @@ import mage.constants.Zone; * * @author LoneFox */ -public class BasalThrull1 extends CardImpl { +public class BasalThrull extends CardImpl { - public BasalThrull1(UUID ownerId, CardSetInfo setInfo) { + public BasalThrull(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); this.subtype.add("Thrull"); this.power = new MageInt(1); @@ -58,12 +58,12 @@ public class BasalThrull1 extends CardImpl { this.addAbility(ability); } - public BasalThrull1(final BasalThrull1 card) { + public BasalThrull(final BasalThrull card) { super(card); } @Override - public BasalThrull1 copy() { - return new BasalThrull1(this); + public BasalThrull copy() { + return new BasalThrull(this); } } diff --git a/Mage.Sets/src/mage/cards/b/BrassclawOrcs1.java b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java similarity index 92% rename from Mage.Sets/src/mage/cards/b/BrassclawOrcs1.java rename to Mage.Sets/src/mage/cards/b/BrassclawOrcs.java index 0159e38998..9a0b68146d 100644 --- a/Mage.Sets/src/mage/cards/b/BrassclawOrcs1.java +++ b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java @@ -43,14 +43,14 @@ import mage.filter.predicate.mageobject.PowerPredicate; * * @author dustinconrad */ -public class BrassclawOrcs1 extends CardImpl { +public class BrassclawOrcs extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 2 or greater"); static { filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 1)); } - public BrassclawOrcs1(UUID ownerId, CardSetInfo setInfo) { + public BrassclawOrcs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); this.subtype.add("Orc"); @@ -62,12 +62,12 @@ public class BrassclawOrcs1 extends CardImpl { } - public BrassclawOrcs1(final BrassclawOrcs1 card) { + public BrassclawOrcs(final BrassclawOrcs card) { super(card); } @Override - public BrassclawOrcs1 copy() { - return new BrassclawOrcs1(this); + public BrassclawOrcs copy() { + return new BrassclawOrcs(this); } } diff --git a/Mage.Sets/src/mage/cards/b/BrothersYamazaki1.java b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java similarity index 95% rename from Mage.Sets/src/mage/cards/b/BrothersYamazaki1.java rename to Mage.Sets/src/mage/cards/b/BrothersYamazaki.java index f4aeabc1c8..976a9133c9 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersYamazaki1.java +++ b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java @@ -54,7 +54,7 @@ import mage.game.permanent.Permanent; * * @author LevelX2 */ -public class BrothersYamazaki1 extends CardImpl { +public class BrothersYamazaki extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); @@ -62,7 +62,7 @@ public class BrothersYamazaki1 extends CardImpl { filter.add(new NamePredicate("Brothers Yamazaki")); } - public BrothersYamazaki1(UUID ownerId, CardSetInfo setInfo) { + public BrothersYamazaki(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); this.supertype.add("Legendary"); this.subtype.add("Human"); @@ -86,13 +86,13 @@ public class BrothersYamazaki1 extends CardImpl { this.addAbility(ability); } - public BrothersYamazaki1(final BrothersYamazaki1 card) { + public BrothersYamazaki(final BrothersYamazaki card) { super(card); } @Override - public BrothersYamazaki1 copy() { - return new BrothersYamazaki1(this); + public BrothersYamazaki copy() { + return new BrothersYamazaki(this); } } diff --git a/Mage.Sets/src/mage/cards/c/CarrierPigeons1.java b/Mage.Sets/src/mage/cards/c/CarrierPigeons.java similarity index 92% rename from Mage.Sets/src/mage/cards/c/CarrierPigeons1.java rename to Mage.Sets/src/mage/cards/c/CarrierPigeons.java index a2211d7404..dbf0493c37 100644 --- a/Mage.Sets/src/mage/cards/c/CarrierPigeons1.java +++ b/Mage.Sets/src/mage/cards/c/CarrierPigeons.java @@ -43,9 +43,9 @@ import mage.constants.Duration; * * @author fireshoes */ -public class CarrierPigeons1 extends CardImpl { +public class CarrierPigeons extends CardImpl { - public CarrierPigeons1(UUID ownerId, CardSetInfo setInfo) { + public CarrierPigeons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); this.subtype.add("Bird"); this.power = new MageInt(1); @@ -59,12 +59,12 @@ public class CarrierPigeons1 extends CardImpl { new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse), false))); } - public CarrierPigeons1(final CarrierPigeons1 card) { + public CarrierPigeons(final CarrierPigeons card) { super(card); } @Override - public CarrierPigeons1 copy() { - return new CarrierPigeons1(this); + public CarrierPigeons copy() { + return new CarrierPigeons(this); } } diff --git a/Mage.Sets/src/mage/cards/c/CemeteryGate1.java b/Mage.Sets/src/mage/cards/c/CemeteryGate.java similarity index 91% rename from Mage.Sets/src/mage/cards/c/CemeteryGate1.java rename to Mage.Sets/src/mage/cards/c/CemeteryGate.java index 3c17eff20b..229b94a6a4 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryGate1.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryGate.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; * * @author fireshoes */ -public class CemeteryGate1 extends CardImpl { +public class CemeteryGate extends CardImpl { private static final FilterCard filter = new FilterCard("Black"); @@ -50,7 +50,7 @@ public class CemeteryGate1 extends CardImpl { filter.add(new ColorPredicate(ObjectColor.BLACK)); } - public CemeteryGate1(UUID ownerId, CardSetInfo setInfo) { + public CemeteryGate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); this.subtype.add("Wall"); this.power = new MageInt(0); @@ -63,12 +63,12 @@ public class CemeteryGate1 extends CardImpl { this.addAbility(new ProtectionAbility(filter)); } - public CemeteryGate1(final CemeteryGate1 card) { + public CemeteryGate(final CemeteryGate card) { super(card); } @Override - public CemeteryGate1 copy() { - return new CemeteryGate1(this); + public CemeteryGate copy() { + return new CemeteryGate(this); } } diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic1.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java similarity index 92% rename from Mage.Sets/src/mage/cards/c/CombatMedic1.java rename to Mage.Sets/src/mage/cards/c/CombatMedic.java index d0f15ac56c..f6e0dcb23b 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic1.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -44,9 +44,9 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author LoneFox */ -public class CombatMedic1 extends CardImpl { +public class CombatMedic extends CardImpl { - public CombatMedic1(UUID ownerId, CardSetInfo setInfo) { + public CombatMedic(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); this.subtype.add("Human"); this.subtype.add("Cleric"); @@ -60,12 +60,12 @@ public class CombatMedic1 extends CardImpl { this.addAbility(ability); } - public CombatMedic1(final CombatMedic1 card) { + public CombatMedic(final CombatMedic card) { super(card); } @Override - public CombatMedic1 copy() { - return new CombatMedic1(this); + public CombatMedic copy() { + return new CombatMedic(this); } } diff --git a/Mage.Sets/src/mage/cards/d/DrySpell1.java b/Mage.Sets/src/mage/cards/d/DrySpell.java similarity index 91% rename from Mage.Sets/src/mage/cards/d/DrySpell1.java rename to Mage.Sets/src/mage/cards/d/DrySpell.java index 8d32a25df1..193b1296ee 100644 --- a/Mage.Sets/src/mage/cards/d/DrySpell1.java +++ b/Mage.Sets/src/mage/cards/d/DrySpell.java @@ -37,9 +37,9 @@ import mage.constants.CardType; * * @author Quercitron */ -public class DrySpell1 extends CardImpl { +public class DrySpell extends CardImpl { - public DrySpell1(UUID ownerId, CardSetInfo setInfo) { + public DrySpell(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}"); @@ -47,12 +47,12 @@ public class DrySpell1 extends CardImpl { this.getSpellAbility().addEffect(new DamageEverythingEffect(1)); } - public DrySpell1(final DrySpell1 card) { + public DrySpell(final DrySpell card) { super(card); } @Override - public DrySpell1 copy() { - return new DrySpell1(this); + public DrySpell copy() { + return new DrySpell(this); } } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenSoldier1.java b/Mage.Sets/src/mage/cards/d/DwarvenSoldier.java similarity index 91% rename from Mage.Sets/src/mage/cards/d/DwarvenSoldier1.java rename to Mage.Sets/src/mage/cards/d/DwarvenSoldier.java index da0e5b80a0..09ae958fcd 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenSoldier1.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenSoldier.java @@ -41,11 +41,11 @@ import mage.filter.common.FilterCreaturePermanent; * * @author MarcoMarin */ -public class DwarvenSoldier1 extends CardImpl { +public class DwarvenSoldier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Orc", "Orc creature"); - public DwarvenSoldier1(UUID ownerId, CardSetInfo setInfo) { + public DwarvenSoldier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); this.subtype.add("Dwarf"); this.subtype.add("Soldier"); @@ -56,12 +56,12 @@ public class DwarvenSoldier1 extends CardImpl { this.addAbility(new BlocksOrBecomesBlockedByCreatureTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), filter, false)); } - public DwarvenSoldier1(final DwarvenSoldier1 card) { + public DwarvenSoldier(final DwarvenSoldier card) { super(card); } @Override - public DwarvenSoldier1 copy() { - return new DwarvenSoldier1(this); + public DwarvenSoldier copy() { + return new DwarvenSoldier(this); } } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenTrader1.java b/Mage.Sets/src/mage/cards/d/DwarvenTrader.java similarity index 89% rename from Mage.Sets/src/mage/cards/d/DwarvenTrader1.java rename to Mage.Sets/src/mage/cards/d/DwarvenTrader.java index 6036ccef01..cc75ac7c76 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenTrader1.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenTrader.java @@ -37,9 +37,9 @@ import mage.cards.CardSetInfo; * * @author North */ -public class DwarvenTrader1 extends CardImpl { +public class DwarvenTrader extends CardImpl { - public DwarvenTrader1(UUID ownerId, CardSetInfo setInfo) { + public DwarvenTrader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); this.subtype.add("Dwarf"); @@ -47,12 +47,12 @@ public class DwarvenTrader1 extends CardImpl { this.toughness = new MageInt(1); } - public DwarvenTrader1(final DwarvenTrader1 card) { + public DwarvenTrader(final DwarvenTrader card) { super(card); } @Override - public DwarvenTrader1 copy() { - return new DwarvenTrader1(this); + public DwarvenTrader copy() { + return new DwarvenTrader(this); } } diff --git a/Mage.Sets/src/mage/cards/e/EliteCatWarrior1.java b/Mage.Sets/src/mage/cards/e/EliteCatWarrior.java similarity index 89% rename from Mage.Sets/src/mage/cards/e/EliteCatWarrior1.java rename to Mage.Sets/src/mage/cards/e/EliteCatWarrior.java index da7e947a48..c373c2051d 100644 --- a/Mage.Sets/src/mage/cards/e/EliteCatWarrior1.java +++ b/Mage.Sets/src/mage/cards/e/EliteCatWarrior.java @@ -38,9 +38,9 @@ import mage.constants.CardType; * * @author Plopman */ -public class EliteCatWarrior1 extends CardImpl { +public class EliteCatWarrior extends CardImpl { - public EliteCatWarrior1(UUID ownerId, CardSetInfo setInfo) { + public EliteCatWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); this.subtype.add("Cat"); this.subtype.add("Warrior"); @@ -52,12 +52,12 @@ public class EliteCatWarrior1 extends CardImpl { this.addAbility(new ForestwalkAbility()); } - public EliteCatWarrior1(final EliteCatWarrior1 card) { + public EliteCatWarrior(final EliteCatWarrior card) { super(card); } @Override - public EliteCatWarrior1 copy() { - return new EliteCatWarrior1(this); + public EliteCatWarrior copy() { + return new EliteCatWarrior(this); } } diff --git a/Mage.Sets/src/mage/cards/e/ElvenFortress1.java b/Mage.Sets/src/mage/cards/e/ElvenFortress.java similarity index 91% rename from Mage.Sets/src/mage/cards/e/ElvenFortress1.java rename to Mage.Sets/src/mage/cards/e/ElvenFortress.java index 61a399e463..5ced9c4c3c 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenFortress1.java +++ b/Mage.Sets/src/mage/cards/e/ElvenFortress.java @@ -44,9 +44,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class ElvenFortress1 extends CardImpl { +public class ElvenFortress extends CardImpl { - public ElvenFortress1(UUID ownerId, CardSetInfo setInfo) { + public ElvenFortress(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // {1}{G}: Target blocking creature gets +0/+1 until end of turn. @@ -55,12 +55,12 @@ public class ElvenFortress1 extends CardImpl { this.addAbility(ability); } - public ElvenFortress1(final ElvenFortress1 card) { + public ElvenFortress(final ElvenFortress card) { super(card); } @Override - public ElvenFortress1 copy() { - return new ElvenFortress1(this); + public ElvenFortress copy() { + return new ElvenFortress(this); } } diff --git a/Mage.Sets/src/mage/cards/e/ElvishHunter1.java b/Mage.Sets/src/mage/cards/e/ElvishHunter.java similarity index 92% rename from Mage.Sets/src/mage/cards/e/ElvishHunter1.java rename to Mage.Sets/src/mage/cards/e/ElvishHunter.java index dec70ae5af..1aa71466f2 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHunter1.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHunter.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; * @author LoneFox */ -public class ElvishHunter1 extends CardImpl { +public class ElvishHunter extends CardImpl { - public ElvishHunter1(UUID ownerId, CardSetInfo setInfo) { + public ElvishHunter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); this.subtype.add("Elf"); this.subtype.add("Archer"); @@ -62,12 +62,12 @@ public class ElvishHunter1 extends CardImpl { this.addAbility(ability); } - public ElvishHunter1(final ElvishHunter1 card) { + public ElvishHunter(final ElvishHunter card) { super(card); } @Override - public ElvishHunter1 copy() { - return new ElvishHunter1(this); + public ElvishHunter copy() { + return new ElvishHunter(this); } } diff --git a/Mage.Sets/src/mage/cards/e/ElvishScout1.java b/Mage.Sets/src/mage/cards/e/ElvishScout.java similarity index 94% rename from Mage.Sets/src/mage/cards/e/ElvishScout1.java rename to Mage.Sets/src/mage/cards/e/ElvishScout.java index 360ed5d262..f824676095 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScout1.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScout.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledCreaturePermanent; * * @author LoneFox */ -public class ElvishScout1 extends CardImpl { +public class ElvishScout extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("attacking creature you control"); @@ -58,7 +58,7 @@ public class ElvishScout1 extends CardImpl { filter.add(new AttackingPredicate()); } - public ElvishScout1(UUID ownerId, CardSetInfo setInfo) { + public ElvishScout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); this.subtype.add("Elf"); this.subtype.add("Scout"); @@ -78,12 +78,12 @@ public class ElvishScout1 extends CardImpl { this.addAbility(ability); } - public ElvishScout1(final ElvishScout1 card) { + public ElvishScout(final ElvishScout card) { super(card); } @Override - public ElvishScout1 copy() { - return new ElvishScout1(this); + public ElvishScout copy() { + return new ElvishScout(this); } } diff --git a/Mage.Sets/src/mage/cards/e/EnslavedScout1.java b/Mage.Sets/src/mage/cards/e/EnslavedScout.java similarity index 91% rename from Mage.Sets/src/mage/cards/e/EnslavedScout1.java rename to Mage.Sets/src/mage/cards/e/EnslavedScout.java index f5eb8d5bcd..b82bcf07cb 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedScout1.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedScout.java @@ -43,9 +43,9 @@ import mage.constants.Zone; * * @author fireshoes */ -public class EnslavedScout1 extends CardImpl { +public class EnslavedScout extends CardImpl { - public EnslavedScout1(UUID ownerId, CardSetInfo setInfo) { + public EnslavedScout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); this.subtype.add("Goblin"); this.subtype.add("Scout"); @@ -58,12 +58,12 @@ public class EnslavedScout1 extends CardImpl { new GenericManaCost(2))); } - public EnslavedScout1(final EnslavedScout1 card) { + public EnslavedScout(final EnslavedScout card) { super(card); } @Override - public EnslavedScout1 copy() { - return new EnslavedScout1(this); + public EnslavedScout copy() { + return new EnslavedScout(this); } } diff --git a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted1.java b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java similarity index 92% rename from Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted1.java rename to Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java index fa15691a09..33e0bcf7d8 100644 --- a/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted1.java +++ b/Mage.Sets/src/mage/cards/e/ErtaiTheCorrupted.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; * * @author fireshoes */ -public class ErtaiTheCorrupted1 extends CardImpl { +public class ErtaiTheCorrupted extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a creature or enchantment"); @@ -57,7 +57,7 @@ public class ErtaiTheCorrupted1 extends CardImpl { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ENCHANTMENT))); } - public ErtaiTheCorrupted1(UUID ownerId, CardSetInfo setInfo) { + public ErtaiTheCorrupted(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}{B}"); this.supertype.add("Legendary"); this.subtype.add("Human"); @@ -73,12 +73,12 @@ public class ErtaiTheCorrupted1 extends CardImpl { this.addAbility(ability); } - public ErtaiTheCorrupted1(final ErtaiTheCorrupted1 card) { + public ErtaiTheCorrupted(final ErtaiTheCorrupted card) { super(card); } @Override - public ErtaiTheCorrupted1 copy() { - return new ErtaiTheCorrupted1(this); + public ErtaiTheCorrupted copy() { + return new ErtaiTheCorrupted(this); } } diff --git a/Mage.Sets/src/mage/cards/f/FarrelsZealot1.java b/Mage.Sets/src/mage/cards/f/FarrelsZealot.java similarity index 92% rename from Mage.Sets/src/mage/cards/f/FarrelsZealot1.java rename to Mage.Sets/src/mage/cards/f/FarrelsZealot.java index 1900bf6def..c9ff54606b 100644 --- a/Mage.Sets/src/mage/cards/f/FarrelsZealot1.java +++ b/Mage.Sets/src/mage/cards/f/FarrelsZealot.java @@ -43,9 +43,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class FarrelsZealot1 extends CardImpl { +public class FarrelsZealot extends CardImpl { - public FarrelsZealot1(UUID ownerId, CardSetInfo setInfo) { + public FarrelsZealot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); this.subtype.add("Human"); this.power = new MageInt(2); @@ -58,12 +58,12 @@ public class FarrelsZealot1 extends CardImpl { this.addAbility(ability); } - public FarrelsZealot1(final FarrelsZealot1 card) { + public FarrelsZealot(final FarrelsZealot card) { super(card); } @Override - public FarrelsZealot1 copy() { - return new FarrelsZealot1(this); + public FarrelsZealot copy() { + return new FarrelsZealot(this); } } diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn1.java b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java similarity index 91% rename from Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn1.java rename to Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java index 252b9c0cb6..908b771dcf 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn1.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java @@ -46,9 +46,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Quercitron */ -public class FeastOfTheUnicorn1 extends CardImpl { +public class FeastOfTheUnicorn extends CardImpl { - public FeastOfTheUnicorn1(UUID ownerId, CardSetInfo setInfo) { + public FeastOfTheUnicorn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); this.subtype.add("Aura"); @@ -63,12 +63,12 @@ public class FeastOfTheUnicorn1 extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 0, Duration.WhileOnBattlefield))); } - public FeastOfTheUnicorn1(final FeastOfTheUnicorn1 card) { + public FeastOfTheUnicorn(final FeastOfTheUnicorn card) { super(card); } @Override - public FeastOfTheUnicorn1 copy() { - return new FeastOfTheUnicorn1(this); + public FeastOfTheUnicorn copy() { + return new FeastOfTheUnicorn(this); } } diff --git a/Mage.Sets/src/mage/cards/f/FeveredStrength1.java b/Mage.Sets/src/mage/cards/f/FeveredStrength.java similarity index 91% rename from Mage.Sets/src/mage/cards/f/FeveredStrength1.java rename to Mage.Sets/src/mage/cards/f/FeveredStrength.java index e2c88348ab..1fc93fabcf 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredStrength1.java +++ b/Mage.Sets/src/mage/cards/f/FeveredStrength.java @@ -42,9 +42,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author fireshoes */ -public class FeveredStrength1 extends CardImpl { +public class FeveredStrength extends CardImpl { - public FeveredStrength1(UUID ownerId, CardSetInfo setInfo) { + public FeveredStrength(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}"); // Target creature gets +2/+0 until end of turn. @@ -56,12 +56,12 @@ public class FeveredStrength1 extends CardImpl { new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse), false)); } - public FeveredStrength1(final FeveredStrength1 card) { + public FeveredStrength(final FeveredStrength card) { super(card); } @Override - public FeveredStrength1 copy() { - return new FeveredStrength1(this); + public FeveredStrength copy() { + return new FeveredStrength(this); } } diff --git a/Mage.Sets/src/mage/cards/f/FishliverOil1.java b/Mage.Sets/src/mage/cards/f/FishliverOil.java similarity index 92% rename from Mage.Sets/src/mage/cards/f/FishliverOil1.java rename to Mage.Sets/src/mage/cards/f/FishliverOil.java index 7ed14ba059..e7c9d625fb 100644 --- a/Mage.Sets/src/mage/cards/f/FishliverOil1.java +++ b/Mage.Sets/src/mage/cards/f/FishliverOil.java @@ -47,9 +47,9 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Laxika */ -public class FishliverOil1 extends CardImpl { +public class FishliverOil extends CardImpl { - public FishliverOil1(UUID ownerId, CardSetInfo setInfo) { + public FishliverOil(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); this.subtype.add("Aura"); @@ -65,12 +65,12 @@ public class FishliverOil1 extends CardImpl { new GainAbilityAttachedEffect(new IslandwalkAbility(), AttachmentType.AURA, Duration.WhileOnBattlefield))); } - public FishliverOil1(final FishliverOil1 card) { + public FishliverOil(final FishliverOil card) { super(card); } @Override - public FishliverOil1 copy() { - return new FishliverOil1(this); + public FishliverOil copy() { + return new FishliverOil(this); } } diff --git a/Mage.Sets/src/mage/cards/f/FolkOfAnHavva1.java b/Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java similarity index 90% rename from Mage.Sets/src/mage/cards/f/FolkOfAnHavva1.java rename to Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java index f8df34d44d..f76fe2744e 100644 --- a/Mage.Sets/src/mage/cards/f/FolkOfAnHavva1.java +++ b/Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java @@ -40,9 +40,9 @@ import mage.constants.Duration; * * @author LoneFox */ -public class FolkOfAnHavva1 extends CardImpl { +public class FolkOfAnHavva extends CardImpl { - public FolkOfAnHavva1(UUID ownerId, CardSetInfo setInfo) { + public FolkOfAnHavva(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); this.subtype.add("Human"); this.power = new MageInt(1); @@ -52,12 +52,12 @@ public class FolkOfAnHavva1 extends CardImpl { this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); } - public FolkOfAnHavva1(final FolkOfAnHavva1 card) { + public FolkOfAnHavva(final FolkOfAnHavva card) { super(card); } @Override - public FolkOfAnHavva1 copy() { - return new FolkOfAnHavva1(this); + public FolkOfAnHavva copy() { + return new FolkOfAnHavva(this); } } diff --git a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon1.java b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java similarity index 91% rename from Mage.Sets/src/mage/cards/g/GoblinChirurgeon1.java rename to Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java index c6e1f75fc5..aec0d39dc7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon1.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LevelX2 */ -public class GoblinChirurgeon1 extends CardImpl { +public class GoblinChirurgeon extends CardImpl { - public GoblinChirurgeon1(UUID ownerId, CardSetInfo setInfo) { + public GoblinChirurgeon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); this.subtype.add("Goblin"); this.subtype.add("Shaman"); @@ -62,12 +62,12 @@ public class GoblinChirurgeon1 extends CardImpl { this.addAbility(ability); } - public GoblinChirurgeon1(final GoblinChirurgeon1 card) { + public GoblinChirurgeon(final GoblinChirurgeon card) { super(card); } @Override - public GoblinChirurgeon1 copy() { - return new GoblinChirurgeon1(this); + public GoblinChirurgeon copy() { + return new GoblinChirurgeon(this); } } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGrenade1.java b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java similarity index 91% rename from Mage.Sets/src/mage/cards/g/GoblinGrenade1.java rename to Mage.Sets/src/mage/cards/g/GoblinGrenade.java index c5ddcf2bf4..f2cdde9fe1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGrenade1.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreatureOrPlayer; /** * @author Loki */ -public class GoblinGrenade1 extends CardImpl { +public class GoblinGrenade extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); @@ -51,7 +51,7 @@ public class GoblinGrenade1 extends CardImpl { filter.add(new SubtypePredicate("Goblin")); } - public GoblinGrenade1(UUID ownerId, CardSetInfo setInfo) { + public GoblinGrenade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); @@ -59,13 +59,13 @@ public class GoblinGrenade1 extends CardImpl { this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } - public GoblinGrenade1(final GoblinGrenade1 card) { + public GoblinGrenade(final GoblinGrenade card) { super(card); } @Override - public GoblinGrenade1 copy() { - return new GoblinGrenade1(this); + public GoblinGrenade copy() { + return new GoblinGrenade(this); } } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarDrums1.java b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java similarity index 91% rename from Mage.Sets/src/mage/cards/g/GoblinWarDrums1.java rename to Mage.Sets/src/mage/cards/g/GoblinWarDrums.java index 9f762cc257..f53fba6830 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarDrums1.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java @@ -44,14 +44,14 @@ import mage.filter.predicate.permanent.ControllerPredicate; * * @author LevelX2 */ - public class GoblinWarDrums1 extends CardImpl { + public class GoblinWarDrums extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); } - public GoblinWarDrums1(UUID ownerId, CardSetInfo setInfo) { + public GoblinWarDrums(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); @@ -59,12 +59,12 @@ import mage.filter.predicate.permanent.ControllerPredicate; this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter))); } - public GoblinWarDrums1(final GoblinWarDrums1 card) { + public GoblinWarDrums(final GoblinWarDrums card) { super(card); } @Override - public GoblinWarDrums1 copy() { - return new GoblinWarDrums1(this); + public GoblinWarDrums copy() { + return new GoblinWarDrums(this); } } diff --git a/Mage.Sets/src/mage/cards/g/GorillaBerserkers1.java b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java similarity index 91% rename from Mage.Sets/src/mage/cards/g/GorillaBerserkers1.java rename to Mage.Sets/src/mage/cards/g/GorillaBerserkers.java index f5d62c6f7a..0e7945d28e 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaBerserkers1.java +++ b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java @@ -42,9 +42,9 @@ import mage.constants.Zone; * * @author LoneFox */ -public class GorillaBerserkers1 extends CardImpl { +public class GorillaBerserkers extends CardImpl { - public GorillaBerserkers1(UUID ownerId, CardSetInfo setInfo) { + public GorillaBerserkers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); this.subtype.add("Ape"); this.subtype.add("Berserker"); @@ -59,12 +59,12 @@ public class GorillaBerserkers1 extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); } - public GorillaBerserkers1(final GorillaBerserkers1 card) { + public GorillaBerserkers(final GorillaBerserkers card) { super(card); } @Override - public GorillaBerserkers1 copy() { - return new GorillaBerserkers1(this); + public GorillaBerserkers copy() { + return new GorillaBerserkers(this); } } diff --git a/Mage.Sets/src/mage/cards/g/GorillaShaman1.java b/Mage.Sets/src/mage/cards/g/GorillaShaman.java similarity index 94% rename from Mage.Sets/src/mage/cards/g/GorillaShaman1.java rename to Mage.Sets/src/mage/cards/g/GorillaShaman.java index bbcfe767b0..8265246169 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaShaman1.java +++ b/Mage.Sets/src/mage/cards/g/GorillaShaman.java @@ -50,11 +50,11 @@ import mage.target.TargetPermanent; * * @author fireshoes */ -public class GorillaShaman1 extends CardImpl { +public class GorillaShaman extends CardImpl { private final UUID originalId; - public GorillaShaman1(UUID ownerId, CardSetInfo setInfo) { + public GorillaShaman(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); this.subtype.add("Ape"); this.subtype.add("Shaman"); @@ -81,13 +81,13 @@ public class GorillaShaman1 extends CardImpl { } } - public GorillaShaman1(final GorillaShaman1 card) { + public GorillaShaman(final GorillaShaman card) { super(card); this.originalId = card.originalId; } @Override - public GorillaShaman1 copy() { - return new GorillaShaman1(this); + public GorillaShaman copy() { + return new GorillaShaman(this); } } diff --git a/Mage.Sets/src/mage/cards/h/HighTide1.java b/Mage.Sets/src/mage/cards/h/HighTide.java similarity index 95% rename from Mage.Sets/src/mage/cards/h/HighTide1.java rename to Mage.Sets/src/mage/cards/h/HighTide.java index d8a4c4af6f..73da989026 100644 --- a/Mage.Sets/src/mage/cards/h/HighTide1.java +++ b/Mage.Sets/src/mage/cards/h/HighTide.java @@ -50,9 +50,9 @@ import mage.target.targetpointer.FixedTarget; * * @author Plopman */ -public class HighTide1 extends CardImpl { +public class HighTide extends CardImpl { - public HighTide1(UUID ownerId, CardSetInfo setInfo) { + public HighTide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); // Until end of turn, whenever a player taps an Island for mana, that player adds {U} to his or her mana pool. @@ -60,13 +60,13 @@ public class HighTide1 extends CardImpl { } - public HighTide1(final HighTide1 card) { + public HighTide(final HighTide card) { super(card); } @Override - public HighTide1 copy() { - return new HighTide1(this); + public HighTide copy() { + return new HighTide(this); } } diff --git a/Mage.Sets/src/mage/cards/h/Homarid1.java b/Mage.Sets/src/mage/cards/h/Homarid.java similarity index 96% rename from Mage.Sets/src/mage/cards/h/Homarid1.java rename to Mage.Sets/src/mage/cards/h/Homarid.java index beeee7b2c7..098c2aeba5 100644 --- a/Mage.Sets/src/mage/cards/h/Homarid1.java +++ b/Mage.Sets/src/mage/cards/h/Homarid.java @@ -54,9 +54,9 @@ import mage.game.events.GameEvent; * * @author LoneFox */ -public class Homarid1 extends CardImpl { +public class Homarid extends CardImpl { - public Homarid1(UUID ownerId, CardSetInfo setInfo) { + public Homarid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); this.subtype.add("Homarid"); this.power = new MageInt(2); @@ -80,13 +80,13 @@ public class Homarid1 extends CardImpl { this.addAbility(new HomaridTriggeredAbility(new RemoveAllCountersSourceEffect(CounterType.TIDE))); } - public Homarid1(final Homarid1 card) { + public Homarid(final Homarid card) { super(card); } @Override - public Homarid1 copy() { - return new Homarid1(this); + public Homarid copy() { + return new Homarid(this); } } diff --git a/Mage.Sets/src/mage/cards/h/HomaridWarrior1.java b/Mage.Sets/src/mage/cards/h/HomaridWarrior.java similarity index 92% rename from Mage.Sets/src/mage/cards/h/HomaridWarrior1.java rename to Mage.Sets/src/mage/cards/h/HomaridWarrior.java index 6b377dedf0..251ab096e1 100644 --- a/Mage.Sets/src/mage/cards/h/HomaridWarrior1.java +++ b/Mage.Sets/src/mage/cards/h/HomaridWarrior.java @@ -47,9 +47,9 @@ import mage.constants.Zone; * * @author LoneFox */ -public class HomaridWarrior1 extends CardImpl { +public class HomaridWarrior extends CardImpl { - public HomaridWarrior1(UUID ownerId, CardSetInfo setInfo) { + public HomaridWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); this.subtype.add("Homarid"); this.subtype.add("Warrior"); @@ -66,12 +66,12 @@ public class HomaridWarrior1 extends CardImpl { this.addAbility(ability); } - public HomaridWarrior1(final HomaridWarrior1 card) { + public HomaridWarrior(final HomaridWarrior card) { super(card); } @Override - public HomaridWarrior1 copy() { - return new HomaridWarrior1(this); + public HomaridWarrior copy() { + return new HomaridWarrior(this); } } diff --git a/Mage.Sets/src/mage/cards/h/HymnToTourach1.java b/Mage.Sets/src/mage/cards/h/HymnToTourach.java similarity index 90% rename from Mage.Sets/src/mage/cards/h/HymnToTourach1.java rename to Mage.Sets/src/mage/cards/h/HymnToTourach.java index 1508ae7edd..fde702bc5d 100644 --- a/Mage.Sets/src/mage/cards/h/HymnToTourach1.java +++ b/Mage.Sets/src/mage/cards/h/HymnToTourach.java @@ -38,9 +38,9 @@ import mage.target.TargetPlayer; * * @author jonubuu */ -public class HymnToTourach1 extends CardImpl { +public class HymnToTourach extends CardImpl { - public HymnToTourach1(UUID ownerId, CardSetInfo setInfo) { + public HymnToTourach(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}{B}"); @@ -49,12 +49,12 @@ public class HymnToTourach1 extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); } - public HymnToTourach1(final HymnToTourach1 card) { + public HymnToTourach(final HymnToTourach card) { super(card); } @Override - public HymnToTourach1 copy() { - return new HymnToTourach1(this); + public HymnToTourach copy() { + return new HymnToTourach(this); } } diff --git a/Mage.Sets/src/mage/cards/i/IcatianJavelineers1.java b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java similarity index 92% rename from Mage.Sets/src/mage/cards/i/IcatianJavelineers1.java rename to Mage.Sets/src/mage/cards/i/IcatianJavelineers.java index 96957eed59..994790ea1d 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianJavelineers1.java +++ b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java @@ -47,9 +47,9 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author fireshoes */ -public class IcatianJavelineers1 extends CardImpl { +public class IcatianJavelineers extends CardImpl { - public IcatianJavelineers1(UUID ownerId, CardSetInfo setInfo) { + public IcatianJavelineers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); this.subtype.add("Human"); this.subtype.add("Soldier"); @@ -66,12 +66,12 @@ public class IcatianJavelineers1 extends CardImpl { this.addAbility(ability); } - public IcatianJavelineers1(final IcatianJavelineers1 card) { + public IcatianJavelineers(final IcatianJavelineers card) { super(card); } @Override - public IcatianJavelineers1 copy() { - return new IcatianJavelineers1(this); + public IcatianJavelineers copy() { + return new IcatianJavelineers(this); } } diff --git a/Mage.Sets/src/mage/cards/i/IcatianMoneychanger1.java b/Mage.Sets/src/mage/cards/i/IcatianMoneychanger.java similarity index 93% rename from Mage.Sets/src/mage/cards/i/IcatianMoneychanger1.java rename to Mage.Sets/src/mage/cards/i/IcatianMoneychanger.java index 6095b415ad..9713007f98 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianMoneychanger1.java +++ b/Mage.Sets/src/mage/cards/i/IcatianMoneychanger.java @@ -52,9 +52,9 @@ import mage.counters.CounterType; * * @author fireshoes */ -public class IcatianMoneychanger1 extends CardImpl { +public class IcatianMoneychanger extends CardImpl { - public IcatianMoneychanger1(UUID ownerId, CardSetInfo setInfo) { + public IcatianMoneychanger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); this.subtype.add("Human"); this.power = new MageInt(0); @@ -78,12 +78,12 @@ public class IcatianMoneychanger1 extends CardImpl { new GainLifeEffect(new CountersSourceCount(CounterType.CREDIT)), new SacrificeSourceCost(), new IsStepCondition(PhaseStep.UPKEEP), null)); } - public IcatianMoneychanger1(final IcatianMoneychanger1 card) { + public IcatianMoneychanger(final IcatianMoneychanger card) { super(card); } @Override - public IcatianMoneychanger1 copy() { - return new IcatianMoneychanger1(this); + public IcatianMoneychanger copy() { + return new IcatianMoneychanger(this); } } diff --git a/Mage.Sets/src/mage/cards/i/IcatianScout1.java b/Mage.Sets/src/mage/cards/i/IcatianScout.java similarity index 92% rename from Mage.Sets/src/mage/cards/i/IcatianScout1.java rename to Mage.Sets/src/mage/cards/i/IcatianScout.java index 31db46919f..7be4145112 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianScout1.java +++ b/Mage.Sets/src/mage/cards/i/IcatianScout.java @@ -46,9 +46,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class IcatianScout1 extends CardImpl { +public class IcatianScout extends CardImpl { - public IcatianScout1(UUID ownerId, CardSetInfo setInfo) { + public IcatianScout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); this.subtype.add("Human"); this.subtype.add("Soldier"); @@ -64,12 +64,12 @@ public class IcatianScout1 extends CardImpl { this.addAbility(ability); } - public IcatianScout1(final IcatianScout1 card) { + public IcatianScout(final IcatianScout card) { super(card); } @Override - public IcatianScout1 copy() { - return new IcatianScout1(this); + public IcatianScout copy() { + return new IcatianScout(this); } } diff --git a/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand1.java b/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java similarity index 93% rename from Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand1.java rename to Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java index 18baa45bf8..771e0ebaff 100644 --- a/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand1.java +++ b/Mage.Sets/src/mage/cards/i/InitiatesOfTheEbonHand.java @@ -50,9 +50,9 @@ import mage.game.Game; * * @author MarcoMarin */ -public class InitiatesOfTheEbonHand1 extends CardImpl { +public class InitiatesOfTheEbonHand extends CardImpl { - public InitiatesOfTheEbonHand1(UUID ownerId, CardSetInfo setInfo) { + public InitiatesOfTheEbonHand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); this.subtype.add("Cleric"); this.power = new MageInt(1); @@ -66,13 +66,13 @@ public class InitiatesOfTheEbonHand1 extends CardImpl { this.addAbility(ability); } - public InitiatesOfTheEbonHand1(final InitiatesOfTheEbonHand1 card) { + public InitiatesOfTheEbonHand(final InitiatesOfTheEbonHand card) { super(card); } @Override - public InitiatesOfTheEbonHand1 copy() { - return new InitiatesOfTheEbonHand1(this); + public InitiatesOfTheEbonHand copy() { + return new InitiatesOfTheEbonHand(this); } } diff --git a/Mage.Sets/src/mage/cards/i/InsidiousBookworms1.java b/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java similarity index 90% rename from Mage.Sets/src/mage/cards/i/InsidiousBookworms1.java rename to Mage.Sets/src/mage/cards/i/InsidiousBookworms.java index aeca369211..141692a222 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousBookworms1.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java @@ -43,9 +43,9 @@ import mage.target.TargetPlayer; * * @author LoneFox */ -public class InsidiousBookworms1 extends CardImpl { +public class InsidiousBookworms extends CardImpl { - public InsidiousBookworms1(UUID ownerId, CardSetInfo setInfo) { + public InsidiousBookworms(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); this.subtype.add("Worm"); this.power = new MageInt(1); @@ -57,12 +57,12 @@ public class InsidiousBookworms1 extends CardImpl { this.addAbility(ability); } - public InsidiousBookworms1(final InsidiousBookworms1 card) { + public InsidiousBookworms(final InsidiousBookworms card) { super(card); } @Override - public InsidiousBookworms1 copy() { - return new InsidiousBookworms1(this); + public InsidiousBookworms copy() { + return new InsidiousBookworms(this); } } diff --git a/Mage.Sets/src/mage/cards/l/LimDulsHighGuard1.java b/Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java similarity index 90% rename from Mage.Sets/src/mage/cards/l/LimDulsHighGuard1.java rename to Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java index 988bf89882..2211e5d0a4 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulsHighGuard1.java +++ b/Mage.Sets/src/mage/cards/l/LimDulsHighGuard.java @@ -42,9 +42,9 @@ import mage.constants.Zone; * * @author LoneFox */ -public class LimDulsHighGuard1 extends CardImpl { +public class LimDulsHighGuard extends CardImpl { - public LimDulsHighGuard1(UUID ownerId, CardSetInfo setInfo) { + public LimDulsHighGuard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); this.subtype.add("Skeleton"); this.power = new MageInt(2); @@ -56,12 +56,12 @@ public class LimDulsHighGuard1 extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } - public LimDulsHighGuard1(final LimDulsHighGuard1 card) { + public LimDulsHighGuard(final LimDulsHighGuard card) { super(card); } @Override - public LimDulsHighGuard1 copy() { - return new LimDulsHighGuard1(this); + public LimDulsHighGuard copy() { + return new LimDulsHighGuard(this); } } diff --git a/Mage.Sets/src/mage/cards/m/MesaFalcon1.java b/Mage.Sets/src/mage/cards/m/MesaFalcon.java similarity index 92% rename from Mage.Sets/src/mage/cards/m/MesaFalcon1.java rename to Mage.Sets/src/mage/cards/m/MesaFalcon.java index aaba5d7dbd..0de45f88d6 100644 --- a/Mage.Sets/src/mage/cards/m/MesaFalcon1.java +++ b/Mage.Sets/src/mage/cards/m/MesaFalcon.java @@ -43,9 +43,9 @@ import mage.constants.Zone; * * @author Quercitron */ -public class MesaFalcon1 extends CardImpl { +public class MesaFalcon extends CardImpl { - public MesaFalcon1(UUID ownerId, CardSetInfo setInfo) { + public MesaFalcon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); this.subtype.add("Bird"); @@ -58,12 +58,12 @@ public class MesaFalcon1 extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); } - public MesaFalcon1(final MesaFalcon1 card) { + public MesaFalcon(final MesaFalcon card) { super(card); } @Override - public MesaFalcon1 copy() { - return new MesaFalcon1(this); + public MesaFalcon copy() { + return new MesaFalcon(this); } } diff --git a/Mage.Sets/src/mage/cards/m/MindstabThrull1.java b/Mage.Sets/src/mage/cards/m/MindstabThrull.java similarity index 91% rename from Mage.Sets/src/mage/cards/m/MindstabThrull1.java rename to Mage.Sets/src/mage/cards/m/MindstabThrull.java index 1240919f11..1c7669b84c 100644 --- a/Mage.Sets/src/mage/cards/m/MindstabThrull1.java +++ b/Mage.Sets/src/mage/cards/m/MindstabThrull.java @@ -42,9 +42,9 @@ import mage.constants.CardType; * * @author LoneFox */ -public class MindstabThrull1 extends CardImpl { +public class MindstabThrull extends CardImpl { - public MindstabThrull1(UUID ownerId, CardSetInfo setInfo) { + public MindstabThrull(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); this.subtype.add("Thrull"); this.power = new MageInt(2); @@ -56,12 +56,12 @@ public class MindstabThrull1 extends CardImpl { this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(new DoIfCostPaid(effect, new SacrificeSourceCost()), false, true)); } - public MindstabThrull1(final MindstabThrull1 card) { + public MindstabThrull(final MindstabThrull card) { super(card); } @Override - public MindstabThrull1 copy() { - return new MindstabThrull1(this); + public MindstabThrull copy() { + return new MindstabThrull(this); } } diff --git a/Mage.Sets/src/mage/cards/n/NafsAsp1.java b/Mage.Sets/src/mage/cards/n/NafsAsp.java similarity index 93% rename from Mage.Sets/src/mage/cards/n/NafsAsp1.java rename to Mage.Sets/src/mage/cards/n/NafsAsp.java index 2e98bd4f41..b5ffc3681d 100644 --- a/Mage.Sets/src/mage/cards/n/NafsAsp1.java +++ b/Mage.Sets/src/mage/cards/n/NafsAsp.java @@ -42,9 +42,9 @@ import mage.constants.PhaseStep; * * @author LoneFox */ -public class NafsAsp1 extends CardImpl { +public class NafsAsp extends CardImpl { - public NafsAsp1(UUID ownerId, CardSetInfo setInfo) { + public NafsAsp(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); this.subtype.add("Snake"); this.power = new MageInt(1); @@ -57,12 +57,12 @@ public class NafsAsp1 extends CardImpl { false, true)); } - public NafsAsp1(final NafsAsp1 card) { + public NafsAsp(final NafsAsp card) { super(card); } @Override - public NafsAsp1 copy() { - return new NafsAsp1(this); + public NafsAsp copy() { + return new NafsAsp(this); } } diff --git a/Mage.Sets/src/mage/cards/n/Necrite1.java b/Mage.Sets/src/mage/cards/n/Necrite.java similarity index 92% rename from Mage.Sets/src/mage/cards/n/Necrite1.java rename to Mage.Sets/src/mage/cards/n/Necrite.java index c5fa4e9ba6..9e638f3497 100644 --- a/Mage.Sets/src/mage/cards/n/Necrite1.java +++ b/Mage.Sets/src/mage/cards/n/Necrite.java @@ -35,11 +35,9 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.continuous.AssignNoCombatDamageSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -52,9 +50,9 @@ import mage.target.TargetPermanent; * * @author MarcoMarin */ -public class Necrite1 extends CardImpl { +public class Necrite extends CardImpl { - public Necrite1(UUID ownerId, CardSetInfo setInfo) { + public Necrite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); this.subtype.add("Thrull"); this.power = new MageInt(2); @@ -68,13 +66,13 @@ public class Necrite1 extends CardImpl { } - public Necrite1(final Necrite1 card) { + public Necrite(final Necrite card) { super(card); } @Override - public Necrite1 copy() { - return new Necrite1(this); + public Necrite copy() { + return new Necrite(this); } } diff --git a/Mage.Sets/src/mage/cards/n/NightSoil1.java b/Mage.Sets/src/mage/cards/n/NightSoil.java similarity index 92% rename from Mage.Sets/src/mage/cards/n/NightSoil1.java rename to Mage.Sets/src/mage/cards/n/NightSoil.java index 77de3dca96..81e56b1c2f 100644 --- a/Mage.Sets/src/mage/cards/n/NightSoil1.java +++ b/Mage.Sets/src/mage/cards/n/NightSoil.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCardInASingleGraveyard; * * @author LevelX2 */ -public class NightSoil1 extends CardImpl { +public class NightSoil extends CardImpl { - public NightSoil1(UUID ownerId, CardSetInfo setInfo) { + public NightSoil(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{G}"); @@ -57,12 +57,12 @@ public class NightSoil1 extends CardImpl { this.addAbility(ability); } - public NightSoil1(final NightSoil1 card) { + public NightSoil(final NightSoil card) { super(card); } @Override - public NightSoil1 copy() { - return new NightSoil1(this); + public NightSoil copy() { + return new NightSoil(this); } } diff --git a/Mage.Sets/src/mage/cards/o/OrcishSpy1.java b/Mage.Sets/src/mage/cards/o/OrcishSpy.java similarity index 92% rename from Mage.Sets/src/mage/cards/o/OrcishSpy1.java rename to Mage.Sets/src/mage/cards/o/OrcishSpy.java index 01164185ca..411973e24d 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishSpy1.java +++ b/Mage.Sets/src/mage/cards/o/OrcishSpy.java @@ -42,9 +42,9 @@ import mage.constants.Zone; * * @author anonymous */ -public class OrcishSpy1 extends CardImpl { +public class OrcishSpy extends CardImpl { - public OrcishSpy1(UUID ownerId, CardSetInfo setInfo) { + public OrcishSpy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); this.subtype.add("Orc"); this.subtype.add("Rogue"); @@ -56,12 +56,12 @@ public class OrcishSpy1 extends CardImpl { this.addAbility(ability); } - public OrcishSpy1(final OrcishSpy1 card) { + public OrcishSpy(final OrcishSpy card) { super(card); } @Override - public OrcishSpy1 copy() { - return new OrcishSpy1(this); + public OrcishSpy copy() { + return new OrcishSpy(this); } } diff --git a/Mage.Sets/src/mage/cards/o/OrcishVeteran1.java b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java similarity index 93% rename from Mage.Sets/src/mage/cards/o/OrcishVeteran1.java rename to Mage.Sets/src/mage/cards/o/OrcishVeteran.java index b3cd6e8384..1428430019 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishVeteran1.java +++ b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java @@ -50,7 +50,7 @@ import mage.filter.predicate.mageobject.PowerPredicate; * * @author fireshoes */ -public class OrcishVeteran1 extends CardImpl { +public class OrcishVeteran extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("white creatures with power 2 or greater"); @@ -59,7 +59,7 @@ public class OrcishVeteran1 extends CardImpl { filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 1)); } - public OrcishVeteran1(UUID ownerId, CardSetInfo setInfo) { + public OrcishVeteran(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); this.subtype.add("Orc"); this.power = new MageInt(2); @@ -72,12 +72,12 @@ public class OrcishVeteran1 extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}"))); } - public OrcishVeteran1(final OrcishVeteran1 card) { + public OrcishVeteran(final OrcishVeteran card) { super(card); } @Override - public OrcishVeteran1 copy() { - return new OrcishVeteran1(this); + public OrcishVeteran copy() { + return new OrcishVeteran(this); } } diff --git a/Mage.Sets/src/mage/cards/o/OrderOfLeitbur1.java b/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java similarity index 93% rename from Mage.Sets/src/mage/cards/o/OrderOfLeitbur1.java rename to Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java index 276272fa43..fc53ff6ec8 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfLeitbur1.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; * @author LoneFox */ -public class OrderOfLeitbur1 extends CardImpl { +public class OrderOfLeitbur extends CardImpl { private static final FilterCard filter = new FilterCard("black"); @@ -57,7 +57,7 @@ public class OrderOfLeitbur1 extends CardImpl { filter.add(new ColorPredicate(ObjectColor.BLACK)); } - public OrderOfLeitbur1(UUID ownerId, CardSetInfo setInfo) { + public OrderOfLeitbur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); this.subtype.add("Human"); this.subtype.add("Cleric"); @@ -75,12 +75,12 @@ public class OrderOfLeitbur1 extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{W}{W}"))); } - public OrderOfLeitbur1(final OrderOfLeitbur1 card) { + public OrderOfLeitbur(final OrderOfLeitbur card) { super(card); } @Override - public OrderOfLeitbur1 copy() { - return new OrderOfLeitbur1(this); + public OrderOfLeitbur copy() { + return new OrderOfLeitbur(this); } } diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand1.java b/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java similarity index 92% rename from Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand1.java rename to Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java index 276914c70d..4bed8b7db8 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand1.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; * @author LoneFox */ -public class OrderOfTheEbonHand1 extends CardImpl { +public class OrderOfTheEbonHand extends CardImpl { private static final FilterCard filter = new FilterCard("white"); @@ -57,7 +57,7 @@ public class OrderOfTheEbonHand1 extends CardImpl { filter.add(new ColorPredicate(ObjectColor.WHITE)); } - public OrderOfTheEbonHand1(UUID ownerId, CardSetInfo setInfo) { + public OrderOfTheEbonHand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); this.subtype.add("Cleric"); this.subtype.add("Knight"); @@ -74,12 +74,12 @@ public class OrderOfTheEbonHand1 extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{B}{B}"))); } - public OrderOfTheEbonHand1(final OrderOfTheEbonHand1 card) { + public OrderOfTheEbonHand(final OrderOfTheEbonHand card) { super(card); } @Override - public OrderOfTheEbonHand1 copy() { - return new OrderOfTheEbonHand1(this); + public OrderOfTheEbonHand copy() { + return new OrderOfTheEbonHand(this); } } diff --git a/Mage.Sets/src/mage/cards/o/Oubliette1.java b/Mage.Sets/src/mage/cards/o/Oubliette.java similarity index 95% rename from Mage.Sets/src/mage/cards/o/Oubliette1.java rename to Mage.Sets/src/mage/cards/o/Oubliette.java index 6d508d4d0b..974223d572 100644 --- a/Mage.Sets/src/mage/cards/o/Oubliette1.java +++ b/Mage.Sets/src/mage/cards/o/Oubliette.java @@ -56,13 +56,13 @@ import mage.target.TargetPermanent; * * @author MarcoMarin */ -public class Oubliette1 extends CardImpl { +public class Oubliette extends CardImpl { public Counters godHelpMe = null; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target creature"); - public Oubliette1(UUID ownerId, CardSetInfo setInfo) { + public Oubliette(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}{B}"); // When Oubliette enters the battlefield, exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. @@ -76,13 +76,13 @@ public class Oubliette1 extends CardImpl { this.addAbility(ability2); } - public Oubliette1(final Oubliette1 card) { + public Oubliette(final Oubliette card) { super(card); } @Override - public Oubliette1 copy() { - return new Oubliette1(this); + public Oubliette copy() { + return new Oubliette(this); } } @@ -133,7 +133,7 @@ class OublietteEffect extends OneShotEffect { } //((Oubliette)enchantment.getMainCard()).godHelpMe = enchantedCreature.getCounters(game); //why doesn't work? should return the same card, no? - ((Oubliette1) game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy(); + ((Oubliette) game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy(); /* if (!(enchantedCreature instanceof Token)) { @@ -219,7 +219,7 @@ class OublietteReturnEffect extends OneShotEffect { if (oubliette == null) { return false;//1st stab at getting those counters back } - for (Counter c : ((Oubliette1) oubliette).godHelpMe.values()) { //would be nice if could just use that copy function to set the whole field + for (Counter c : ((Oubliette) oubliette).godHelpMe.values()) { //would be nice if could just use that copy function to set the whole field if (c != null) { newPermanent.getCounters(game).addCounter(c); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianWarBeast1.java b/Mage.Sets/src/mage/cards/p/PhyrexianWarBeast.java similarity index 91% rename from Mage.Sets/src/mage/cards/p/PhyrexianWarBeast1.java rename to Mage.Sets/src/mage/cards/p/PhyrexianWarBeast.java index a07eedb296..17adbd1ca9 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianWarBeast1.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianWarBeast.java @@ -44,9 +44,9 @@ import mage.target.common.TargetControlledPermanent; * * @author fireshoes */ -public class PhyrexianWarBeast1 extends CardImpl { +public class PhyrexianWarBeast extends CardImpl { - public PhyrexianWarBeast1(UUID ownerId, CardSetInfo setInfo) { + public PhyrexianWarBeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); this.subtype.add("Beast"); this.power = new MageInt(3); @@ -61,12 +61,12 @@ public class PhyrexianWarBeast1 extends CardImpl { this.addAbility(ability); } - public PhyrexianWarBeast1(final PhyrexianWarBeast1 card) { + public PhyrexianWarBeast(final PhyrexianWarBeast card) { super(card); } @Override - public PhyrexianWarBeast1 copy() { - return new PhyrexianWarBeast1(this); + public PhyrexianWarBeast copy() { + return new PhyrexianWarBeast(this); } } diff --git a/Mage.Sets/src/mage/cards/p/Piety1.java b/Mage.Sets/src/mage/cards/p/Piety.java similarity index 93% rename from Mage.Sets/src/mage/cards/p/Piety1.java rename to Mage.Sets/src/mage/cards/p/Piety.java index bd6e4352c5..dda7f3c82d 100644 --- a/Mage.Sets/src/mage/cards/p/Piety1.java +++ b/Mage.Sets/src/mage/cards/p/Piety.java @@ -41,11 +41,11 @@ import mage.filter.common.FilterBlockingCreature; * * @author MarcoMarin */ -public class Piety1 extends CardImpl { +public class Piety extends CardImpl { public static final FilterBlockingCreature filter = new FilterBlockingCreature(); - public Piety1(UUID ownerId, CardSetInfo setInfo) { + public Piety(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); // Blocking creatures get +0/+3 until end of turn. @@ -53,12 +53,12 @@ public class Piety1 extends CardImpl { //this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_POST, "end Piety", true, new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false))); } - public Piety1(final Piety1 card) { + public Piety(final Piety card) { super(card); } @Override - public Piety1 copy() { - return new Piety1(this); + public Piety copy() { + return new Piety(this); } } diff --git a/Mage.Sets/src/mage/cards/r/ReefPirates1.java b/Mage.Sets/src/mage/cards/r/ReefPirates.java similarity index 92% rename from Mage.Sets/src/mage/cards/r/ReefPirates1.java rename to Mage.Sets/src/mage/cards/r/ReefPirates.java index 81bd0b7e06..1d9efd7d88 100644 --- a/Mage.Sets/src/mage/cards/r/ReefPirates1.java +++ b/Mage.Sets/src/mage/cards/r/ReefPirates.java @@ -40,9 +40,9 @@ import mage.constants.CardType; * * @author LoneFox */ -public class ReefPirates1 extends CardImpl { +public class ReefPirates extends CardImpl { - public ReefPirates1(UUID ownerId, CardSetInfo setInfo) { + public ReefPirates(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); this.subtype.add("Zombie"); this.subtype.add("Pirate"); @@ -55,12 +55,12 @@ public class ReefPirates1 extends CardImpl { this.addAbility(new DealsDamageToAPlayerTriggeredAbility(effect, false, true)); } - public ReefPirates1(final ReefPirates1 card) { + public ReefPirates(final ReefPirates card) { super(card); } @Override - public ReefPirates1 copy() { - return new ReefPirates1(this); + public ReefPirates copy() { + return new ReefPirates(this); } } diff --git a/Mage.Sets/src/mage/cards/r/RoyalHerbalist1.java b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java similarity index 91% rename from Mage.Sets/src/mage/cards/r/RoyalHerbalist1.java rename to Mage.Sets/src/mage/cards/r/RoyalHerbalist.java index 6676e5500a..81ab3c3f21 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalHerbalist1.java +++ b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java @@ -44,9 +44,9 @@ import mage.constants.Zone; * @author LoneFox */ -public class RoyalHerbalist1 extends CardImpl { +public class RoyalHerbalist extends CardImpl { - public RoyalHerbalist1(UUID ownerId, CardSetInfo setInfo) { + public RoyalHerbalist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); this.subtype.add("Human"); this.subtype.add("Cleric"); @@ -59,12 +59,12 @@ public class RoyalHerbalist1 extends CardImpl { this.addAbility(ability); } - public RoyalHerbalist1(final RoyalHerbalist1 card) { + public RoyalHerbalist(final RoyalHerbalist card) { super(card); } @Override - public RoyalHerbalist1 copy() { - return new RoyalHerbalist1(this); + public RoyalHerbalist copy() { + return new RoyalHerbalist(this); } } diff --git a/Mage.Sets/src/mage/cards/r/RukhEgg1.java b/Mage.Sets/src/mage/cards/r/RukhEgg.java similarity index 94% rename from Mage.Sets/src/mage/cards/r/RukhEgg1.java rename to Mage.Sets/src/mage/cards/r/RukhEgg.java index dfa1d2dbe8..337d32a18f 100644 --- a/Mage.Sets/src/mage/cards/r/RukhEgg1.java +++ b/Mage.Sets/src/mage/cards/r/RukhEgg.java @@ -45,9 +45,9 @@ import mage.game.permanent.token.Token; * * @author anonymous */ -public class RukhEgg1 extends CardImpl { +public class RukhEgg extends CardImpl { - public RukhEgg1(UUID ownerId, CardSetInfo setInfo) { + public RukhEgg(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); this.subtype.add("Bird"); this.power = new MageInt(0); @@ -60,13 +60,13 @@ public class RukhEgg1 extends CardImpl { this.addAbility(ability); } - public RukhEgg1(final RukhEgg1 card) { + public RukhEgg(final RukhEgg card) { super(card); } @Override - public RukhEgg1 copy() { - return new RukhEgg1(this); + public RukhEgg copy() { + return new RukhEgg(this); } } diff --git a/Mage.Sets/src/mage/cards/s/SengirBats2.java b/Mage.Sets/src/mage/cards/s/SengirBats.java similarity index 92% rename from Mage.Sets/src/mage/cards/s/SengirBats2.java rename to Mage.Sets/src/mage/cards/s/SengirBats.java index dc9a604092..af01e4b9fb 100644 --- a/Mage.Sets/src/mage/cards/s/SengirBats2.java +++ b/Mage.Sets/src/mage/cards/s/SengirBats.java @@ -41,9 +41,9 @@ import mage.counters.CounterType; * * @author fireshoes */ -public class SengirBats2 extends CardImpl { +public class SengirBats extends CardImpl { - public SengirBats2(UUID ownerId, CardSetInfo setInfo) { + public SengirBats(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); this.subtype.add("Bat"); this.power = new MageInt(1); @@ -55,12 +55,12 @@ public class SengirBats2 extends CardImpl { this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); } - public SengirBats2(final SengirBats2 card) { + public SengirBats(final SengirBats card) { super(card); } @Override - public SengirBats2 copy() { - return new SengirBats2(this); + public SengirBats copy() { + return new SengirBats(this); } } diff --git a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight1.java b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java similarity index 94% rename from Mage.Sets/src/mage/cards/s/SkyshipWeatherlight1.java rename to Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java index 55f5bfcba1..4e1f706e01 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight1.java +++ b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java @@ -33,9 +33,9 @@ import mage.util.CardUtil; * * @author nick.myers */ -public class SkyshipWeatherlight1 extends CardImpl { +public class SkyshipWeatherlight extends CardImpl { - public SkyshipWeatherlight1(UUID ownerId, CardSetInfo setInfo) { + public SkyshipWeatherlight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); this.supertype.add("Legendary"); @@ -48,13 +48,13 @@ public class SkyshipWeatherlight1 extends CardImpl { this.addAbility(ability); } - public SkyshipWeatherlight1(final SkyshipWeatherlight1 card) { + public SkyshipWeatherlight(final SkyshipWeatherlight card) { super(card); } @Override - public SkyshipWeatherlight1 copy() { - return new SkyshipWeatherlight1(this); + public SkyshipWeatherlight copy() { + return new SkyshipWeatherlight(this); } } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviAdnate1.java b/Mage.Sets/src/mage/cards/s/SoldeviAdnate.java similarity index 93% rename from Mage.Sets/src/mage/cards/s/SoldeviAdnate1.java rename to Mage.Sets/src/mage/cards/s/SoldeviAdnate.java index 8557d0edf9..36d1f2dc96 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviAdnate1.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviAdnate.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; * * @author LoneFox */ -public class SoldeviAdnate1 extends CardImpl { +public class SoldeviAdnate extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("black or artifact creature"); @@ -57,7 +57,7 @@ public class SoldeviAdnate1 extends CardImpl { filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK), new CardTypePredicate(CardType.ARTIFACT))); } - public SoldeviAdnate1(UUID ownerId, CardSetInfo setInfo) { + public SoldeviAdnate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); this.subtype.add("Human"); this.subtype.add("Cleric"); @@ -71,12 +71,12 @@ public class SoldeviAdnate1 extends CardImpl { this.addAbility(ability); } - public SoldeviAdnate1(final SoldeviAdnate1 card) { + public SoldeviAdnate(final SoldeviAdnate card) { super(card); } @Override - public SoldeviAdnate1 copy() { - return new SoldeviAdnate1(this); + public SoldeviAdnate copy() { + return new SoldeviAdnate(this); } } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSage1.java b/Mage.Sets/src/mage/cards/s/SoldeviSage.java similarity index 95% rename from Mage.Sets/src/mage/cards/s/SoldeviSage1.java rename to Mage.Sets/src/mage/cards/s/SoldeviSage.java index eddf391872..fbc56bb837 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSage1.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSage.java @@ -53,9 +53,9 @@ import mage.target.common.TargetControlledPermanent; * * @author Quercitron */ -public class SoldeviSage1 extends CardImpl { +public class SoldeviSage extends CardImpl { - public SoldeviSage1(UUID ownerId, CardSetInfo setInfo) { + public SoldeviSage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); this.subtype.add("Human"); this.subtype.add("Wizard"); @@ -69,13 +69,13 @@ public class SoldeviSage1 extends CardImpl { this.addAbility(ability); } - public SoldeviSage1(final SoldeviSage1 card) { + public SoldeviSage(final SoldeviSage card) { super(card); } @Override - public SoldeviSage1 copy() { - return new SoldeviSage1(this); + public SoldeviSage copy() { + return new SoldeviSage(this); } } diff --git a/Mage.Sets/src/mage/cards/s/StoneThrowingDevils1.java b/Mage.Sets/src/mage/cards/s/StoneThrowingDevils.java similarity index 88% rename from Mage.Sets/src/mage/cards/s/StoneThrowingDevils1.java rename to Mage.Sets/src/mage/cards/s/StoneThrowingDevils.java index e34baa053a..7768f9efb4 100644 --- a/Mage.Sets/src/mage/cards/s/StoneThrowingDevils1.java +++ b/Mage.Sets/src/mage/cards/s/StoneThrowingDevils.java @@ -38,9 +38,9 @@ import mage.cards.CardSetInfo; * * @author North */ -public class StoneThrowingDevils1 extends CardImpl { +public class StoneThrowingDevils extends CardImpl { - public StoneThrowingDevils1(UUID ownerId, CardSetInfo setInfo) { + public StoneThrowingDevils(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); this.subtype.add("Devil"); @@ -51,12 +51,12 @@ public class StoneThrowingDevils1 extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); } - public StoneThrowingDevils1(final StoneThrowingDevils1 card) { + public StoneThrowingDevils(final StoneThrowingDevils card) { super(card); } @Override - public StoneThrowingDevils1 copy() { - return new StoneThrowingDevils1(this); + public StoneThrowingDevils copy() { + return new StoneThrowingDevils(this); } } diff --git a/Mage.Sets/src/mage/cards/s/StormShaman1.java b/Mage.Sets/src/mage/cards/s/StormShaman.java similarity index 91% rename from Mage.Sets/src/mage/cards/s/StormShaman1.java rename to Mage.Sets/src/mage/cards/s/StormShaman.java index 94d736b59d..6cea2ced62 100644 --- a/Mage.Sets/src/mage/cards/s/StormShaman1.java +++ b/Mage.Sets/src/mage/cards/s/StormShaman.java @@ -43,9 +43,9 @@ import mage.constants.Zone; * @author LoneFox */ -public class StormShaman1 extends CardImpl { +public class StormShaman extends CardImpl { - public StormShaman1(UUID ownerId, CardSetInfo setInfo) { + public StormShaman(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); this.subtype.add("Human"); this.subtype.add("Cleric"); @@ -57,12 +57,12 @@ public class StormShaman1 extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); } - public StormShaman1(final StormShaman1 card) { + public StormShaman(final StormShaman card) { super(card); } @Override - public StormShaman1 copy() { - return new StormShaman1(this); + public StormShaman copy() { + return new StormShaman(this); } } diff --git a/Mage.Sets/src/mage/cards/s/SwampMosquito1.java b/Mage.Sets/src/mage/cards/s/SwampMosquito.java similarity index 91% rename from Mage.Sets/src/mage/cards/s/SwampMosquito1.java rename to Mage.Sets/src/mage/cards/s/SwampMosquito.java index fcbb963137..bddeed23b2 100644 --- a/Mage.Sets/src/mage/cards/s/SwampMosquito1.java +++ b/Mage.Sets/src/mage/cards/s/SwampMosquito.java @@ -41,9 +41,9 @@ import mage.constants.CardType; * * @author LoneFox */ -public class SwampMosquito1 extends CardImpl { +public class SwampMosquito extends CardImpl { - public SwampMosquito1(UUID ownerId, CardSetInfo setInfo) { + public SwampMosquito(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); this.subtype.add("Insect"); this.power = new MageInt(0); @@ -57,12 +57,12 @@ public class SwampMosquito1 extends CardImpl { this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(effect, false, true)); } - public SwampMosquito1(final SwampMosquito1 card) { + public SwampMosquito(final SwampMosquito card) { super(card); } @Override - public SwampMosquito1 copy() { - return new SwampMosquito1(this); + public SwampMosquito copy() { + return new SwampMosquito(this); } } diff --git a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero1.java b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java similarity index 91% rename from Mage.Sets/src/mage/cards/t/TahngarthTalruumHero1.java rename to Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java index 896f3b7844..1839cc5487 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero1.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class TahngarthTalruumHero1 extends CardImpl { +public class TahngarthTalruumHero extends CardImpl { - public TahngarthTalruumHero1(UUID ownerId, CardSetInfo setInfo) { + public TahngarthTalruumHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); this.supertype.add("Legendary"); this.subtype.add("Minotaur"); @@ -64,12 +64,12 @@ public class TahngarthTalruumHero1 extends CardImpl { this.addAbility(ability); } - public TahngarthTalruumHero1(final TahngarthTalruumHero1 card) { + public TahngarthTalruumHero(final TahngarthTalruumHero card) { super(card); } @Override - public TahngarthTalruumHero1 copy() { - return new TahngarthTalruumHero1(this); + public TahngarthTalruumHero copy() { + return new TahngarthTalruumHero(this); } } diff --git a/Mage.Sets/src/mage/cards/t/ThornThallid1.java b/Mage.Sets/src/mage/cards/t/ThornThallid.java similarity index 93% rename from Mage.Sets/src/mage/cards/t/ThornThallid1.java rename to Mage.Sets/src/mage/cards/t/ThornThallid.java index 7a2b221d2e..e266a28a8d 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThallid1.java +++ b/Mage.Sets/src/mage/cards/t/ThornThallid.java @@ -47,9 +47,9 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author fireshoes */ -public class ThornThallid1 extends CardImpl { +public class ThornThallid extends CardImpl { - public ThornThallid1(UUID ownerId, CardSetInfo setInfo) { + public ThornThallid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); this.subtype.add("Fungus"); this.power = new MageInt(2); @@ -65,12 +65,12 @@ public class ThornThallid1 extends CardImpl { this.addAbility(ability); } - public ThornThallid1(final ThornThallid1 card) { + public ThornThallid(final ThornThallid card) { super(card); } @Override - public ThornThallid1 copy() { - return new ThornThallid1(this); + public ThornThallid copy() { + return new ThornThallid(this); } } diff --git a/Mage.Sets/src/mage/cards/t/Torture1.java b/Mage.Sets/src/mage/cards/t/Torture.java similarity index 94% rename from Mage.Sets/src/mage/cards/t/Torture1.java rename to Mage.Sets/src/mage/cards/t/Torture.java index 2b96fd2b34..23df04bb71 100644 --- a/Mage.Sets/src/mage/cards/t/Torture1.java +++ b/Mage.Sets/src/mage/cards/t/Torture.java @@ -48,11 +48,11 @@ import mage.target.common.TargetCreaturePermanent; * @author jeffwadsworth */ -public class Torture1 extends CardImpl { +public class Torture extends CardImpl { private static final String rule = "Testing rules"; - public Torture1(UUID ownerId, CardSetInfo setInfo) { + public Torture(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); this.subtype.add("Aura"); @@ -72,12 +72,12 @@ public class Torture1 extends CardImpl { new ManaCostsImpl("{1}{B}"))); } - public Torture1(final Torture1 card) { + public Torture(final Torture card) { super(card); } @Override - public Torture1 copy() { - return new Torture1(this); + public Torture copy() { + return new Torture(this); } } diff --git a/Mage.Sets/src/mage/cards/v/VodalianMage1.java b/Mage.Sets/src/mage/cards/v/VodalianMage.java similarity index 92% rename from Mage.Sets/src/mage/cards/v/VodalianMage1.java rename to Mage.Sets/src/mage/cards/v/VodalianMage.java index cbde74bf2f..81169ca441 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianMage1.java +++ b/Mage.Sets/src/mage/cards/v/VodalianMage.java @@ -44,9 +44,9 @@ import mage.target.TargetSpell; * * @author LoneFox */ -public class VodalianMage1 extends CardImpl { +public class VodalianMage extends CardImpl { - public VodalianMage1(UUID ownerId, CardSetInfo setInfo) { + public VodalianMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); @@ -61,12 +61,12 @@ public class VodalianMage1 extends CardImpl { this.addAbility(ability); } - public VodalianMage1(final VodalianMage1 card) { + public VodalianMage(final VodalianMage card) { super(card); } @Override - public VodalianMage1 copy() { - return new VodalianMage1(this); + public VodalianMage copy() { + return new VodalianMage(this); } } diff --git a/Mage.Sets/src/mage/cards/v/VodalianSoldiers1.java b/Mage.Sets/src/mage/cards/v/VodalianSoldiers.java similarity index 89% rename from Mage.Sets/src/mage/cards/v/VodalianSoldiers1.java rename to Mage.Sets/src/mage/cards/v/VodalianSoldiers.java index c1d38cb2a2..334ddf9ddc 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianSoldiers1.java +++ b/Mage.Sets/src/mage/cards/v/VodalianSoldiers.java @@ -37,9 +37,9 @@ import mage.cards.CardSetInfo; * * @author North */ -public class VodalianSoldiers1 extends CardImpl { +public class VodalianSoldiers extends CardImpl { - public VodalianSoldiers1(UUID ownerId, CardSetInfo setInfo) { + public VodalianSoldiers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); this.subtype.add("Merfolk"); this.subtype.add("Soldier"); @@ -48,12 +48,12 @@ public class VodalianSoldiers1 extends CardImpl { this.toughness = new MageInt(2); } - public VodalianSoldiers1(final VodalianSoldiers1 card) { + public VodalianSoldiers(final VodalianSoldiers card) { super(card); } @Override - public VodalianSoldiers1 copy() { - return new VodalianSoldiers1(this); + public VodalianSoldiers copy() { + return new VodalianSoldiers(this); } } diff --git a/Mage.Sets/src/mage/cards/w/WarriorsCharge1.java b/Mage.Sets/src/mage/cards/w/WarriorsCharge.java similarity index 89% rename from Mage.Sets/src/mage/cards/w/WarriorsCharge1.java rename to Mage.Sets/src/mage/cards/w/WarriorsCharge.java index b3fe7644bf..efa953d45d 100644 --- a/Mage.Sets/src/mage/cards/w/WarriorsCharge1.java +++ b/Mage.Sets/src/mage/cards/w/WarriorsCharge.java @@ -38,21 +38,21 @@ import mage.constants.Duration; * * @author fireshoes */ -public class WarriorsCharge1 extends CardImpl { +public class WarriorsCharge extends CardImpl { - public WarriorsCharge1(UUID ownerId, CardSetInfo setInfo) { + public WarriorsCharge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}"); // Creatures you control get +1/+1 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); } - public WarriorsCharge1(final WarriorsCharge1 card) { + public WarriorsCharge(final WarriorsCharge card) { super(card); } @Override - public WarriorsCharge1 copy() { - return new WarriorsCharge1(this); + public WarriorsCharge copy() { + return new WarriorsCharge(this); } } diff --git a/Mage.Sets/src/mage/cards/w/Wastes1.java b/Mage.Sets/src/mage/cards/w/Wastes.java similarity index 91% rename from Mage.Sets/src/mage/cards/w/Wastes1.java rename to Mage.Sets/src/mage/cards/w/Wastes.java index 1113afce64..4657575472 100644 --- a/Mage.Sets/src/mage/cards/w/Wastes1.java +++ b/Mage.Sets/src/mage/cards/w/Wastes.java @@ -37,9 +37,9 @@ import mage.constants.CardType; * * @author fireshoes */ -public class Wastes1 extends CardImpl { +public class Wastes extends CardImpl { - public Wastes1(UUID ownerId, CardSetInfo setInfo) { + public Wastes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.supertype.add("Basic"); @@ -47,12 +47,12 @@ public class Wastes1 extends CardImpl { this.addAbility(new ColorlessManaAbility()); } - public Wastes1(final Wastes1 card) { + public Wastes(final Wastes card) { super(card); } @Override - public Wastes1 copy() { - return new Wastes1(this); + public Wastes copy() { + return new Wastes(this); } } diff --git a/Mage.Sets/src/mage/cards/w/WhipVine1.java b/Mage.Sets/src/mage/cards/w/WhipVine.java similarity index 94% rename from Mage.Sets/src/mage/cards/w/WhipVine1.java rename to Mage.Sets/src/mage/cards/w/WhipVine.java index 7ea248885f..2a69e0bdd6 100644 --- a/Mage.Sets/src/mage/cards/w/WhipVine1.java +++ b/Mage.Sets/src/mage/cards/w/WhipVine.java @@ -51,9 +51,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author LoneFox */ -public class WhipVine1 extends CardImpl { +public class WhipVine extends CardImpl { - public WhipVine1(UUID ownerId, CardSetInfo setInfo) { + public WhipVine(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); this.subtype.add("Plant"); this.subtype.add("Wall"); @@ -76,12 +76,12 @@ public class WhipVine1 extends CardImpl { this.addAbility(ability); } - public WhipVine1(final WhipVine1 card) { + public WhipVine(final WhipVine card) { super(card); } @Override - public WhipVine1 copy() { - return new WhipVine1(this); + public WhipVine copy() { + return new WhipVine(this); } } diff --git a/Mage.Sets/src/mage/cards/w/WillowFaerie1.java b/Mage.Sets/src/mage/cards/w/WillowFaerie.java similarity index 90% rename from Mage.Sets/src/mage/cards/w/WillowFaerie1.java rename to Mage.Sets/src/mage/cards/w/WillowFaerie.java index 5383b6894b..92a0c9a8ed 100644 --- a/Mage.Sets/src/mage/cards/w/WillowFaerie1.java +++ b/Mage.Sets/src/mage/cards/w/WillowFaerie.java @@ -38,9 +38,9 @@ import mage.cards.CardSetInfo; * * @author North */ -public class WillowFaerie1 extends CardImpl { +public class WillowFaerie extends CardImpl { - public WillowFaerie1(UUID ownerId, CardSetInfo setInfo) { + public WillowFaerie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); this.subtype.add("Faerie"); @@ -51,12 +51,12 @@ public class WillowFaerie1 extends CardImpl { this.addAbility(FlyingAbility.getInstance()); } - public WillowFaerie1(final WillowFaerie1 card) { + public WillowFaerie(final WillowFaerie card) { super(card); } @Override - public WillowFaerie1 copy() { - return new WillowFaerie1(this); + public WillowFaerie copy() { + return new WillowFaerie(this); } } diff --git a/Mage.Sets/src/mage/sets/Alliances.java b/Mage.Sets/src/mage/sets/Alliances.java index 84436f2de2..4063147184 100644 --- a/Mage.Sets/src/mage/sets/Alliances.java +++ b/Mage.Sets/src/mage/sets/Alliances.java @@ -1,6 +1,23 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.a.AesthirGlider; +import mage.cards.a.AgentOfStromgald; +import mage.cards.b.BalduvianWarMakers; +import mage.cards.c.CarrierPigeons; +import mage.cards.e.EnslavedScout; +import mage.cards.f.FeveredStrength; +import mage.cards.g.GorillaBerserkers; +import mage.cards.g.GorillaShaman; +import mage.cards.i.InsidiousBookworms; +import mage.cards.l.LimDulsHighGuard; +import mage.cards.p.PhyrexianWarBeast; +import mage.cards.r.RoyalHerbalist; +import mage.cards.s.SoldeviAdnate; +import mage.cards.s.SoldeviSage; +import mage.cards.s.StormShaman; +import mage.cards.s.SwampMosquito; +import mage.cards.w.WhipVine; import mage.constants.SetType; import mage.constants.Rarity; @@ -24,10 +41,10 @@ public class Alliances extends ExpansionSet { this.numBoosterUncommon = 3; this.numBoosterRare = 1; this.ratioBoosterMythic = 0; - cards.add(new SetCardInfo("Aesthir Glider", 156, Rarity.COMMON, mage.cards.a.AesthirGlider1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Aesthir Glider", 157, Rarity.COMMON, mage.cards.a.AesthirGlider1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Agent of Stromgald", 94, Rarity.COMMON, mage.cards.a.AgentOfStromgald1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Agent of Stromgald", 95, Rarity.COMMON, mage.cards.a.AgentOfStromgald1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Aesthir Glider", 156, Rarity.COMMON, AesthirGlider.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Aesthir Glider", 157, Rarity.COMMON, AesthirGlider.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Agent of Stromgald", 94, Rarity.COMMON, AgentOfStromgald.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Agent of Stromgald", 95, Rarity.COMMON, AgentOfStromgald.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Arcane Denial", 32, Rarity.COMMON, mage.cards.a.ArcaneDenial.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Arcane Denial", 33, Rarity.COMMON, mage.cards.a.ArcaneDenial.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Astrolabe", 159, Rarity.COMMON, mage.cards.a.Astrolabe.class, new CardGraphicInfo(null, true))); @@ -35,13 +52,13 @@ public class Alliances extends ExpansionSet { cards.add(new SetCardInfo("Balduvian Dead", 1, Rarity.UNCOMMON, mage.cards.b.BalduvianDead.class)); cards.add(new SetCardInfo("Balduvian Horde", 96, Rarity.RARE, mage.cards.b.BalduvianHorde.class)); cards.add(new SetCardInfo("Balduvian Trading Post", 182, Rarity.RARE, mage.cards.b.BalduvianTradingPost.class)); - cards.add(new SetCardInfo("Balduvian War-Makers", 97, Rarity.COMMON, mage.cards.b.BalduvianWarMakers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Balduvian War-Makers", 98, Rarity.COMMON, mage.cards.b.BalduvianWarMakers1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Balduvian War-Makers", 97, Rarity.COMMON, BalduvianWarMakers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Balduvian War-Makers", 98, Rarity.COMMON, BalduvianWarMakers.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Bounty of the Hunt", 63, Rarity.UNCOMMON, mage.cards.b.BountyOfTheHunt.class)); cards.add(new SetCardInfo("Browse", 38, Rarity.UNCOMMON, mage.cards.b.Browse.class)); cards.add(new SetCardInfo("Burnout", 101, Rarity.UNCOMMON, mage.cards.b.Burnout.class)); - cards.add(new SetCardInfo("Carrier Pigeons", 125, Rarity.COMMON, mage.cards.c.CarrierPigeons1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Carrier Pigeons", 126, Rarity.COMMON, mage.cards.c.CarrierPigeons1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Carrier Pigeons", 125, Rarity.COMMON, CarrierPigeons.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Carrier Pigeons", 126, Rarity.COMMON, CarrierPigeons.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Contagion", 4, Rarity.UNCOMMON, mage.cards.c.Contagion.class)); cards.add(new SetCardInfo("Deadly Insect", 64, Rarity.COMMON, mage.cards.d.DeadlyInsect.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Deadly Insect", 65, Rarity.COMMON, mage.cards.d.DeadlyInsect.class, new CardGraphicInfo(null, true))); @@ -51,23 +68,23 @@ public class Alliances extends ExpansionSet { cards.add(new SetCardInfo("Elvish Ranger", 67, Rarity.COMMON, mage.cards.e.ElvishRanger.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Elvish Ranger", 68, Rarity.COMMON, mage.cards.e.ElvishRanger.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Elvish Spirit Guide", 69, Rarity.UNCOMMON, mage.cards.e.ElvishSpiritGuide.class)); - cards.add(new SetCardInfo("Enslaved Scout", 104, Rarity.COMMON, mage.cards.e.EnslavedScout1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Enslaved Scout", 105, Rarity.COMMON, mage.cards.e.EnslavedScout1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Enslaved Scout", 104, Rarity.COMMON, EnslavedScout.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Enslaved Scout", 105, Rarity.COMMON, EnslavedScout.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Exile", 129, Rarity.RARE, mage.cards.e.Exile.class)); cards.add(new SetCardInfo("False Demise", 40, Rarity.COMMON, mage.cards.f.FalseDemise.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("False Demise", 41, Rarity.COMMON, mage.cards.f.FalseDemise.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Feast or Famine", 8, Rarity.COMMON, mage.cards.f.FeastOrFamine.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Feast or Famine", 9, Rarity.COMMON, mage.cards.f.FeastOrFamine.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Fevered Strength", 10, Rarity.COMMON, mage.cards.f.FeveredStrength1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Fevered Strength", 11, Rarity.COMMON, mage.cards.f.FeveredStrength1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Fevered Strength", 10, Rarity.COMMON, FeveredStrength.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Fevered Strength", 11, Rarity.COMMON, FeveredStrength.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Floodwater Dam", 161, Rarity.RARE, mage.cards.f.FloodwaterDam.class)); cards.add(new SetCardInfo("Force of Will", 42, Rarity.UNCOMMON, mage.cards.f.ForceOfWill.class)); - cards.add(new SetCardInfo("Gorilla Berserkers", 75, Rarity.COMMON, mage.cards.g.GorillaBerserkers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Gorilla Berserkers", 76, Rarity.COMMON, mage.cards.g.GorillaBerserkers1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Gorilla Berserkers", 75, Rarity.COMMON, GorillaBerserkers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Gorilla Berserkers", 76, Rarity.COMMON, GorillaBerserkers.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Gorilla Chieftain", 77, Rarity.COMMON, mage.cards.g.GorillaChieftain.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Gorilla Chieftain", 78, Rarity.COMMON, mage.cards.g.GorillaChieftain.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Gorilla Shaman", 106, Rarity.COMMON, mage.cards.g.GorillaShaman1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Gorilla Shaman", 107, Rarity.UNCOMMON, mage.cards.g.GorillaShaman1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Gorilla Shaman", 106, Rarity.COMMON, GorillaShaman.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Gorilla Shaman", 107, Rarity.UNCOMMON, GorillaShaman.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Gorilla War Cry", 108, Rarity.COMMON, mage.cards.g.GorillaWarCry.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Gorilla War Cry", 109, Rarity.COMMON, mage.cards.g.GorillaWarCry.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Guerrilla Tactics", 110, Rarity.COMMON, mage.cards.g.GuerrillaTactics.class, new CardGraphicInfo(null, true))); @@ -75,24 +92,24 @@ public class Alliances extends ExpansionSet { cards.add(new SetCardInfo("Heart of Yavimaya", 183, Rarity.RARE, mage.cards.h.HeartOfYavimaya.class)); cards.add(new SetCardInfo("Helm of Obedience", 163, Rarity.RARE, mage.cards.h.HelmOfObedience.class)); cards.add(new SetCardInfo("Inheritance", 130, Rarity.UNCOMMON, mage.cards.i.Inheritance.class)); - cards.add(new SetCardInfo("Insidious Bookworms", 12, Rarity.COMMON, mage.cards.i.InsidiousBookworms1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Insidious Bookworms", 13, Rarity.COMMON, mage.cards.i.InsidiousBookworms1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Insidious Bookworms", 12, Rarity.COMMON, InsidiousBookworms.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Insidious Bookworms", 13, Rarity.COMMON, InsidiousBookworms.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Juniper Order Advocate", 132, Rarity.UNCOMMON, mage.cards.j.JuniperOrderAdvocate.class)); cards.add(new SetCardInfo("Kaysa", 80, Rarity.RARE, mage.cards.k.Kaysa.class)); cards.add(new SetCardInfo("Keeper of Tresserhorn", 14, Rarity.RARE, mage.cards.k.KeeperOfTresserhorn.class)); cards.add(new SetCardInfo("Kjeldoran Outpost", 184, Rarity.RARE, mage.cards.k.KjeldoranOutpost.class)); cards.add(new SetCardInfo("Lake of the Dead", 185, Rarity.RARE, mage.cards.l.LakeOfTheDead.class)); cards.add(new SetCardInfo("Library of Lat-Nam", 47, Rarity.RARE, mage.cards.l.LibraryOfLatNam.class)); - cards.add(new SetCardInfo("Lim-Dul's High Guard", 17, Rarity.COMMON, mage.cards.l.LimDulsHighGuard1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Lim-Dul's High Guard", 18, Rarity.COMMON, mage.cards.l.LimDulsHighGuard1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Lim-Dul's High Guard", 17, Rarity.COMMON, LimDulsHighGuard.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Lim-Dul's High Guard", 18, Rarity.COMMON, LimDulsHighGuard.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Lim-Dul's Paladin", 191, Rarity.UNCOMMON, mage.cards.l.LimDulsPaladin.class)); cards.add(new SetCardInfo("Lim-Dul's Vault", 192, Rarity.UNCOMMON, mage.cards.l.LimDulsVault.class)); cards.add(new SetCardInfo("Lord of Tresserhorn", 193, Rarity.RARE, mage.cards.l.LordOfTresserhorn.class)); cards.add(new SetCardInfo("Mystic Compass", 166, Rarity.UNCOMMON, mage.cards.m.MysticCompass.class)); cards.add(new SetCardInfo("Phelddagrif", 196, Rarity.RARE, mage.cards.p.Phelddagrif.class)); cards.add(new SetCardInfo("Phyrexian Devourer", 167, Rarity.RARE, mage.cards.p.PhyrexianDevourer.class)); - cards.add(new SetCardInfo("Phyrexian War Beast", 169, Rarity.COMMON, mage.cards.p.PhyrexianWarBeast1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Phyrexian War Beast", 170, Rarity.COMMON, mage.cards.p.PhyrexianWarBeast1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Phyrexian War Beast", 169, Rarity.COMMON, PhyrexianWarBeast.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Phyrexian War Beast", 170, Rarity.COMMON, PhyrexianWarBeast.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Pillage", 113, Rarity.UNCOMMON, mage.cards.p.Pillage.class)); cards.add(new SetCardInfo("Pyrokinesis", 115, Rarity.UNCOMMON, mage.cards.p.Pyrokinesis.class)); cards.add(new SetCardInfo("Reinforcements", 142, Rarity.COMMON, mage.cards.r.Reinforcements.class, new CardGraphicInfo(null, true))); @@ -100,36 +117,36 @@ public class Alliances extends ExpansionSet { cards.add(new SetCardInfo("Reprisal", 144, Rarity.COMMON, mage.cards.r.Reprisal.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Reprisal", 145, Rarity.COMMON, mage.cards.r.Reprisal.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Ritual of the Machine", 24, Rarity.RARE, mage.cards.r.RitualOfTheMachine.class)); - cards.add(new SetCardInfo("Royal Herbalist", 147, Rarity.COMMON, mage.cards.r.RoyalHerbalist1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Royal Herbalist", 148, Rarity.COMMON, mage.cards.r.RoyalHerbalist1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Royal Herbalist", 147, Rarity.COMMON, RoyalHerbalist.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Royal Herbalist", 148, Rarity.COMMON, RoyalHerbalist.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("School of the Unseen", 186, Rarity.UNCOMMON, mage.cards.s.SchoolOfTheUnseen.class)); cards.add(new SetCardInfo("Seasoned Tactician", 150, Rarity.UNCOMMON, mage.cards.s.SeasonedTactician.class)); cards.add(new SetCardInfo("Sheltered Valley", 187, Rarity.RARE, mage.cards.s.ShelteredValley.class)); cards.add(new SetCardInfo("Shield Sphere", 172, Rarity.UNCOMMON, mage.cards.s.ShieldSphere.class)); - cards.add(new SetCardInfo("Soldevi Adnate", 25, Rarity.COMMON, mage.cards.s.SoldeviAdnate1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Soldevi Adnate", 26, Rarity.COMMON, mage.cards.s.SoldeviAdnate1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Soldevi Adnate", 25, Rarity.COMMON, SoldeviAdnate.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Soldevi Adnate", 26, Rarity.COMMON, SoldeviAdnate.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Soldevi Digger", 174, Rarity.RARE, mage.cards.s.SoldeviDigger.class)); cards.add(new SetCardInfo("Soldevi Excavations", 188, Rarity.RARE, mage.cards.s.SoldeviExcavations.class)); - cards.add(new SetCardInfo("Soldevi Sage", 51, Rarity.COMMON, mage.cards.s.SoldeviSage1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Soldevi Sage", 52, Rarity.COMMON, mage.cards.s.SoldeviSage1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Soldevi Sage", 51, Rarity.COMMON, SoldeviSage.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Soldevi Sage", 52, Rarity.COMMON, SoldeviSage.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Soldier of Fortune", 117, Rarity.UNCOMMON, mage.cards.s.SoldierOfFortune.class)); cards.add(new SetCardInfo("Sol Grail", 173, Rarity.UNCOMMON, mage.cards.s.SolGrail.class)); cards.add(new SetCardInfo("Storm Cauldron", 179, Rarity.RARE, mage.cards.s.StormCauldron.class)); cards.add(new SetCardInfo("Storm Crow", 54, Rarity.COMMON, mage.cards.s.StormCrow.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Storm Crow", 55, Rarity.COMMON, mage.cards.s.StormCrow.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Storm Shaman", 118, Rarity.COMMON, mage.cards.s.StormShaman1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Storm Shaman", 119, Rarity.UNCOMMON, mage.cards.s.StormShaman1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Storm Shaman", 118, Rarity.COMMON, StormShaman.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Storm Shaman", 119, Rarity.UNCOMMON, StormShaman.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Sustaining Spirit", 151, Rarity.RARE, mage.cards.s.SustainingSpirit.class)); - cards.add(new SetCardInfo("Swamp Mosquito", 30, Rarity.COMMON, mage.cards.s.SwampMosquito1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Swamp Mosquito", 31, Rarity.COMMON, mage.cards.s.SwampMosquito1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Swamp Mosquito", 30, Rarity.COMMON, SwampMosquito.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Swamp Mosquito", 31, Rarity.COMMON, SwampMosquito.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Thawing Glaciers", 189, Rarity.RARE, mage.cards.t.ThawingGlaciers.class)); cards.add(new SetCardInfo("Thought Lash", 58, Rarity.RARE, mage.cards.t.ThoughtLash.class)); cards.add(new SetCardInfo("Tornado", 86, Rarity.RARE, mage.cards.t.Tornado.class)); cards.add(new SetCardInfo("Viscerid Armor", 60, Rarity.COMMON, mage.cards.v.VisceridArmor.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Viscerid Armor", 61, Rarity.COMMON, mage.cards.v.VisceridArmor.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Wandering Mage", 198, Rarity.RARE, mage.cards.w.WanderingMage.class)); - cards.add(new SetCardInfo("Whip Vine", 89, Rarity.COMMON, mage.cards.w.WhipVine1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Whip Vine", 90, Rarity.COMMON, mage.cards.w.WhipVine1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Whip Vine", 89, Rarity.COMMON, WhipVine.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Whip Vine", 90, Rarity.COMMON, WhipVine.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Wild Aesthir", 154, Rarity.COMMON, mage.cards.w.WildAesthir.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Wild Aesthir", 155, Rarity.COMMON, mage.cards.w.WildAesthir.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Yavimaya Ancients", 91, Rarity.COMMON, mage.cards.y.YavimayaAncients.class, new CardGraphicInfo(null, true))); diff --git a/Mage.Sets/src/mage/sets/ArabianNights.java b/Mage.Sets/src/mage/sets/ArabianNights.java index 1fd04d7276..a0165eb36c 100644 --- a/Mage.Sets/src/mage/sets/ArabianNights.java +++ b/Mage.Sets/src/mage/sets/ArabianNights.java @@ -28,6 +28,13 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.a.ArmyOfAllah; +import mage.cards.f.FishliverOil; +import mage.cards.n.NafsAsp; +import mage.cards.o.Oubliette; +import mage.cards.p.Piety; +import mage.cards.r.RukhEgg; +import mage.cards.s.StoneThrowingDevils; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -59,8 +66,8 @@ public class ArabianNights extends ExpansionSet { cards.add(new SetCardInfo("Aladdin's Ring", 71, Rarity.RARE, mage.cards.a.AladdinsRing.class)); cards.add(new SetCardInfo("Ali Baba", 43, Rarity.UNCOMMON, mage.cards.a.AliBaba.class)); cards.add(new SetCardInfo("Ali from Cairo", 44, Rarity.RARE, mage.cards.a.AliFromCairo.class)); - cards.add(new SetCardInfo("Army of Allah", 56, Rarity.COMMON, mage.cards.a.ArmyOfAllah1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Army of Allah", 57, Rarity.COMMON, mage.cards.a.ArmyOfAllah1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Army of Allah", 56, Rarity.COMMON, ArmyOfAllah.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Army of Allah", 57, Rarity.COMMON, ArmyOfAllah.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Bazaar of Baghdad", 84, Rarity.UNCOMMON, mage.cards.b.BazaarOfBaghdad.class)); cards.add(new SetCardInfo("Bird Maiden", 45, Rarity.COMMON, mage.cards.b.BirdMaiden.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Bird Maiden", 46, Rarity.COMMON, mage.cards.b.BirdMaiden.class, new CardGraphicInfo(null, true))); @@ -84,8 +91,8 @@ public class ArabianNights extends ExpansionSet { cards.add(new SetCardInfo("Erg Raiders", 4, Rarity.COMMON, mage.cards.e.ErgRaiders.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Erhnam Djinn", 32, Rarity.RARE, mage.cards.e.ErhnamDjinn.class)); cards.add(new SetCardInfo("Eye for an Eye", 59, Rarity.UNCOMMON, mage.cards.e.EyeForAnEye.class)); - cards.add(new SetCardInfo("Fishliver Oil", 17, Rarity.COMMON, mage.cards.f.FishliverOil1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Fishliver Oil", 18, Rarity.COMMON, mage.cards.f.FishliverOil1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Fishliver Oil", 17, Rarity.COMMON, FishliverOil.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Fishliver Oil", 18, Rarity.COMMON, FishliverOil.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Flying Carpet", 77, Rarity.UNCOMMON, mage.cards.f.FlyingCarpet.class)); cards.add(new SetCardInfo("Flying Men", 19, Rarity.COMMON, mage.cards.f.FlyingMen.class)); cards.add(new SetCardInfo("Ghazban Ogre", 33, Rarity.COMMON, mage.cards.g.GhazbanOgre.class)); @@ -114,18 +121,18 @@ public class ArabianNights extends ExpansionSet { cards.add(new SetCardInfo("Moorish Cavalry", 62, Rarity.COMMON, mage.cards.m.MoorishCavalry.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Moorish Cavalry", 63, Rarity.COMMON, mage.cards.m.MoorishCavalry.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Mountain", 91, Rarity.COMMON, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Nafs Asp", 36, Rarity.COMMON, mage.cards.n.NafsAsp1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Nafs Asp", 37, Rarity.COMMON, mage.cards.n.NafsAsp1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Nafs Asp", 36, Rarity.COMMON, NafsAsp.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Nafs Asp", 37, Rarity.COMMON, NafsAsp.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Oasis", 92, Rarity.UNCOMMON, mage.cards.o.Oasis.class)); cards.add(new SetCardInfo("Old Man of the Sea", 24, Rarity.RARE, mage.cards.o.OldManOfTheSea.class)); - cards.add(new SetCardInfo("Oubliette", 11, Rarity.COMMON, mage.cards.o.Oubliette1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Oubliette", 12, Rarity.COMMON, mage.cards.o.Oubliette1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Piety", 64, Rarity.COMMON, mage.cards.p.Piety1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Piety", 65, Rarity.COMMON, mage.cards.p.Piety1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Oubliette", 11, Rarity.COMMON, Oubliette.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Oubliette", 12, Rarity.COMMON, Oubliette.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Piety", 64, Rarity.COMMON, Piety.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Piety", 65, Rarity.COMMON, Piety.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Pyramids", 81, Rarity.RARE, mage.cards.p.Pyramids.class)); cards.add(new SetCardInfo("Repentant Blacksmith", 66, Rarity.RARE, mage.cards.r.RepentantBlacksmith.class)); - cards.add(new SetCardInfo("Rukh Egg", 52, Rarity.COMMON, mage.cards.r.RukhEgg1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Rukh Egg", 53, Rarity.COMMON, mage.cards.r.RukhEgg1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Rukh Egg", 52, Rarity.COMMON, RukhEgg.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Rukh Egg", 53, Rarity.COMMON, RukhEgg.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Sandals of Abdallah", 83, Rarity.UNCOMMON, mage.cards.s.SandalsOfAbdallah.class)); cards.add(new SetCardInfo("Sandstorm", 38, Rarity.COMMON, mage.cards.s.Sandstorm.class)); cards.add(new SetCardInfo("Serendib Djinn", 25, Rarity.RARE, mage.cards.s.SerendibDjinn.class)); @@ -133,8 +140,8 @@ public class ArabianNights extends ExpansionSet { cards.add(new SetCardInfo("Sindbad", 27, Rarity.UNCOMMON, mage.cards.s.Sindbad.class)); cards.add(new SetCardInfo("Singing Tree", 39, Rarity.RARE, mage.cards.s.SingingTree.class)); cards.add(new SetCardInfo("Sorceress Queen", 13, Rarity.UNCOMMON, mage.cards.s.SorceressQueen.class)); - cards.add(new SetCardInfo("Stone-Throwing Devils", 14, Rarity.COMMON, mage.cards.s.StoneThrowingDevils1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Stone-Throwing Devils", 15, Rarity.COMMON, mage.cards.s.StoneThrowingDevils1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Stone-Throwing Devils", 14, Rarity.COMMON, StoneThrowingDevils.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Stone-Throwing Devils", 15, Rarity.COMMON, StoneThrowingDevils.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Unstable Mutation", 28, Rarity.COMMON, mage.cards.u.UnstableMutation.class)); cards.add(new SetCardInfo("Wyluli Wolf", 40, Rarity.COMMON, mage.cards.w.WyluliWolf.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Wyluli Wolf", 41, Rarity.COMMON, mage.cards.w.WyluliWolf.class, new CardGraphicInfo(null, true))); diff --git a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java index 5e63a23876..ed47c7c0e3 100644 --- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java @@ -1,6 +1,7 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.b.BrothersYamazaki; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -39,8 +40,8 @@ public class ChampionsOfKamigawa extends ExpansionSet { cards.add(new SetCardInfo("Blood Speaker", 103, Rarity.UNCOMMON, mage.cards.b.BloodSpeaker.class)); cards.add(new SetCardInfo("Bloodthirsty Ogre", 104, Rarity.UNCOMMON, mage.cards.b.BloodthirstyOgre.class)); cards.add(new SetCardInfo("Boseiju, Who Shelters All", 273, Rarity.RARE, mage.cards.b.BoseijuWhoSheltersAll.class)); - cards.add(new SetCardInfo("Brothers Yamazaki", "160a", Rarity.UNCOMMON, mage.cards.b.BrothersYamazaki1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Brothers Yamazaki", "160b", Rarity.UNCOMMON, mage.cards.b.BrothersYamazaki1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Brothers Yamazaki", "160a", Rarity.UNCOMMON, BrothersYamazaki.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Brothers Yamazaki", "160b", Rarity.UNCOMMON, BrothersYamazaki.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Brutal Deceiver", 161, Rarity.COMMON, mage.cards.b.BrutalDeceiver.class)); cards.add(new SetCardInfo("Budoka Gardener", 202, Rarity.RARE, mage.cards.b.BudokaGardener.class)); cards.add(new SetCardInfo("Burr Grafter", 203, Rarity.COMMON, mage.cards.b.BurrGrafter.class)); diff --git a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java index d2efedf32a..d9cb4734be 100644 --- a/Mage.Sets/src/mage/sets/ClassicSixthEdition.java +++ b/Mage.Sets/src/mage/sets/ClassicSixthEdition.java @@ -28,6 +28,11 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.d.DrySpell; +import mage.cards.f.FeastOfTheUnicorn; +import mage.cards.m.MesaFalcon; +import mage.cards.s.SoldeviSage; +import mage.cards.v.VodalianSoldiers; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -128,7 +133,7 @@ public class ClassicSixthEdition extends ExpansionSet { cards.add(new SetCardInfo("Dread of Night", 122, Rarity.UNCOMMON, mage.cards.d.DreadOfNight.class)); cards.add(new SetCardInfo("Dream Cache", 66, Rarity.COMMON, mage.cards.d.DreamCache.class)); cards.add(new SetCardInfo("Drudge Skeletons", 123, Rarity.COMMON, mage.cards.d.DrudgeSkeletons.class)); - cards.add(new SetCardInfo("Dry Spell", 124, Rarity.COMMON, mage.cards.d.DrySpell1.class)); + cards.add(new SetCardInfo("Dry Spell", 124, Rarity.COMMON, DrySpell.class)); cards.add(new SetCardInfo("Dwarven Ruins", 323, Rarity.UNCOMMON, mage.cards.d.DwarvenRuins.class)); cards.add(new SetCardInfo("Early Harvest", 222, Rarity.RARE, mage.cards.e.EarlyHarvest.class)); cards.add(new SetCardInfo("Earthquake", 173, Rarity.RARE, mage.cards.e.Earthquake.class)); @@ -148,7 +153,7 @@ public class ClassicSixthEdition extends ExpansionSet { cards.add(new SetCardInfo("Familiar Ground", 228, Rarity.UNCOMMON, mage.cards.f.FamiliarGround.class)); cards.add(new SetCardInfo("Fatal Blow", 128, Rarity.COMMON, mage.cards.f.FatalBlow.class)); cards.add(new SetCardInfo("Fear", 129, Rarity.COMMON, mage.cards.f.Fear.class)); - cards.add(new SetCardInfo("Feast of the Unicorn", 130, Rarity.COMMON, mage.cards.f.FeastOfTheUnicorn1.class)); + cards.add(new SetCardInfo("Feast of the Unicorn", 130, Rarity.COMMON, FeastOfTheUnicorn.class)); cards.add(new SetCardInfo("Femeref Archers", 229, Rarity.UNCOMMON, mage.cards.f.FemerefArchers.class)); cards.add(new SetCardInfo("Feral Shadow", 131, Rarity.COMMON, mage.cards.f.FeralShadow.class)); cards.add(new SetCardInfo("Fervor", 174, Rarity.RARE, mage.cards.f.Fervor.class)); @@ -245,7 +250,7 @@ public class ClassicSixthEdition extends ExpansionSet { cards.add(new SetCardInfo("Meekstone", 299, Rarity.RARE, mage.cards.m.Meekstone.class)); cards.add(new SetCardInfo("Memory Lapse", 81, Rarity.COMMON, mage.cards.m.MemoryLapse.class)); cards.add(new SetCardInfo("Merfolk of the Pearl Trident", 82, Rarity.COMMON, mage.cards.m.MerfolkOfThePearlTrident.class)); - cards.add(new SetCardInfo("Mesa Falcon", 31, Rarity.COMMON, mage.cards.m.MesaFalcon1.class)); + cards.add(new SetCardInfo("Mesa Falcon", 31, Rarity.COMMON, MesaFalcon.class)); cards.add(new SetCardInfo("Millstone", 300, Rarity.RARE, mage.cards.m.Millstone.class)); cards.add(new SetCardInfo("Mind Warp", 143, Rarity.UNCOMMON, mage.cards.m.MindWarp.class)); cards.add(new SetCardInfo("Mischievous Poltergeist", 144, Rarity.UNCOMMON, mage.cards.m.MischievousPoltergeist.class)); @@ -331,7 +336,7 @@ public class ClassicSixthEdition extends ExpansionSet { cards.add(new SetCardInfo("Skull Catapult", 310, Rarity.UNCOMMON, mage.cards.s.SkullCatapult.class)); cards.add(new SetCardInfo("Sky Diamond", 311, Rarity.UNCOMMON, mage.cards.s.SkyDiamond.class)); cards.add(new SetCardInfo("Snake Basket", 312, Rarity.RARE, mage.cards.s.SnakeBasket.class)); - cards.add(new SetCardInfo("Soldevi Sage", 99, Rarity.UNCOMMON, mage.cards.s.SoldeviSage1.class)); + cards.add(new SetCardInfo("Soldevi Sage", 99, Rarity.UNCOMMON, SoldeviSage.class)); cards.add(new SetCardInfo("Soul Net", 313, Rarity.UNCOMMON, mage.cards.s.SoulNet.class)); cards.add(new SetCardInfo("Spell Blast", 100, Rarity.COMMON, mage.cards.s.SpellBlast.class)); cards.add(new SetCardInfo("Spirit Link", 43, Rarity.UNCOMMON, mage.cards.s.SpiritLink.class)); @@ -382,7 +387,7 @@ public class ClassicSixthEdition extends ExpansionSet { cards.add(new SetCardInfo("Vertigo", 212, Rarity.UNCOMMON, mage.cards.v.Vertigo.class)); cards.add(new SetCardInfo("Viashino Warrior", 213, Rarity.COMMON, mage.cards.v.ViashinoWarrior.class)); cards.add(new SetCardInfo("Vitalize", 265, Rarity.COMMON, mage.cards.v.Vitalize.class)); - cards.add(new SetCardInfo("Vodalian Soldiers", 104, Rarity.COMMON, mage.cards.v.VodalianSoldiers1.class)); + cards.add(new SetCardInfo("Vodalian Soldiers", 104, Rarity.COMMON, VodalianSoldiers.class)); cards.add(new SetCardInfo("Volcanic Dragon", 214, Rarity.RARE, mage.cards.v.VolcanicDragon.class)); cards.add(new SetCardInfo("Volcanic Geyser", 215, Rarity.UNCOMMON, mage.cards.v.VolcanicGeyser.class)); cards.add(new SetCardInfo("Waiting in the Weeds", 266, Rarity.RARE, mage.cards.w.WaitingInTheWeeds.class)); diff --git a/Mage.Sets/src/mage/sets/Commander2013.java b/Mage.Sets/src/mage/sets/Commander2013.java index ee010562fd..c56145de85 100644 --- a/Mage.Sets/src/mage/sets/Commander2013.java +++ b/Mage.Sets/src/mage/sets/Commander2013.java @@ -29,6 +29,7 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.n.NightSoil; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -242,7 +243,7 @@ public class Commander2013 extends ExpansionSet { cards.add(new SetCardInfo("Nevinyrral's Disk", 248, Rarity.RARE, mage.cards.n.NevinyrralsDisk.class)); cards.add(new SetCardInfo("New Benalia", 309, Rarity.UNCOMMON, mage.cards.n.NewBenalia.class)); cards.add(new SetCardInfo("Nightscape Familiar", 83, Rarity.COMMON, mage.cards.n.NightscapeFamiliar.class)); - cards.add(new SetCardInfo("Night Soil", 158, Rarity.COMMON, mage.cards.n.NightSoil1.class)); + cards.add(new SetCardInfo("Night Soil", 158, Rarity.COMMON, NightSoil.class)); cards.add(new SetCardInfo("Nihil Spellbomb", 249, Rarity.COMMON, mage.cards.n.NihilSpellbomb.class)); cards.add(new SetCardInfo("Nivix Guildmage", 202, Rarity.UNCOMMON, mage.cards.n.NivixGuildmage.class)); cards.add(new SetCardInfo("Obelisk of Esper", 250, Rarity.COMMON, mage.cards.o.ObeliskOfEsper.class)); diff --git a/Mage.Sets/src/mage/sets/EighthEdition.java b/Mage.Sets/src/mage/sets/EighthEdition.java index 00910ea066..17e5ec1d2b 100644 --- a/Mage.Sets/src/mage/sets/EighthEdition.java +++ b/Mage.Sets/src/mage/sets/EighthEdition.java @@ -1,5 +1,7 @@ package mage.sets; +import mage.cards.o.OrcishSpy; +import mage.cards.r.RukhEgg; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -226,7 +228,7 @@ public class EighthEdition extends ExpansionSet { cards.add(new SetCardInfo("Okk", 206, Rarity.RARE, mage.cards.o.Okk.class)); cards.add(new SetCardInfo("Oracle's Attendants", 32, Rarity.RARE, mage.cards.o.OraclesAttendants.class)); cards.add(new SetCardInfo("Orcish Artillery", 207, Rarity.UNCOMMON, mage.cards.o.OrcishArtillery.class)); - cards.add(new SetCardInfo("Orcish Spy", 208, Rarity.COMMON, mage.cards.o.OrcishSpy1.class)); + cards.add(new SetCardInfo("Orcish Spy", 208, Rarity.COMMON, OrcishSpy.class)); cards.add(new SetCardInfo("Pacifism", 33, Rarity.COMMON, mage.cards.p.Pacifism.class)); cards.add(new SetCardInfo("Panic Attack", 209, Rarity.COMMON, mage.cards.p.PanicAttack.class)); cards.add(new SetCardInfo("Patagia Golem", 308, Rarity.UNCOMMON, mage.cards.p.PatagiaGolem.class)); @@ -268,7 +270,7 @@ public class EighthEdition extends ExpansionSet { cards.add(new SetCardInfo("Rod of Ruin", 312, Rarity.UNCOMMON, mage.cards.r.RodOfRuin.class)); cards.add(new SetCardInfo("Rolling Stones", 38, Rarity.RARE, mage.cards.r.RollingStones.class)); cards.add(new SetCardInfo("Royal Assassin", 159, Rarity.RARE, mage.cards.r.RoyalAssassin.class)); - cards.add(new SetCardInfo("Rukh Egg", 216, Rarity.RARE, mage.cards.r.RukhEgg1.class)); + cards.add(new SetCardInfo("Rukh Egg", 216, Rarity.RARE, RukhEgg.class)); cards.add(new SetCardInfo("Rushwood Dryad", 278, Rarity.COMMON, mage.cards.r.RushwoodDryad.class)); cards.add(new SetCardInfo("Sabretooth Tiger", 217, Rarity.COMMON, mage.cards.s.SabretoothTiger.class)); cards.add(new SetCardInfo("Sacred Ground", 39, Rarity.RARE, mage.cards.s.SacredGround.class)); diff --git a/Mage.Sets/src/mage/sets/ElspethVsKiora.java b/Mage.Sets/src/mage/sets/ElspethVsKiora.java index 0c76067dd5..eda7e3c646 100644 --- a/Mage.Sets/src/mage/sets/ElspethVsKiora.java +++ b/Mage.Sets/src/mage/sets/ElspethVsKiora.java @@ -28,6 +28,7 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.i.IcatianJavelineers; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -70,7 +71,7 @@ public class ElspethVsKiora extends ExpansionSet { cards.add(new SetCardInfo("Gustcloak Savior", 11, Rarity.RARE, mage.cards.g.GustcloakSavior.class)); cards.add(new SetCardInfo("Gustcloak Sentinel", 12, Rarity.UNCOMMON, mage.cards.g.GustcloakSentinel.class)); cards.add(new SetCardInfo("Gustcloak Skirmisher", 13, Rarity.UNCOMMON, mage.cards.g.GustcloakSkirmisher.class)); - cards.add(new SetCardInfo("Icatian Javelineers", 14, Rarity.COMMON, mage.cards.i.IcatianJavelineers1.class)); + cards.add(new SetCardInfo("Icatian Javelineers", 14, Rarity.COMMON, IcatianJavelineers.class)); cards.add(new SetCardInfo("Inkwell Leviathan", 37, Rarity.RARE, mage.cards.i.InkwellLeviathan.class)); cards.add(new SetCardInfo("Island", 60, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Island", 61, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(null, true))); diff --git a/Mage.Sets/src/mage/sets/EternalMasters.java b/Mage.Sets/src/mage/sets/EternalMasters.java index 823dc7577d..7254c3ebea 100644 --- a/Mage.Sets/src/mage/sets/EternalMasters.java +++ b/Mage.Sets/src/mage/sets/EternalMasters.java @@ -29,6 +29,7 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.h.HymnToTourach; import mage.constants.SetType; import mage.constants.Rarity; @@ -154,7 +155,7 @@ public class EternalMasters extends ExpansionSet { cards.add(new SetCardInfo("Honden of Seeing Winds", 54, Rarity.UNCOMMON, mage.cards.h.HondenOfSeeingWinds.class)); cards.add(new SetCardInfo("Humble", 14, Rarity.COMMON, mage.cards.h.Humble.class)); cards.add(new SetCardInfo("Hydroblast", 55, Rarity.UNCOMMON, mage.cards.h.Hydroblast.class)); - cards.add(new SetCardInfo("Hymn to Tourach", 92, Rarity.UNCOMMON, mage.cards.h.HymnToTourach1.class)); + cards.add(new SetCardInfo("Hymn to Tourach", 92, Rarity.UNCOMMON, HymnToTourach.class)); cards.add(new SetCardInfo("Ichorid", 93, Rarity.RARE, mage.cards.i.Ichorid.class)); cards.add(new SetCardInfo("Imperious Perfect", 173, Rarity.RARE, mage.cards.i.ImperiousPerfect.class)); cards.add(new SetCardInfo("Inkwell Leviathan", 56, Rarity.RARE, mage.cards.i.InkwellLeviathan.class)); diff --git a/Mage.Sets/src/mage/sets/FTVTwenty.java b/Mage.Sets/src/mage/sets/FTVTwenty.java index b73355bba5..21034cf3fd 100644 --- a/Mage.Sets/src/mage/sets/FTVTwenty.java +++ b/Mage.Sets/src/mage/sets/FTVTwenty.java @@ -28,6 +28,7 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.h.HymnToTourach; import mage.constants.Rarity; import mage.constants.SetType; @@ -56,7 +57,7 @@ public class FTVTwenty extends ExpansionSet { cards.add(new SetCardInfo("Fyndhorn Elves", 4, Rarity.MYTHIC, mage.cards.f.FyndhornElves.class)); cards.add(new SetCardInfo("Gilded Lotus", 12, Rarity.MYTHIC, mage.cards.g.GildedLotus.class)); cards.add(new SetCardInfo("Green Sun's Zenith", 19, Rarity.MYTHIC, mage.cards.g.GreenSunsZenith.class)); - cards.add(new SetCardInfo("Hymn to Tourach", 3, Rarity.SPECIAL, mage.cards.h.HymnToTourach1.class)); + cards.add(new SetCardInfo("Hymn to Tourach", 3, Rarity.SPECIAL, HymnToTourach.class)); cards.add(new SetCardInfo("Impulse", 5, Rarity.MYTHIC, mage.cards.i.Impulse.class)); cards.add(new SetCardInfo("Ink-Eyes, Servant of Oni", 13, Rarity.MYTHIC, mage.cards.i.InkEyesServantOfOni.class)); cards.add(new SetCardInfo("Jace, the Mind Sculptor", 18, Rarity.MYTHIC, mage.cards.j.JaceTheMindSculptor.class)); diff --git a/Mage.Sets/src/mage/sets/FallenEmpires.java b/Mage.Sets/src/mage/sets/FallenEmpires.java index 4962a458e9..0f082432b9 100644 --- a/Mage.Sets/src/mage/sets/FallenEmpires.java +++ b/Mage.Sets/src/mage/sets/FallenEmpires.java @@ -28,6 +28,36 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.a.ArmorThrull; +import mage.cards.b.BasalThrull; +import mage.cards.b.BrassclawOrcs; +import mage.cards.c.CombatMedic; +import mage.cards.d.DwarvenSoldier; +import mage.cards.e.ElvenFortress; +import mage.cards.e.ElvishHunter; +import mage.cards.e.ElvishScout; +import mage.cards.f.FarrelsZealot; +import mage.cards.g.GoblinChirurgeon; +import mage.cards.g.GoblinGrenade; +import mage.cards.g.GoblinWarDrums; +import mage.cards.h.HighTide; +import mage.cards.h.Homarid; +import mage.cards.h.HomaridWarrior; +import mage.cards.h.HymnToTourach; +import mage.cards.i.IcatianJavelineers; +import mage.cards.i.IcatianMoneychanger; +import mage.cards.i.IcatianScout; +import mage.cards.i.InitiatesOfTheEbonHand; +import mage.cards.m.MindstabThrull; +import mage.cards.n.Necrite; +import mage.cards.n.NightSoil; +import mage.cards.o.OrcishSpy; +import mage.cards.o.OrcishVeteran; +import mage.cards.o.OrderOfLeitbur; +import mage.cards.o.OrderOfTheEbonHand; +import mage.cards.t.ThornThallid; +import mage.cards.v.VodalianMage; +import mage.cards.v.VodalianSoldiers; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -54,25 +84,25 @@ public class FallenEmpires extends ExpansionSet { this.numBoosterRare = 1; this.ratioBoosterMythic = 0; cards.add(new SetCardInfo("Aeolipile", 166, Rarity.RARE, mage.cards.a.Aeolipile.class)); - cards.add(new SetCardInfo("Armor Thrull", 1, Rarity.COMMON, mage.cards.a.ArmorThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Armor Thrull", 2, Rarity.COMMON, mage.cards.a.ArmorThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Armor Thrull", 3, Rarity.COMMON, mage.cards.a.ArmorThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Armor Thrull", 4, Rarity.COMMON, mage.cards.a.ArmorThrull1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Armor Thrull", 1, Rarity.COMMON, ArmorThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Armor Thrull", 2, Rarity.COMMON, ArmorThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Armor Thrull", 3, Rarity.COMMON, ArmorThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Armor Thrull", 4, Rarity.COMMON, ArmorThrull.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Balm of Restoration", 167, Rarity.RARE, mage.cards.b.BalmOfRestoration.class)); - cards.add(new SetCardInfo("Basal Thrull", 5, Rarity.COMMON, mage.cards.b.BasalThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Basal Thrull", 6, Rarity.COMMON, mage.cards.b.BasalThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Basal Thrull", 7, Rarity.COMMON, mage.cards.b.BasalThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Basal Thrull", 8, Rarity.COMMON, mage.cards.b.BasalThrull1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Basal Thrull", 5, Rarity.COMMON, BasalThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Basal Thrull", 6, Rarity.COMMON, BasalThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Basal Thrull", 7, Rarity.COMMON, BasalThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Basal Thrull", 8, Rarity.COMMON, BasalThrull.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Bottomless Vault", 177, Rarity.RARE, mage.cards.b.BottomlessVault.class)); - cards.add(new SetCardInfo("Brassclaw Orcs", 100, Rarity.COMMON, mage.cards.b.BrassclawOrcs1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Brassclaw Orcs", 101, Rarity.COMMON, mage.cards.b.BrassclawOrcs1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Brassclaw Orcs", 102, Rarity.COMMON, mage.cards.b.BrassclawOrcs1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Brassclaw Orcs", 103, Rarity.COMMON, mage.cards.b.BrassclawOrcs1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Brassclaw Orcs", 100, Rarity.COMMON, BrassclawOrcs.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Brassclaw Orcs", 101, Rarity.COMMON, BrassclawOrcs.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Brassclaw Orcs", 102, Rarity.COMMON, BrassclawOrcs.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Brassclaw Orcs", 103, Rarity.COMMON, BrassclawOrcs.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Breeding Pit", 9, Rarity.UNCOMMON, mage.cards.b.BreedingPit.class)); - cards.add(new SetCardInfo("Combat Medic", 133, Rarity.COMMON, mage.cards.c.CombatMedic1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Combat Medic", 134, Rarity.COMMON, mage.cards.c.CombatMedic1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Combat Medic", 135, Rarity.COMMON, mage.cards.c.CombatMedic1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Combat Medic", 136, Rarity.COMMON, mage.cards.c.CombatMedic1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Combat Medic", 133, Rarity.COMMON, CombatMedic.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Combat Medic", 134, Rarity.COMMON, CombatMedic.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Combat Medic", 135, Rarity.COMMON, CombatMedic.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Combat Medic", 136, Rarity.COMMON, CombatMedic.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Conch Horn", 168, Rarity.RARE, mage.cards.c.ConchHorn.class)); cards.add(new SetCardInfo("Deep Spawn", 34, Rarity.UNCOMMON, mage.cards.d.DeepSpawn.class)); cards.add(new SetCardInfo("Delif's Cone", 169, Rarity.COMMON, mage.cards.d.DelifsCone.class)); @@ -84,103 +114,103 @@ public class FallenEmpires extends ExpansionSet { cards.add(new SetCardInfo("Dwarven Hold", 178, Rarity.RARE, mage.cards.d.DwarvenHold.class)); cards.add(new SetCardInfo("Dwarven Lieutenant", 106, Rarity.UNCOMMON, mage.cards.d.DwarvenLieutenant.class)); cards.add(new SetCardInfo("Dwarven Ruins", 179, Rarity.UNCOMMON, mage.cards.d.DwarvenRuins.class)); - cards.add(new SetCardInfo("Dwarven Soldier", 107, Rarity.COMMON, mage.cards.d.DwarvenSoldier1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Dwarven Soldier", 108, Rarity.COMMON, mage.cards.d.DwarvenSoldier1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Dwarven Soldier", 109, Rarity.COMMON, mage.cards.d.DwarvenSoldier1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dwarven Soldier", 107, Rarity.COMMON, DwarvenSoldier.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dwarven Soldier", 108, Rarity.COMMON, DwarvenSoldier.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dwarven Soldier", 109, Rarity.COMMON, DwarvenSoldier.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Ebon Praetor", 11, Rarity.RARE, mage.cards.e.EbonPraetor.class)); cards.add(new SetCardInfo("Ebon Stronghold", 180, Rarity.UNCOMMON, mage.cards.e.EbonStronghold.class)); - cards.add(new SetCardInfo("Elven Fortress", 67, Rarity.COMMON, mage.cards.e.ElvenFortress1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elven Fortress", 68, Rarity.COMMON, mage.cards.e.ElvenFortress1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elven Fortress", 69, Rarity.COMMON, mage.cards.e.ElvenFortress1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elven Fortress", 70, Rarity.COMMON, mage.cards.e.ElvenFortress1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elven Fortress", 67, Rarity.COMMON, ElvenFortress.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elven Fortress", 68, Rarity.COMMON, ElvenFortress.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elven Fortress", 69, Rarity.COMMON, ElvenFortress.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elven Fortress", 70, Rarity.COMMON, ElvenFortress.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Elven Lyre", 172, Rarity.RARE, mage.cards.e.ElvenLyre.class)); cards.add(new SetCardInfo("Elvish Farmer", 71, Rarity.RARE, mage.cards.e.ElvishFarmer.class)); - cards.add(new SetCardInfo("Elvish Hunter", 72, Rarity.COMMON, mage.cards.e.ElvishHunter1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elvish Hunter", 73, Rarity.COMMON, mage.cards.e.ElvishHunter1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elvish Hunter", 74, Rarity.COMMON, mage.cards.e.ElvishHunter1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elvish Scout", 75, Rarity.COMMON, mage.cards.e.ElvishScout1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elvish Scout", 76, Rarity.COMMON, mage.cards.e.ElvishScout1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elvish Scout", 77, Rarity.COMMON, mage.cards.e.ElvishScout1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elvish Hunter", 72, Rarity.COMMON, ElvishHunter.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elvish Hunter", 73, Rarity.COMMON, ElvishHunter.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elvish Hunter", 74, Rarity.COMMON, ElvishHunter.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elvish Scout", 75, Rarity.COMMON, ElvishScout.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elvish Scout", 76, Rarity.COMMON, ElvishScout.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elvish Scout", 77, Rarity.COMMON, ElvishScout.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Farrelite Priest", 137, Rarity.UNCOMMON, mage.cards.f.FarrelitePriest.class)); cards.add(new SetCardInfo("Farrel's Mantle", 138, Rarity.UNCOMMON, mage.cards.f.FarrelsMantle.class)); - cards.add(new SetCardInfo("Farrel's Zealot", 139, Rarity.COMMON, mage.cards.f.FarrelsZealot1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Farrel's Zealot", 140, Rarity.COMMON, mage.cards.f.FarrelsZealot1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Farrel's Zealot", 141, Rarity.COMMON, mage.cards.f.FarrelsZealot1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Farrel's Zealot", 139, Rarity.COMMON, FarrelsZealot.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Farrel's Zealot", 140, Rarity.COMMON, FarrelsZealot.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Farrel's Zealot", 141, Rarity.COMMON, FarrelsZealot.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Feral Thallid", 78, Rarity.UNCOMMON, mage.cards.f.FeralThallid.class)); cards.add(new SetCardInfo("Fungal Bloom", 79, Rarity.RARE, mage.cards.f.FungalBloom.class)); - cards.add(new SetCardInfo("Goblin Chirurgeon", 110, Rarity.COMMON, mage.cards.g.GoblinChirurgeon1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin Chirurgeon", 111, Rarity.COMMON, mage.cards.g.GoblinChirurgeon1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin Chirurgeon", 112, Rarity.COMMON, mage.cards.g.GoblinChirurgeon1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin Chirurgeon", 110, Rarity.COMMON, GoblinChirurgeon.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin Chirurgeon", 111, Rarity.COMMON, GoblinChirurgeon.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin Chirurgeon", 112, Rarity.COMMON, GoblinChirurgeon.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Goblin Flotilla", 113, Rarity.RARE, mage.cards.g.GoblinFlotilla.class)); - cards.add(new SetCardInfo("Goblin Grenade", 114, Rarity.COMMON, mage.cards.g.GoblinGrenade1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin Grenade", 115, Rarity.COMMON, mage.cards.g.GoblinGrenade1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin Grenade", 116, Rarity.COMMON, mage.cards.g.GoblinGrenade1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin Grenade", 114, Rarity.COMMON, GoblinGrenade.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin Grenade", 115, Rarity.COMMON, GoblinGrenade.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin Grenade", 116, Rarity.COMMON, GoblinGrenade.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Goblin Kites", 117, Rarity.UNCOMMON, mage.cards.g.GoblinKites.class)); - cards.add(new SetCardInfo("Goblin War Drums", 118, Rarity.COMMON, mage.cards.g.GoblinWarDrums1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin War Drums", 119, Rarity.COMMON, mage.cards.g.GoblinWarDrums1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin War Drums", 120, Rarity.COMMON, mage.cards.g.GoblinWarDrums1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Goblin War Drums", 121, Rarity.COMMON, mage.cards.g.GoblinWarDrums1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin War Drums", 118, Rarity.COMMON, GoblinWarDrums.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin War Drums", 119, Rarity.COMMON, GoblinWarDrums.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin War Drums", 120, Rarity.COMMON, GoblinWarDrums.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Goblin War Drums", 121, Rarity.COMMON, GoblinWarDrums.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Goblin Warrens", 122, Rarity.RARE, mage.cards.g.GoblinWarrens.class)); cards.add(new SetCardInfo("Hand of Justice", 142, Rarity.RARE, mage.cards.h.HandOfJustice.class)); cards.add(new SetCardInfo("Havenwood Battleground", 181, Rarity.UNCOMMON, mage.cards.h.HavenwoodBattleground.class)); - cards.add(new SetCardInfo("High Tide", 35, Rarity.COMMON, mage.cards.h.HighTide1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("High Tide", 36, Rarity.COMMON, mage.cards.h.HighTide1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("High Tide", 37, Rarity.COMMON, mage.cards.h.HighTide1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("High Tide", 35, Rarity.COMMON, HighTide.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("High Tide", 36, Rarity.COMMON, HighTide.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("High Tide", 37, Rarity.COMMON, HighTide.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Hollow Trees", 182, Rarity.RARE, mage.cards.h.HollowTrees.class)); - cards.add(new SetCardInfo("Homarid", 38, Rarity.COMMON, mage.cards.h.Homarid1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Homarid", 39, Rarity.COMMON, mage.cards.h.Homarid1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Homarid", 40, Rarity.COMMON, mage.cards.h.Homarid1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Homarid", 41, Rarity.COMMON, mage.cards.h.Homarid1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid", 38, Rarity.COMMON, Homarid.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid", 39, Rarity.COMMON, Homarid.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid", 40, Rarity.COMMON, Homarid.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid", 41, Rarity.COMMON, Homarid.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Homarid Shaman", 42, Rarity.RARE, mage.cards.h.HomaridShaman.class)); cards.add(new SetCardInfo("Homarid Spawning Bed", 43, Rarity.UNCOMMON, mage.cards.h.HomaridSpawningBed.class)); - cards.add(new SetCardInfo("Homarid Warrior", 44, Rarity.COMMON, mage.cards.h.HomaridWarrior1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Homarid Warrior", 45, Rarity.COMMON, mage.cards.h.HomaridWarrior1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Homarid Warrior", 46, Rarity.COMMON, mage.cards.h.HomaridWarrior1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Hymn to Tourach", 12, Rarity.COMMON, mage.cards.h.HymnToTourach1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Hymn to Tourach", 13, Rarity.COMMON, mage.cards.h.HymnToTourach1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Hymn to Tourach", 14, Rarity.COMMON, mage.cards.h.HymnToTourach1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Hymn to Tourach", 15, Rarity.COMMON, mage.cards.h.HymnToTourach1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Javelineers", 148, Rarity.COMMON, mage.cards.i.IcatianJavelineers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Javelineers", 149, Rarity.COMMON, mage.cards.i.IcatianJavelineers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Javelineers", 150, Rarity.COMMON, mage.cards.i.IcatianJavelineers1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid Warrior", 44, Rarity.COMMON, HomaridWarrior.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid Warrior", 45, Rarity.COMMON, HomaridWarrior.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Homarid Warrior", 46, Rarity.COMMON, HomaridWarrior.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Hymn to Tourach", 12, Rarity.COMMON, HymnToTourach.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Hymn to Tourach", 13, Rarity.COMMON, HymnToTourach.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Hymn to Tourach", 14, Rarity.COMMON, HymnToTourach.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Hymn to Tourach", 15, Rarity.COMMON, HymnToTourach.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Javelineers", 148, Rarity.COMMON, IcatianJavelineers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Javelineers", 149, Rarity.COMMON, IcatianJavelineers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Javelineers", 150, Rarity.COMMON, IcatianJavelineers.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Icatian Lieutenant", 151, Rarity.RARE, mage.cards.i.IcatianLieutenant.class)); - cards.add(new SetCardInfo("Icatian Moneychanger", 152, Rarity.COMMON, mage.cards.i.IcatianMoneychanger1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Moneychanger", 153, Rarity.COMMON, mage.cards.i.IcatianMoneychanger1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Moneychanger", 154, Rarity.COMMON, mage.cards.i.IcatianMoneychanger1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Moneychanger", 152, Rarity.COMMON, IcatianMoneychanger.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Moneychanger", 153, Rarity.COMMON, IcatianMoneychanger.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Moneychanger", 154, Rarity.COMMON, IcatianMoneychanger.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Icatian Priest", 156, Rarity.UNCOMMON, mage.cards.i.IcatianPriest.class)); - cards.add(new SetCardInfo("Icatian Scout", 157, Rarity.COMMON, mage.cards.i.IcatianScout1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Scout", 158, Rarity.COMMON, mage.cards.i.IcatianScout1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Scout", 159, Rarity.COMMON, mage.cards.i.IcatianScout1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Icatian Scout", 160, Rarity.COMMON, mage.cards.i.IcatianScout1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Scout", 157, Rarity.COMMON, IcatianScout.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Scout", 158, Rarity.COMMON, IcatianScout.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Scout", 159, Rarity.COMMON, IcatianScout.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Icatian Scout", 160, Rarity.COMMON, IcatianScout.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Icatian Store", 183, Rarity.RARE, mage.cards.i.IcatianStore.class)); cards.add(new SetCardInfo("Icatian Town", 162, Rarity.RARE, mage.cards.i.IcatianTown.class)); cards.add(new SetCardInfo("Implements of Sacrifice", 173, Rarity.RARE, mage.cards.i.ImplementsOfSacrifice.class)); - cards.add(new SetCardInfo("Initiates of the Ebon Hand", 16, Rarity.COMMON, mage.cards.i.InitiatesOfTheEbonHand1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Initiates of the Ebon Hand", 17, Rarity.COMMON, mage.cards.i.InitiatesOfTheEbonHand1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Initiates of the Ebon Hand", 18, Rarity.COMMON, mage.cards.i.InitiatesOfTheEbonHand1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Mindstab Thrull", 19, Rarity.COMMON, mage.cards.m.MindstabThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Mindstab Thrull", 20, Rarity.COMMON, mage.cards.m.MindstabThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Mindstab Thrull", 21, Rarity.COMMON, mage.cards.m.MindstabThrull1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Necrite", 22, Rarity.COMMON, mage.cards.n.Necrite1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Necrite", 23, Rarity.COMMON, mage.cards.n.Necrite1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Necrite", 24, Rarity.COMMON, mage.cards.n.Necrite1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Night Soil", 80, Rarity.COMMON, mage.cards.n.NightSoil1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Night Soil", 81, Rarity.COMMON, mage.cards.n.NightSoil1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Night Soil", 82, Rarity.COMMON, mage.cards.n.NightSoil1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Initiates of the Ebon Hand", 16, Rarity.COMMON, InitiatesOfTheEbonHand.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Initiates of the Ebon Hand", 17, Rarity.COMMON, InitiatesOfTheEbonHand.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Initiates of the Ebon Hand", 18, Rarity.COMMON, InitiatesOfTheEbonHand.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Mindstab Thrull", 19, Rarity.COMMON, MindstabThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Mindstab Thrull", 20, Rarity.COMMON, MindstabThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Mindstab Thrull", 21, Rarity.COMMON, MindstabThrull.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Necrite", 22, Rarity.COMMON, Necrite.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Necrite", 23, Rarity.COMMON, Necrite.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Necrite", 24, Rarity.COMMON, Necrite.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Night Soil", 80, Rarity.COMMON, NightSoil.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Night Soil", 81, Rarity.COMMON, NightSoil.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Night Soil", 82, Rarity.COMMON, NightSoil.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Orcish Captain", 123, Rarity.UNCOMMON, mage.cards.o.OrcishCaptain.class)); - cards.add(new SetCardInfo("Orcish Spy", 124, Rarity.COMMON, mage.cards.o.OrcishSpy1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Orcish Spy", 125, Rarity.COMMON, mage.cards.o.OrcishSpy1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Orcish Spy", 126, Rarity.COMMON, mage.cards.o.OrcishSpy1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Orcish Veteran", 127, Rarity.COMMON, mage.cards.o.OrcishVeteran1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Orcish Veteran", 128, Rarity.COMMON, mage.cards.o.OrcishVeteran1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Orcish Veteran", 129, Rarity.COMMON, mage.cards.o.OrcishVeteran1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Orcish Veteran", 130, Rarity.COMMON, mage.cards.o.OrcishVeteran1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Order of Leitbur", 163, Rarity.COMMON, mage.cards.o.OrderOfLeitbur1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Order of Leitbur", 164, Rarity.COMMON, mage.cards.o.OrderOfLeitbur1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Order of Leitbur", 165, Rarity.COMMON, mage.cards.o.OrderOfLeitbur1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Order of the Ebon Hand", 25, Rarity.COMMON, mage.cards.o.OrderOfTheEbonHand1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Order of the Ebon Hand", 26, Rarity.COMMON, mage.cards.o.OrderOfTheEbonHand1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Order of the Ebon Hand", 27, Rarity.COMMON, mage.cards.o.OrderOfTheEbonHand1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Spy", 124, Rarity.COMMON, OrcishSpy.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Spy", 125, Rarity.COMMON, OrcishSpy.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Spy", 126, Rarity.COMMON, OrcishSpy.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Veteran", 127, Rarity.COMMON, OrcishVeteran.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Veteran", 128, Rarity.COMMON, OrcishVeteran.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Veteran", 129, Rarity.COMMON, OrcishVeteran.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Orcish Veteran", 130, Rarity.COMMON, OrcishVeteran.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order of Leitbur", 163, Rarity.COMMON, OrderOfLeitbur.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order of Leitbur", 164, Rarity.COMMON, OrderOfLeitbur.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order of Leitbur", 165, Rarity.COMMON, OrderOfLeitbur.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order of the Ebon Hand", 25, Rarity.COMMON, OrderOfTheEbonHand.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order of the Ebon Hand", 26, Rarity.COMMON, OrderOfTheEbonHand.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order of the Ebon Hand", 27, Rarity.COMMON, OrderOfTheEbonHand.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Orgg", 131, Rarity.RARE, mage.cards.o.Orgg.class)); cards.add(new SetCardInfo("Rainbow Vale", 184, Rarity.RARE, mage.cards.r.RainbowVale.class)); cards.add(new SetCardInfo("Ring of Renewal", 174, Rarity.RARE, mage.cards.r.RingOfRenewal.class)); @@ -200,21 +230,21 @@ public class FallenEmpires extends ExpansionSet { cards.add(new SetCardInfo("Thallid Devourer", 91, Rarity.UNCOMMON, mage.cards.t.ThallidDevourer.class)); cards.add(new SetCardInfo("Thelonite Druid", 92, Rarity.UNCOMMON, mage.cards.t.TheloniteDruid.class)); cards.add(new SetCardInfo("Thelonite Monk", 93, Rarity.RARE, mage.cards.t.TheloniteMonk.class)); - cards.add(new SetCardInfo("Thorn Thallid", 96, Rarity.COMMON, mage.cards.t.ThornThallid1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Thorn Thallid", 97, Rarity.COMMON, mage.cards.t.ThornThallid1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Thorn Thallid", 98, Rarity.COMMON, mage.cards.t.ThornThallid1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Thorn Thallid", 99, Rarity.COMMON, mage.cards.t.ThornThallid1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Thorn Thallid", 96, Rarity.COMMON, ThornThallid.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Thorn Thallid", 97, Rarity.COMMON, ThornThallid.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Thorn Thallid", 98, Rarity.COMMON, ThornThallid.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Thorn Thallid", 99, Rarity.COMMON, ThornThallid.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Thrull Champion", 29, Rarity.RARE, mage.cards.t.ThrullChampion.class)); cards.add(new SetCardInfo("Thrull Retainer", 30, Rarity.UNCOMMON, mage.cards.t.ThrullRetainer.class)); cards.add(new SetCardInfo("Tidal Influence", 57, Rarity.UNCOMMON, mage.cards.t.TidalInfluence.class)); cards.add(new SetCardInfo("Vodalian Knights", 58, Rarity.RARE, mage.cards.v.VodalianKnights.class)); - cards.add(new SetCardInfo("Vodalian Mage", 59, Rarity.COMMON, mage.cards.v.VodalianMage1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Vodalian Mage", 60, Rarity.COMMON, mage.cards.v.VodalianMage1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Vodalian Mage", 61, Rarity.COMMON, mage.cards.v.VodalianMage1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Vodalian Soldiers", 62, Rarity.COMMON, mage.cards.v.VodalianSoldiers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Vodalian Soldiers", 63, Rarity.COMMON, mage.cards.v.VodalianSoldiers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Vodalian Soldiers", 64, Rarity.COMMON, mage.cards.v.VodalianSoldiers1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Vodalian Soldiers", 65, Rarity.COMMON, mage.cards.v.VodalianSoldiers1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Mage", 59, Rarity.COMMON, VodalianMage.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Mage", 60, Rarity.COMMON, VodalianMage.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Mage", 61, Rarity.COMMON, VodalianMage.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Soldiers", 62, Rarity.COMMON, VodalianSoldiers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Soldiers", 63, Rarity.COMMON, VodalianSoldiers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Soldiers", 64, Rarity.COMMON, VodalianSoldiers.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Vodalian Soldiers", 65, Rarity.COMMON, VodalianSoldiers.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Zelyon Sword", 176, Rarity.RARE, mage.cards.z.ZelyonSword.class)); } } diff --git a/Mage.Sets/src/mage/sets/FifthEdition.java b/Mage.Sets/src/mage/sets/FifthEdition.java index fca03e05f2..9be0569e2c 100644 --- a/Mage.Sets/src/mage/sets/FifthEdition.java +++ b/Mage.Sets/src/mage/sets/FifthEdition.java @@ -1,6 +1,18 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.b.BrassclawOrcs; +import mage.cards.d.DwarvenSoldier; +import mage.cards.g.GoblinWarDrums; +import mage.cards.h.HomaridWarrior; +import mage.cards.i.IcatianScout; +import mage.cards.i.InitiatesOfTheEbonHand; +import mage.cards.m.MesaFalcon; +import mage.cards.m.MindstabThrull; +import mage.cards.n.Necrite; +import mage.cards.r.ReefPirates; +import mage.cards.t.Torture; +import mage.cards.v.VodalianSoldiers; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -63,7 +75,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Bottle of Suleiman", 354, Rarity.RARE, mage.cards.b.BottleOfSuleiman.class)); cards.add(new SetCardInfo("Bottomless Vault", 411, Rarity.RARE, mage.cards.b.BottomlessVault.class)); cards.add(new SetCardInfo("Brainstorm", 76, Rarity.COMMON, mage.cards.b.Brainstorm.class)); - cards.add(new SetCardInfo("Brassclaw Orcs", 213, Rarity.COMMON, mage.cards.b.BrassclawOrcs1.class)); + cards.add(new SetCardInfo("Brassclaw Orcs", 213, Rarity.COMMON, BrassclawOrcs.class)); cards.add(new SetCardInfo("Breeding Pit", 10, Rarity.UNCOMMON, mage.cards.b.BreedingPit.class)); cards.add(new SetCardInfo("Brothers of Fire", 214, Rarity.COMMON, mage.cards.b.BrothersOfFire.class)); cards.add(new SetCardInfo("Brushland", 412, Rarity.RARE, mage.cards.b.Brushland.class)); @@ -122,7 +134,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Dwarven Catapult", 220, Rarity.UNCOMMON, mage.cards.d.DwarvenCatapult.class)); cards.add(new SetCardInfo("Dwarven Hold", 414, Rarity.RARE, mage.cards.d.DwarvenHold.class)); cards.add(new SetCardInfo("Dwarven Ruins", 415, Rarity.UNCOMMON, mage.cards.d.DwarvenRuins.class)); - cards.add(new SetCardInfo("Dwarven Soldier", 221, Rarity.COMMON, mage.cards.d.DwarvenSoldier1.class)); + cards.add(new SetCardInfo("Dwarven Soldier", 221, Rarity.COMMON, DwarvenSoldier.class)); cards.add(new SetCardInfo("Dwarven Warriors", 222, Rarity.COMMON, mage.cards.d.DwarvenWarriors.class)); cards.add(new SetCardInfo("Earthquake", 223, Rarity.RARE, mage.cards.e.Earthquake.class)); cards.add(new SetCardInfo("Ebon Stronghold", 416, Rarity.UNCOMMON, mage.cards.e.EbonStronghold.class)); @@ -176,7 +188,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Goblin Digging Team", 234, Rarity.COMMON, mage.cards.g.GoblinDiggingTeam.class)); cards.add(new SetCardInfo("Goblin Hero", 235, Rarity.COMMON, mage.cards.g.GoblinHero.class)); cards.add(new SetCardInfo("Goblin King", 236, Rarity.RARE, mage.cards.g.GoblinKing.class)); - cards.add(new SetCardInfo("Goblin War Drums", 237, Rarity.COMMON, mage.cards.g.GoblinWarDrums1.class)); + cards.add(new SetCardInfo("Goblin War Drums", 237, Rarity.COMMON, GoblinWarDrums.class)); cards.add(new SetCardInfo("Goblin Warrens", 238, Rarity.RARE, mage.cards.g.GoblinWarrens.class)); cards.add(new SetCardInfo("Grapeshot Catapult", 375, Rarity.COMMON, mage.cards.g.GrapeshotCatapult.class)); cards.add(new SetCardInfo("Grizzly Bears", 163, Rarity.COMMON, mage.cards.g.GrizzlyBears.class)); @@ -187,7 +199,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Hill Giant", 239, Rarity.COMMON, mage.cards.h.HillGiant.class)); cards.add(new SetCardInfo("Hollow Trees", 422, Rarity.RARE, mage.cards.h.HollowTrees.class)); cards.add(new SetCardInfo("Holy Strength", 311, Rarity.COMMON, mage.cards.h.HolyStrength.class)); - cards.add(new SetCardInfo("Homarid Warrior", 92, Rarity.COMMON, mage.cards.h.HomaridWarrior1.class)); + cards.add(new SetCardInfo("Homarid Warrior", 92, Rarity.COMMON, HomaridWarrior.class)); cards.add(new SetCardInfo("Howl from Beyond", 30, Rarity.COMMON, mage.cards.h.HowlFromBeyond.class)); cards.add(new SetCardInfo("Howling Mine", 377, Rarity.RARE, mage.cards.h.HowlingMine.class)); cards.add(new SetCardInfo("Hungry Mist", 164, Rarity.COMMON, mage.cards.h.HungryMist.class)); @@ -195,13 +207,13 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Hurloon Minotaur", 240, Rarity.COMMON, mage.cards.h.HurloonMinotaur.class)); cards.add(new SetCardInfo("Hurricane", 165, Rarity.UNCOMMON, mage.cards.h.Hurricane.class)); cards.add(new SetCardInfo("Hydroblast", 94, Rarity.UNCOMMON, mage.cards.h.Hydroblast.class)); - cards.add(new SetCardInfo("Icatian Scout", 313, Rarity.COMMON, mage.cards.i.IcatianScout1.class)); + cards.add(new SetCardInfo("Icatian Scout", 313, Rarity.COMMON, IcatianScout.class)); cards.add(new SetCardInfo("Icatian Store", 423, Rarity.RARE, mage.cards.i.IcatianStore.class)); cards.add(new SetCardInfo("Icatian Town", 314, Rarity.RARE, mage.cards.i.IcatianTown.class)); cards.add(new SetCardInfo("Imposing Visage", 241, Rarity.COMMON, mage.cards.i.ImposingVisage.class)); cards.add(new SetCardInfo("Incinerate", 242, Rarity.COMMON, mage.cards.i.Incinerate.class)); cards.add(new SetCardInfo("Inferno", 243, Rarity.RARE, mage.cards.i.Inferno.class)); - cards.add(new SetCardInfo("Initiates of the Ebon Hand", 31, Rarity.COMMON, mage.cards.i.InitiatesOfTheEbonHand1.class)); + cards.add(new SetCardInfo("Initiates of the Ebon Hand", 31, Rarity.COMMON, InitiatesOfTheEbonHand.class)); cards.add(new SetCardInfo("Instill Energy", 166, Rarity.UNCOMMON, mage.cards.i.InstillEnergy.class)); cards.add(new SetCardInfo("Ironclaw Orcs", 245, Rarity.COMMON, mage.cards.i.IronclawOrcs.class)); cards.add(new SetCardInfo("Ironroot Treefolk", 167, Rarity.COMMON, mage.cards.i.IronrootTreefolk.class)); @@ -254,10 +266,10 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Meekstone", 389, Rarity.RARE, mage.cards.m.Meekstone.class)); cards.add(new SetCardInfo("Memory Lapse", 103, Rarity.COMMON, mage.cards.m.MemoryLapse.class)); cards.add(new SetCardInfo("Merfolk of the Pearl Trident", 104, Rarity.COMMON, mage.cards.m.MerfolkOfThePearlTrident.class)); - cards.add(new SetCardInfo("Mesa Falcon", 322, Rarity.COMMON, mage.cards.m.MesaFalcon1.class)); + cards.add(new SetCardInfo("Mesa Falcon", 322, Rarity.COMMON, MesaFalcon.class)); cards.add(new SetCardInfo("Millstone", 390, Rarity.RARE, mage.cards.m.Millstone.class)); cards.add(new SetCardInfo("Mind Ravel", 38, Rarity.COMMON, mage.cards.m.MindRavel.class)); - cards.add(new SetCardInfo("Mindstab Thrull", 40, Rarity.COMMON, mage.cards.m.MindstabThrull1.class)); + cards.add(new SetCardInfo("Mindstab Thrull", 40, Rarity.COMMON, MindstabThrull.class)); cards.add(new SetCardInfo("Mind Warp", 39, Rarity.UNCOMMON, mage.cards.m.MindWarp.class)); cards.add(new SetCardInfo("Mole Worms", 41, Rarity.UNCOMMON, mage.cards.m.MoleWorms.class)); cards.add(new SetCardInfo("Mons's Goblin Raiders", 251, Rarity.COMMON, mage.cards.m.MonssGoblinRaiders.class)); @@ -268,7 +280,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Mountain Goat", 252, Rarity.COMMON, mage.cards.m.MountainGoat.class)); cards.add(new SetCardInfo("Murk Dwellers", 42, Rarity.COMMON, mage.cards.m.MurkDwellers.class)); cards.add(new SetCardInfo("Nature's Lore", 178, Rarity.COMMON, mage.cards.n.NaturesLore.class)); - cards.add(new SetCardInfo("Necrite", 43, Rarity.COMMON, mage.cards.n.Necrite1.class)); + cards.add(new SetCardInfo("Necrite", 43, Rarity.COMMON, Necrite.class)); cards.add(new SetCardInfo("Necropotence", 44, Rarity.RARE, mage.cards.n.Necropotence.class)); cards.add(new SetCardInfo("Nether Shadow", 45, Rarity.RARE, mage.cards.n.NetherShadow.class)); cards.add(new SetCardInfo("Nevinyrral's Disk", 391, Rarity.RARE, mage.cards.n.NevinyrralsDisk.class)); @@ -311,7 +323,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Raise Dead", 53, Rarity.COMMON, mage.cards.r.RaiseDead.class)); cards.add(new SetCardInfo("Ray of Command", 114, Rarity.COMMON, mage.cards.r.RayOfCommand.class)); cards.add(new SetCardInfo("Recall", 115, Rarity.RARE, mage.cards.r.Recall.class)); - cards.add(new SetCardInfo("Reef Pirates", 116, Rarity.COMMON, mage.cards.r.ReefPirates1.class)); + cards.add(new SetCardInfo("Reef Pirates", 116, Rarity.COMMON, ReefPirates.class)); cards.add(new SetCardInfo("Regeneration", 183, Rarity.COMMON, mage.cards.r.Regeneration.class)); cards.add(new SetCardInfo("Remove Soul", 117, Rarity.COMMON, mage.cards.r.RemoveSoul.class)); cards.add(new SetCardInfo("Repentant Blacksmith", 330, Rarity.COMMON, mage.cards.r.RepentantBlacksmith.class)); @@ -373,7 +385,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Thrull Retainer", 60, Rarity.UNCOMMON, mage.cards.t.ThrullRetainer.class)); cards.add(new SetCardInfo("Time Bomb", 404, Rarity.RARE, mage.cards.t.TimeBomb.class)); cards.add(new SetCardInfo("Titania's Song", 194, Rarity.RARE, mage.cards.t.TitaniasSong.class)); - cards.add(new SetCardInfo("Torture", 61, Rarity.COMMON, mage.cards.t.Torture1.class)); + cards.add(new SetCardInfo("Torture", 61, Rarity.COMMON, Torture.class)); cards.add(new SetCardInfo("Touch of Death", 62, Rarity.COMMON, mage.cards.t.TouchOfDeath.class)); cards.add(new SetCardInfo("Tranquility", 195, Rarity.COMMON, mage.cards.t.Tranquility.class)); cards.add(new SetCardInfo("Tsunami", 196, Rarity.UNCOMMON, mage.cards.t.Tsunami.class)); @@ -392,7 +404,7 @@ public class FifthEdition extends ExpansionSet { cards.add(new SetCardInfo("Vampire Bats", 64, Rarity.COMMON, mage.cards.v.VampireBats.class)); cards.add(new SetCardInfo("Venom", 198, Rarity.COMMON, mage.cards.v.Venom.class)); cards.add(new SetCardInfo("Verduran Enchantress", 199, Rarity.RARE, mage.cards.v.VerduranEnchantress.class)); - cards.add(new SetCardInfo("Vodalian Soldiers", 134, Rarity.COMMON, mage.cards.v.VodalianSoldiers1.class)); + cards.add(new SetCardInfo("Vodalian Soldiers", 134, Rarity.COMMON, VodalianSoldiers.class)); cards.add(new SetCardInfo("Wall of Air", 135, Rarity.UNCOMMON, mage.cards.w.WallOfAir.class)); cards.add(new SetCardInfo("Wall of Bone", 65, Rarity.UNCOMMON, mage.cards.w.WallOfBone.class)); cards.add(new SetCardInfo("Wall of Brambles", 200, Rarity.UNCOMMON, mage.cards.w.WallOfBrambles.class)); diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java index e063e4d291..0ab1d41b6e 100644 --- a/Mage.Sets/src/mage/sets/FourthEdition.java +++ b/Mage.Sets/src/mage/sets/FourthEdition.java @@ -28,6 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.n.NafsAsp; +import mage.cards.p.Piety; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -251,7 +253,7 @@ public class FourthEdition extends ExpansionSet { cards.add(new SetCardInfo("Mountain", 183, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Mountain", 184, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Murk Dwellers", 32, Rarity.COMMON, mage.cards.m.MurkDwellers.class)); - cards.add(new SetCardInfo("Nafs Asp", 148, Rarity.COMMON, mage.cards.n.NafsAsp1.class)); + cards.add(new SetCardInfo("Nafs Asp", 148, Rarity.COMMON, NafsAsp.class)); cards.add(new SetCardInfo("Nether Shadow", 33, Rarity.RARE, mage.cards.n.NetherShadow.class)); cards.add(new SetCardInfo("Nevinyrral's Disk", 356, Rarity.RARE, mage.cards.n.NevinyrralsDisk.class)); cards.add(new SetCardInfo("Nightmare", 34, Rarity.RARE, mage.cards.n.Nightmare.class)); @@ -269,7 +271,7 @@ public class FourthEdition extends ExpansionSet { cards.add(new SetCardInfo("Phantasmal Forces", 88, Rarity.UNCOMMON, mage.cards.p.PhantasmalForces.class)); cards.add(new SetCardInfo("Phantasmal Terrain", 89, Rarity.COMMON, mage.cards.p.PhantasmalTerrain.class)); cards.add(new SetCardInfo("Phantom Monster", 90, Rarity.UNCOMMON, mage.cards.p.PhantomMonster.class)); - cards.add(new SetCardInfo("Piety", 291, Rarity.COMMON, mage.cards.p.Piety1.class)); + cards.add(new SetCardInfo("Piety", 291, Rarity.COMMON, Piety.class)); cards.add(new SetCardInfo("Pirate Ship", 91, Rarity.RARE, mage.cards.p.PirateShip.class)); cards.add(new SetCardInfo("Pit Scorpion", 37, Rarity.COMMON, mage.cards.p.PitScorpion.class)); cards.add(new SetCardInfo("Plague Rats", 38, Rarity.COMMON, mage.cards.p.PlagueRats.class)); diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java index 3b86629e8c..59e3b18d2f 100644 --- a/Mage.Sets/src/mage/sets/Homelands.java +++ b/Mage.Sets/src/mage/sets/Homelands.java @@ -28,6 +28,18 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.a.AbbeyMatron; +import mage.cards.a.AlibansTower; +import mage.cards.c.CemeteryGate; +import mage.cards.d.DrySpell; +import mage.cards.d.DwarvenTrader; +import mage.cards.f.FeastOfTheUnicorn; +import mage.cards.f.FolkOfAnHavva; +import mage.cards.m.MesaFalcon; +import mage.cards.r.ReefPirates; +import mage.cards.s.SengirBats; +import mage.cards.t.Torture; +import mage.cards.w.WillowFaerie; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -54,10 +66,10 @@ public class Homelands extends ExpansionSet { this.numBoosterRare = 1; this.ratioBoosterMythic = 0; cards.add(new SetCardInfo("Abbey Gargoyles", 101, Rarity.UNCOMMON, mage.cards.a.AbbeyGargoyles.class)); - cards.add(new SetCardInfo("Abbey Matron", 102, Rarity.COMMON, mage.cards.a.AbbeyMatron1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Abbey Matron", 103, Rarity.COMMON, mage.cards.a.AbbeyMatron1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Aliban's Tower", 76, Rarity.COMMON, mage.cards.a.AlibansTower1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Aliban's Tower", 77, Rarity.COMMON, mage.cards.a.AlibansTower1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Abbey Matron", 102, Rarity.COMMON, AbbeyMatron.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Abbey Matron", 103, Rarity.COMMON, AbbeyMatron.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Aliban's Tower", 76, Rarity.COMMON, AlibansTower.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Aliban's Tower", 77, Rarity.COMMON, AlibansTower.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Ambush", 78, Rarity.COMMON, mage.cards.a.Ambush.class)); cards.add(new SetCardInfo("Ambush Party", 79, Rarity.COMMON, mage.cards.a.AmbushParty.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Ambush Party", 80, Rarity.COMMON, mage.cards.a.AmbushParty.class, new CardGraphicInfo(null, true))); @@ -77,8 +89,8 @@ public class Homelands extends ExpansionSet { cards.add(new SetCardInfo("Baron Sengir", 1, Rarity.RARE, mage.cards.b.BaronSengir.class)); cards.add(new SetCardInfo("Black Carriage", 2, Rarity.RARE, mage.cards.b.BlackCarriage.class)); cards.add(new SetCardInfo("Castle Sengir", 138, Rarity.UNCOMMON, mage.cards.c.CastleSengir.class)); - cards.add(new SetCardInfo("Cemetery Gate", 4, Rarity.COMMON, mage.cards.c.CemeteryGate1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Cemetery Gate", 5, Rarity.COMMON, mage.cards.c.CemeteryGate1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Cemetery Gate", 4, Rarity.COMMON, CemeteryGate.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Cemetery Gate", 5, Rarity.COMMON, CemeteryGate.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Chandler", 88, Rarity.COMMON, mage.cards.c.Chandler.class)); cards.add(new SetCardInfo("Clockwork Gnomes", 127, Rarity.COMMON, mage.cards.c.ClockworkGnomes.class)); cards.add(new SetCardInfo("Coral Reef", 29, Rarity.COMMON, mage.cards.c.CoralReef.class)); @@ -87,20 +99,20 @@ public class Homelands extends ExpansionSet { cards.add(new SetCardInfo("Death Speakers", 109, Rarity.UNCOMMON, mage.cards.d.DeathSpeakers.class)); cards.add(new SetCardInfo("Didgeridoo", 130, Rarity.RARE, mage.cards.d.Didgeridoo.class)); cards.add(new SetCardInfo("Drudge Spell", 6, Rarity.UNCOMMON, mage.cards.d.DrudgeSpell.class)); - cards.add(new SetCardInfo("Dry Spell", 7, Rarity.COMMON, mage.cards.d.DrySpell1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Dry Spell", 8, Rarity.COMMON, mage.cards.d.DrySpell1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dry Spell", 7, Rarity.COMMON, DrySpell.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dry Spell", 8, Rarity.COMMON, DrySpell.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Dwarven Pony", 89, Rarity.RARE, mage.cards.d.DwarvenPony.class)); - cards.add(new SetCardInfo("Dwarven Trader", 91, Rarity.COMMON, mage.cards.d.DwarvenTrader1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Dwarven Trader", 92, Rarity.COMMON, mage.cards.d.DwarvenTrader1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dwarven Trader", 91, Rarity.COMMON, DwarvenTrader.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Dwarven Trader", 92, Rarity.COMMON, DwarvenTrader.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Ebony Rhino", 131, Rarity.COMMON, mage.cards.e.EbonyRhino.class)); cards.add(new SetCardInfo("Eron the Relentless", 93, Rarity.UNCOMMON, mage.cards.e.EronTheRelentless.class)); cards.add(new SetCardInfo("Evaporate", 94, Rarity.UNCOMMON, mage.cards.e.Evaporate.class)); cards.add(new SetCardInfo("Faerie Noble", 57, Rarity.RARE, mage.cards.f.FaerieNoble.class)); - cards.add(new SetCardInfo("Feast of the Unicorn", 9, Rarity.COMMON, mage.cards.f.FeastOfTheUnicorn1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Feast of the Unicorn", 10, Rarity.COMMON, mage.cards.f.FeastOfTheUnicorn1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Feast of the Unicorn", 9, Rarity.COMMON, FeastOfTheUnicorn.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Feast of the Unicorn", 10, Rarity.COMMON, FeastOfTheUnicorn.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Feroz's Ban", 132, Rarity.RARE, mage.cards.f.FerozsBan.class)); - cards.add(new SetCardInfo("Folk of An-Havva", 58, Rarity.COMMON, mage.cards.f.FolkOfAnHavva1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Folk of An-Havva", 59, Rarity.COMMON, mage.cards.f.FolkOfAnHavva1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Folk of An-Havva", 58, Rarity.COMMON, FolkOfAnHavva.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Folk of An-Havva", 59, Rarity.COMMON, FolkOfAnHavva.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Forget", 32, Rarity.RARE, mage.cards.f.Forget.class)); cards.add(new SetCardInfo("Grandmother Sengir", 13, Rarity.RARE, mage.cards.g.GrandmotherSengir.class)); cards.add(new SetCardInfo("Headstone", 15, Rarity.COMMON, mage.cards.h.Headstone.class)); @@ -118,13 +130,13 @@ public class Homelands extends ExpansionSet { cards.add(new SetCardInfo("Memory Lapse", 40, Rarity.COMMON, mage.cards.m.MemoryLapse.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Memory Lapse", 41, Rarity.COMMON, mage.cards.m.MemoryLapse.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Merchant Scroll", 42, Rarity.COMMON, mage.cards.m.MerchantScroll.class)); - cards.add(new SetCardInfo("Mesa Falcon", 112, Rarity.COMMON, mage.cards.m.MesaFalcon1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Mesa Falcon", 113, Rarity.COMMON, mage.cards.m.MesaFalcon1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Mesa Falcon", 112, Rarity.COMMON, MesaFalcon.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Mesa Falcon", 113, Rarity.COMMON, MesaFalcon.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Mystic Decree", 43, Rarity.RARE, mage.cards.m.MysticDecree.class)); cards.add(new SetCardInfo("Narwhal", 44, Rarity.RARE, mage.cards.n.Narwhal.class)); cards.add(new SetCardInfo("Primal Order", 65, Rarity.RARE, mage.cards.p.PrimalOrder.class)); - cards.add(new SetCardInfo("Reef Pirates", 45, Rarity.COMMON, mage.cards.r.ReefPirates1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Reef Pirates", 46, Rarity.COMMON, mage.cards.r.ReefPirates1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Reef Pirates", 45, Rarity.COMMON, ReefPirates.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Reef Pirates", 46, Rarity.COMMON, ReefPirates.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Renewal", 66, Rarity.COMMON, mage.cards.r.Renewal.class)); cards.add(new SetCardInfo("Reveka, Wizard Savant", 47, Rarity.RARE, mage.cards.r.RevekaWizardSavant.class)); cards.add(new SetCardInfo("Roots", 68, Rarity.UNCOMMON, mage.cards.r.Roots.class)); @@ -132,18 +144,18 @@ public class Homelands extends ExpansionSet { cards.add(new SetCardInfo("Roterothopter", 134, Rarity.COMMON, mage.cards.r.Roterothopter.class)); cards.add(new SetCardInfo("Sea Sprite", 48, Rarity.UNCOMMON, mage.cards.s.SeaSprite.class)); cards.add(new SetCardInfo("Sengir Autocrat", 19, Rarity.UNCOMMON, mage.cards.s.SengirAutocrat.class)); - cards.add(new SetCardInfo("Sengir Bats", 20, Rarity.COMMON, mage.cards.s.SengirBats2.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Sengir Bats", 21, Rarity.COMMON, mage.cards.s.SengirBats2.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Sengir Bats", 20, Rarity.COMMON, SengirBats.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Sengir Bats", 21, Rarity.COMMON, SengirBats.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Serra Aviary", 118, Rarity.RARE, mage.cards.s.SerraAviary.class)); cards.add(new SetCardInfo("Serrated Arrows", 135, Rarity.COMMON, mage.cards.s.SerratedArrows.class)); cards.add(new SetCardInfo("Shrink", 71, Rarity.COMMON, mage.cards.s.Shrink.class)); cards.add(new SetCardInfo("Spectral Bears", 72, Rarity.UNCOMMON, mage.cards.s.SpectralBears.class)); - cards.add(new SetCardInfo("Torture", 23, Rarity.COMMON, mage.cards.t.Torture1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Torture", 24, Rarity.COMMON, mage.cards.t.Torture1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Torture", 23, Rarity.COMMON, Torture.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Torture", 24, Rarity.COMMON, Torture.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Veldrane of Sengir", 25, Rarity.RARE, mage.cards.v.VeldraneOfSengir.class)); cards.add(new SetCardInfo("Wall of Kelp", 50, Rarity.RARE, mage.cards.w.WallOfKelp.class)); - cards.add(new SetCardInfo("Willow Faerie", 73, Rarity.COMMON, mage.cards.w.WillowFaerie1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Willow Faerie", 74, Rarity.COMMON, mage.cards.w.WillowFaerie1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Willow Faerie", 73, Rarity.COMMON, WillowFaerie.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Willow Faerie", 74, Rarity.COMMON, WillowFaerie.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Willow Priestess", 75, Rarity.RARE, mage.cards.w.WillowPriestess.class)); cards.add(new SetCardInfo("Winter Sky", 100, Rarity.RARE, mage.cards.w.WinterSky.class)); cards.add(new SetCardInfo("Wizards' School", 140, Rarity.UNCOMMON, mage.cards.w.WizardsSchool.class)); diff --git a/Mage.Sets/src/mage/sets/Magic2012.java b/Mage.Sets/src/mage/sets/Magic2012.java index 8d13bed68e..a09d8e28c1 100644 --- a/Mage.Sets/src/mage/sets/Magic2012.java +++ b/Mage.Sets/src/mage/sets/Magic2012.java @@ -27,6 +27,7 @@ */ package mage.sets; +import mage.cards.g.GoblinGrenade; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -155,7 +156,7 @@ public class Magic2012 extends ExpansionSet { cards.add(new SetCardInfo("Goblin Bangchuckers", 137, Rarity.UNCOMMON, mage.cards.g.GoblinBangchuckers.class)); cards.add(new SetCardInfo("Goblin Chieftain", 138, Rarity.RARE, mage.cards.g.GoblinChieftain.class)); cards.add(new SetCardInfo("Goblin Fireslinger", 139, Rarity.COMMON, mage.cards.g.GoblinFireslinger.class)); - cards.add(new SetCardInfo("Goblin Grenade", 140, Rarity.UNCOMMON, mage.cards.g.GoblinGrenade1.class)); + cards.add(new SetCardInfo("Goblin Grenade", 140, Rarity.UNCOMMON, GoblinGrenade.class)); cards.add(new SetCardInfo("Goblin Piker", 141, Rarity.COMMON, mage.cards.g.GoblinPiker.class)); cards.add(new SetCardInfo("Goblin Tunneler", 142, Rarity.COMMON, mage.cards.g.GoblinTunneler.class)); cards.add(new SetCardInfo("Goblin War Paint", 143, Rarity.COMMON, mage.cards.g.GoblinWarPaint.class)); diff --git a/Mage.Sets/src/mage/sets/MastersEdition.java b/Mage.Sets/src/mage/sets/MastersEdition.java index 83ab9e6063..e5bec3db65 100644 --- a/Mage.Sets/src/mage/sets/MastersEdition.java +++ b/Mage.Sets/src/mage/sets/MastersEdition.java @@ -28,6 +28,18 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.b.BasalThrull; +import mage.cards.d.DwarvenSoldier; +import mage.cards.g.GoblinChirurgeon; +import mage.cards.g.GoblinGrenade; +import mage.cards.h.HighTide; +import mage.cards.h.HymnToTourach; +import mage.cards.m.MindstabThrull; +import mage.cards.o.OrderOfLeitbur; +import mage.cards.o.OrderOfTheEbonHand; +import mage.cards.o.Oubliette; +import mage.cards.p.PhyrexianWarBeast; +import mage.cards.t.ThornThallid; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -67,7 +79,7 @@ public class MastersEdition extends ExpansionSet { cards.add(new SetCardInfo("Balduvian Horde", 86, Rarity.RARE, mage.cards.b.BalduvianHorde.class)); cards.add(new SetCardInfo("Ball Lightning", 87, Rarity.RARE, mage.cards.b.BallLightning.class)); cards.add(new SetCardInfo("Baron Sengir", 58, Rarity.RARE, mage.cards.b.BaronSengir.class)); - cards.add(new SetCardInfo("Basal Thrull", 59, Rarity.COMMON, mage.cards.b.BasalThrull1.class)); + cards.add(new SetCardInfo("Basal Thrull", 59, Rarity.COMMON, BasalThrull.class)); cards.add(new SetCardInfo("Berserk", 114, Rarity.RARE, mage.cards.b.Berserk.class)); cards.add(new SetCardInfo("Black Knight", 60, Rarity.UNCOMMON, mage.cards.b.BlackKnight.class)); cards.add(new SetCardInfo("Blight", 61, Rarity.UNCOMMON, mage.cards.b.Blight.class)); @@ -94,7 +106,7 @@ public class MastersEdition extends ExpansionSet { cards.add(new SetCardInfo("Dragon Engine", 156, Rarity.COMMON, mage.cards.d.DragonEngine.class)); cards.add(new SetCardInfo("Dust to Dust", 10, Rarity.COMMON, mage.cards.d.DustToDust.class)); cards.add(new SetCardInfo("Dwarven Catapult", 91, Rarity.UNCOMMON, mage.cards.d.DwarvenCatapult.class)); - cards.add(new SetCardInfo("Dwarven Soldier", 92, Rarity.COMMON, mage.cards.d.DwarvenSoldier1.class)); + cards.add(new SetCardInfo("Dwarven Soldier", 92, Rarity.COMMON, DwarvenSoldier.class)); cards.add(new SetCardInfo("Eater of the Dead", 67, Rarity.UNCOMMON, mage.cards.e.EaterOfTheDead.class)); cards.add(new SetCardInfo("Erg Raiders", 68, Rarity.COMMON, mage.cards.e.ErgRaiders.class)); cards.add(new SetCardInfo("Eureka", 117, Rarity.RARE, mage.cards.e.Eureka.class)); @@ -110,22 +122,22 @@ public class MastersEdition extends ExpansionSet { cards.add(new SetCardInfo("Fyndhorn Elves", 118, Rarity.COMMON, mage.cards.f.FyndhornElves.class)); cards.add(new SetCardInfo("Ghazban Ogre", 120, Rarity.COMMON, mage.cards.g.GhazbanOgre.class)); cards.add(new SetCardInfo("Giant Tortoise", 34, Rarity.COMMON, mage.cards.g.GiantTortoise.class)); - cards.add(new SetCardInfo("Goblin Chirurgeon", 94, Rarity.COMMON, mage.cards.g.GoblinChirurgeon1.class)); - cards.add(new SetCardInfo("Goblin Grenade", 95, Rarity.UNCOMMON, mage.cards.g.GoblinGrenade1.class)); + cards.add(new SetCardInfo("Goblin Chirurgeon", 94, Rarity.COMMON, GoblinChirurgeon.class)); + cards.add(new SetCardInfo("Goblin Grenade", 95, Rarity.UNCOMMON, GoblinGrenade.class)); cards.add(new SetCardInfo("Goblin Mutant", 96, Rarity.UNCOMMON, mage.cards.g.GoblinMutant.class)); cards.add(new SetCardInfo("Goblins of the Flarg", 98, Rarity.COMMON, mage.cards.g.GoblinsOfTheFlarg.class)); cards.add(new SetCardInfo("Goblin Wizard", 97, Rarity.RARE, mage.cards.g.GoblinWizard.class)); cards.add(new SetCardInfo("Granite Gargoyle", 99, Rarity.UNCOMMON, mage.cards.g.GraniteGargoyle.class)); cards.add(new SetCardInfo("Hand of Justice", 15, Rarity.RARE, mage.cards.h.HandOfJustice.class)); cards.add(new SetCardInfo("Hecatomb", 71, Rarity.RARE, mage.cards.h.Hecatomb.class)); - cards.add(new SetCardInfo("High Tide", 35, Rarity.UNCOMMON, mage.cards.h.HighTide1.class)); + cards.add(new SetCardInfo("High Tide", 35, Rarity.UNCOMMON, HighTide.class)); cards.add(new SetCardInfo("Holy Light", 16, Rarity.COMMON, mage.cards.h.HolyLight.class)); cards.add(new SetCardInfo("Homarid Spawning Bed", 36, Rarity.UNCOMMON, mage.cards.h.HomaridSpawningBed.class)); cards.add(new SetCardInfo("Hungry Mist", 121, Rarity.COMMON, mage.cards.h.HungryMist.class)); cards.add(new SetCardInfo("Hyalopterous Lemure", 72, Rarity.COMMON, mage.cards.h.HyalopterousLemure.class)); cards.add(new SetCardInfo("Hydroblast", 37, Rarity.COMMON, mage.cards.h.Hydroblast.class)); cards.add(new SetCardInfo("Hymn of Rebirth", 146, Rarity.UNCOMMON, mage.cards.h.HymnOfRebirth.class)); - cards.add(new SetCardInfo("Hymn to Tourach", 73, Rarity.UNCOMMON, mage.cards.h.HymnToTourach1.class)); + cards.add(new SetCardInfo("Hymn to Tourach", 73, Rarity.UNCOMMON, HymnToTourach.class)); cards.add(new SetCardInfo("Icatian Lieutenant", 17, Rarity.COMMON, mage.cards.i.IcatianLieutenant.class)); cards.add(new SetCardInfo("Icatian Town", 18, Rarity.UNCOMMON, mage.cards.i.IcatianTown.class)); cards.add(new SetCardInfo("Ice Storm", 122, Rarity.UNCOMMON, mage.cards.i.IceStorm.class)); @@ -150,7 +162,7 @@ public class MastersEdition extends ExpansionSet { cards.add(new SetCardInfo("Lord of Tresserhorn", 149, Rarity.RARE, mage.cards.l.LordOfTresserhorn.class)); cards.add(new SetCardInfo("Mana Flare", 103, Rarity.RARE, mage.cards.m.ManaFlare.class)); cards.add(new SetCardInfo("Marton Stromgald", 104, Rarity.RARE, mage.cards.m.MartonStromgald.class)); - cards.add(new SetCardInfo("Mindstab Thrull", 76, Rarity.COMMON, mage.cards.m.MindstabThrull1.class)); + cards.add(new SetCardInfo("Mindstab Thrull", 76, Rarity.COMMON, MindstabThrull.class)); cards.add(new SetCardInfo("Mishra's Factory", 178, Rarity.UNCOMMON, mage.cards.m.MishrasFactory.class)); cards.add(new SetCardInfo("Moat", 21, Rarity.RARE, mage.cards.m.Moat.class)); cards.add(new SetCardInfo("Mountain", 190, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); @@ -163,13 +175,13 @@ public class MastersEdition extends ExpansionSet { cards.add(new SetCardInfo("Nevinyrral's Disk", 160, Rarity.RARE, mage.cards.n.NevinyrralsDisk.class)); cards.add(new SetCardInfo("Onulet", 161, Rarity.COMMON, mage.cards.o.Onulet.class)); cards.add(new SetCardInfo("Orcish Mechanics", 106, Rarity.UNCOMMON, mage.cards.o.OrcishMechanics.class)); - cards.add(new SetCardInfo("Order of Leitbur", 22, Rarity.COMMON, mage.cards.o.OrderOfLeitbur1.class)); - cards.add(new SetCardInfo("Order of the Ebon Hand", 78, Rarity.COMMON, mage.cards.o.OrderOfTheEbonHand1.class)); - cards.add(new SetCardInfo("Oubliette", 79, Rarity.COMMON, mage.cards.o.Oubliette1.class)); + cards.add(new SetCardInfo("Order of Leitbur", 22, Rarity.COMMON, OrderOfLeitbur.class)); + cards.add(new SetCardInfo("Order of the Ebon Hand", 78, Rarity.COMMON, OrderOfTheEbonHand.class)); + cards.add(new SetCardInfo("Oubliette", 79, Rarity.COMMON, Oubliette.class)); cards.add(new SetCardInfo("Paralyze", 80, Rarity.COMMON, mage.cards.p.Paralyze.class)); cards.add(new SetCardInfo("Phantom Monster", 43, Rarity.COMMON, mage.cards.p.PhantomMonster.class)); cards.add(new SetCardInfo("Phelddagrif", 150, Rarity.RARE, mage.cards.p.Phelddagrif.class)); - cards.add(new SetCardInfo("Phyrexian War Beast", 162, Rarity.UNCOMMON, mage.cards.p.PhyrexianWarBeast1.class)); + cards.add(new SetCardInfo("Phyrexian War Beast", 162, Rarity.UNCOMMON, PhyrexianWarBeast.class)); cards.add(new SetCardInfo("Plains", 181, Rarity.LAND, mage.cards.basiclands.Plains.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Plains", 182, Rarity.LAND, mage.cards.basiclands.Plains.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Plains", 183, Rarity.LAND, mage.cards.basiclands.Plains.class, new CardGraphicInfo(null, true))); @@ -206,7 +218,7 @@ public class MastersEdition extends ExpansionSet { cards.add(new SetCardInfo("Tawnos's Coffin", 169, Rarity.RARE, mage.cards.t.TawnossCoffin.class)); cards.add(new SetCardInfo("Thawing Glaciers", 180, Rarity.RARE, mage.cards.t.ThawingGlaciers.class)); cards.add(new SetCardInfo("Thicket Basilisk", 134, Rarity.UNCOMMON, mage.cards.t.ThicketBasilisk.class)); - cards.add(new SetCardInfo("Thorn Thallid", 135, Rarity.COMMON, mage.cards.t.ThornThallid1.class)); + cards.add(new SetCardInfo("Thorn Thallid", 135, Rarity.COMMON, ThornThallid.class)); cards.add(new SetCardInfo("Thrull Champion", 83, Rarity.RARE, mage.cards.t.ThrullChampion.class)); cards.add(new SetCardInfo("Thrull Retainer", 84, Rarity.COMMON, mage.cards.t.ThrullRetainer.class)); cards.add(new SetCardInfo("Thunder Spirit", 27, Rarity.UNCOMMON, mage.cards.t.ThunderSpirit.class)); diff --git a/Mage.Sets/src/mage/sets/MastersEditionII.java b/Mage.Sets/src/mage/sets/MastersEditionII.java index 45e88084fe..b3abc73476 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionII.java @@ -28,6 +28,18 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.a.ArmorThrull; +import mage.cards.b.BrassclawOrcs; +import mage.cards.c.CombatMedic; +import mage.cards.e.ElvishHunter; +import mage.cards.f.FarrelsZealot; +import mage.cards.g.GorillaShaman; +import mage.cards.i.IcatianJavelineers; +import mage.cards.i.IcatianScout; +import mage.cards.l.LimDulsHighGuard; +import mage.cards.n.Necrite; +import mage.cards.n.NightSoil; +import mage.cards.o.OrcishVeteran; import mage.constants.SetType; import mage.constants.Rarity; @@ -61,7 +73,7 @@ public class MastersEditionII extends ExpansionSet { cards.add(new SetCardInfo("Angel of Light", 3, Rarity.UNCOMMON, mage.cards.a.AngelOfLight.class)); cards.add(new SetCardInfo("Armored Griffin", 5, Rarity.COMMON, mage.cards.a.ArmoredGriffin.class)); cards.add(new SetCardInfo("Armor of Faith", 4, Rarity.COMMON, mage.cards.a.ArmorOfFaith.class)); - cards.add(new SetCardInfo("Armor Thrull", 77, Rarity.COMMON, mage.cards.a.ArmorThrull1.class)); + cards.add(new SetCardInfo("Armor Thrull", 77, Rarity.COMMON, ArmorThrull.class)); cards.add(new SetCardInfo("Aurochs", 153, Rarity.COMMON, mage.cards.a.Aurochs.class)); cards.add(new SetCardInfo("Aysen Bureaucrats", 6, Rarity.COMMON, mage.cards.a.AysenBureaucrats.class)); cards.add(new SetCardInfo("Badlands", 225, Rarity.RARE, mage.cards.b.Badlands.class)); @@ -71,12 +83,12 @@ public class MastersEditionII extends ExpansionSet { cards.add(new SetCardInfo("Binding Grasp", 41, Rarity.RARE, mage.cards.b.BindingGrasp.class)); cards.add(new SetCardInfo("Bounty of the Hunt", 154, Rarity.RARE, mage.cards.b.BountyOfTheHunt.class)); cards.add(new SetCardInfo("Brainstorm", 42, Rarity.COMMON, mage.cards.b.Brainstorm.class)); - cards.add(new SetCardInfo("Brassclaw Orcs", 119, Rarity.COMMON, mage.cards.b.BrassclawOrcs1.class)); + cards.add(new SetCardInfo("Brassclaw Orcs", 119, Rarity.COMMON, BrassclawOrcs.class)); cards.add(new SetCardInfo("Brimstone Dragon", 120, Rarity.RARE, mage.cards.b.BrimstoneDragon.class)); cards.add(new SetCardInfo("Browse", 43, Rarity.UNCOMMON, mage.cards.b.Browse.class)); cards.add(new SetCardInfo("Burnout", 121, Rarity.UNCOMMON, mage.cards.b.Burnout.class)); cards.add(new SetCardInfo("Caribou Range", 8, Rarity.RARE, mage.cards.c.CaribouRange.class)); - cards.add(new SetCardInfo("Combat Medic", 9, Rarity.COMMON, mage.cards.c.CombatMedic1.class)); + cards.add(new SetCardInfo("Combat Medic", 9, Rarity.COMMON, CombatMedic.class)); cards.add(new SetCardInfo("Conquer", 122, Rarity.UNCOMMON, mage.cards.c.Conquer.class)); cards.add(new SetCardInfo("Counterspell", 44, Rarity.UNCOMMON, mage.cards.c.Counterspell.class)); cards.add(new SetCardInfo("Dance of the Dead", 83, Rarity.UNCOMMON, mage.cards.d.DanceOfTheDead.class)); @@ -92,13 +104,13 @@ public class MastersEditionII extends ExpansionSet { cards.add(new SetCardInfo("Elemental Augury", 193, Rarity.RARE, mage.cards.e.ElementalAugury.class)); cards.add(new SetCardInfo("Elven Lyre", 208, Rarity.COMMON, mage.cards.e.ElvenLyre.class)); cards.add(new SetCardInfo("Elvish Farmer", 156, Rarity.RARE, mage.cards.e.ElvishFarmer.class)); - cards.add(new SetCardInfo("Elvish Hunter", 157, Rarity.COMMON, mage.cards.e.ElvishHunter1.class)); + cards.add(new SetCardInfo("Elvish Hunter", 157, Rarity.COMMON, ElvishHunter.class)); cards.add(new SetCardInfo("Elvish Ranger", 158, Rarity.COMMON, mage.cards.e.ElvishRanger.class)); cards.add(new SetCardInfo("Elvish Spirit Guide", 159, Rarity.UNCOMMON, mage.cards.e.ElvishSpiritGuide.class)); cards.add(new SetCardInfo("Enervate", 47, Rarity.COMMON, mage.cards.e.Enervate.class)); cards.add(new SetCardInfo("Errantry", 124, Rarity.COMMON, mage.cards.e.Errantry.class)); cards.add(new SetCardInfo("Farrel's Mantle", 13, Rarity.UNCOMMON, mage.cards.f.FarrelsMantle.class)); - cards.add(new SetCardInfo("Farrel's Zealot", 14, Rarity.UNCOMMON, mage.cards.f.FarrelsZealot1.class)); + cards.add(new SetCardInfo("Farrel's Zealot", 14, Rarity.UNCOMMON, FarrelsZealot.class)); cards.add(new SetCardInfo("Feral Thallid", 161, Rarity.COMMON, mage.cards.f.FeralThallid.class)); cards.add(new SetCardInfo("Fire Dragon", 125, Rarity.RARE, mage.cards.f.FireDragon.class)); cards.add(new SetCardInfo("Flame Spirit", 126, Rarity.UNCOMMON, mage.cards.f.FlameSpirit.class)); @@ -111,13 +123,13 @@ public class MastersEditionII extends ExpansionSet { cards.add(new SetCardInfo("Giant Growth", 167, Rarity.COMMON, mage.cards.g.GiantGrowth.class)); cards.add(new SetCardInfo("Glacial Chasm", 229, Rarity.RARE, mage.cards.g.GlacialChasm.class)); cards.add(new SetCardInfo("Glacial Crevasses", 127, Rarity.RARE, mage.cards.g.GlacialCrevasses.class)); - cards.add(new SetCardInfo("Gorilla Shaman", 129, Rarity.UNCOMMON, mage.cards.g.GorillaShaman1.class)); + cards.add(new SetCardInfo("Gorilla Shaman", 129, Rarity.UNCOMMON, GorillaShaman.class)); cards.add(new SetCardInfo("Grandmother Sengir", 93, Rarity.RARE, mage.cards.g.GrandmotherSengir.class)); cards.add(new SetCardInfo("Havenwood Battleground", 230, Rarity.UNCOMMON, mage.cards.h.HavenwoodBattleground.class)); cards.add(new SetCardInfo("Heart of Yavimaya", 231, Rarity.RARE, mage.cards.h.HeartOfYavimaya.class)); cards.add(new SetCardInfo("Helm of Obedience", 210, Rarity.RARE, mage.cards.h.HelmOfObedience.class)); - cards.add(new SetCardInfo("Icatian Javelineers", 15, Rarity.COMMON, mage.cards.i.IcatianJavelineers1.class)); - cards.add(new SetCardInfo("Icatian Scout", 17, Rarity.COMMON, mage.cards.i.IcatianScout1.class)); + cards.add(new SetCardInfo("Icatian Javelineers", 15, Rarity.COMMON, IcatianJavelineers.class)); + cards.add(new SetCardInfo("Icatian Scout", 17, Rarity.COMMON, IcatianScout.class)); cards.add(new SetCardInfo("Icequake", 94, Rarity.COMMON, mage.cards.i.Icequake.class)); cards.add(new SetCardInfo("Icy Prison", 50, Rarity.COMMON, mage.cards.i.IcyPrison.class)); cards.add(new SetCardInfo("Ihsan's Shade", 95, Rarity.RARE, mage.cards.i.IhsansShade.class)); @@ -136,20 +148,20 @@ public class MastersEditionII extends ExpansionSet { cards.add(new SetCardInfo("Krovikan Fetish", 100, Rarity.COMMON, mage.cards.k.KrovikanFetish.class)); cards.add(new SetCardInfo("Krovikan Sorcerer", 51, Rarity.COMMON, mage.cards.k.KrovikanSorcerer.class)); cards.add(new SetCardInfo("Leaping Lizard", 171, Rarity.COMMON, mage.cards.l.LeapingLizard.class)); - cards.add(new SetCardInfo("Lim-Dul's High Guard", 103, Rarity.UNCOMMON, mage.cards.l.LimDulsHighGuard1.class)); + cards.add(new SetCardInfo("Lim-Dul's High Guard", 103, Rarity.UNCOMMON, LimDulsHighGuard.class)); cards.add(new SetCardInfo("Magus of the Unseen", 53, Rarity.RARE, mage.cards.m.MagusOfTheUnseen.class)); cards.add(new SetCardInfo("Mana Crypt", 214, Rarity.RARE, mage.cards.m.ManaCrypt.class)); cards.add(new SetCardInfo("Marjhan", 54, Rarity.RARE, mage.cards.m.Marjhan.class)); cards.add(new SetCardInfo("Mesmeric Trance", 55, Rarity.RARE, mage.cards.m.MesmericTrance.class)); cards.add(new SetCardInfo("Narwhal", 57, Rarity.UNCOMMON, mage.cards.n.Narwhal.class)); - cards.add(new SetCardInfo("Necrite", 106, Rarity.COMMON, mage.cards.n.Necrite1.class)); + cards.add(new SetCardInfo("Necrite", 106, Rarity.COMMON, Necrite.class)); cards.add(new SetCardInfo("Necropotence", 107, Rarity.RARE, mage.cards.n.Necropotence.class)); - cards.add(new SetCardInfo("Night Soil", 173, Rarity.UNCOMMON, mage.cards.n.NightSoil1.class)); + cards.add(new SetCardInfo("Night Soil", 173, Rarity.UNCOMMON, NightSoil.class)); cards.add(new SetCardInfo("Orc General", 137, Rarity.UNCOMMON, mage.cards.o.OrcGeneral.class)); cards.add(new SetCardInfo("Orcish Cannoneers", 138, Rarity.UNCOMMON, mage.cards.o.OrcishCannoneers.class)); cards.add(new SetCardInfo("Orcish Captain", 139, Rarity.UNCOMMON, mage.cards.o.OrcishCaptain.class)); cards.add(new SetCardInfo("Orcish Lumberjack", 142, Rarity.COMMON, mage.cards.o.OrcishLumberjack.class)); - cards.add(new SetCardInfo("Orcish Veteran", 144, Rarity.COMMON, mage.cards.o.OrcishVeteran1.class)); + cards.add(new SetCardInfo("Orcish Veteran", 144, Rarity.COMMON, OrcishVeteran.class)); cards.add(new SetCardInfo("Order of the Sacred Torch", 25, Rarity.RARE, mage.cards.o.OrderOfTheSacredTorch.class)); cards.add(new SetCardInfo("Order of the White Shield", 26, Rarity.UNCOMMON, mage.cards.o.OrderOfTheWhiteShield.class)); cards.add(new SetCardInfo("Panic", 145, Rarity.COMMON, mage.cards.p.Panic.class)); diff --git a/Mage.Sets/src/mage/sets/MastersEditionIII.java b/Mage.Sets/src/mage/sets/MastersEditionIII.java index ed969ff4c8..1551119c2a 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIII.java @@ -28,6 +28,7 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.f.FeveredStrength; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -105,7 +106,7 @@ public class MastersEditionIII extends ExpansionSet { cards.add(new SetCardInfo("False Defeat", 11, Rarity.UNCOMMON, mage.cards.f.FalseDefeat.class)); cards.add(new SetCardInfo("Famine", 65, Rarity.UNCOMMON, mage.cards.f.Famine.class)); cards.add(new SetCardInfo("Fellwar Stone", 195, Rarity.COMMON, mage.cards.f.FellwarStone.class)); - cards.add(new SetCardInfo("Fevered Strength", 66, Rarity.COMMON, mage.cards.f.FeveredStrength1.class)); + cards.add(new SetCardInfo("Fevered Strength", 66, Rarity.COMMON, FeveredStrength.class)); cards.add(new SetCardInfo("Fire Ambush", 97, Rarity.COMMON, mage.cards.f.FireAmbush.class)); cards.add(new SetCardInfo("Fire Drake", 98, Rarity.COMMON, mage.cards.f.FireDrake.class)); cards.add(new SetCardInfo("Fire Sprites", 118, Rarity.COMMON, mage.cards.f.FireSprites.class)); diff --git a/Mage.Sets/src/mage/sets/MastersEditionIV.java b/Mage.Sets/src/mage/sets/MastersEditionIV.java index 817ef8163b..7d2805f3b6 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIV.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIV.java @@ -28,6 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.a.AesthirGlider; +import mage.cards.e.EliteCatWarrior; import mage.constants.SetType; import mage.constants.Rarity; @@ -54,7 +56,7 @@ public class MastersEditionIV extends ExpansionSet { this.numBoosterRare = 1; this.ratioBoosterMythic = 0; cards.add(new SetCardInfo("Acid Rain", 36, Rarity.RARE, mage.cards.a.AcidRain.class)); - cards.add(new SetCardInfo("Aesthir Glider", 176, Rarity.COMMON, mage.cards.a.AesthirGlider1.class)); + cards.add(new SetCardInfo("Aesthir Glider", 176, Rarity.COMMON, AesthirGlider.class)); cards.add(new SetCardInfo("Air Elemental", 37, Rarity.UNCOMMON, mage.cards.a.AirElemental.class)); cards.add(new SetCardInfo("Alaborn Musketeer", 1, Rarity.COMMON, mage.cards.a.AlabornMusketeer.class)); cards.add(new SetCardInfo("Alaborn Trooper", 2, Rarity.COMMON, mage.cards.a.AlabornTrooper.class)); @@ -121,7 +123,7 @@ public class MastersEditionIV extends ExpansionSet { cards.add(new SetCardInfo("Ebony Horse", 198, Rarity.COMMON, mage.cards.e.EbonyHorse.class)); cards.add(new SetCardInfo("Ebony Rhino", 199, Rarity.COMMON, mage.cards.e.EbonyRhino.class)); cards.add(new SetCardInfo("Elephant Graveyard", 244, Rarity.UNCOMMON, mage.cards.e.ElephantGraveyard.class)); - cards.add(new SetCardInfo("Elite Cat Warrior", 151, Rarity.COMMON, mage.cards.e.EliteCatWarrior1.class)); + cards.add(new SetCardInfo("Elite Cat Warrior", 151, Rarity.COMMON, EliteCatWarrior.class)); cards.add(new SetCardInfo("Energy Flux", 48, Rarity.UNCOMMON, mage.cards.e.EnergyFlux.class)); cards.add(new SetCardInfo("Eye for an Eye", 12, Rarity.RARE, mage.cards.e.EyeForAnEye.class)); cards.add(new SetCardInfo("False Summoning", 49, Rarity.COMMON, mage.cards.f.FalseSummoning.class)); diff --git a/Mage.Sets/src/mage/sets/MediaInserts.java b/Mage.Sets/src/mage/sets/MediaInserts.java index 03cd682e93..3ece476f55 100644 --- a/Mage.Sets/src/mage/sets/MediaInserts.java +++ b/Mage.Sets/src/mage/sets/MediaInserts.java @@ -29,6 +29,11 @@ package mage.sets; import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; +<<<<<<< Updated upstream +======= +import mage.cards.h.HighTide; +import mage.constants.SetType; +>>>>>>> Stashed changes import mage.constants.Rarity; import mage.constants.SetType; @@ -119,7 +124,7 @@ public class MediaInserts extends ExpansionSet { cards.add(new SetCardInfo("Hamletback Goliath", 71, Rarity.RARE, mage.cards.h.HamletbackGoliath.class)); cards.add(new SetCardInfo("Harbinger of the Hunt", 116, Rarity.SPECIAL, mage.cards.h.HarbingerOfTheHunt.class)); cards.add(new SetCardInfo("Hero of Goma Fada", 136, Rarity.SPECIAL, mage.cards.h.HeroOfGomaFada.class)); - cards.add(new SetCardInfo("High Tide", 80, Rarity.COMMON, mage.cards.h.HighTide1.class)); + cards.add(new SetCardInfo("High Tide", 80, Rarity.COMMON, HighTide.class)); cards.add(new SetCardInfo("Hixus, Prison Warden", 126, Rarity.SPECIAL, mage.cards.h.HixusPrisonWarden.class)); cards.add(new SetCardInfo("Honored Hierarch", 129, Rarity.SPECIAL, mage.cards.h.HonoredHierarch.class)); cards.add(new SetCardInfo("Honor of the Pure", 20, Rarity.RARE, mage.cards.h.HonorOfThePure.class)); diff --git a/Mage.Sets/src/mage/sets/NinthEdition.java b/Mage.Sets/src/mage/sets/NinthEdition.java index 5cdacf31e2..041224e583 100644 --- a/Mage.Sets/src/mage/sets/NinthEdition.java +++ b/Mage.Sets/src/mage/sets/NinthEdition.java @@ -1,5 +1,7 @@ package mage.sets; +import mage.cards.f.FishliverOil; +import mage.cards.r.RukhEgg; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -111,7 +113,7 @@ public class NinthEdition extends ExpansionSet { cards.add(new SetCardInfo("Festering Goblin", 130, Rarity.COMMON, mage.cards.f.FesteringGoblin.class)); cards.add(new SetCardInfo("Final Punishment", 131, Rarity.RARE, mage.cards.f.FinalPunishment.class)); cards.add(new SetCardInfo("Firebreathing", 181, Rarity.COMMON, mage.cards.f.Firebreathing.class)); - cards.add(new SetCardInfo("Fishliver Oil", 77, Rarity.COMMON, mage.cards.f.FishliverOil1.class)); + cards.add(new SetCardInfo("Fishliver Oil", 77, Rarity.COMMON, FishliverOil.class)); cards.add(new SetCardInfo("Flame Wave", 182, Rarity.UNCOMMON, mage.cards.f.FlameWave.class)); cards.add(new SetCardInfo("Flashfires", 183, Rarity.UNCOMMON, mage.cards.f.Flashfires.class)); cards.add(new SetCardInfo("Fleeting Image", 78, Rarity.RARE, mage.cards.f.FleetingImage.class)); @@ -267,7 +269,7 @@ public class NinthEdition extends ExpansionSet { cards.add(new SetCardInfo("Rootbreaker Wurm", 267, Rarity.UNCOMMON, mage.cards.r.RootbreakerWurm.class)); cards.add(new SetCardInfo("Rootwalla", 268, Rarity.COMMON, mage.cards.r.Rootwalla.class)); cards.add(new SetCardInfo("Royal Assassin", 159, Rarity.RARE, mage.cards.r.RoyalAssassin.class)); - cards.add(new SetCardInfo("Rukh Egg", 214, Rarity.RARE, mage.cards.r.RukhEgg1.class)); + cards.add(new SetCardInfo("Rukh Egg", 214, Rarity.RARE, RukhEgg.class)); cards.add(new SetCardInfo("Sacred Ground", 37, Rarity.RARE, mage.cards.s.SacredGround.class)); cards.add(new SetCardInfo("Sacred Nectar", 38, Rarity.COMMON, mage.cards.s.SacredNectar.class)); cards.add(new SetCardInfo("Sage Aven", 95, Rarity.COMMON, mage.cards.s.SageAven.class)); diff --git a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java index 10cbefa289..baf3c52bd1 100644 --- a/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java +++ b/Mage.Sets/src/mage/sets/OathOfTheGatewatch.java @@ -11,6 +11,7 @@ import mage.cards.ExpansionSet; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; +import mage.cards.w.Wastes; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -217,8 +218,8 @@ public class OathOfTheGatewatch extends ExpansionSet { cards.add(new SetCardInfo("Wandering Fumarole", 182, Rarity.RARE, mage.cards.w.WanderingFumarole.class)); cards.add(new SetCardInfo("Warden of Geometries", 11, Rarity.COMMON, mage.cards.w.WardenOfGeometries.class)); cards.add(new SetCardInfo("Warping Wail", 12, Rarity.UNCOMMON, mage.cards.w.WarpingWail.class)); - cards.add(new SetCardInfo("Wastes", 183, Rarity.COMMON, mage.cards.w.Wastes1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Wastes", 184, Rarity.COMMON, mage.cards.w.Wastes1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Wastes", 183, Rarity.COMMON, Wastes.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Wastes", 184, Rarity.COMMON, Wastes.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Weapons Trainer", 160, Rarity.UNCOMMON, mage.cards.w.WeaponsTrainer.class)); cards.add(new SetCardInfo("Witness the End", 82, Rarity.COMMON, mage.cards.w.WitnessTheEnd.class)); cards.add(new SetCardInfo("World Breaker", 126, Rarity.MYTHIC, mage.cards.w.WorldBreaker.class)); diff --git a/Mage.Sets/src/mage/sets/Planeshift.java b/Mage.Sets/src/mage/sets/Planeshift.java index a29b870f70..56e6538f05 100644 --- a/Mage.Sets/src/mage/sets/Planeshift.java +++ b/Mage.Sets/src/mage/sets/Planeshift.java @@ -27,6 +27,9 @@ */ package mage.sets; +import mage.cards.e.ErtaiTheCorrupted; +import mage.cards.s.SkyshipWeatherlight; +import mage.cards.t.TahngarthTalruumHero; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -83,8 +86,8 @@ public class Planeshift extends ExpansionSet { cards.add(new SetCardInfo("Dromar's Charm", 105, Rarity.UNCOMMON, mage.cards.d.DromarsCharm.class)); cards.add(new SetCardInfo("Eladamri's Call", 106, Rarity.RARE, mage.cards.e.EladamrisCall.class)); cards.add(new SetCardInfo("Ertai's Trickery", 24, Rarity.UNCOMMON, mage.cards.e.ErtaisTrickery.class)); - cards.add(new SetCardInfo("Ertai, the Corrupted", "107a", Rarity.RARE, mage.cards.e.ErtaiTheCorrupted1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Ertai, the Corrupted", "107b", Rarity.RARE, mage.cards.e.ErtaiTheCorrupted1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Ertai, the Corrupted", "107a", Rarity.RARE, ErtaiTheCorrupted.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Ertai, the Corrupted", "107b", Rarity.RARE, ErtaiTheCorrupted.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Escape Routes", 25, Rarity.COMMON, mage.cards.e.EscapeRoutes.class)); cards.add(new SetCardInfo("Exotic Disease", 43, Rarity.UNCOMMON, mage.cards.e.ExoticDisease.class)); cards.add(new SetCardInfo("Falling Timber", 79, Rarity.COMMON, mage.cards.f.FallingTimber.class)); @@ -156,8 +159,8 @@ public class Planeshift extends ExpansionSet { cards.add(new SetCardInfo("Singe", 71, Rarity.COMMON, mage.cards.s.Singe.class)); cards.add(new SetCardInfo("Sinister Strength", 54, Rarity.COMMON, mage.cards.s.SinisterStrength.class)); cards.add(new SetCardInfo("Sisay's Ingenuity", 33, Rarity.COMMON, mage.cards.s.SisaysIngenuity.class)); - cards.add(new SetCardInfo("Skyship Weatherlight", "133a", Rarity.RARE, mage.cards.s.SkyshipWeatherlight1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Skyship Weatherlight", "133b", Rarity.RARE, mage.cards.s.SkyshipWeatherlight1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Skyship Weatherlight", "133a", Rarity.RARE, SkyshipWeatherlight.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Skyship Weatherlight", "133b", Rarity.RARE, SkyshipWeatherlight.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Skyshroud Blessing", 92, Rarity.UNCOMMON, mage.cards.s.SkyshroudBlessing.class)); cards.add(new SetCardInfo("Slay", 55, Rarity.UNCOMMON, mage.cards.s.Slay.class)); cards.add(new SetCardInfo("Sleeping Potion", 34, Rarity.COMMON, mage.cards.s.SleepingPotion.class)); @@ -173,8 +176,8 @@ public class Planeshift extends ExpansionSet { cards.add(new SetCardInfo("Sunken Hope", 37, Rarity.RARE, mage.cards.s.SunkenHope.class)); cards.add(new SetCardInfo("Sunscape Battlemage", 16, Rarity.UNCOMMON, mage.cards.s.SunscapeBattlemage.class)); cards.add(new SetCardInfo("Sunscape Familiar", 17, Rarity.COMMON, mage.cards.s.SunscapeFamiliar.class)); - cards.add(new SetCardInfo("Tahngarth, Talruum Hero", "74a", Rarity.RARE, mage.cards.t.TahngarthTalruumHero1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Tahngarth, Talruum Hero", "74b", Rarity.RARE, mage.cards.t.TahngarthTalruumHero1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Tahngarth, Talruum Hero", "74a", Rarity.RARE, TahngarthTalruumHero.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Tahngarth, Talruum Hero", "74b", Rarity.RARE, TahngarthTalruumHero.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Terminal Moraine", 142, Rarity.UNCOMMON, mage.cards.t.TerminalMoraine.class)); cards.add(new SetCardInfo("Terminate", 128, Rarity.COMMON, mage.cards.t.Terminate.class)); cards.add(new SetCardInfo("Thornscape Battlemage", 94, Rarity.UNCOMMON, mage.cards.t.ThornscapeBattlemage.class)); diff --git a/Mage.Sets/src/mage/sets/Portal.java b/Mage.Sets/src/mage/sets/Portal.java index 4bc6909327..7a5d483fc6 100644 --- a/Mage.Sets/src/mage/sets/Portal.java +++ b/Mage.Sets/src/mage/sets/Portal.java @@ -29,6 +29,9 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.d.DrySpell; +import mage.cards.e.EliteCatWarrior; +import mage.cards.w.WarriorsCharge; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -106,11 +109,11 @@ public class Portal extends ExpansionSet { cards.add(new SetCardInfo("Devoted Hero", 175, Rarity.COMMON, mage.cards.d.DevotedHero.class)); cards.add(new SetCardInfo("Djinn of the Lamp", 54, Rarity.RARE, mage.cards.d.DjinnOfTheLamp.class)); cards.add(new SetCardInfo("Dread Reaper", 11, Rarity.RARE, mage.cards.d.DreadReaper.class)); - cards.add(new SetCardInfo("Dry Spell", 12, Rarity.UNCOMMON, mage.cards.d.DrySpell1.class)); + cards.add(new SetCardInfo("Dry Spell", 12, Rarity.UNCOMMON, DrySpell.class)); cards.add(new SetCardInfo("Earthquake", 129, Rarity.RARE, mage.cards.e.Earthquake.class)); cards.add(new SetCardInfo("Ebon Dragon", 13, Rarity.RARE, mage.cards.e.EbonDragon.class)); - cards.add(new SetCardInfo("Elite Cat Warrior", 87, Rarity.COMMON, mage.cards.e.EliteCatWarrior1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Elite Cat Warrior", 88, Rarity.COMMON, mage.cards.e.EliteCatWarrior1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elite Cat Warrior", 87, Rarity.COMMON, EliteCatWarrior.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Elite Cat Warrior", 88, Rarity.COMMON, EliteCatWarrior.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Elven Cache", 89, Rarity.COMMON, mage.cards.e.ElvenCache.class)); cards.add(new SetCardInfo("Elvish Ranger", 90, Rarity.COMMON, mage.cards.e.ElvishRanger.class)); cards.add(new SetCardInfo("Endless Cockroaches", 14, Rarity.RARE, mage.cards.e.EndlessCockroaches.class)); @@ -259,8 +262,8 @@ public class Portal extends ExpansionSet { cards.add(new SetCardInfo("Volcanic Hammer", 160, Rarity.COMMON, mage.cards.v.VolcanicHammer.class)); cards.add(new SetCardInfo("Wall of Granite", 161, Rarity.UNCOMMON, mage.cards.w.WallOfGranite.class)); cards.add(new SetCardInfo("Wall of Swords", 199, Rarity.UNCOMMON, mage.cards.w.WallOfSwords.class)); - cards.add(new SetCardInfo("Warrior's Charge", 200, Rarity.COMMON, mage.cards.w.WarriorsCharge1.class, new CardGraphicInfo(null, true))); - cards.add(new SetCardInfo("Warrior's Charge", 201, Rarity.COMMON, mage.cards.w.WarriorsCharge1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Warrior's Charge", 200, Rarity.COMMON, WarriorsCharge.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Warrior's Charge", 201, Rarity.COMMON, WarriorsCharge.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Whiptail Wurm", 118, Rarity.UNCOMMON, mage.cards.w.WhiptailWurm.class)); cards.add(new SetCardInfo("Wicked Pact", 40, Rarity.RARE, mage.cards.w.WickedPact.class)); cards.add(new SetCardInfo("Willow Dryad", 119, Rarity.COMMON, mage.cards.w.WillowDryad.class)); diff --git a/Mage.Sets/src/mage/sets/SeventhEdition.java b/Mage.Sets/src/mage/sets/SeventhEdition.java index 157d56b39c..ba306fa24f 100644 --- a/Mage.Sets/src/mage/sets/SeventhEdition.java +++ b/Mage.Sets/src/mage/sets/SeventhEdition.java @@ -28,6 +28,8 @@ package mage.sets; import mage.cards.ExpansionSet; +import mage.cards.g.GoblinWarDrums; +import mage.cards.s.StormShaman; import mage.constants.SetType; import mage.constants.Rarity; import mage.cards.CardGraphicInfo; @@ -176,7 +178,7 @@ public class SeventhEdition extends ExpansionSet { cards.add(new SetCardInfo("Goblin Matron", 191, Rarity.UNCOMMON, mage.cards.g.GoblinMatron.class)); cards.add(new SetCardInfo("Goblin Raider", 192, Rarity.COMMON, mage.cards.g.GoblinRaider.class)); cards.add(new SetCardInfo("Goblin Spelunkers", 193, Rarity.COMMON, mage.cards.g.GoblinSpelunkers.class)); - cards.add(new SetCardInfo("Goblin War Drums", 194, Rarity.UNCOMMON, mage.cards.g.GoblinWarDrums1.class)); + cards.add(new SetCardInfo("Goblin War Drums", 194, Rarity.UNCOMMON, GoblinWarDrums.class)); cards.add(new SetCardInfo("Gorilla Chieftain", 250, Rarity.COMMON, mage.cards.g.GorillaChieftain.class)); cards.add(new SetCardInfo("Grafted Skullcap", 298, Rarity.RARE, mage.cards.g.GraftedSkullcap.class)); cards.add(new SetCardInfo("Granite Grip", 195, Rarity.COMMON, mage.cards.g.GraniteGrip.class)); @@ -343,7 +345,7 @@ public class SeventhEdition extends ExpansionSet { cards.add(new SetCardInfo("Stone Rain", 221, Rarity.COMMON, mage.cards.s.StoneRain.class)); cards.add(new SetCardInfo("Storm Cauldron", 320, Rarity.RARE, mage.cards.s.StormCauldron.class)); cards.add(new SetCardInfo("Storm Crow", 100, Rarity.COMMON, mage.cards.s.StormCrow.class)); - cards.add(new SetCardInfo("Storm Shaman", 222, Rarity.UNCOMMON, mage.cards.s.StormShaman1.class)); + cards.add(new SetCardInfo("Storm Shaman", 222, Rarity.UNCOMMON, StormShaman.class)); cards.add(new SetCardInfo("Strands of Night", 165, Rarity.UNCOMMON, mage.cards.s.StrandsOfNight.class)); cards.add(new SetCardInfo("Stream of Life", 272, Rarity.COMMON, mage.cards.s.StreamOfLife.class)); cards.add(new SetCardInfo("Stronghold Assassin", 166, Rarity.RARE, mage.cards.s.StrongholdAssassin.class)); diff --git a/Mage.Sets/src/mage/sets/Shadowmoor.java b/Mage.Sets/src/mage/sets/Shadowmoor.java index fa5fd0a024..3974daf686 100644 --- a/Mage.Sets/src/mage/sets/Shadowmoor.java +++ b/Mage.Sets/src/mage/sets/Shadowmoor.java @@ -27,6 +27,7 @@ */ package mage.sets; +import mage.cards.t.Torture; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -323,7 +324,7 @@ public class Shadowmoor extends ExpansionSet { cards.add(new SetCardInfo("Toil to Renown", 130, Rarity.COMMON, mage.cards.t.ToilToRenown.class)); cards.add(new SetCardInfo("Torpor Dust", 177, Rarity.COMMON, mage.cards.t.TorporDust.class)); cards.add(new SetCardInfo("Torrent of Souls", 199, Rarity.UNCOMMON, mage.cards.t.TorrentOfSouls.class)); - cards.add(new SetCardInfo("Torture", 80, Rarity.COMMON, mage.cards.t.Torture1.class)); + cards.add(new SetCardInfo("Torture", 80, Rarity.COMMON, Torture.class)); cards.add(new SetCardInfo("Tower Above", 131, Rarity.UNCOMMON, mage.cards.t.TowerAbove.class)); cards.add(new SetCardInfo("Traitor's Roar", 200, Rarity.COMMON, mage.cards.t.TraitorsRoar.class)); cards.add(new SetCardInfo("Trip Noose", 266, Rarity.UNCOMMON, mage.cards.t.TripNoose.class)); diff --git a/Mage.Sets/src/mage/sets/StarWars.java b/Mage.Sets/src/mage/sets/StarWars.java index 4e02a45288..cd6d0649fd 100644 --- a/Mage.Sets/src/mage/sets/StarWars.java +++ b/Mage.Sets/src/mage/sets/StarWars.java @@ -55,7 +55,7 @@ public class StarWars extends ExpansionSet { this.numBoosterUncommon = 3; this.numBoosterRare = 1; this.ratioBoosterMythic = 8; - cards.add(new SetCardInfo("AAT-1", 179, Rarity.UNCOMMON, mage.cards.a.AAT1.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("AAT-1", 179, Rarity.UNCOMMON, mage.cards.a.AAT1.class)); cards.add(new SetCardInfo("Acklay of the Arena", 180, Rarity.RARE, mage.cards.a.AcklayOfTheArena.class)); cards.add(new SetCardInfo("Acquire Target", 64, Rarity.COMMON, mage.cards.a.AcquireTarget.class)); cards.add(new SetCardInfo("Admiral Ackbar", 34, Rarity.RARE, mage.cards.a.AdmiralAckbar.class)); @@ -80,7 +80,7 @@ public class StarWars extends ExpansionSet { cards.add(new SetCardInfo("Bounty Sniper", 98, Rarity.UNCOMMON, mage.cards.b.BountySniper.class)); cards.add(new SetCardInfo("Bounty Spotter", 69, Rarity.UNCOMMON, mage.cards.b.BountySpotter.class)); cards.add(new SetCardInfo("Bull Rancor", 186, Rarity.RARE, mage.cards.b.BullRancor.class)); - cards.add(new SetCardInfo("C-3PO and R2D2", 160, Rarity.RARE, mage.cards.c.C3POAndR2D2.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("C-3PO and R2D2", 160, Rarity.RARE, mage.cards.c.C3POAndR2D2.class)); cards.add(new SetCardInfo("Cantina Band", 6, Rarity.COMMON, mage.cards.c.CantinaBand.class)); cards.add(new SetCardInfo("Capture", 99, Rarity.COMMON, mage.cards.c.Capture.class)); cards.add(new SetCardInfo("Carbonite Chamber", 161, Rarity.UNCOMMON, mage.cards.c.CarboniteChamber.class)); @@ -216,7 +216,7 @@ public class StarWars extends ExpansionSet { cards.add(new SetCardInfo("Nute Gunray", 208, Rarity.RARE, mage.cards.n.NuteGunray.class)); cards.add(new SetCardInfo("Obi-Wan Kenobi", 163, Rarity.MYTHIC, mage.cards.o.ObiWanKenobi.class)); cards.add(new SetCardInfo("Orbital Bombardment", 25, Rarity.RARE, mage.cards.o.OrbitalBombardment.class)); - cards.add(new SetCardInfo("Order 66", 82, Rarity.RARE, mage.cards.o.Order66.class, new CardGraphicInfo(null, true))); + cards.add(new SetCardInfo("Order 66", 82, Rarity.RARE, mage.cards.o.Order66.class)); cards.add(new SetCardInfo("Ortolan Keyboardist", 49, Rarity.COMMON, mage.cards.o.OrtolanKeyboardist.class)); cards.add(new SetCardInfo("Outer Rim Slaver", 209, Rarity.COMMON, mage.cards.o.OuterRimSlaver.class)); cards.add(new SetCardInfo("Outlaw Holocron", 235, Rarity.COMMON, mage.cards.o.OutlawHolocron.class)); diff --git a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java index ebdc36c44b..446c3ea4ae 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java +++ b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java @@ -27,6 +27,8 @@ */ package mage.sets; +import mage.cards.i.IcatianJavelineers; +import mage.cards.s.SwampMosquito; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -90,7 +92,7 @@ public class TimeSpiralTimeshifted extends ExpansionSet { cards.add(new SetCardInfo("Goblin Snowman", 64, Rarity.UNCOMMON, mage.cards.g.GoblinSnowman.class)); cards.add(new SetCardInfo("Grinning Totem", 110, Rarity.SPECIAL, mage.cards.g.GrinningTotem.class)); cards.add(new SetCardInfo("Hunting Moa", 80, Rarity.COMMON, mage.cards.h.HuntingMoa.class)); - cards.add(new SetCardInfo("Icatian Javelineers", 10, Rarity.SPECIAL, mage.cards.i.IcatianJavelineers1.class)); + cards.add(new SetCardInfo("Icatian Javelineers", 10, Rarity.SPECIAL, IcatianJavelineers.class)); cards.add(new SetCardInfo("Jasmine Boreal", 93, Rarity.COMMON, mage.cards.j.JasmineBoreal.class)); cards.add(new SetCardInfo("Jolrael, Empress of Beasts", 81, Rarity.SPECIAL, mage.cards.j.JolraelEmpressOfBeasts.class)); cards.add(new SetCardInfo("Kobold Taskmaster", 65, Rarity.SPECIAL, mage.cards.k.KoboldTaskmaster.class)); @@ -131,7 +133,7 @@ public class TimeSpiralTimeshifted extends ExpansionSet { cards.add(new SetCardInfo("Stormscape Familiar", 32, Rarity.COMMON, mage.cards.s.StormscapeFamiliar.class)); cards.add(new SetCardInfo("Stupor", 48, Rarity.COMMON, mage.cards.s.Stupor.class)); cards.add(new SetCardInfo("Suq'Ata Lancer", 69, Rarity.COMMON, mage.cards.s.SuqAtaLancer.class)); - cards.add(new SetCardInfo("Swamp Mosquito", 49, Rarity.SPECIAL, mage.cards.s.SwampMosquito1.class)); + cards.add(new SetCardInfo("Swamp Mosquito", 49, Rarity.SPECIAL, SwampMosquito.class)); cards.add(new SetCardInfo("Teferi's Moat", 103, Rarity.SPECIAL, mage.cards.t.TeferisMoat.class)); cards.add(new SetCardInfo("Thallid", 86, Rarity.COMMON, mage.cards.t.Thallid.class)); cards.add(new SetCardInfo("The Rack", 113, Rarity.SPECIAL, mage.cards.t.TheRack.class)); diff --git a/Mage.Sets/src/mage/sets/VintageMasters.java b/Mage.Sets/src/mage/sets/VintageMasters.java index 18a4ab3fc0..fca554c3d0 100644 --- a/Mage.Sets/src/mage/sets/VintageMasters.java +++ b/Mage.Sets/src/mage/sets/VintageMasters.java @@ -30,6 +30,8 @@ package mage.sets; import java.util.List; import mage.cards.ExpansionSet; +import mage.cards.h.HighTide; +import mage.cards.h.HymnToTourach; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; @@ -194,9 +196,9 @@ public class VintageMasters extends ExpansionSet { cards.add(new SetCardInfo("Gush", 72, Rarity.UNCOMMON, mage.cards.g.Gush.class)); cards.add(new SetCardInfo("Gustcloak Harrier", 30, Rarity.COMMON, mage.cards.g.GustcloakHarrier.class)); cards.add(new SetCardInfo("Hermit Druid", 216, Rarity.RARE, mage.cards.h.HermitDruid.class)); - cards.add(new SetCardInfo("High Tide", 73, Rarity.UNCOMMON, mage.cards.h.HighTide1.class)); + cards.add(new SetCardInfo("High Tide", 73, Rarity.UNCOMMON, HighTide.class)); cards.add(new SetCardInfo("Hulking Goblin", 174, Rarity.COMMON, mage.cards.h.HulkingGoblin.class)); - cards.add(new SetCardInfo("Hymn to Tourach", 122, Rarity.UNCOMMON, mage.cards.h.HymnToTourach1.class)); + cards.add(new SetCardInfo("Hymn to Tourach", 122, Rarity.UNCOMMON, HymnToTourach.class)); cards.add(new SetCardInfo("Ichorid", 123, Rarity.RARE, mage.cards.i.Ichorid.class)); cards.add(new SetCardInfo("Ivory Tower", 269, Rarity.UNCOMMON, mage.cards.i.IvoryTower.class)); cards.add(new SetCardInfo("Jace, the Mind Sculptor", 74, Rarity.MYTHIC, mage.cards.j.JaceTheMindSculptor.class)); diff --git a/Mage.Sets/src/mage/sets/WPNGateway.java b/Mage.Sets/src/mage/sets/WPNGateway.java index 1784e706c9..47e5e5b89b 100644 --- a/Mage.Sets/src/mage/sets/WPNGateway.java +++ b/Mage.Sets/src/mage/sets/WPNGateway.java @@ -5,6 +5,7 @@ */ package mage.sets; +import mage.cards.i.IcatianJavelineers; import mage.constants.SetType; import mage.cards.ExpansionSet; import mage.constants.Rarity; @@ -47,7 +48,7 @@ public class WPNGateway extends ExpansionSet { cards.add(new SetCardInfo("Gravedigger", 16, Rarity.SPECIAL, mage.cards.g.Gravedigger.class)); cards.add(new SetCardInfo("Hada Freeblade", 38, Rarity.SPECIAL, mage.cards.h.HadaFreeblade.class)); cards.add(new SetCardInfo("Hellspark Elemental", 25, Rarity.SPECIAL, mage.cards.h.HellsparkElemental.class)); - cards.add(new SetCardInfo("Icatian Javelineers", 2, Rarity.SPECIAL, mage.cards.i.IcatianJavelineers1.class)); + cards.add(new SetCardInfo("Icatian Javelineers", 2, Rarity.SPECIAL, IcatianJavelineers.class)); cards.add(new SetCardInfo("Kalastria Highborn", 39, Rarity.SPECIAL, mage.cards.k.KalastriaHighborn.class)); cards.add(new SetCardInfo("Kor Duelist", 32, Rarity.SPECIAL, mage.cards.k.KorDuelist.class)); cards.add(new SetCardInfo("Kor Firewalker", 36, Rarity.SPECIAL, mage.cards.k.KorFirewalker.class)); diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index 8a94962d23..24e3d35dc2 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -52,7 +52,6 @@ public abstract class ExpansionSet implements Serializable { private final String cardNumber; private final Rarity rarity; private final Class cardClass; - private final boolean usesVariousArt; private final CardGraphicInfo graphicInfo; public SetCardInfo(String name, int cardNumber, Rarity rarity, Class cardClass) { @@ -72,11 +71,6 @@ public abstract class ExpansionSet implements Serializable { this.cardNumber = cardNumber; this.rarity = rarity; this.cardClass = cardClass; - if (graphicInfo != null) { - this.usesVariousArt = graphicInfo.getUsesVariousArt(); - } else { - usesVariousArt = false; - } this.graphicInfo = graphicInfo; } @@ -96,10 +90,6 @@ public abstract class ExpansionSet implements Serializable { return this.cardClass; } - public boolean getUsesVariousArt() { - return this.usesVariousArt; - } - public CardGraphicInfo getGraphicInfo() { return this.graphicInfo; } diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 197d798bb6..29ab851bd3 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -101,6 +101,8 @@ public class CardInfo { @DatabaseField protected String frameStyle; @DatabaseField + protected boolean variousArt; + @DatabaseField protected boolean splitCard; @DatabaseField protected boolean splitCardHalf; @@ -141,6 +143,7 @@ public class CardInfo { this.frameStyle = card.getFrameStyle().toString(); this.frameColor = card.getFrameColor(null).toString(); + this.variousArt = card.getUsesVariousArt(); this.blue = card.getColor(null).isBlue(); this.black = card.getColor(null).isBlack(); this.green = card.getColor(null).isGreen(); @@ -211,11 +214,7 @@ public class CardInfo { } } - public boolean usesVariousArt() { - return getRarity().equals(Rarity.LAND) - || Character.isDigit(className.charAt(className.length() - 1)) - || !Character.isDigit(cardNumber.charAt(cardNumber.length() - 1)); - } + public boolean usesVariousArt() { return variousArt; } public ObjectColor getColor() { ObjectColor color = new ObjectColor(); diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 35f30921e8..fd5a9289cd 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -62,7 +62,7 @@ public enum CardRepository { private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE"; private static final String VERSION_ENTITY_NAME = "card"; // raise this if db structure was changed - private static final long CARD_DB_VERSION = 47; + private static final long CARD_DB_VERSION = 48; // raise this if new cards were added to the server private static final long CARD_CONTENT_VERSION = 64;