diff --git a/Mage.Client/src/main/java/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java index ee084b15824..ad229651b19 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Card.java +++ b/Mage.Client/src/main/java/mage/client/cards/Card.java @@ -251,7 +251,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis else if (card.getCardTypes() != null && (card.getCardTypes().contains(CardType.CREATURE) || card.getCardTypes().contains(CardType.PLANESWALKER))) { sb.append("creature"); } - sb.append(card.getColor()).append(card.getArt()).append(card.getRarity()).append(card.getExpansionSetCode()); + sb.append(card.getColor()).append(card.getRarity()).append(card.getExpansionSetCode()); return sb.toString(); } diff --git a/Mage.Common/src/mage/view/AbilityView.java b/Mage.Common/src/mage/view/AbilityView.java index 5fd0f09fba7..b6e1780b9df 100644 --- a/Mage.Common/src/mage/view/AbilityView.java +++ b/Mage.Common/src/mage/view/AbilityView.java @@ -58,7 +58,6 @@ public class AbilityView extends CardView { this.superTypes = new ArrayList(); this.color = new ObjectColor(); this.manaCost = ability.getManaCosts().getSymbols(); - this.art = ""; } public CardView getSourceCard() { diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 7cef8b191a8..e083ff7a97e 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -38,7 +38,6 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.cards.Card; import mage.counters.CounterType; -import mage.counters.Counters; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.game.permanent.token.Token; @@ -66,7 +65,6 @@ public class CardView implements Serializable { protected ObjectColor color; protected List manaCost; protected int convertedManaCost; - protected String art; protected Rarity rarity; protected String expansionSetCode; protected int cardNumber; @@ -95,12 +93,10 @@ public class CardView implements Serializable { this.manaCost = card.getManaCost().getSymbols(); this.convertedManaCost = card.getManaCost().convertedManaCost(); if (card instanceof PermanentToken) { - this.art = ""; this.rarity = Rarity.NA; this.expansionSetCode = ""; } else { - this.art = card.getArt(); this.rarity = card.getRarity(); this.expansionSetCode = card.getExpansionSetCode(); } @@ -130,7 +126,6 @@ public class CardView implements Serializable { this.superTypes = token.getSupertype(); this.color = token.getColor(); this.manaCost = token.getManaCost().getSymbols(); - this.art = ""; this.rarity = Rarity.NA; this.expansionSetCode = ""; } @@ -216,10 +211,6 @@ public class CardView implements Serializable { return convertedManaCost; } - public String getArt() { - return art; - } - public Rarity getRarity() { return rarity; } diff --git a/Mage.Common/src/mage/view/StackAbilityView.java b/Mage.Common/src/mage/view/StackAbilityView.java index 96739f610a9..e1f9d980213 100644 --- a/Mage.Common/src/mage/view/StackAbilityView.java +++ b/Mage.Common/src/mage/view/StackAbilityView.java @@ -57,7 +57,6 @@ public class StackAbilityView extends CardView { this.superTypes = ability.getSupertype(); this.color = ability.getColor(); this.manaCost = ability.getManaCost().getSymbols(); - this.art = ""; setTargets(ability.getTargets()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java index 837f39500f0..c7a7d4c43ca 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BehemothSledge.java @@ -72,9 +72,4 @@ public class BehemothSledge extends CardImpl { return new BehemothSledge(this); } - @Override - public String getArt() { - return "120963_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java index 51d9d0f14bf..d8db8f9e85a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java @@ -62,9 +62,4 @@ public class BituminousBlast extends CardImpl { return new BituminousBlast(this); } - @Override - public String getArt() { - return "121045_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java b/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java index a0fa6fe6200..b59b1a9f97e 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BloodbraidElf.java @@ -65,8 +65,4 @@ public class BloodbraidElf extends CardImpl { return new BloodbraidElf(this); } - @Override - public String getArt() { - return "121042_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java index 760da9bf572..0c24d77b78a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java @@ -72,11 +72,6 @@ public class FinestHour extends CardImpl { return new FinestHour(this); } - @Override - public String getArt() { - return "121018_typ_reg_sty_010.jpg"; - } - } class FinestHourAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java index 4a256a4aeee..e1c57cc61ce 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromPulse.java @@ -60,9 +60,4 @@ public class MaelstromPulse extends CardImpl { return new MaelstromPulse(this); } - @Override - public String getArt() { - return "121021_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java index 5f1dea3bea8..775f7c289e8 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java +++ b/Mage.Sets/src/mage/sets/alarareborn/PutridLeech.java @@ -67,8 +67,4 @@ public class PutridLeech extends CardImpl { return new PutridLeech(this); } - @Override - public String getArt() { - return "120997_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java b/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java index a5815735d00..f89932ad714 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SpellbreakerBehemoth.java @@ -75,10 +75,5 @@ public class SpellbreakerBehemoth extends CardImpl { public SpellbreakerBehemoth copy() { return new SpellbreakerBehemoth(this); } - - @Override - public String getArt() { - return "120966_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java index 7b28b631def..0114828aded 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java @@ -60,9 +60,4 @@ public class Terminate extends CardImpl { return new Terminate(this); } - @Override - public String getArt() { - return "115230_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java index 3a588d01367..e45933ee1df 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java @@ -71,11 +71,6 @@ public class VengefulRebirth extends CardImpl { return new VengefulRebirth(this); } - @Override - public String getArt() { - return "115104_typ_reg_sty_010.jpg"; - } - } class VengefulRebirthEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java index b574cadff88..2e7e6db726c 100644 --- a/Mage.Sets/src/mage/sets/conflux/AerieMystics.java +++ b/Mage.Sets/src/mage/sets/conflux/AerieMystics.java @@ -70,9 +70,4 @@ public class AerieMystics extends CardImpl { return new AerieMystics(this); } - @Override - public String getArt() { - return "118654_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java index f83215d7377..4f1c2be333e 100644 --- a/Mage.Sets/src/mage/sets/conflux/AvenSquire.java +++ b/Mage.Sets/src/mage/sets/conflux/AvenSquire.java @@ -63,9 +63,4 @@ public class AvenSquire extends CardImpl { return new AvenSquire(this); } - @Override - public String getArt() { - return "118763_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java index ab70b24b3b3..9457fdf6945 100644 --- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class BeaconBehemoth extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater"); static { filter.setPower(4); @@ -78,9 +78,5 @@ public class BeaconBehemoth extends CardImpl { public BeaconBehemoth copy() { return new BeaconBehemoth(this); } - - @Override - public String getArt() { - return "118735_typ_reg_sty_010.jpg"; - } + } diff --git a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java index dbc02c67c66..3d194b8294e 100644 --- a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java +++ b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java @@ -69,11 +69,6 @@ public class BloodhallOoze extends CardImpl { return new BloodhallOoze(this); } - @Override - public String getArt() { - return "118658_typ_reg_sty_010.jpg"; - } - } class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl { @@ -119,7 +114,7 @@ class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { filter.getColor().setGreen(true); diff --git a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java index 4ed3b4efeb4..9ef3a7b521e 100644 --- a/Mage.Sets/src/mage/sets/conflux/BoneSaw.java +++ b/Mage.Sets/src/mage/sets/conflux/BoneSaw.java @@ -62,9 +62,4 @@ public class BoneSaw extends CardImpl { return new BoneSaw(this); } - @Override - public String getArt() { - return "119803_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java index 8c4aa0c68fc..06772e7a22d 100644 --- a/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java +++ b/Mage.Sets/src/mage/sets/conflux/CanyonMinotaur.java @@ -60,9 +60,4 @@ public class CanyonMinotaur extends CardImpl { return new CanyonMinotaur(this); } - @Override - public String getArt() { - return "118765_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java index cb86a2222b0..defb7315b03 100644 --- a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java @@ -45,7 +45,7 @@ import mage.target.TargetPermanent; */ public class CelestialPurge extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("black or red permanent"); + private static final FilterPermanent filter = new FilterPermanent("black or red permanent"); static { filter.setUseColor(true); @@ -71,9 +71,4 @@ public class CelestialPurge extends CardImpl { return new CelestialPurge(this); } - @Override - public String getArt() { - return "118751_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java index c4ec0c30f83..f3bf9d05914 100644 --- a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java @@ -62,9 +62,4 @@ public class ConstrictingTendrils extends CardImpl { return new ConstrictingTendrils(this); } - @Override - public String getArt() { - return "118727_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java index efa55571f80..80d8df6607b 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java +++ b/Mage.Sets/src/mage/sets/conflux/DarklitGargoyle.java @@ -66,9 +66,4 @@ public class DarklitGargoyle extends CardImpl { return new DarklitGargoyle(this); } - @Override - public String getArt() { - return "118733_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java index ef332eb58b9..b067d9082ed 100644 --- a/Mage.Sets/src/mage/sets/conflux/Dreadwing.java +++ b/Mage.Sets/src/mage/sets/conflux/Dreadwing.java @@ -68,9 +68,4 @@ public class Dreadwing extends CardImpl { return new Dreadwing(this); } - @Override - public String getArt() { - return "118661_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java index 91ab6bd406c..c22541bd861 100644 --- a/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java +++ b/Mage.Sets/src/mage/sets/conflux/EsperCormorants.java @@ -61,9 +61,4 @@ public class EsperCormorants extends CardImpl { return new EsperCormorants(this); } - @Override - public String getArt() { - return "118756_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java index 70ab066ff12..e421b777384 100644 --- a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java @@ -43,16 +43,14 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonScope; import mage.filter.common.FilterControlledPermanent; -import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreaturePermanent; /** * * @author Loki */ public class EtherswornAdjudicator extends CardImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent("creature or enchantment"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("creature or enchantment"); static { filter.getCardType().add(CardType.CREATURE); @@ -86,9 +84,4 @@ public class EtherswornAdjudicator extends CardImpl { return new EtherswornAdjudicator(this); } - @Override - public String getArt() { - return "118676_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java index 1a62ef226f0..e4a27f40f1e 100644 --- a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java +++ b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java @@ -62,11 +62,6 @@ public class FontOfMythos extends CardImpl { return new FontOfMythos(this); } - @Override - public String getArt() { - return "119800_typ_reg_sty_010.jpg"; - } - } class FontOfMythosAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java index a5e2266fa5d..4fa882fff2b 100644 --- a/Mage.Sets/src/mage/sets/conflux/FusionElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/FusionElemental.java @@ -62,9 +62,4 @@ public class FusionElemental extends CardImpl { return new FusionElemental(this); } - @Override - public String getArt() { - return "118699_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java b/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java index 101fca390d0..b9661149c34 100644 --- a/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/GoblinOutlander.java @@ -41,11 +41,11 @@ import mage.filter.FilterCard; * @author Loki */ public class GoblinOutlander extends CardImpl { - private static FilterCard filter = new FilterCard("white"); + private static final FilterCard filter = new FilterCard("white"); static { filter.setUseColor(true); - filter.getColor().setWhite(true); + filter.getColor().setWhite(true); } public GoblinOutlander(UUID ownerId) { @@ -69,9 +69,4 @@ public class GoblinOutlander extends CardImpl { return new GoblinOutlander(this); } - @Override - public String getArt() { - return "118772_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java b/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java index 2fda3be3f78..56afa19eb7f 100644 --- a/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java +++ b/Mage.Sets/src/mage/sets/conflux/GrixisSlavedriver.java @@ -66,9 +66,4 @@ public class GrixisSlavedriver extends CardImpl { return new GrixisSlavedriver(this); } - @Override - public String getArt() { - return "118660_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java index 93156d68636..2cf7c4add2e 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java @@ -70,9 +70,4 @@ public class HellsparkElemental extends CardImpl { return new HellsparkElemental(this); } - @Override - public String getArt() { - return "118669_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java index b7104382297..3fb8cd91fc3 100644 --- a/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java +++ b/Mage.Sets/src/mage/sets/conflux/InkwellLeviathan.java @@ -65,9 +65,4 @@ public class InkwellLeviathan extends CardImpl { return new InkwellLeviathan(this); } - @Override - public String getArt() { - return "118655_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java b/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java index 64e8e4e18e0..9bc9b821927 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/sets/conflux/KnightOfTheReliquary.java @@ -62,7 +62,7 @@ import mage.target.common.TargetControlledPermanent; */ public class KnightOfTheReliquary extends CardImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent("Forest or Plains"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest or Plains"); static { filter.getCardType().add(CardType.LAND); @@ -98,11 +98,6 @@ public class KnightOfTheReliquary extends CardImpl { return new KnightOfTheReliquary(this); } - @Override - public String getArt() { - return "119798_typ_reg_sty_010.jpg"; - } - } class KnightOfTheReliquaryEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java index defb92a36ed..39d834b618e 100644 --- a/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java +++ b/Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java @@ -54,7 +54,7 @@ public class KnotvineMystic extends CardImpl{ this.subtype.add("Elf"); this.subtype.add("Druid"); this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.toughness = new MageInt(2); Ability ability = new KnotvineMysticManaAbility(); ability.addCost(new ManaCostsImpl("{1}")); this.addAbility(ability); @@ -69,28 +69,23 @@ public class KnotvineMystic extends CardImpl{ return new KnotvineMystic(this); } - @Override - public String getArt() { - return "118723_typ_reg_sty_010.jpg"; +} + +class KnotvineMysticManaAbility extends BasicManaAbility { + + public KnotvineMysticManaAbility() { + super(new ManaEffect(new Mana(1, 1, 0, 1, 0, 0, 0))); + this.netMana.setGreen(1); + this.netMana.setRed(1); + this.netMana.setWhite(1); } - class KnotvineMysticManaAbility extends BasicManaAbility { + public KnotvineMysticManaAbility(final KnotvineMysticManaAbility ability) { + super(ability); + } - public KnotvineMysticManaAbility() { - super(new ManaEffect(new Mana(1, 1, 0, 1, 0, 0, 0))); - this.netMana.setGreen(1); - this.netMana.setRed(1); - this.netMana.setWhite(1); - } - - public KnotvineMysticManaAbility(final KnotvineMysticManaAbility ability) { - super(ability); - } - - @Override - public KnotvineMysticManaAbility copy() { - return new KnotvineMysticManaAbility(this); - } - + @Override + public KnotvineMysticManaAbility copy() { + return new KnotvineMysticManaAbility(this); } } diff --git a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java index 51ffb50f458..cf4afb488e8 100644 --- a/Mage.Sets/src/mage/sets/conflux/Kranioceros.java +++ b/Mage.Sets/src/mage/sets/conflux/Kranioceros.java @@ -64,9 +64,4 @@ public class Kranioceros extends CardImpl { public Kranioceros copy() { return new Kranioceros(this); } - - @Override - public String getArt() { - return "118681_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java index 25fe18615e7..8c77b74308d 100644 --- a/Mage.Sets/src/mage/sets/conflux/MartialCoup.java +++ b/Mage.Sets/src/mage/sets/conflux/MartialCoup.java @@ -39,7 +39,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SoldierToken; -import mage.players.Player; /** @@ -63,11 +62,6 @@ public class MartialCoup extends CardImpl { public MartialCoup copy() { return new MartialCoup(this); } - - @Override - public String getArt() { - return "118685_typ_reg_sty_010.jpg"; - } } class MartialCoupEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java index 63e1e756db3..1e267ec4651 100644 --- a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java +++ b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java @@ -45,11 +45,11 @@ import mage.target.common.TargetCreaturePermanent; */ public class MoltenFrame extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); static { - filter.getCardType().add(CardType.ARTIFACT); - filter.setScopeCardType(ComparisonScope.Any); + filter.getCardType().add(CardType.ARTIFACT); + filter.setScopeCardType(ComparisonScope.Any); } public MoltenFrame(UUID ownerId) { @@ -70,9 +70,4 @@ public class MoltenFrame extends CardImpl { return new MoltenFrame(this); } - @Override - public String getArt() { - return "118759_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java b/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java index a5a8402a6b0..55b0a65f3d6 100644 --- a/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/NacatlOutlander.java @@ -41,11 +41,11 @@ import mage.filter.FilterCard; * @author Loki */ public class NacatlOutlander extends CardImpl { - private static FilterCard filter = new FilterCard("blue"); + private static final FilterCard filter = new FilterCard("blue"); static { filter.setUseColor(true); - filter.getColor().setBlue(true); + filter.getColor().setBlue(true); } public NacatlOutlander(UUID ownerId) { @@ -56,7 +56,7 @@ public class NacatlOutlander extends CardImpl { this.subtype.add("Cat"); this.subtype.add("Scout"); this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.toughness = new MageInt(2); this.addAbility(new ProtectionAbility(filter)); } @@ -69,9 +69,4 @@ public class NacatlOutlander extends CardImpl { return new NacatlOutlander(this); } - @Override - public String getArt() { - return "118770_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java index b5bf3224b69..046d0319596 100644 --- a/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java +++ b/Mage.Sets/src/mage/sets/conflux/NobleHierarch.java @@ -67,9 +67,4 @@ public class NobleHierarch extends CardImpl { public NobleHierarch copy() { return new NobleHierarch(this); } - - @Override - public String getArt() { - return "118694_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/conflux/PathToExile.java b/Mage.Sets/src/mage/sets/conflux/PathToExile.java index 8f96bc1f35a..240ce0c0d61 100644 --- a/Mage.Sets/src/mage/sets/conflux/PathToExile.java +++ b/Mage.Sets/src/mage/sets/conflux/PathToExile.java @@ -67,11 +67,6 @@ public class PathToExile extends CardImpl { public PathToExile copy() { return new PathToExile(this); } - - @Override - public String getArt() { - return "118686_typ_reg_sty_010.jpg"; - } } class PathToExileEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java index 27c759d655f..3e1b4e173d8 100644 --- a/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java +++ b/Mage.Sets/src/mage/sets/conflux/PestilentKathari.java @@ -70,9 +70,4 @@ public class PestilentKathari extends CardImpl { return new PestilentKathari(this); } - @Override - public String getArt() { - return "118710_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java index b6cf359924f..7a4f8992229 100644 --- a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java +++ b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java @@ -70,11 +70,6 @@ public class QuenchableFire extends CardImpl { public QuenchableFire copy() { return new QuenchableFire(this); } - - @Override - public String getArt() { - return "118698_typ_reg_sty_010.jpg"; - } } class QuenchableFireEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java index a35025f81f2..878f70a1a98 100644 --- a/Mage.Sets/src/mage/sets/conflux/RakkaMar.java +++ b/Mage.Sets/src/mage/sets/conflux/RakkaMar.java @@ -58,7 +58,7 @@ public class RakkaMar extends CardImpl { this.subtype.add("Shaman"); this.color.setRed(true); this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(token), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); @@ -73,22 +73,17 @@ public class RakkaMar extends CardImpl { public RakkaMar copy() { return new RakkaMar(this); } - - @Override - public String getArt() { - return "118775_typ_reg_sty_010.jpg"; - } - - private static class ElementalToken extends Token { - public ElementalToken() { - super("Elemental", "3/1 red Elemental creature with Haste"); - cardType.add(CardType.CREATURE); - color = ObjectColor.RED; - subtype.add("Elemental"); - power = new MageInt(3); - toughness = new MageInt(1); - addAbility(HasteAbility.getInstance()); - } - } - +} + +class ElementalToken extends Token { + + public ElementalToken() { + super("Elemental", "3/1 red Elemental creature with Haste"); + cardType.add(CardType.CREATURE); + color = ObjectColor.RED; + subtype.add("Elemental"); + power = new MageInt(3); + toughness = new MageInt(1); + addAbility(HasteAbility.getInstance()); + } } diff --git a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java index 7a866b57ef6..4673c6e9c34 100644 --- a/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java +++ b/Mage.Sets/src/mage/sets/conflux/RhoxBodyguard.java @@ -52,7 +52,7 @@ public class RhoxBodyguard extends CardImpl { this.subtype.add("Monk"); this.subtype.add("Soldier"); this.power = new MageInt(2); - this.toughness = new MageInt(3); + this.toughness = new MageInt(3); this.addAbility(new ExaltedAbility()); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3))); } @@ -66,9 +66,4 @@ public class RhoxBodyguard extends CardImpl { return new RhoxBodyguard(this); } - @Override - public String getArt() { - return "118758_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java index 2f58124a5b2..921b4938f38 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java +++ b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java @@ -71,9 +71,4 @@ public class ScarlandThrinax extends CardImpl { return new ScarlandThrinax(this); } - @Override - public String getArt() { - return "118748_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java index 9d9d8e54c78..4570a9c306e 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java @@ -65,9 +65,4 @@ public class ScepterOfDominance extends CardImpl { return new ScepterOfDominance(this); } - @Override - public String getArt() { - return "118668_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java index 28f374bd0fd..edac5478ed9 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfInsight.java @@ -63,9 +63,4 @@ public class ScepterOfInsight extends CardImpl { return new ScepterOfInsight(this); } - @Override - public String getArt() { - return "118760_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java index d6cb985b303..5198aeef6b2 100644 --- a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java +++ b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java @@ -66,11 +66,6 @@ public class SigilOfTheEmptyThrone extends CardImpl { return new SigilOfTheEmptyThrone(this); } - @Override - public String getArt() { - return "118726_typ_reg_sty_010.jpg"; - } - } class SigilOfTheEmptyThroneAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java index 1e9721d2af1..349ef724be6 100644 --- a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java +++ b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java @@ -63,11 +63,6 @@ public class SoulsMajesty extends CardImpl { return new SoulsMajesty(this); } - @Override - public String getArt() { - return "118768_typ_reg_sty_010.jpg"; - } - private class SoulsMajestyEffect extends OneShotEffect { public SoulsMajestyEffect() { diff --git a/Mage.Sets/src/mage/sets/conflux/Thornling.java b/Mage.Sets/src/mage/sets/conflux/Thornling.java index 3144d648e35..70fac7cc566 100644 --- a/Mage.Sets/src/mage/sets/conflux/Thornling.java +++ b/Mage.Sets/src/mage/sets/conflux/Thornling.java @@ -74,9 +74,4 @@ public class Thornling extends CardImpl { return new Thornling(this); } - @Override - public String getArt() { - return "118734_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java index 49568a9d835..05b78d1d363 100644 --- a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java +++ b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java @@ -63,11 +63,6 @@ public class TukatongueThallid extends CardImpl { return new TukatongueThallid(this); } - @Override - public String getArt() { - return "118766_typ_reg_sty_010.jpg"; - } - private class SaprolingToken extends Token { public SaprolingToken() { super("Saproling", "1/1 green Saproling creature tokens"); diff --git a/Mage.Sets/src/mage/sets/conflux/Unsummon.java b/Mage.Sets/src/mage/sets/conflux/Unsummon.java index 7c9c291f60f..a5f9662e0dc 100644 --- a/Mage.Sets/src/mage/sets/conflux/Unsummon.java +++ b/Mage.Sets/src/mage/sets/conflux/Unsummon.java @@ -51,9 +51,4 @@ public class Unsummon extends mage.sets.tenth.Unsummon { return new Unsummon(this); } - @Override - public String getArt() { - return "118680_typ_reg_sty_010.jpg"; - } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java index 6dcbdd6e42c..6167f25f540 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ValeronOutlander.java @@ -41,11 +41,11 @@ import mage.filter.FilterCard; * @author Loki */ public class ValeronOutlander extends CardImpl { - private static FilterCard filter = new FilterCard("black"); + private static final FilterCard filter = new FilterCard("black"); static { filter.setUseColor(true); - filter.getColor().setBlack(true); + filter.getColor().setBlack(true); } public ValeronOutlander(UUID ownerId) { @@ -56,7 +56,7 @@ public class ValeronOutlander extends CardImpl { this.subtype.add("Human"); this.subtype.add("Scout"); this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.toughness = new MageInt(2); this.addAbility(new ProtectionAbility(filter)); } @@ -68,9 +68,4 @@ public class ValeronOutlander extends CardImpl { public ValeronOutlander copy() { return new ValeronOutlander(this); } - - @Override - public String getArt() { - return "118774_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java index 019ed870ba9..87bbd75ce74 100644 --- a/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java +++ b/Mage.Sets/src/mage/sets/conflux/ValiantGuard.java @@ -59,9 +59,4 @@ public class ValiantGuard extends CardImpl { return new ValiantGuard(this); } - @Override - public String getArt() { - return "118757_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java index ad3c7655203..66754387a2e 100644 --- a/Mage.Sets/src/mage/sets/conflux/VectisAgents.java +++ b/Mage.Sets/src/mage/sets/conflux/VectisAgents.java @@ -71,9 +71,4 @@ public class VectisAgents extends CardImpl { return new VectisAgents(this); } - @Override - public String getArt() { - return "118754_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java index f1ed8f917fc..e817c21d02d 100644 --- a/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/VedalkenOutlander.java @@ -41,11 +41,11 @@ import mage.filter.FilterCard; * @author Loki */ public class VedalkenOutlander extends CardImpl { - private static FilterCard filter = new FilterCard("red"); + private static final FilterCard filter = new FilterCard("red"); static { filter.setUseColor(true); - filter.getColor().setRed(true); + filter.getColor().setRed(true); } public VedalkenOutlander(UUID ownerId) { @@ -68,9 +68,4 @@ public class VedalkenOutlander extends CardImpl { public VedalkenOutlander copy() { return new VedalkenOutlander(this); } - - @Override - public String getArt() { - return "118771_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java index 94c2e2ec28f..c6c88c2b3fb 100644 --- a/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java +++ b/Mage.Sets/src/mage/sets/conflux/ZombieOutlander.java @@ -41,11 +41,11 @@ import mage.filter.FilterCard; * @author Loki */ public class ZombieOutlander extends CardImpl { - private static FilterCard filter = new FilterCard("green"); + private static final FilterCard filter = new FilterCard("green"); static { filter.setUseColor(true); - filter.getColor().setGreen(true); + filter.getColor().setGreen(true); } public ZombieOutlander(UUID ownerId) { @@ -56,7 +56,7 @@ public class ZombieOutlander extends CardImpl { this.subtype.add("Zombie"); this.subtype.add("Scout"); this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.toughness = new MageInt(2); this.addAbility(new ProtectionAbility(filter)); } @@ -69,9 +69,4 @@ public class ZombieOutlander extends CardImpl { return new ZombieOutlander(this); } - @Override - public String getArt() { - return "118769_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java index dde34ffe356..77d7773bc5e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; */ public class AcidicSlime extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact, enchantment, or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact, enchantment, or land"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -82,9 +82,4 @@ public class AcidicSlime extends CardImpl { return new AcidicSlime(this); } - @Override - public String getArt() { - return "121561_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java index 15232b92f8e..09d573e3c92 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java @@ -70,9 +70,4 @@ public class AcolyteOfXathrid extends CardImpl { return new AcolyteOfXathrid(this); } - @Override - public String getArt() { - return "121644_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java index 78b7e0de2f8..02ebf0c2c74 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java @@ -65,9 +65,4 @@ public class ActOfTreason extends CardImpl { return new ActOfTreason(this); } - @Override - public String getArt() { - return "121664_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java index d7263b5afe9..43753f5bf8b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AirElemental.java +++ b/Mage.Sets/src/mage/sets/magic2010/AirElemental.java @@ -60,9 +60,4 @@ public class AirElemental extends CardImpl { return new AirElemental(this); } - @Override - public String getArt() { - return "101044_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java index a68e7a590ff..8f6adf0bf1a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/sets/magic2010/AjaniGoldmane.java @@ -91,11 +91,6 @@ public class AjaniGoldmane extends CardImpl { return new AjaniGoldmane(this); } - @Override - public String getArt() { - return "105545_typ_reg_sty_010.jpg"; - } - } class AvatarToken extends Token { diff --git a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java index 41d3326d666..87cb06c50f2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java +++ b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java @@ -76,9 +76,4 @@ public class AlluringSiren extends CardImpl { return new AlluringSiren(this); } - @Override - public String getArt() { - return "121568_typ_reg_sty_010.jpg"; - } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java index e15e9cdd1a0..c19d36ae575 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java +++ b/Mage.Sets/src/mage/sets/magic2010/AngelsMercy.java @@ -55,9 +55,4 @@ public class AngelsMercy extends CardImpl { public AngelsMercy copy() { return new AngelsMercy(this); } - - @Override - public String getArt() { - return "121628_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java index 78e32624d96..95ad0f35cf2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AntQueen.java +++ b/Mage.Sets/src/mage/sets/magic2010/AntQueen.java @@ -68,9 +68,4 @@ public class AntQueen extends CardImpl { return new AntQueen(this); } - @Override - public String getArt() { - return "122179_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java index 3d83c4add47..be1604ddd8b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java +++ b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java @@ -78,16 +78,11 @@ public class ArmoredAscension extends CardImpl { public ArmoredAscension copy() { return new ArmoredAscension(this); } - - @Override - public String getArt() { - return "122162_typ_reg_sty_010.jpg"; - } } class ArmoredAscensionEffect extends ContinuousEffectImpl { - private static FilterLandPermanent filter = new FilterLandPermanent("Plains"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Plains"); static { filter.getSubtype().add("Plains"); diff --git a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java index da00d86bf32..167011a48fc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AwakenerDruid.java @@ -52,7 +52,7 @@ import mage.target.common.TargetLandPermanent; */ public class AwakenerDruid extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent("Forest"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); static { filter.getSubtype().add("Forest"); @@ -80,11 +80,6 @@ public class AwakenerDruid extends CardImpl { public AwakenerDruid copy() { return new AwakenerDruid(this); } - - @Override - public String getArt() { - return "121576_typ_reg_sty_010.jpg"; - } } class AwakenerDruidEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java index d2329cedde3..86fca2979fb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BallLightning.java +++ b/Mage.Sets/src/mage/sets/magic2010/BallLightning.java @@ -67,9 +67,4 @@ public class BallLightning extends CardImpl { return new BallLightning(this); } - @Override - public String getArt() { - return "122161_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java index ebdddc9f3a1..6e2934f049a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/sets/magic2010/BaneslayerAngel.java @@ -45,6 +45,13 @@ import mage.filter.common.FilterCreaturePermanent; * @author BetaSteward_at_googlemail.com */ public class BaneslayerAngel extends CardImpl { + private static final FilterPermanent filter1 = new FilterCreaturePermanent("Demon"); + private static final FilterPermanent filter2 = new FilterCreaturePermanent("Dragon"); + + static { + filter1.getSubtype().add("Demon"); + filter2.getSubtype().add("Dragon"); + } public BaneslayerAngel(UUID ownerId) { super(ownerId, 4, "Baneslayer Angel", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); @@ -57,11 +64,7 @@ public class BaneslayerAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); - FilterPermanent filter1 = new FilterCreaturePermanent("Demon"); - filter1.getSubtype().add("Demon"); this.addAbility(new ProtectionAbility(filter1)); - FilterPermanent filter2 = new FilterCreaturePermanent("Dragon"); - filter2.getSubtype().add("Dragon"); this.addAbility(new ProtectionAbility(filter2)); } @@ -74,9 +77,4 @@ public class BaneslayerAngel extends CardImpl { return new BaneslayerAngel(this); } - @Override - public String getArt() { - return "87090_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java index adbfbf64349..961b2f685dd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java +++ b/Mage.Sets/src/mage/sets/magic2010/BerserkersOfBloodRidge.java @@ -61,9 +61,4 @@ public class BerserkersOfBloodRidge extends CardImpl { return new BerserkersOfBloodRidge(this); } - @Override - public String getArt() { - return "121659_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java index f91de6907c4..5937b6084d1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlackKnight.java @@ -43,7 +43,7 @@ import mage.filter.FilterCard; */ public class BlackKnight extends CardImpl { - private static FilterCard filter = new FilterCard("White"); + private static final FilterCard filter = new FilterCard("White"); static { filter.setUseColor(true); @@ -72,9 +72,4 @@ public class BlackKnight extends CardImpl { return new BlackKnight(this); } - @Override - public String getArt() { - return "121622_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java index 466a7fe0175..8d7e9805d59 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java @@ -70,9 +70,4 @@ public class BlindingMage extends CardImpl { return new BlindingMage(this); } - @Override - public String getArt() { - return "121614_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java index d752f453dff..1518fa58f71 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogWraith.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogWraith.java @@ -60,9 +60,4 @@ public class BogWraith extends CardImpl { return new BogWraith(this); } - @Override - public String getArt() { - return "106215_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java index 91b7d4462f9..afcbc9f121a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2010/BogardanHellkite.java @@ -70,9 +70,4 @@ public class BogardanHellkite extends CardImpl { return new BogardanHellkite(this); } - @Override - public String getArt() { - return "97381_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index ae2957fb7b5..263524da967 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -83,10 +83,5 @@ public class ChandraNalaar extends CardImpl { public ChandraNalaar copy() { return new ChandraNalaar(this); } - - @Override - public String getArt() { - return "105500_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java index 5f5f2dd9ba0..fcf6f5c5a35 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChildOfNight.java @@ -61,9 +61,4 @@ public class ChildOfNight extends CardImpl { return new ChildOfNight(this); } - @Override - public String getArt() { - return "98590_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java index 7238ecbf79d..bd4864565ed 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java +++ b/Mage.Sets/src/mage/sets/magic2010/CoralMerfolk.java @@ -58,9 +58,4 @@ public class CoralMerfolk extends CardImpl { return new CoralMerfolk(this); } - @Override - public String getArt() { - return "122166_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java index 9807a9e345c..1df403db42f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java +++ b/Mage.Sets/src/mage/sets/magic2010/CudgelTroll.java @@ -64,9 +64,4 @@ public class CudgelTroll extends CardImpl { return new CudgelTroll(this); } - @Override - public String getArt() { - return "121570_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java b/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java index 51ca25b24a8..c76f2ec3844 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java +++ b/Mage.Sets/src/mage/sets/magic2010/DeadlyRecluse.java @@ -62,9 +62,4 @@ public class DeadlyRecluse extends CardImpl { return new DeadlyRecluse(this); } - @Override - public String getArt() { - return "121590_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Deathmark.java b/Mage.Sets/src/mage/sets/magic2010/Deathmark.java index b1a5b2c1731..ff99824023f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Deathmark.java +++ b/Mage.Sets/src/mage/sets/magic2010/Deathmark.java @@ -42,11 +42,6 @@ public class Deathmark extends mage.sets.tenth.Deathmark { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "122155_typ_reg_sty_010.jpg"; - } - public Deathmark(final Deathmark card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java index 18f6a1be820..109007fb0f6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disentomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disentomb.java @@ -61,9 +61,4 @@ public class Disentomb extends CardImpl { return new Disentomb(this); } - @Override - public String getArt() { - return "121633_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index 6be28ffe595..ff3802ce2c5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disorient.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disorient.java @@ -60,10 +60,5 @@ public class Disorient extends CardImpl { return new Disorient(this); } - @Override - public String getArt() { - return "121598_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java index 24d377078a2..e5e77e219a5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java +++ b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class DoomBlade extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); static { filter.setUseColor(true); @@ -66,9 +66,4 @@ public class DoomBlade extends CardImpl { public DoomBlade copy() { return new DoomBlade(this); } - - @Override - public String getArt() { - return "121618_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java index 18beb410234..c72941864bf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java +++ b/Mage.Sets/src/mage/sets/magic2010/DragonskullSummit.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterLandPermanent; */ public class DragonskullSummit extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.getSubtype().add("Swamp"); @@ -77,9 +77,4 @@ public class DragonskullSummit extends CardImpl { public DragonskullSummit copy() { return new DragonskullSummit(this); } - - @Override - public String getArt() { - return "121671_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java index 7a4fd74fb7b..b416ea184c7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrownedCatacomb.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterLandPermanent; */ public class DrownedCatacomb extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.getSubtype().add("Swamp"); @@ -77,9 +77,4 @@ public class DrownedCatacomb extends CardImpl { public DrownedCatacomb copy() { return new DrownedCatacomb(this); } - - @Override - public String getArt() { - return "121655_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java index a248e66ceb3..9e9af2f7f8e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java +++ b/Mage.Sets/src/mage/sets/magic2010/DrudgeSkeletons.java @@ -63,9 +63,4 @@ public class DrudgeSkeletons extends CardImpl{ return new DrudgeSkeletons(this); } - @Override - public String getArt() { - return "122151_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Duress.java b/Mage.Sets/src/mage/sets/magic2010/Duress.java index 3f14ef8f280..1540e4a568b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Duress.java +++ b/Mage.Sets/src/mage/sets/magic2010/Duress.java @@ -66,16 +66,11 @@ public class Duress extends CardImpl { public Duress copy() { return new Duress(this); } - - @Override - public String getArt() { - return "122154_typ_reg_sty_010.jpg"; - } } class DuressEffect extends OneShotEffect { - private static FilterCard filter = new FilterCard("noncreature, nonland card"); + private static final FilterCard filter = new FilterCard("noncreature, nonland card"); static { filter.getNotCardType().add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java index ab3e52f2598..8c8ac9f35b9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Earthquake.java +++ b/Mage.Sets/src/mage/sets/magic2010/Earthquake.java @@ -62,16 +62,11 @@ public class Earthquake extends CardImpl { public Earthquake copy() { return new Earthquake(this); } - - @Override - public String getArt() { - return "118685_typ_reg_sty_010.jpg"; - } } class EarthquakeEffect extends OneShotEffect { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.getAbilities().add(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java index 25f703a1c3d..919f04883fa 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java +++ b/Mage.Sets/src/mage/sets/magic2010/EliteVanguard.java @@ -59,9 +59,4 @@ public class EliteVanguard extends CardImpl { return new EliteVanguard(this); } - @Override - public String getArt() { - return "103534_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java index bf13839ff68..96b969f713e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/sets/magic2010/ElvishArchdruid.java @@ -51,7 +51,7 @@ import mage.game.Game; */ public class ElvishArchdruid extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { filter.getSubtype().add("Elf"); @@ -79,11 +79,6 @@ public class ElvishArchdruid extends CardImpl { return new ElvishArchdruid(this); } - @Override - public String getArt() { - return "121692_typ_reg_sty_010.jpg"; - } - class ElvishArchdruidAbility extends ManaAbility { public ElvishArchdruidAbility() { diff --git a/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java b/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java index d25730fe84d..572d9daf588 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java +++ b/Mage.Sets/src/mage/sets/magic2010/EmeraldOryx.java @@ -60,9 +60,4 @@ public class EmeraldOryx extends CardImpl { return new EmeraldOryx(this); } - @Override - public String getArt() { - return "43180_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java index ef9e30191d8..f31a6a7231c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java +++ b/Mage.Sets/src/mage/sets/magic2010/FieryHellhound.java @@ -66,9 +66,4 @@ public class FieryHellhound extends CardImpl { return new FieryHellhound(this); } - @Override - public String getArt() { - return "121662_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java index fe6e07fa27b..10d3e346c85 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java @@ -71,11 +71,6 @@ public class Fireball extends CardImpl { public Fireball copy() { return new Fireball(this); } - - @Override - public String getArt() { - return "52012_typ_reg_sty_010.jpg"; - } } class FireballEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2010/Fog.java b/Mage.Sets/src/mage/sets/magic2010/Fog.java index 20c36472ddb..17ad89a3df7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fog.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fog.java @@ -57,9 +57,4 @@ public class Fog extends CardImpl { return new Fog(this); } - @Override - public String getArt() { - return "02368_typ_reg_sty_001.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest1.java b/Mage.Sets/src/mage/sets/magic2010/Forest1.java index 676d7e25849..4853829c52c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest1.java @@ -41,11 +41,6 @@ public class Forest1 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "06769_typ_reg_sty_010.jpg"; - } - public Forest1(final Forest1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest2.java b/Mage.Sets/src/mage/sets/magic2010/Forest2.java index 4c6f881e7e4..058c51660a7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest2.java @@ -41,11 +41,6 @@ public class Forest2 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121707_typ_reg_sty_010.jpg"; - } - public Forest2(final Forest2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest3.java b/Mage.Sets/src/mage/sets/magic2010/Forest3.java index 9c67b0a2626..7218dfe55a0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest3.java @@ -41,11 +41,6 @@ public class Forest3 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "25501_typ_reg_sty_010.jpg"; - } - public Forest3(final Forest3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Forest4.java b/Mage.Sets/src/mage/sets/magic2010/Forest4.java index a5fb6859435..c1c6db5f7a3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Forest4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Forest4.java @@ -41,11 +41,6 @@ public class Forest4 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121708_typ_reg_sty_010.jpg"; - } - public Forest4(final Forest4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java index a7116fd2cfe..0f99b375f4f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java +++ b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java @@ -65,11 +65,6 @@ public class GargoyleCastle extends CardImpl { return new GargoyleCastle(this); } - @Override - public String getArt() { - return "122169_typ_reg_sty_010.jpg"; - } - } class GargoyleCastleAbility extends ActivatedAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java index daae0490a6e..69b1db1b972 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/sets/magic2010/GarrukWildspeaker.java @@ -84,9 +84,4 @@ public class GarrukWildspeaker extends CardImpl { public GarrukWildspeaker copy() { return new GarrukWildspeaker(this); } - - @Override - public String getArt() { - return "105523_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java index 1b455f09a37..84c73536fe9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java +++ b/Mage.Sets/src/mage/sets/magic2010/GlacialFortress.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterLandPermanent; */ public class GlacialFortress extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.getSubtype().add("Plains"); @@ -77,9 +77,4 @@ public class GlacialFortress extends CardImpl { public GlacialFortress copy() { return new GlacialFortress(this); } - - @Override - public String getArt() { - return "121634_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java index a06777a8594..cb1c930f2fc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java +++ b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterCreaturePermanent; */ public class GoblinChieftain extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creatures"); static { filter.getSubtype().add("Goblin"); @@ -75,9 +75,4 @@ public class GoblinChieftain extends CardImpl { return new GoblinChieftain(this); } - @Override - public String getArt() { - return "121632_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java index ac1f39ddbce..c4402772799 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java +++ b/Mage.Sets/src/mage/sets/magic2010/GreatSableStag.java @@ -44,6 +44,15 @@ import mage.filter.FilterCard; * @author BetaSteward_at_googlemail.com */ public class GreatSableStag extends CardImpl { + private static final FilterCard filter1 = new FilterCard("Blue"); + private static final FilterCard filter2 = new FilterCard("Black"); + + static { + filter1.setUseColor(true); + filter1.getColor().setBlue(true); + filter2.setUseColor(true); + filter2.getColor().setBlack(true); + } public GreatSableStag(UUID ownerId) { super(ownerId, 186, "Great Sable Stag", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); @@ -53,13 +62,7 @@ public class GreatSableStag extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - FilterCard filter1 = new FilterCard("Blue"); - filter1.setUseColor(true); - filter1.getColor().setBlue(true); this.addAbility(new ProtectionAbility(filter1)); - FilterCard filter2 = new FilterCard("Black"); - filter2.setUseColor(true); - filter2.getColor().setBlack(true); this.addAbility(new ProtectionAbility(filter2)); this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect())); } @@ -73,9 +76,4 @@ public class GreatSableStag extends CardImpl { return new GreatSableStag(this); } - @Override - public String getArt() { - return "122172_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java index 3de1e5f5efb..443548e050d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2010/GriffinSentinel.java @@ -62,9 +62,4 @@ public class GriffinSentinel extends CardImpl { return new GriffinSentinel(this); } - @Override - public String getArt() { - return "121597_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java index c1da07b0de1..273f4539ea0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java +++ b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java @@ -68,16 +68,11 @@ public class HauntingEchoes extends CardImpl { public HauntingEchoes copy() { return new HauntingEchoes(this); } - - @Override - public String getArt() { - return "122152_typ_reg_sty_010.jpg"; - } } class HauntingEchoesEffect extends OneShotEffect { - private static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public HauntingEchoesEffect() { super(Outcome.Detriment); diff --git a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java index 5fad8fef2af..eb2f18c3149 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java +++ b/Mage.Sets/src/mage/sets/magic2010/HonorOfThePure.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterCreaturePermanent; */ public class HonorOfThePure extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("White creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("White creatures"); static { filter.setUseColor(true); @@ -67,9 +67,4 @@ public class HonorOfThePure extends CardImpl { return new HonorOfThePure(this); } - @Override - public String getArt() { - return "102628_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java b/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java index 7cc43c052d3..2401805ca4f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java +++ b/Mage.Sets/src/mage/sets/magic2010/HornedTurtle.java @@ -58,9 +58,4 @@ public class HornedTurtle extends CardImpl{ return new HornedTurtle(this); } - @Override - public String getArt() { - return "03032_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java b/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java index 82333684420..9c19c8de2d5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlingBanshee.java @@ -68,11 +68,6 @@ public class HowlingBanshee extends CardImpl { return new HowlingBanshee(this); } - @Override - public String getArt() { - return "121627_typ_reg_sty_010.jpg"; - } - } class HowlingBansheeEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java b/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java index c4a738708f9..9aa36692ce1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java @@ -61,11 +61,6 @@ public class HowlingMine extends CardImpl { return new HowlingMine(this); } - @Override - public String getArt() { - return "102959_typ_reg_sty_010.jpg"; - } - } class HowlingMineAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/IceCage.java b/Mage.Sets/src/mage/sets/magic2010/IceCage.java index 5cb77f5aa2d..2f97a563aae 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IceCage.java +++ b/Mage.Sets/src/mage/sets/magic2010/IceCage.java @@ -78,11 +78,6 @@ public class IceCage extends CardImpl { public IceCage copy() { return new IceCage(this); } - - @Override - public String getArt() { - return "121586_typ_reg_sty_010.jpg"; - } } class IceCageEffect extends ReplacementEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/Island1.java b/Mage.Sets/src/mage/sets/magic2010/Island1.java index f3532127a95..e795bd524b6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island1.java @@ -41,11 +41,6 @@ public class Island1 extends mage.cards.basiclands.Island { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121700_typ_reg_sty_010.jpg"; - } - public Island1(final Island1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Island2.java b/Mage.Sets/src/mage/sets/magic2010/Island2.java index 3ec4271305d..14a6ddd5bd6 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island2.java @@ -41,11 +41,6 @@ public class Island2 extends mage.cards.basiclands.Island { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121687_typ_reg_sty_010.jpg"; - } - public Island2(final Island2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Island3.java b/Mage.Sets/src/mage/sets/magic2010/Island3.java index bcd94638ba5..4077ac0d9c7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island3.java @@ -41,11 +41,6 @@ public class Island3 extends mage.cards.basiclands.Island { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "25162_typ_reg_sty_010.jpg"; - } - public Island3(final Island3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Island4.java b/Mage.Sets/src/mage/sets/magic2010/Island4.java index d5aa2223dc6..8d60a2a3558 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Island4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Island4.java @@ -41,11 +41,6 @@ public class Island4 extends mage.cards.basiclands.Island { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "19006_typ_reg_sty_010.jpg"; - } - public Island4(final Island4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java index 91d2877835e..7c14d088169 100644 --- a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java +++ b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java @@ -77,9 +77,4 @@ public class JaceBeleren extends CardImpl { return new JaceBeleren(this); } - @Override - public String getArt() { - return "105537_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java index 389e3f414c9..84f2c5ba124 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java +++ b/Mage.Sets/src/mage/sets/magic2010/KelinoreBat.java @@ -60,9 +60,4 @@ public class KelinoreBat extends CardImpl { return new KelinoreBat(this); } - @Override - public String getArt() { - return "121619_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java index 72e83e0f035..2237fb7f450 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightningBolt.java @@ -58,9 +58,4 @@ public class LightningBolt extends CardImpl { return new LightningBolt(this); } - @Override - public String getArt() { - return "121669_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index 2720d0d6ce8..2e73c6aeb32 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java @@ -81,11 +81,6 @@ public class LilianaVess extends CardImpl { return new LilianaVess(this); } - @Override - public String getArt() { - return "105529_typ_reg_sty_010.jpg"; - } - } class LilianaVessEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java index 5a9a9ce3cb2..b0c395f5396 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java +++ b/Mage.Sets/src/mage/sets/magic2010/LoomingShade.java @@ -64,9 +64,4 @@ public class LoomingShade extends CardImpl { return new LoomingShade(this); } - @Override - public String getArt() { - return "27692_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java index 89b99a4b9b6..baeec89739a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java @@ -69,9 +69,4 @@ public class MagmaPhoenix extends CardImpl { return new MagmaPhoenix(this); } - @Override - public String getArt() { - return "121697_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java index 52feb09a9fe..d231ffddcf1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java @@ -82,16 +82,11 @@ public class MasterOfTheWildHunt extends CardImpl { public MasterOfTheWildHunt copy() { return new MasterOfTheWildHunt(this); } - - @Override - public String getArt() { - return "121652_typ_reg_sty_010.jpg"; - } } class MasterOfTheWildHuntEffect extends OneShotEffect { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.getName().add("Wolf"); diff --git a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java index cabdc1b6f44..2c3a285ebdf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/sets/magic2010/MerfolkSovereign.java @@ -51,8 +51,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class MerfolkSovereign extends CardImpl { - private static FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Merfolk creatures"); - private static FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Merfolk creature"); + private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Merfolk creatures"); + private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Merfolk creature"); static { filter1.getSubtype().add("Merfolk"); @@ -82,9 +82,4 @@ public class MerfolkSovereign extends CardImpl { return new MerfolkSovereign(this); } - @Override - public String getArt() { - return "121667_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index 9d939b442ba..922675509b2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java +++ b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java @@ -58,9 +58,4 @@ public class MightOfOaks extends CardImpl { public MightOfOaks copy() { return new MightOfOaks(this); } - - @Override - public String getArt() { - return "102958_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java index 17d3d4d541b..9b8d5418509 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindSpring.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindSpring.java @@ -60,11 +60,6 @@ public class MindSpring extends CardImpl { return new MindSpring(this); } - @Override - public String getArt() { - return "109919_typ_reg_sty_010.jpg"; - } - } class MindSpringEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java b/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java index 0e5ee2e2a6d..74480bc2bb5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java +++ b/Mage.Sets/src/mage/sets/magic2010/MistLeopard.java @@ -60,9 +60,4 @@ public class MistLeopard extends CardImpl { return new MistLeopard(this); } - @Override - public String getArt() { - return "122142_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain1.java b/Mage.Sets/src/mage/sets/magic2010/Mountain1.java index 261c174c5b4..186645effa3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain1.java @@ -41,11 +41,6 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "43246_typ_reg_sty_010.jpg"; - } - public Mountain1(final Mountain1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain2.java b/Mage.Sets/src/mage/sets/magic2010/Mountain2.java index b797de6755c..78e04fc1351 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain2.java @@ -41,11 +41,6 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "27715_typ_reg_sty_010.jpg"; - } - public Mountain2(final Mountain2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain3.java b/Mage.Sets/src/mage/sets/magic2010/Mountain3.java index 293231b3690..91725cb1334 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain3.java @@ -41,11 +41,6 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121704_typ_reg_sty_010.jpg"; - } - public Mountain3(final Mountain3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Mountain4.java b/Mage.Sets/src/mage/sets/magic2010/Mountain4.java index 6c9443b2713..3cf94b39d4c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Mountain4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Mountain4.java @@ -41,11 +41,6 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121703_typ_reg_sty_010.jpg"; - } - public Mountain4(final Mountain4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java index 1b57bfc9240..d723583308d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java +++ b/Mage.Sets/src/mage/sets/magic2010/NaturesSpiral.java @@ -35,7 +35,6 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonScope; import mage.filter.FilterCard; -import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInYourGraveyard; /** @@ -44,7 +43,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class NaturesSpiral extends CardImpl { - private static FilterCard filter = new FilterCard("permanent card"); + private static final FilterCard filter = new FilterCard("permanent card"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -71,9 +70,4 @@ public class NaturesSpiral extends CardImpl { public NaturesSpiral copy() { return new NaturesSpiral(this); } - - @Override - public String getArt() { - return "121584_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/Negate.java b/Mage.Sets/src/mage/sets/magic2010/Negate.java index 0c89dfa0f5a..76e9ab259e7 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Negate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Negate.java @@ -42,7 +42,7 @@ import mage.target.TargetSpell; */ public class Negate extends CardImpl { - private static FilterSpell filter = new FilterSpell("noncreature spell"); + private static final FilterSpell filter = new FilterSpell("noncreature spell"); static { filter.getNotCardType().add(CardType.CREATURE); @@ -65,9 +65,4 @@ public class Negate extends CardImpl { return new Negate(this); } - @Override - public String getArt() { - return "109907_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java index 355d1650b3f..d94eb5f95e2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java +++ b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java @@ -76,11 +76,6 @@ public class Oakenform extends CardImpl { return new Oakenform(this); } - @Override - public String getArt() { - return "121588_typ_reg_sty_010.jpg"; - } - } class OakenformEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java index 9c1d8971332..1a9f402446f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/magic2010/Ornithopter.java @@ -42,11 +42,6 @@ public class Ornithopter extends mage.sets.tenth.Ornithopter { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "122159_typ_reg_sty_010.jpg"; - } - public Ornithopter(final Ornithopter card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Overrun.java b/Mage.Sets/src/mage/sets/magic2010/Overrun.java index eaacce4e722..8b9c5da36c3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Overrun.java +++ b/Mage.Sets/src/mage/sets/magic2010/Overrun.java @@ -61,9 +61,4 @@ public class Overrun extends CardImpl { public Overrun copy() { return new Overrun(this); } - - @Override - public String getArt() { - return "33280_typ_reg_sty_001.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java index f0588b7dd1d..0fa5ece59b2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java +++ b/Mage.Sets/src/mage/sets/magic2010/PalaceGuard.java @@ -71,11 +71,6 @@ public class PalaceGuard extends CardImpl { return new PalaceGuard(this); } - @Override - public String getArt() { - return "121617_typ_reg_sty_010.jpg"; - } - class PalaceGuardEffect extends ContinuousEffectImpl { public PalaceGuardEffect() { diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains1.java b/Mage.Sets/src/mage/sets/magic2010/Plains1.java index f475508d20b..9bf458abaa1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains1.java @@ -41,11 +41,6 @@ public class Plains1 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "33222_typ_reg_sty_010.jpg"; - } - public Plains1(final Plains1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains2.java b/Mage.Sets/src/mage/sets/magic2010/Plains2.java index 144a655697d..20fb645b597 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains2.java @@ -41,11 +41,6 @@ public class Plains2 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121682_typ_reg_sty_010.jpg"; - } - public Plains2(final Plains2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains3.java b/Mage.Sets/src/mage/sets/magic2010/Plains3.java index db3e6a00b33..411dca91e66 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains3.java @@ -41,11 +41,6 @@ public class Plains3 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121696_typ_reg_sty_010.jpg"; - } - public Plains3(final Plains3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Plains4.java b/Mage.Sets/src/mage/sets/magic2010/Plains4.java index 15e2fe180f9..745babed967 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Plains4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Plains4.java @@ -41,11 +41,6 @@ public class Plains4 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "33224_typ_reg_sty_010.jpg"; - } - public Plains4(final Plains4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java index 95117d54e22..7b046e72b09 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/sets/magic2010/PrizedUnicorn.java @@ -64,9 +64,4 @@ public class PrizedUnicorn extends CardImpl { return new PrizedUnicorn(this); } - @Override - public String getArt() { - return "121572_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java index 52e743ff437..acd8499879a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java +++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java @@ -80,11 +80,6 @@ public class ProteanHydra extends CardImpl { return new ProteanHydra(this); } - @Override - public String getArt() { - return "122168_typ_reg_sty_010.jpg"; - } - class ProteanHydraEffect1 extends OneShotEffect { public ProteanHydraEffect1() { diff --git a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java index 0f5ee78800c..e3acbc5a046 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2010/RampantGrowth.java @@ -59,9 +59,4 @@ public class RampantGrowth extends CardImpl { public RampantGrowth copy() { return new RampantGrowth(this); } - - @Override - public String getArt() { - return "101061_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java index a852ebb4dcb..228200a4899 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/sets/magic2010/RhoxPikemaster.java @@ -46,10 +46,10 @@ import mage.filter.common.FilterCreaturePermanent; */ public class RhoxPikemaster extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.getSubtype().add("Soldier"); + filter.getSubtype().add("Soldier"); } public RhoxPikemaster(UUID ownerId) { @@ -72,9 +72,4 @@ public class RhoxPikemaster extends CardImpl { public RhoxPikemaster copy() { return new RhoxPikemaster(this); } - - @Override - public String getArt() { - return "121642_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java index 95c8f66549a..111a4531733 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java +++ b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCardInGraveyard; */ public class RiseFromTheGrave extends CardImpl { - private static FilterCreatureCard filter = new FilterCreatureCard(); + private static final FilterCreatureCard filter = new FilterCreatureCard(); public RiseFromTheGrave(UUID ownerId) { super(ownerId, 109, "Rise from the Grave", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); @@ -69,11 +69,6 @@ public class RiseFromTheGrave extends CardImpl { public RiseFromTheGrave copy() { return new RiseFromTheGrave(this); } - - @Override - public String getArt() { - return "121611_typ_reg_sty_010.jpg"; - } } class RiseFromTheGraveEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java index 5b090759e44..9e96248cc29 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java +++ b/Mage.Sets/src/mage/sets/magic2010/RootboundCrag.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterLandPermanent; */ public class RootboundCrag extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.getSubtype().add("Mountain"); @@ -77,9 +77,4 @@ public class RootboundCrag extends CardImpl { public RootboundCrag copy() { return new RootboundCrag(this); } - - @Override - public String getArt() { - return "121648_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java b/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java index 3e1cff64cc3..e678c3e5edb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java +++ b/Mage.Sets/src/mage/sets/magic2010/RuneclawBear.java @@ -59,9 +59,4 @@ public class RuneclawBear extends CardImpl { return new RuneclawBear(this); } - @Override - public String getArt() { - return "121566_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java index fc39108c271..947cbca964f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SafePassage.java +++ b/Mage.Sets/src/mage/sets/magic2010/SafePassage.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterCreatureOrPlayer; */ public class SafePassage extends CardImpl { - private static FilterCreatureOrPlayer filter = new FilterCreatureOrPlayer("you and creatures you control"); + private static final FilterCreatureOrPlayer filter = new FilterCreatureOrPlayer("you and creatures you control"); static { filter.getCreatureFilter().setTargetController(TargetController.YOU); @@ -66,9 +66,4 @@ public class SafePassage extends CardImpl { return new SafePassage(this); } - @Override - public String getArt() { - return "121601_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java b/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java index 8bb8a9c6150..62795f43d2c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java +++ b/Mage.Sets/src/mage/sets/magic2010/SiegeMastodon.java @@ -59,9 +59,4 @@ public class SiegeMastodon extends CardImpl { return new SiegeMastodon(this); } - @Override - public String getArt() { - return "123434_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java index e082b0e255b..4b0796d68ba 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java +++ b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java @@ -59,9 +59,4 @@ public class SignInBlood extends CardImpl { public SignInBlood copy() { return new SignInBlood(this); } - - @Override - public String getArt() { - return "121620_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/Silence.java b/Mage.Sets/src/mage/sets/magic2010/Silence.java index 2d41907116c..c97590cae30 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Silence.java +++ b/Mage.Sets/src/mage/sets/magic2010/Silence.java @@ -61,11 +61,6 @@ public class Silence extends CardImpl { public Silence copy() { return new Silence(this); } - - @Override - public String getArt() { - return "121665_typ_reg_sty_010.jpg"; - } } class SilenceEffect extends ReplacementEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java b/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java index fdb78af3d9d..712c9fe89e5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java +++ b/Mage.Sets/src/mage/sets/magic2010/SilvercoatLion.java @@ -59,9 +59,4 @@ public class SilvercoatLion extends CardImpl { return new SilvercoatLion(this); } - @Override - public String getArt() { - return "102612_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Sleep.java b/Mage.Sets/src/mage/sets/magic2010/Sleep.java index f51d7ec546b..82563a6a8c2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Sleep.java +++ b/Mage.Sets/src/mage/sets/magic2010/Sleep.java @@ -28,8 +28,6 @@ package mage.sets.magic2010; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; @@ -70,11 +68,6 @@ public class Sleep extends CardImpl { public Sleep copy() { return new Sleep(this); } - - @Override - public String getArt() { - return "121609_typ_reg_sty_010.jpg"; - } } class SleepEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java index 97464a287e2..f062578ef4e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/SnappingDrake.java @@ -60,9 +60,4 @@ public class SnappingDrake extends CardImpl{ return new SnappingDrake(this); } - @Override - public String getArt() { - return "102614_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java index 857458b0f73..3b1781ed80e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java +++ b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class SolemnOffering extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -69,9 +69,4 @@ public class SolemnOffering extends CardImpl { public SolemnOffering copy() { return new SolemnOffering(this); } - - @Override - public String getArt() { - return "122138_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java index d3781728a8f..8a7082b64de 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulWarden.java @@ -68,11 +68,6 @@ public class SoulWarden extends CardImpl { return new SoulWarden(this); } - @Override - public String getArt() { - return "05621_typ_reg_sty_010.jpg"; - } - } class SoulWardenAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java b/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java index 86fc6601947..cc6603a41c2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java +++ b/Mage.Sets/src/mage/sets/magic2010/StormfrontPegasus.java @@ -61,9 +61,4 @@ public class StormfrontPegasus extends CardImpl { return new StormfrontPegasus(this); } - @Override - public String getArt() { - return "121624_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java index fdd0f1f1935..4b25590a913 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java +++ b/Mage.Sets/src/mage/sets/magic2010/SunpetalGrove.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterLandPermanent; */ public class SunpetalGrove extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.getSubtype().add("Forest"); @@ -77,9 +77,4 @@ public class SunpetalGrove extends CardImpl { public SunpetalGrove copy() { return new SunpetalGrove(this); } - - @Override - public String getArt() { - return "121679_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/Swamp1.java b/Mage.Sets/src/mage/sets/magic2010/Swamp1.java index fa373496717..e0219bd9cf8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Swamp1.java +++ b/Mage.Sets/src/mage/sets/magic2010/Swamp1.java @@ -41,11 +41,6 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "43243_typ_reg_sty_010.jpg"; - } - public Swamp1(final Swamp1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Swamp2.java b/Mage.Sets/src/mage/sets/magic2010/Swamp2.java index 95211ce1096..9c5e77afc86 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Swamp2.java +++ b/Mage.Sets/src/mage/sets/magic2010/Swamp2.java @@ -41,11 +41,6 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121691_typ_reg_sty_010.jpg"; - } - public Swamp2(final Swamp2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Swamp3.java b/Mage.Sets/src/mage/sets/magic2010/Swamp3.java index a24c391353c..7d38f2cbaa3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Swamp3.java +++ b/Mage.Sets/src/mage/sets/magic2010/Swamp3.java @@ -41,11 +41,6 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "121681_typ_reg"; - } - public Swamp3(final Swamp3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Swamp4.java b/Mage.Sets/src/mage/sets/magic2010/Swamp4.java index 84f91267b2f..21b3f0956a2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Swamp4.java +++ b/Mage.Sets/src/mage/sets/magic2010/Swamp4.java @@ -41,11 +41,6 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M10"; } - @Override - public String getArt() { - return "33214_typ_reg_sty_010.jpg"; - } - public Swamp4(final Swamp4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java index e471ebaccf4..9ab79951a26 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java +++ b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java @@ -62,11 +62,6 @@ public class TimeWarp extends CardImpl { return new TimeWarp(this); } - @Override - public String getArt() { - return "122160_typ_reg_sty_010.jpg"; - } - } class TimeWarpEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java index cc33ac4d769..098303271e5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java +++ b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java @@ -57,9 +57,4 @@ public class TomeScour extends CardImpl { public TomeScour copy() { return new TomeScour(this); } - - @Override - public String getArt() { - return "102623_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 61942d9fe54..45c912ec3b9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java @@ -70,9 +70,4 @@ public class VampireAristocrat extends CardImpl { return new VampireAristocrat(this); } - @Override - public String getArt() { - return "121635_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java index 5eb179d97bb..a1a65422471 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfBone.java @@ -66,9 +66,4 @@ public class WallOfBone extends CardImpl { return new WallOfBone(this); } - @Override - public String getArt() { - return "122153_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java index a102be30223..dd608089435 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFaith.java @@ -67,9 +67,4 @@ public class WallOfFaith extends CardImpl { return new WallOfFaith(this); } - @Override - public String getArt() { - return "121606_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java index e92a282350a..0e64a1add06 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java +++ b/Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java @@ -70,11 +70,6 @@ public class WallOfFrost extends CardImpl { return new WallOfFrost(this); } - @Override - public String getArt() { - return "121591_typ_reg_sty_010.jpg"; - } - } class WallOfFrostAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java index 7fef9722d9c..b8e17a97412 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java +++ b/Mage.Sets/src/mage/sets/magic2010/WarpathGhoul.java @@ -58,9 +58,4 @@ public class WarpathGhoul extends CardImpl { return new WarpathGhoul(this); } - @Override - public String getArt() { - return "101036_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/Weakness.java b/Mage.Sets/src/mage/sets/magic2010/Weakness.java index 2ce6a16b729..6615f6523c9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Weakness.java +++ b/Mage.Sets/src/mage/sets/magic2010/Weakness.java @@ -74,11 +74,6 @@ public class Weakness extends CardImpl { public Weakness copy() { return new Weakness(this); } - - @Override - public String getArt() { - return "02510_typ_reg_sty_010.jpg"; - } } class WeaknessEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java index 5ed24838623..56ee7d2c675 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java +++ b/Mage.Sets/src/mage/sets/magic2010/WhispersilkCloak.java @@ -51,9 +51,4 @@ public class WhispersilkCloak extends mage.sets.tenth.WhispersilkCloak { return new WhispersilkCloak(this); } - @Override - public String getArt() { - return "121663_typ_reg_sty_010.jpg"; - } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java index 2f69346f35c..5b8ae8e6866 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java +++ b/Mage.Sets/src/mage/sets/magic2010/WhiteKnight.java @@ -68,9 +68,4 @@ public class WhiteKnight extends CardImpl { return new WhiteKnight(this); } - @Override - public String getArt() { - return "121715_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java index ce94b6d37c7..f4d86f986f2 100644 --- a/Mage.Sets/src/mage/sets/magic2010/WindDrake.java +++ b/Mage.Sets/src/mage/sets/magic2010/WindDrake.java @@ -60,9 +60,4 @@ public class WindDrake extends CardImpl { return new WindDrake(this); } - @Override - public String getArt() { - return "122178_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java index 008dbf20435..5d57620300c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java +++ b/Mage.Sets/src/mage/sets/magic2010/ZephyrSprite.java @@ -60,9 +60,4 @@ public class ZephyrSprite extends CardImpl { return new ZephyrSprite(this); } - @Override - public String getArt() { - return "121594_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index cb7ed4dea70..e43a411beaf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -67,9 +67,4 @@ public class AetherAdept extends CardImpl { return new AetherAdept(this); } - @Override - public String getArt() { - return "129110_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AirServant.java b/Mage.Sets/src/mage/sets/magic2011/AirServant.java index 8db8fd91c5e..7fe124eeab4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AirServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/AirServant.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class AirServant extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.getAbilities().add(FlyingAbility.getInstance()); @@ -76,9 +76,4 @@ public class AirServant extends CardImpl { return new AirServant(this); } - @Override - public String getArt() { - return "129155_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java index 3fecf2500dc..3eba216fa24 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisMantra.java @@ -58,9 +58,4 @@ public class AjanisMantra extends CardImpl { return new AjanisMantra(this); } - @Override - public String getArt() { - return "129081_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java index 315ad1111c4..073162a76cb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java +++ b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java @@ -68,11 +68,6 @@ public class AjanisPridemate extends CardImpl { return new AjanisPridemate(this); } - @Override - public String getArt() { - return "129151_typ_reg_sty_010.jpg"; - } - } class AjanisPridemateAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java index 7d53ef8b379..85a6b9ffdee 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java @@ -34,7 +34,6 @@ import mage.Constants.ColoredManaSymbol; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.CostImpl; import mage.abilities.costs.mana.ColoredManaCost; @@ -43,7 +42,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; -import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -74,11 +72,6 @@ public class AncientHellkite extends CardImpl { return new AncientHellkite(this); } - @Override - public String getArt() { - return "129075_typ_reg_sty_010.jpg"; - } - } class AncientHellkiteAbility extends ActivatedAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java index 3fb1a46df1c..2fa57af4f02 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java +++ b/Mage.Sets/src/mage/sets/magic2011/AngelicArbiter.java @@ -76,11 +76,6 @@ public class AngelicArbiter extends CardImpl { return new AngelicArbiter(this); } - @Override - public String getArt() { - return "129070_typ_reg_sty_010.jpg"; - } - } class AngelicArbiterWatcher1 extends WatcherImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java index 562bf85773d..435613cd44f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArcRunner.java @@ -66,9 +66,4 @@ public class ArcRunner extends CardImpl { return new ArcRunner(this); } - @Override - public String getArt() { - return "129084_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java index 5ca74c2029e..5d917382b54 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java +++ b/Mage.Sets/src/mage/sets/magic2011/ArmoredCancrix.java @@ -58,9 +58,4 @@ public class ArmoredCancrix extends CardImpl { return new ArmoredCancrix(this); } - @Override - public String getArt() { - return "129159_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java index 981088cf9bf..edbefc2fcc6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java +++ b/Mage.Sets/src/mage/sets/magic2011/AssaultGriffin.java @@ -61,10 +61,5 @@ public class AssaultGriffin extends CardImpl { return new AssaultGriffin(this); } - @Override - public String getArt() { - return "129194_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java index e4c3cf06e58..077a6c2d76d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java +++ b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java @@ -64,9 +64,4 @@ public class AuguryOwl extends CardImpl { return new AuguryOwl(this); } - @Override - public String getArt() { - return "129176_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java index 1f428413c8c..6a701d03dbf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java +++ b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java @@ -32,7 +32,6 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.ObjectColor; import mage.abilities.effects.common.CantCounterControlledEffect; import mage.abilities.effects.common.CantTargetControlledEffect; import mage.cards.CardImpl; @@ -47,9 +46,9 @@ import mage.filter.common.FilterCreaturePermanent; */ public class AutumnsVeil extends CardImpl { - private static FilterSpell filterTarget1 = new FilterSpell("spells you control"); - private static FilterCreaturePermanent filterTarget2 = FilterCreaturePermanent.getDefault(); - private static FilterStackObject filterSource = new FilterStackObject("blue or black spells"); + private static final FilterSpell filterTarget1 = new FilterSpell("spells you control"); + private static final FilterCreaturePermanent filterTarget2 = FilterCreaturePermanent.getDefault(); + private static final FilterStackObject filterSource = new FilterStackObject("blue or black spells"); static { filterSource.getColor().setBlue(true); @@ -74,10 +73,5 @@ public class AutumnsVeil extends CardImpl { return new AutumnsVeil(this); } - @Override - public String getArt() { - return "129140_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java index 12f0b31b189..d86f06352d1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java +++ b/Mage.Sets/src/mage/sets/magic2011/AzureDrake.java @@ -61,10 +61,4 @@ public class AzureDrake extends CardImpl { return new AzureDrake(this); } - @Override - public String getArt() { - return "02311_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java index 64b17dda2ee..b203d19e3af 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BackToNature.java +++ b/Mage.Sets/src/mage/sets/magic2011/BackToNature.java @@ -41,7 +41,7 @@ import mage.filter.FilterPermanent; */ public class BackToNature extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("enchantments"); + private static final FilterPermanent filter = new FilterPermanent("enchantments"); static { filter.getCardType().add(CardType.ENCHANTMENT); @@ -63,9 +63,4 @@ public class BackToNature extends CardImpl { return new BackToNature(this); } - @Override - public String getArt() { - return "129188_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java index be8e11e8c7b..9588c98794f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/BaronyVampire.java @@ -58,9 +58,4 @@ public class BaronyVampire extends CardImpl { return new BaronyVampire(this); } - @Override - public String getArt() { - return "129093_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java index 6a69cbe3daa..de4338959fb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodTithe.java @@ -60,11 +60,6 @@ public class BloodTithe extends CardImpl { return new BloodTithe(this); } - @Override - public String getArt() { - return "129141_typ_reg_sty_010.jpg"; - } - } class BloodTitheEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java index d303411924b..d174c439515 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/sets/magic2011/BloodcrazedGoblin.java @@ -73,11 +73,6 @@ public class BloodcrazedGoblin extends CardImpl { return new BloodcrazedGoblin(this); } - @Override - public String getArt() { - return "129098_typ_reg_sty_010.jpg"; - } - } class BloodcrazedGoblinWatcher extends WatcherImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java index ff40ca1e8f6..f56f8f959c6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java +++ b/Mage.Sets/src/mage/sets/magic2011/BogRaiders.java @@ -60,9 +60,4 @@ public class BogRaiders extends CardImpl { return new BogRaiders(this); } - @Override - public String getArt() { - return "08678_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java index a7176c7656a..046ca874db6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrindleBoar.java @@ -64,9 +64,4 @@ public class BrindleBoar extends CardImpl { return new BrindleBoar(this); } - @Override - public String getArt() { - return "129128_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java index 339d039bb17..b599f5ea1b6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java @@ -70,9 +70,4 @@ public class BrittleEffigy extends CardImpl { return new BrittleEffigy(this); } - @Override - public String getArt() { - return "129094_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/CallToMind.java b/Mage.Sets/src/mage/sets/magic2011/CallToMind.java index a1ed3e9b0e2..5d2cc34846c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CallToMind.java +++ b/Mage.Sets/src/mage/sets/magic2011/CallToMind.java @@ -31,12 +31,10 @@ package mage.sets.magic2011; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter.ComparisonScope; import mage.filter.FilterCard; -import mage.target.TargetCard; import mage.target.common.TargetCardInYourGraveyard; /** @@ -45,7 +43,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class CallToMind extends CardImpl { - private static FilterCard filter = new FilterCard("instant or sorcery card"); + private static final FilterCard filter = new FilterCard("instant or sorcery card"); static { filter.getCardType().add(CardType.INSTANT); @@ -71,9 +69,4 @@ public class CallToMind extends CardImpl { return new CallToMind(this); } - @Override - public String getArt() { - return "129174_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index bf531dc26d8..573cb3faa21 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java @@ -57,8 +57,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class CaptivatingVampire extends CardImpl { - private static FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Vampire creatures"); - private static FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("untapped Vampire"); + private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Vampire creatures"); + private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("untapped Vampire"); static { filter1.getSubtype().add("Vampire"); @@ -90,11 +90,6 @@ public class CaptivatingVampire extends CardImpl { return new CaptivatingVampire(this); } - @Override - public String getArt() { - return "131382_typ_reg_sty_010.jpg"; - } - } class CaptivatingVampireEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java index 481cbe5b657..244bc23042c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java @@ -63,11 +63,6 @@ public class ChandrasOutrage extends CardImpl { return new ChandrasOutrage(this); } - @Override - public String getArt() { - return "129156_typ_reg_sty_010.jpg"; - } - } class ChandrasOutrageEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java index bd880ee755e..d3c75a558cf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java @@ -69,11 +69,6 @@ public class ChandrasSpitfire extends CardImpl { return new ChandrasSpitfire(this); } - @Override - public String getArt() { - return "129115_typ_reg_sty_010.jpg"; - } - } class ChandrasSpitfireAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java index 10b9a65830d..afb488d55d2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java +++ b/Mage.Sets/src/mage/sets/magic2011/CloudCrusader.java @@ -64,9 +64,4 @@ public class CloudCrusader extends CardImpl { return new CloudCrusader(this); } - @Override - public String getArt() { - return "129191_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/Combust.java b/Mage.Sets/src/mage/sets/magic2011/Combust.java index d4f3814f569..bbe51db99ac 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Combust.java +++ b/Mage.Sets/src/mage/sets/magic2011/Combust.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Combust extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("white or blue creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("white or blue creature"); static { filter.getColor().setWhite(true); @@ -73,9 +73,4 @@ public class Combust extends CardImpl { return new Combust(this); } - @Override - public String getArt() { - return "129101_typ_reg_sty_010.jpg"; - } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java index b5da12f062c..58e18d39884 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java +++ b/Mage.Sets/src/mage/sets/magic2011/ConundrumSphinx.java @@ -76,11 +76,6 @@ public class ConundrumSphinx extends CardImpl { return new ConundrumSphinx(this); } - @Override - public String getArt() { - return "129077_typ_reg_sty_010.jpg"; - } - } class ConundrumSphinxEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java index 028347e5f89..02e1fa1ccad 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Corrupt.java +++ b/Mage.Sets/src/mage/sets/magic2011/Corrupt.java @@ -66,16 +66,11 @@ public class Corrupt extends CardImpl { return new Corrupt(this); } - @Override - public String getArt() { - return "111602_typ_reg_sty_010.jpg"; - } - } class CorruptEffect extends OneShotEffect { - private static FilterLandPermanent filter = new FilterLandPermanent("Swamps"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Swamps"); static { filter.getSubtype().add("Swamp"); diff --git a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java index deef362db98..39874828788 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java +++ b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java @@ -64,10 +64,5 @@ public class CrystalBall extends CardImpl { return new CrystalBall(this); } - @Override - public String getArt() { - return "129138_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java index bb65a7a5f5a..d01e2201b86 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Cultivate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Cultivate.java @@ -71,16 +71,11 @@ public class Cultivate extends CardImpl { return new Cultivate(this); } - @Override - public String getArt() { - return "129089_typ_reg_sty_010.jpg"; - } - } class CultivateEffect extends OneShotEffect { - protected static FilterCard filter = new FilterCard("card to put on the battlefield tapped"); + protected static final FilterCard filter = new FilterCard("card to put on the battlefield tapped"); public CultivateEffect() { super(Outcome.PutLandInPlay); diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index 603b640014f..33b88c30468 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -39,7 +39,6 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; -import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; @@ -72,11 +71,6 @@ public class CyclopsGladiator extends CardImpl { return new CyclopsGladiator(this); } - @Override - public String getArt() { - return "129160_typ_reg_sty_010.jpg"; - } - } class CyclopsGladiatorEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java index 0f7e116196a..8b351c41168 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java +++ b/Mage.Sets/src/mage/sets/magic2011/DarkTutelage.java @@ -66,11 +66,6 @@ public class DarkTutelage extends CardImpl { return new DarkTutelage(this); } - @Override - public String getArt() { - return "129074_typ_reg_sty_010.jpg"; - } - } class DarkTutelageEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java index 3e2f768272d..0b92c57279c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java +++ b/Mage.Sets/src/mage/sets/magic2011/DemonOfDeathsGate.java @@ -69,15 +69,10 @@ public class DemonOfDeathsGate extends CardImpl { return new DemonOfDeathsGate(this); } - @Override - public String getArt() { - return "129162_typ_reg_sty_010.jpg"; - } - } class DemonOfDeathsGateAlternativeCost extends AlternativeCost { - private static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("black creature"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("black creature"); static { filter.getColor().setBlack(true); diff --git a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java index 16c82837f30..ade6c6a59ab 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java +++ b/Mage.Sets/src/mage/sets/magic2011/DestructiveForce.java @@ -36,7 +36,6 @@ import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.common.FilterLandPermanent; /** * @@ -44,7 +43,7 @@ import mage.filter.common.FilterLandPermanent; */ public class DestructiveForce extends CardImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent("land"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("land"); static { filter.getCardType().add(CardType.LAND); @@ -67,10 +66,4 @@ public class DestructiveForce extends CardImpl { return new DestructiveForce(this); } - @Override - public String getArt() { - return "129135_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index e78e2e76148..4bcd040f0dc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Diminish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Diminish.java @@ -59,9 +59,4 @@ public class Diminish extends CardImpl { return new Diminish(this); } - @Override - public String getArt() { - return "129177_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java index c2517cb32d4..9f69e6ae86f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java +++ b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java @@ -77,11 +77,6 @@ public class DryadsFavor extends CardImpl { public DryadsFavor copy() { return new DryadsFavor(this); } - - @Override - public String getArt() { - return "129161_typ_reg_sty_010.jpg"; - } } class DryadsFavorEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java index 08d54797d1f..fb08bffa6e2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/DuskdaleWurm.java @@ -61,10 +61,5 @@ public class DuskdaleWurm extends CardImpl { return new DuskdaleWurm(this); } - @Override - public String getArt() { - return "113643_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java index 35d0d15799f..f5f03c1d193 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EarthServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/EarthServant.java @@ -71,16 +71,11 @@ public class EarthServant extends CardImpl { return new EarthServant(this); } - @Override - public String getArt() { - return "129080_typ_reg_sty_010.jpg"; - } - } class EarthServantEffect extends ContinuousEffectImpl { - private static FilterLandPermanent filter = new FilterLandPermanent("Mountain"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { filter.getSubtype().add("Mountain"); diff --git a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java index 4c48c58d41b..b12d7fcf97e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java +++ b/Mage.Sets/src/mage/sets/magic2011/ElixirOfImmortality.java @@ -73,11 +73,6 @@ public class ElixirOfImmortality extends CardImpl { return new ElixirOfImmortality(this); } - @Override - public String getArt() { - return "129148_typ_reg_sty_010.jpg"; - } - } class ElixerOfImmortalityEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java index 6ea970a84af..7c6c14d97ea 100644 --- a/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java +++ b/Mage.Sets/src/mage/sets/magic2011/EmberHauler.java @@ -75,9 +75,4 @@ public class EmberHauler extends CardImpl { return new EmberHauler(this); } - @Override - public String getArt() { - return "129173_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java index 4c199a11565..69cb9ab9db6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java +++ b/Mage.Sets/src/mage/sets/magic2011/FaunaShaman.java @@ -80,9 +80,4 @@ public class FaunaShaman extends CardImpl { return new FaunaShaman(this); } - @Override - public String getArt() { - return "129146_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/FireServant.java b/Mage.Sets/src/mage/sets/magic2011/FireServant.java index 4f05024f2b7..ecb23298a37 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FireServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/FireServant.java @@ -69,11 +69,6 @@ public class FireServant extends CardImpl { return new FireServant(this); } - @Override - public String getArt() { - return "129085_typ_reg_sty_010.jpg"; - } - } class FireServantEffect extends ReplacementEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/Fling.java b/Mage.Sets/src/mage/sets/magic2011/Fling.java index 76ba7a74ae1..37e08418cc2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fling.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fling.java @@ -66,11 +66,6 @@ public class Fling extends CardImpl { public Fling copy() { return new Fling(this); } - - @Override - public String getArt() { - return "03685_typ_reg_sty_010.jpg"; - } } class FlingEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/Foresee.java b/Mage.Sets/src/mage/sets/magic2011/Foresee.java index 709304a2d60..ce458e34a24 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Foresee.java +++ b/Mage.Sets/src/mage/sets/magic2011/Foresee.java @@ -57,9 +57,4 @@ public class Foresee extends CardImpl { public Foresee copy() { return new Foresee(this); } - - @Override - public String getArt() { - return "102404_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest1.java b/Mage.Sets/src/mage/sets/magic2011/Forest1.java index 6996c5c91f1..829f6f28da3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest1.java @@ -41,11 +41,6 @@ public class Forest1 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121707_typ_reg_sty_010.jpg"; - } - public Forest1(final Forest1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest2.java b/Mage.Sets/src/mage/sets/magic2011/Forest2.java index cadf83210ee..7297a3604cf 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest2.java @@ -41,11 +41,6 @@ public class Forest2 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121708_typ_reg_sty_010.jpg"; - } - public Forest2(final Forest2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest3.java b/Mage.Sets/src/mage/sets/magic2011/Forest3.java index 6eca0ec3c3f..01091979721 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest3.java @@ -41,11 +41,6 @@ public class Forest3 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "27625_typ_reg_sty_010.jpg"; - } - public Forest3(final Forest3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Forest4.java b/Mage.Sets/src/mage/sets/magic2011/Forest4.java index 3a5f8a553ae..a136b30c49a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Forest4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Forest4.java @@ -41,11 +41,6 @@ public class Forest4 extends mage.cards.basiclands.Forest { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "106210_typ_reg_sty_010.jpg"; - } - public Forest4(final Forest4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java index bdfca4cf946..ecf896a07e6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java @@ -73,11 +73,6 @@ public class FrostTitan extends CardImpl { return new FrostTitan(this); } - @Override - public String getArt() { - return "129092_typ_reg_sty_010.jpg"; - } - } class FrostTitanAbility1 extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java index ffcc7f0ec6a..01d70704a23 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java +++ b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java @@ -47,7 +47,7 @@ import mage.filter.FilterStackObject; */ public class GaeasRevenge extends CardImpl { - private static FilterStackObject filter = new FilterStackObject("nongreen spells or abilities from nongreen sources"); + private static final FilterStackObject filter = new FilterStackObject("nongreen spells or abilities from nongreen sources"); static { filter.getColor().setGreen(true); @@ -78,9 +78,4 @@ public class GaeasRevenge extends CardImpl { return new GaeasRevenge(this); } - @Override - public String getArt() { - return "129122_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java index 5ac450c2bb4..f53665dae10 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java +++ b/Mage.Sets/src/mage/sets/magic2011/GargoyleSentinel.java @@ -74,11 +74,6 @@ public class GargoyleSentinel extends CardImpl { return new GargoyleSentinel(this); } - @Override - public String getArt() { - return "129079_typ_reg_sty_010.jpg"; - } - } class GargoyleSentinelEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java index 1d2d0b3a91f..47e8d29585c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksCompanion.java @@ -61,9 +61,4 @@ public class GarruksCompanion extends CardImpl { return new GarruksCompanion(this); } - @Override - public String getArt() { - return "129114_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java index 54ad20b6cc3..758ce029749 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java +++ b/Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java @@ -68,11 +68,6 @@ public class GarruksPackleader extends CardImpl { return new GarruksPackleader(this); } - @Override - public String getArt() { - return "129147_typ_reg_sty_010.jpg"; - } - } class GarruksPackleaderAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java index ccc35de5aa3..888095655cc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoblinBalloonBrigade.java @@ -67,9 +67,4 @@ public class GoblinBalloonBrigade extends CardImpl { return new GoblinBalloonBrigade(this); } - @Override - public String getArt() { - return "86949_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java index fb8179d592d..f56e9abfd12 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java +++ b/Mage.Sets/src/mage/sets/magic2011/GoldenglowMoth.java @@ -66,9 +66,4 @@ public class GoldenglowMoth extends CardImpl { return new GoldenglowMoth(this); } - @Override - public String getArt() { - return "111904_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java index 0ad91241c85..b88f527b1b2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java @@ -70,11 +70,6 @@ public class GraveTitan extends CardImpl { return new GraveTitan(this); } - @Override - public String getArt() { - return "129102_typ_reg_sty_010.jpg"; - } - } class GraveTitanAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java index c4e51fee13e..3960fbf5d83 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java +++ b/Mage.Sets/src/mage/sets/magic2011/GreaterBasilisk.java @@ -61,9 +61,4 @@ public class GreaterBasilisk extends CardImpl { return new GreaterBasilisk(this); } - @Override - public String getArt() { - return "129106_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java index 20a7791643c..33b45aac491 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java +++ b/Mage.Sets/src/mage/sets/magic2011/HarborSerpent.java @@ -73,16 +73,11 @@ public class HarborSerpent extends CardImpl { return new HarborSerpent(this); } - @Override - public String getArt() { - return "129069_typ_reg_sty_010.jpg"; - } - } class HarborSerpentEffect extends ReplacementEffectImpl { - private static FilterLandPermanent filter = new FilterLandPermanent("Island"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Island"); static { filter.getSubtype().add("Island"); diff --git a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java index 29a1d71d2a1..739b46f6451 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java @@ -53,7 +53,7 @@ import mage.target.common.TargetCardInLibrary; */ public class HoardingDragon extends CardImpl { - private static FilterCard filter = new FilterCard(); + private static final FilterCard filter = new FilterCard(); static { filter.getCardType().add(CardType.ARTIFACT); @@ -81,11 +81,6 @@ public class HoardingDragon extends CardImpl { return new HoardingDragon(this); } - @Override - public String getArt() { - return "129166_typ_reg_sty_010.jpg"; - } - } class HoardingDragonEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java index 6bce8c1e4af..2744deb9abd 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HornetSting.java +++ b/Mage.Sets/src/mage/sets/magic2011/HornetSting.java @@ -57,9 +57,4 @@ public class HornetSting extends CardImpl { public HornetSting copy() { return new HornetSting(this); } - - @Override - public String getArt() { - return "129139_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java index 08acc5c8504..40ebd51d6c4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/HuntersFeast.java @@ -57,9 +57,4 @@ public class HuntersFeast extends CardImpl { public HuntersFeast copy() { return new HuntersFeast(this); } - - @Override - public String getArt() { - return "129126_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/Incite.java b/Mage.Sets/src/mage/sets/magic2011/Incite.java index f6a08f1fdaf..b373c07732f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Incite.java +++ b/Mage.Sets/src/mage/sets/magic2011/Incite.java @@ -66,11 +66,6 @@ public class Incite extends CardImpl { public Incite copy() { return new Incite(this); } - - @Override - public String getArt() { - return "129134_typ_reg_sty_010.jpg"; - } } class InciteEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java index 020cd5cea08..e91236b5b43 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfantryVeteran.java @@ -70,9 +70,4 @@ public class InfantryVeteran extends CardImpl { return new InfantryVeteran(this); } - @Override - public String getArt() { - return "2191_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java index e8e3c875e2b..a081f643ee5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java @@ -73,11 +73,6 @@ public class InfernoTitan extends CardImpl { return new InfernoTitan(this); } - @Override - public String getArt() { - return "129131_typ_reg_sty_010.jpg"; - } - } class InfernoTitanAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java index 6e491b06a8a..9d8ea9ac686 100644 --- a/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java +++ b/Mage.Sets/src/mage/sets/magic2011/InspiredCharge.java @@ -56,9 +56,4 @@ public class InspiredCharge extends CardImpl { public InspiredCharge copy() { return new InspiredCharge(this); } - - @Override - public String getArt() { - return "129157_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island1.java b/Mage.Sets/src/mage/sets/magic2011/Island1.java index 93673086a3f..a13957819c3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island1.java @@ -41,11 +41,6 @@ public class Island1 extends mage.cards.basiclands.Island { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121687_typ_reg_sty_010.jpg"; - } - public Island1(final Island1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island2.java b/Mage.Sets/src/mage/sets/magic2011/Island2.java index ddaa091ac1e..38a1c343897 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island2.java @@ -41,11 +41,6 @@ public class Island2 extends mage.cards.basiclands.Island { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121700_typ_reg_sty_010.jpg"; - } - public Island2(final Island2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island3.java b/Mage.Sets/src/mage/sets/magic2011/Island3.java index b930b6a63a9..fbf418a35f4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island3.java @@ -41,11 +41,6 @@ public class Island3 extends mage.cards.basiclands.Island { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "6779_typ_reg_sty_010.jpg"; - } - public Island3(final Island3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Island4.java b/Mage.Sets/src/mage/sets/magic2011/Island4.java index 39a06b62a28..b6203f438f9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Island4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Island4.java @@ -41,11 +41,6 @@ public class Island4 extends mage.cards.basiclands.Island { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "106211_typ_reg_sty_010.jpg"; - } - public Island4(final Island4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java index 4828cd67f51..262710132e2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java @@ -60,9 +60,4 @@ public class JacesErasure extends CardImpl { public JacesErasure copy() { return new JacesErasure(this); } - - @Override - public String getArt() { - return "125788_typ_reg_sty_010.jpg"; - } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java index 9cdcba5d166..cac756efade 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesIngenuity.java @@ -55,10 +55,5 @@ public class JacesIngenuity extends CardImpl { public JacesIngenuity copy() { return new JacesIngenuity(this); } - - @Override - public String getArt() { - return "129105_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java index 51c434be3ac..ed65461993b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java +++ b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java @@ -73,11 +73,6 @@ public class JinxedIdol extends CardImpl { return new JinxedIdol(this); } - @Override - public String getArt() { - return "129171_typ_reg_sty_010.jpg"; - } - } class JinxedIdolEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java b/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java index 22b906fe743..1b94cbabeea 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/magic2011/Juggernaut.java @@ -42,11 +42,6 @@ public class Juggernaut extends mage.sets.tenth.Juggernaut { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "129164_typ_reg_sty_010.jpg"; - } - public Juggernaut(final Juggernaut card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java index 3003b83bbf8..f128622185e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java +++ b/Mage.Sets/src/mage/sets/magic2011/KnightExemplar.java @@ -48,7 +48,7 @@ import mage.filter.common.FilterCreaturePermanent; */ public class KnightExemplar extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("Knight creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Knight creatures"); static { filter.getSubtype().add("Knight"); @@ -77,9 +77,4 @@ public class KnightExemplar extends CardImpl { return new KnightExemplar(this); } - @Override - public String getArt() { - return "129082_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java index e970d76a266..c9298615754 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfAnticipation.java @@ -66,11 +66,6 @@ public class LeylineOfAnticipation extends CardImpl { return new LeylineOfAnticipation(this); } - @Override - public String getArt() { - return "129099_typ_reg_sty_010.jpg"; - } - } class LeylineOfAnticipationEffect extends AsThoughEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java index e67ad2ebd7a..5369486ab3b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java @@ -67,11 +67,6 @@ public class LeylineOfPunishment extends CardImpl { return new LeylineOfPunishment(this); } - @Override - public String getArt() { - return "129108_typ_reg_sty_010.jpg"; - } - } class LeylineOfPunishmentEffect1 extends ReplacementEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java index 1c95bff6a9e..027c9fba07e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfSanctity.java @@ -46,7 +46,7 @@ import mage.filter.FilterStackObject; */ public class LeylineOfSanctity extends CardImpl { - private static FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); + private static final FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); static { filter.setTargetController(TargetController.OPPONENT); @@ -69,10 +69,5 @@ public class LeylineOfSanctity extends CardImpl { return new LeylineOfSanctity(this); } - @Override - public String getArt() { - return "129086_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java index d4319daed42..826f6168da5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfTheVoid.java @@ -69,11 +69,6 @@ public class LeylineOfTheVoid extends CardImpl { return new LeylineOfTheVoid(this); } - @Override - public String getArt() { - return "129103_typ_reg_sty_010.jpg"; - } - } class LeylineOfTheVoidEffect extends ReplacementEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java index b7f33d21597..90b313c337a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java @@ -66,9 +66,4 @@ public class LeylineOfVitality extends CardImpl { return new LeylineOfVitality(this); } - @Override - public String getArt() { - return "129120_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java index 0aef0a0e021..779eeb92d74 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java @@ -62,11 +62,6 @@ public class LilianasCaress extends CardImpl { return new LilianasCaress(this); } - @Override - public String getArt() { - return "129124_typ_reg_sty_010.jpg"; - } - } class LilianasCaressAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java index 057a9bb47cf..26df84a14b7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java @@ -68,11 +68,6 @@ public class LilianasSpecter extends CardImpl { return new LilianasSpecter(this); } - @Override - public String getArt() { - return "129091_typ_reg_sty_010.jpg"; - } - } class LilianasSpecterEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java index 617587fa6c8..fc018a0f863 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManaLeak.java @@ -62,9 +62,4 @@ public class ManaLeak extends CardImpl { public ManaLeak copy() { return new ManaLeak(this); } - - @Override - public String getArt() { - return "129076_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java index 520ba100f66..aaf8643daf0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; */ public class ManicVandal extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -79,9 +79,4 @@ public class ManicVandal extends CardImpl { return new ManicVandal(this); } - @Override - public String getArt() { - return "129172_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java index d77c9d57673..34fbce65024 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java +++ b/Mage.Sets/src/mage/sets/magic2011/MaritimeGuard.java @@ -59,9 +59,4 @@ public class MaritimeGuard extends CardImpl { return new MaritimeGuard(this); } - @Override - public String getArt() { - return "129129_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java index 23d2f91c982..066d46cd933 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java +++ b/Mage.Sets/src/mage/sets/magic2011/MassPolymorph.java @@ -66,11 +66,6 @@ public class MassPolymorph extends CardImpl { public MassPolymorph copy() { return new MassPolymorph(this); } - - @Override - public String getArt() { - return "129072_typ_reg_sty_010.jpg"; - } } class MassPolymorphEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java index 52c5b1f0ee0..dc85f6424df 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java +++ b/Mage.Sets/src/mage/sets/magic2011/MerfolkSpy.java @@ -71,11 +71,6 @@ public class MerfolkSpy extends CardImpl { return new MerfolkSpy(this); } - @Override - public String getArt() { - return "129100_typ_reg_sty_010.jpg"; - } - } class MerfolkSpyEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java index afc260e939b..4c91a553678 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java +++ b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java @@ -61,9 +61,4 @@ public class MightyLeap extends CardImpl { public MightyLeap copy() { return new MightyLeap(this); } - - @Override - public String getArt() { - return "129186_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/MindControl.java b/Mage.Sets/src/mage/sets/magic2011/MindControl.java index 27d13a5cb9e..a089da51d21 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2011/MindControl.java @@ -50,9 +50,4 @@ public class MindControl extends mage.sets.magic2010.MindControl { public MindControl copy() { return new MindControl(this); } - - @Override - public String getArt() { - return "129175_typ_reg_sty_010.jpg"; - } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java index 338bc092b06..4470d7346d0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java +++ b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java @@ -63,11 +63,6 @@ public class MitoticSlime extends CardImpl { return new MitoticSlime(this); } - @Override - public String getArt() { - return "129121_typ_reg_sty_010.jpg"; - } - } class Ooze2Token extends Token { diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain1.java b/Mage.Sets/src/mage/sets/magic2011/Mountain1.java index 248d279d31f..38b0ad60bde 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain1.java @@ -41,11 +41,6 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "106212_typ_reg_sty_010.jpg"; - } - public Mountain1(final Mountain1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain2.java b/Mage.Sets/src/mage/sets/magic2011/Mountain2.java index b215bd0687a..a27b28138fe 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain2.java @@ -41,11 +41,6 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121704_typ_reg_sty_010.jpg"; - } - public Mountain2(final Mountain2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain3.java b/Mage.Sets/src/mage/sets/magic2011/Mountain3.java index 0b08f509eed..b7e91449fa5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain3.java @@ -41,11 +41,6 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "19716_typ_reg_sty_010.jpg"; - } - public Mountain3(final Mountain3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Mountain4.java b/Mage.Sets/src/mage/sets/magic2011/Mountain4.java index 7dedc49eed7..729c2cc66aa 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Mountain4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Mountain4.java @@ -41,11 +41,6 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121703_typ_reg_sty_010.jpg"; - } - public Mountain4(final Mountain4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java index 7efc9681325..a322cedc12b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java +++ b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java @@ -56,7 +56,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class MystifyingMaze extends CardImpl { - private static FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature an opponent controls"); + private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature an opponent controls"); static { filter.setTargetController(TargetController.OPPONENT); @@ -80,11 +80,6 @@ public class MystifyingMaze extends CardImpl { public MystifyingMaze copy() { return new MystifyingMaze(this); } - - @Override - public String getArt() { - return "129073_typ_reg_sty_010.jpg"; - } } class MystifyingMazeEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java index e04394dd028..2629aab6d22 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NantukoShade.java @@ -66,9 +66,4 @@ public class NantukoShade extends CardImpl { return new NantukoShade(this); } - @Override - public String getArt() { - return "36461_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index ad853ca00c1..dd0780e0f4e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -85,11 +85,6 @@ public class NecroticPlague extends CardImpl { public NecroticPlague copy() { return new NecroticPlague(this); } - - @Override - public String getArt() { - return "129168_typ_reg_sty_010.jpg"; - } } class NecroticPlagueEffect extends ContinuousEffectImpl { @@ -145,7 +140,7 @@ class NecroticPlagueEffect extends ContinuousEffectImpl { class NecroticPlagueEffect2 extends OneShotEffect { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.setTargetController(TargetController.OPPONENT); diff --git a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java index d2c258b7d88..425fc25018f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java +++ b/Mage.Sets/src/mage/sets/magic2011/NetherHorror.java @@ -59,9 +59,4 @@ public class NetherHorror extends CardImpl { return new NetherHorror(this); } - @Override - public String getArt() { - return "129087_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java index 759fc850b92..e67bb635fcc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java +++ b/Mage.Sets/src/mage/sets/magic2011/NightwingShade.java @@ -67,9 +67,4 @@ public class NightwingShade extends CardImpl { return new NightwingShade(this); } - @Override - public String getArt() { - return "129167_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java index eab0a099dfe..d3baa017306 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java +++ b/Mage.Sets/src/mage/sets/magic2011/ObstinateBaloth.java @@ -76,11 +76,6 @@ public class ObstinateBaloth extends CardImpl { return new ObstinateBaloth(this); } - @Override - public String getArt() { - return "129158_typ_reg_sty_010.jpg"; - } - } class ObstinateBalothEffect extends ReplacementEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java b/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java index 596eb79afa1..b4da7ec0262 100644 --- a/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java +++ b/Mage.Sets/src/mage/sets/magic2011/OverwhelmingStampede.java @@ -64,11 +64,6 @@ public class OverwhelmingStampede extends CardImpl { public OverwhelmingStampede copy() { return new OverwhelmingStampede(this); } - - @Override - public String getArt() { - return "129095_typ_reg_sty_010.jpg"; - } } class OverwhelmingStampedeEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java index c3456d8587a..5b952f1914e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java @@ -67,11 +67,6 @@ public class PhantomBeast extends CardImpl { return new PhantomBeast(this); } - @Override - public String getArt() { - return "129107_typ_reg_sty_010.jpg"; - } - class PhantomBeastAbility extends TriggeredAbilityImpl { public PhantomBeastAbility() { diff --git a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java index bf65225f135..386155d62e9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java +++ b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java @@ -78,11 +78,6 @@ public class PhylacteryLich extends CardImpl { return new PhylacteryLich(this); } - @Override - public String getArt() { - return "129123_typ_reg_sty_010.jpg"; - } - class PhylacteryLichAbility extends StateTriggeredAbility { public PhylacteryLichAbility() { @@ -118,7 +113,7 @@ public class PhylacteryLich extends CardImpl { class PhylacteryLichEffect extends OneShotEffect { - private static FilterControlledPermanent filter = new FilterControlledPermanent("artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact"); static { filter.getCardType().add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains1.java b/Mage.Sets/src/mage/sets/magic2011/Plains1.java index 31df21c6e9c..195febc7b8b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains1.java @@ -41,11 +41,6 @@ public class Plains1 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121696_typ_reg_sty_010.jpg"; - } - public Plains1(final Plains1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains2.java b/Mage.Sets/src/mage/sets/magic2011/Plains2.java index f57030c913d..e85be3c6c2b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains2.java @@ -41,11 +41,6 @@ public class Plains2 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121682_typ_reg_sty_010.jpg"; - } - public Plains2(final Plains2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains3.java b/Mage.Sets/src/mage/sets/magic2011/Plains3.java index dbc5b6f4fde..cbcdef3660d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains3.java @@ -41,11 +41,6 @@ public class Plains3 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "106213_typ_reg_sty_010.jpg"; - } - public Plains3(final Plains3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plains4.java b/Mage.Sets/src/mage/sets/magic2011/Plains4.java index 9115c612958..261a236815f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plains4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plains4.java @@ -41,11 +41,6 @@ public class Plains4 extends mage.cards.basiclands.Plains { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "25492_typ_reg_sty_010.jpg"; - } - public Plains4(final Plains4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plummet.java b/Mage.Sets/src/mage/sets/magic2011/Plummet.java index da9c3719d90..9ea2c900acb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plummet.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plummet.java @@ -28,11 +28,6 @@ package mage.sets.magic2011; -import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.MageInt; -import mage.cards.CardImpl; import java.util.UUID; import mage.Constants.CardType; @@ -49,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Plummet extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.getAbilities().add(FlyingAbility.getInstance()); @@ -71,9 +66,4 @@ public class Plummet extends CardImpl { public Plummet copy() { return new Plummet(this); } - - @Override - public String getArt() { - return "129149_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/Preordain.java b/Mage.Sets/src/mage/sets/magic2011/Preordain.java index 50444a21338..23f93c9704d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Preordain.java +++ b/Mage.Sets/src/mage/sets/magic2011/Preordain.java @@ -57,9 +57,4 @@ public class Preordain extends CardImpl { public Preordain copy() { return new Preordain(this); } - - @Override - public String getArt() { - return "129109_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index d474bbbd66b..2bfbb2d1db4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java @@ -77,11 +77,6 @@ public class PrimalCocoon extends CardImpl { public PrimalCocoon copy() { return new PrimalCocoon(this); } - - @Override - public String getArt() { - return "129088_typ_reg_sty_010.jpg"; - } } class PrimalCocoonAbility1 extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java index 876d8c8f2c9..a5fec10a4c9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java @@ -72,11 +72,6 @@ public class PrimevalTitan extends CardImpl { return new PrimevalTitan(this); } - @Override - public String getArt() { - return "129116_typ_reg_sty_010.jpg"; - } - } class PrimevalTitanAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java index 78433284137..f602828a710 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java +++ b/Mage.Sets/src/mage/sets/magic2011/PyreticRitual.java @@ -56,9 +56,4 @@ public class PyreticRitual extends CardImpl { public PyreticRitual copy() { return new PyreticRitual(this); } - - @Override - public String getArt() { - return "129153_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java index 42eda559922..562139f5ec0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java +++ b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java @@ -77,16 +77,11 @@ public class QuagSickness extends CardImpl { public QuagSickness copy() { return new QuagSickness(this); } - - @Override - public String getArt() { - return "129117_typ_reg_sty_010.jpg"; - } } class QuagSicknessEffect extends ContinuousEffectImpl { - private static FilterLandPermanent filter = new FilterLandPermanent("Swamp"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp"); static { filter.getSubtype().add("Swamp"); diff --git a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java index 6c3b832387a..7541e949cb1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java +++ b/Mage.Sets/src/mage/sets/magic2011/ReassemblingSkeleton.java @@ -65,9 +65,4 @@ public class ReassemblingSkeleton extends CardImpl { return new ReassemblingSkeleton(this); } - @Override - public String getArt() { - return "129152_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/Redirect.java b/Mage.Sets/src/mage/sets/magic2011/Redirect.java index fa1d02321f1..a087179c210 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Redirect.java +++ b/Mage.Sets/src/mage/sets/magic2011/Redirect.java @@ -57,9 +57,4 @@ public class Redirect extends CardImpl { public Redirect copy() { return new Redirect(this); } - - @Override - public String getArt() { - return "129178_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java index 954b413f70e..0f9c661621f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Reverberate.java +++ b/Mage.Sets/src/mage/sets/magic2011/Reverberate.java @@ -43,7 +43,7 @@ import mage.target.TargetSpell; */ public class Reverberate extends CardImpl { - private static FilterSpell filter = new FilterSpell(); + private static final FilterSpell filter = new FilterSpell(); static { filter.getCardType().add(CardType.INSTANT); @@ -67,9 +67,4 @@ public class Reverberate extends CardImpl { public Reverberate copy() { return new Reverberate(this); } - - @Override - public String getArt() { - return "129127_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java index eb667998ed5..ff6b2fe64ed 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java +++ b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java @@ -68,11 +68,6 @@ public class RocEgg extends CardImpl { return new RocEgg(this); } - @Override - public String getArt() { - return "129142_typ_reg_sty_010.jpg"; - } - } class RocEggToken extends Token { diff --git a/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java b/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java index 9e301f7acaa..4d9b2d48e24 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java +++ b/Mage.Sets/src/mage/sets/magic2011/RottingLegion.java @@ -61,9 +61,4 @@ public class RottingLegion extends CardImpl { return new RottingLegion(this); } - @Override - public String getArt() { - return "129136_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java b/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java index 141fe5beb41..b29db853c02 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java +++ b/Mage.Sets/src/mage/sets/magic2011/SacredWolf.java @@ -46,7 +46,7 @@ import mage.filter.FilterStackObject; */ public class SacredWolf extends CardImpl { - private static FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); + private static final FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); static { filter.setTargetController(TargetController.OPPONENT); @@ -71,10 +71,5 @@ public class SacredWolf extends CardImpl { return new SacredWolf(this); } - @Override - public String getArt() { - return "129113_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java b/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java index f8fbd0ee463..228bc546974 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java +++ b/Mage.Sets/src/mage/sets/magic2011/ScrollThief.java @@ -63,9 +63,4 @@ public class ScrollThief extends CardImpl { return new ScrollThief(this); } - @Override - public String getArt() { - return "129096_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java index b60d7961a41..f028d6152d6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java +++ b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java @@ -75,11 +75,6 @@ public class SerraAscendant extends CardImpl { return new SerraAscendant(this); } - @Override - public String getArt() { - return "129083_typ_reg_sty_010.jpg"; - } - } class SerraAscendantEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java index 748408731ca..34f5ec3f984 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java @@ -81,11 +81,6 @@ public class ShivsEmbrace extends CardImpl { public ShivsEmbrace copy() { return new ShivsEmbrace(this); } - - @Override - public String getArt() { - return "129169_typ_reg_sty_010.jpg"; - } } class ShivsEmbraceEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java b/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java index 4bd5a2a4457..aa0dd42201d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java +++ b/Mage.Sets/src/mage/sets/magic2011/SorcerersStrongbox.java @@ -70,11 +70,6 @@ public class SorcerersStrongbox extends CardImpl { return new SorcerersStrongbox(this); } - @Override - public String getArt() { - return "129154_typ_reg_sty_010.jpg"; - } - } class SorcerersStrongboxEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java b/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java index 2044bd00b5d..81fc4ab5ce3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java +++ b/Mage.Sets/src/mage/sets/magic2011/SquadronHawk.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInLibrary; */ public class SquadronHawk extends CardImpl { - private static FilterCard filter = new FilterCard("cards named Squadron Hawk"); + private static final FilterCard filter = new FilterCard("cards named Squadron Hawk"); static { filter.getName().add("Squadron Hawk"); @@ -73,9 +73,4 @@ public class SquadronHawk extends CardImpl { return new SquadronHawk(this); } - @Override - public String getArt() { - return "129185_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java index f1cfc9bfd51..2a83c223b38 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java +++ b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java @@ -60,9 +60,4 @@ public class StabbingPain extends CardImpl { public StabbingPain copy() { return new StabbingPain(this); } - - @Override - public String getArt() { - return "129137_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java b/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java index e0ab53d7f13..76be1af8e35 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java +++ b/Mage.Sets/src/mage/sets/magic2011/SteelOverseer.java @@ -46,7 +46,7 @@ import mage.filter.FilterPermanent; */ public class SteelOverseer extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact creature"); + private static final FilterPermanent filter = new FilterPermanent("artifact creature"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -73,9 +73,4 @@ public class SteelOverseer extends CardImpl { return new SteelOverseer(this); } - @Override - public String getArt() { - return "129125_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java b/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java index 1e9ed91015b..3b990292c4e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java +++ b/Mage.Sets/src/mage/sets/magic2011/StoneGolem.java @@ -58,9 +58,4 @@ public class StoneGolem extends CardImpl { return new StoneGolem(this); } - @Override - public String getArt() { - return "129143_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java b/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java index 172c8b9d756..d1fb1306a24 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java +++ b/Mage.Sets/src/mage/sets/magic2011/StormtideLeviathan.java @@ -80,11 +80,6 @@ public class StormtideLeviathan extends CardImpl { return new StormtideLeviathan(this); } - @Override - public String getArt() { - return "129118_typ_reg_sty_010.jpg"; - } - } class StormtideLeviathanEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java index 079c6a1db87..f5888b06970 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java @@ -73,16 +73,11 @@ public class SunTitan extends CardImpl { return new SunTitan(this); } - @Override - public String getArt() { - return "129119_typ_reg_sty_010.jpg"; - } - } class SunTitanAbility extends TriggeredAbilityImpl { - private static FilterCard filter = new FilterCard("permanent card with converted mana cost 3 or less"); + private static final FilterCard filter = new FilterCard("permanent card with converted mana cost 3 or less"); static { filter.getCardType().add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/sets/magic2011/Swamp1.java b/Mage.Sets/src/mage/sets/magic2011/Swamp1.java index 5a85347dd72..8676bde5a63 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Swamp1.java +++ b/Mage.Sets/src/mage/sets/magic2011/Swamp1.java @@ -41,11 +41,6 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "106214_typ_reg_sty_010.jpg"; - } - public Swamp1(final Swamp1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Swamp2.java b/Mage.Sets/src/mage/sets/magic2011/Swamp2.java index a95b9352d36..49600cce3b3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Swamp2.java +++ b/Mage.Sets/src/mage/sets/magic2011/Swamp2.java @@ -41,11 +41,6 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "27822_typ_reg_sty_010.jpg"; - } - public Swamp2(final Swamp2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Swamp3.java b/Mage.Sets/src/mage/sets/magic2011/Swamp3.java index d4d03fbf7ee..2e7339fc9c2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Swamp3.java +++ b/Mage.Sets/src/mage/sets/magic2011/Swamp3.java @@ -41,11 +41,6 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121691_typ_reg_sty_010.jpg"; - } - public Swamp3(final Swamp3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Swamp4.java b/Mage.Sets/src/mage/sets/magic2011/Swamp4.java index 2254fc7b6d3..392a5b71a65 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Swamp4.java +++ b/Mage.Sets/src/mage/sets/magic2011/Swamp4.java @@ -41,11 +41,6 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "M11"; } - @Override - public String getArt() { - return "121681_typ_reg_sty_010.jpg"; - } - public Swamp4(final Swamp4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java b/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java index 236fff93db2..ff323a1aca2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java +++ b/Mage.Sets/src/mage/sets/magic2011/SwordOfVengeance.java @@ -74,9 +74,4 @@ public class SwordOfVengeance extends CardImpl { return new SwordOfVengeance(this); } - @Override - public String getArt() { - return "129133_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java b/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java index ac6de6bc1e3..938962d61f6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java +++ b/Mage.Sets/src/mage/sets/magic2011/SylvanRanger.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCardInLibrary; */ public class SylvanRanger extends CardImpl { - private static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public SylvanRanger(UUID ownerId) { super(ownerId, 198, "Sylvan Ranger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); @@ -68,10 +68,4 @@ public class SylvanRanger extends CardImpl { return new SylvanRanger(this); } - @Override - public String getArt() { - return "102617_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage.Sets/src/mage/sets/magic2011/TempleBell.java b/Mage.Sets/src/mage/sets/magic2011/TempleBell.java index bcdb87e532a..4abe9ada3b8 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TempleBell.java +++ b/Mage.Sets/src/mage/sets/magic2011/TempleBell.java @@ -58,9 +58,4 @@ public class TempleBell extends CardImpl { return new TempleBell(this); } - @Override - public String getArt() { - return "129145_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java index 892c8ab05e4..be48f2122a4 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java +++ b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java @@ -61,9 +61,4 @@ public class ThunderStrike extends CardImpl { public ThunderStrike copy() { return new ThunderStrike(this); } - - @Override - public String getArt() { - return "129068_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java index e2707e4df5e..c5306a2fe74 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java +++ b/Mage.Sets/src/mage/sets/magic2011/TimeReversal.java @@ -61,11 +61,6 @@ public class TimeReversal extends CardImpl { public TimeReversal copy() { return new TimeReversal(this); } - - @Override - public String getArt() { - return "129112_typ_reg_sty_010.jpg"; - } } class TimeReversalEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java b/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java index acbf6bf51d8..6af4ce5cc16 100644 --- a/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java +++ b/Mage.Sets/src/mage/sets/magic2011/TirelessMissionaries.java @@ -63,9 +63,4 @@ public class TirelessMissionaries extends CardImpl { return new TirelessMissionaries(this); } - @Override - public String getArt() { - return "129104_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/Triskelion.java b/Mage.Sets/src/mage/sets/magic2011/Triskelion.java index 4d573c97f72..f43d6d85ea9 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Triskelion.java +++ b/Mage.Sets/src/mage/sets/magic2011/Triskelion.java @@ -71,9 +71,4 @@ public class Triskelion extends CardImpl { return new Triskelion(this); } - @Override - public String getArt() { - return "51030_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java index facf503bf0a..5c9091e8424 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java +++ b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java @@ -74,11 +74,6 @@ public class VengefulArchon extends CardImpl { return new VengefulArchon(this); } - @Override - public String getArt() { - return "129192_typ_reg_sty_010.jpg"; - } - } class VengefulArchonEffect extends PreventionEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java index 5490e78cc6f..3cc7d11e05d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java +++ b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java @@ -66,9 +66,4 @@ public class VisceraSeer extends CardImpl { return new VisceraSeer(this); } - @Override - public String getArt() { - return "129165_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java b/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java index e12b975777c..bebf3b45efb 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java +++ b/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java @@ -77,11 +77,6 @@ public class VolcanicStrength extends CardImpl { public VolcanicStrength copy() { return new VolcanicStrength(this); } - - @Override - public String getArt() { - return "129170_typ_reg_sty_010.jpg"; - } } class VolcanicStrengthEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java index e0121d27fe8..7a9254719b5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java +++ b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class VoltaicKey extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -77,9 +77,4 @@ public class VoltaicKey extends CardImpl { return new VoltaicKey(this); } - @Override - public String getArt() { - return "127997_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java b/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java index 6f0a89d676d..8ce8ec9a874 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java +++ b/Mage.Sets/src/mage/sets/magic2011/VulshokBerserker.java @@ -62,9 +62,4 @@ public class VulshokBerserker extends CardImpl { return new VulshokBerserker(this); } - @Override - public String getArt() { - return "50184_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java b/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java index c13e04298be..115f6f7c33c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java +++ b/Mage.Sets/src/mage/sets/magic2011/WallOfVines.java @@ -64,9 +64,4 @@ public class WallOfVines extends CardImpl { return new WallOfVines(this); } - @Override - public String getArt() { - return "129078_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java index fabd61e7971..70eb60fc441 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; */ public class WarPriestOfThune extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.getCardType().add(CardType.ENCHANTMENT); @@ -79,9 +79,4 @@ public class WarPriestOfThune extends CardImpl { return new WarPriestOfThune(this); } - @Override - public String getArt() { - return "129182_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java b/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java index 94b1e704475..211e2c3710a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarlordsAxe.java @@ -63,10 +63,5 @@ public class WarlordsAxe extends CardImpl { return new WarlordsAxe(this); } - @Override - public String getArt() { - return "129144_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java index 13529339324..c6dd6fce81b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WaterServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/WaterServant.java @@ -66,9 +66,4 @@ public class WaterServant extends CardImpl { return new WaterServant(this); } - @Override - public String getArt() { - return "129097_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java b/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java index 5182c7f7932..4b3b8d194b2 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java +++ b/Mage.Sets/src/mage/sets/magic2011/WildEvocation.java @@ -68,11 +68,6 @@ public class WildEvocation extends CardImpl { return new WildEvocation(this); } - @Override - public String getArt() { - return "123721_typ_reg_sty_010.jpg"; - } - } class WildEvocationAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java b/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java index 3aa99d42e71..82c0cdb0499 100644 --- a/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java +++ b/Mage.Sets/src/mage/sets/magic2011/YavimayaWurm.java @@ -61,9 +61,4 @@ public class YavimayaWurm extends CardImpl { return new YavimayaWurm(this); } - @Override - public String getArt() { - return "129163_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java index cc1eb6163ed..8ab01c8d98a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AwakeningZone.java @@ -59,9 +59,4 @@ public class AwakeningZone extends CardImpl { return new AwakeningZone(this); } - @Override - public String getArt() { - return "127314_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index 94d6fb50d2f..4985c085c8a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java @@ -64,9 +64,4 @@ public class BloodthroneVampire extends CardImpl { public BloodthroneVampire copy() { return new BloodthroneVampire(this); } - - @Override - public String getArt() { - return "127479_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java index be167910fb0..0b2f1514171 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Deprive.java @@ -45,7 +45,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Deprive extends CardImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent("land"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("land"); static { filter.getCardType().add(CardType.LAND); @@ -70,9 +70,4 @@ public class Deprive extends CardImpl { return new Deprive(this); } - @Override - public String getArt() { - return "127324_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java index 1fc2cc9de08..9ea639023bf 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulsHatcher.java @@ -64,9 +64,4 @@ public class EmrakulsHatcher extends CardImpl { return new EmrakulsHatcher(this); } - @Override - public String getArt() { - return "127298_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java index dd085b699b4..888fd81696b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java @@ -62,11 +62,6 @@ public class EvolvingWilds extends CardImpl { return new EvolvingWilds(this); } - @Override - public String getArt() { - return "127296_typ_reg_sty_010.jpg"; - } - } class EvolvingWildsAbility extends ActivatedAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java index 1e0b2784528..7c103351e68 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java @@ -58,9 +58,4 @@ public class FlameSlash extends CardImpl { return new FlameSlash(this); } - @Override - public String getArt() { - return "127404_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java index 6179f4df45f..7dc10c3ac60 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest1.java @@ -41,11 +41,6 @@ public class Forest1 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127495_typ_reg_sty_010.jpg"; - } - public Forest1(final Forest1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java index 4a627d906cd..6827cc69aef 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest2.java @@ -41,11 +41,6 @@ public class Forest2 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127489_typ_reg_sty_010.jpg"; - } - public Forest2(final Forest2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java index 4e30a8056c2..fbe1d4b312b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest3.java @@ -41,11 +41,6 @@ public class Forest3 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127497_typ_reg_sty_010.jpg"; - } - public Forest3(final Forest3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java index b9b6a72d80b..ccd35c68466 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Forest4.java @@ -41,11 +41,6 @@ public class Forest4 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127511_typ_reg_sty_010.jpg"; - } - public Forest4(final Forest4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index 1d0cc8601a0..72aa2066231 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -57,7 +57,7 @@ import mage.target.common.TargetOpponent; */ public class GideonJura extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.setUseTapped(true); @@ -93,11 +93,6 @@ public class GideonJura extends CardImpl { return new GideonJura(this); } - @Override - public String getArt() { - return "127248_typ_reg_sty_010.jpg"; - } - } class GideonJuraToken extends Token { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index 32a82a44348..fb24e030d96 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -80,9 +80,4 @@ public class GoblinTunneler extends CardImpl { return new GoblinTunneler(this); } - @Override - public String getArt() { - return "127259_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java index 631960c5365..b697e3079d7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java @@ -37,7 +37,6 @@ import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; -import mage.filter.Filter.ComparisonScope; import mage.filter.Filter.ComparisonType; import mage.filter.FilterCard; import mage.game.Game; @@ -67,16 +66,11 @@ public class InquisitionOfKozilek extends CardImpl { public InquisitionOfKozilek copy() { return new InquisitionOfKozilek(this); } - - @Override - public String getArt() { - return "122154_typ_reg_sty_010.jpg"; - } } class InquisitionOfKozilekEffect extends OneShotEffect { - private static FilterCard filter = new FilterCard("nonland card with converted mana cost 3 or less"); + private static final FilterCard filter = new FilterCard("nonland card with converted mana cost 3 or less"); static { filter.getNotCardType().add(CardType.LAND); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java index 791d69605d1..e0d54ecd434 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island1.java @@ -41,11 +41,6 @@ public class Island1 extends mage.cards.basiclands.Island { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127494_typ_reg_sty_010.jpg"; - } - public Island1(final Island1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java index 73f5290ce52..05aecd3c57f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island2.java @@ -41,11 +41,6 @@ public class Island2 extends mage.cards.basiclands.Island { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127501_typ_reg_sty_010.jpg"; - } - public Island2(final Island2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java index 754be840c7a..afe203b6973 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island3.java @@ -41,11 +41,6 @@ public class Island3 extends mage.cards.basiclands.Island { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127506_typ_reg_sty_010.jpg"; - } - public Island3(final Island3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java index 3b9e5a64738..446990310cb 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Island4.java @@ -41,11 +41,6 @@ public class Island4 extends mage.cards.basiclands.Island { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127507_typ_reg_sty_010.jpg"; - } - public Island4(final Island4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java index 19c72edcc8e..9a541e99354 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JoragaTreespeaker.java @@ -87,11 +87,6 @@ public class JoragaTreespeaker extends LevelerCard { return new JoragaTreespeaker(this); } - @Override - public String getArt() { - return "127280_typ_reg_sty_010.jpg"; - } - } class JoragaManaAbility extends BasicManaAbility { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java index 566d22b7b41..f2860e579e9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KarganDragonlord.java @@ -81,9 +81,4 @@ public class KarganDragonlord extends LevelerCard { return new KarganDragonlord(this); } - @Override - public String getArt() { - return "127295_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java index 4fa84ebae02..ed9a0fd4862 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozileksPredator.java @@ -64,9 +64,4 @@ public class KozileksPredator extends CardImpl { return new KozileksPredator(this); } - @Override - public String getArt() { - return "127475_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java index f2673f6584a..85ace36b8c2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain1.java @@ -41,11 +41,6 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127485_typ_reg_sty_010.jpg"; - } - public Mountain1(final Mountain1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java index 04bfb912f35..8c601cdbd4e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain2.java @@ -41,11 +41,6 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127488_typ_reg_sty_010.jpg"; - } - public Mountain2(final Mountain2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java index f42727d7d14..041e775d161 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain3.java @@ -41,11 +41,6 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127509_typ_reg_sty_010.jpg"; - } - public Mountain3(final Mountain3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java index bd6d3ea82dd..c9df94ceb6c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Mountain4.java @@ -41,11 +41,6 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127499_typ_reg_sty_010.jpg"; - } - public Mountain4(final Mountain4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java index 8519ee5c184..b61da6c4c2a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Naturalize.java @@ -42,11 +42,6 @@ public class Naturalize extends mage.sets.tenth.Naturalize { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127264_typ_reg_sty_010.jpg"; - } - public Naturalize(final Naturalize card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java index 7fa72b26539..55e683e1ee9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NestInvader.java @@ -64,9 +64,4 @@ public class NestInvader extends CardImpl { return new NestInvader(this); } - @Override - public String getArt() { - return "127252_typ_reg_sty_010.jpg"; - } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java index 8a1a3f02224..41d3ef0c6e2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains1.java @@ -41,11 +41,6 @@ public class Plains1 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127487_typ_reg_sty_010.jpg"; - } - public Plains1(final Plains1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java index 359615839c9..77c3941260c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains2.java @@ -41,11 +41,6 @@ public class Plains2 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127490_typ_reg_sty_010.jpg"; - } - public Plains2(final Plains2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java index 0063258b086..1b1535ee9a3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains3.java @@ -41,11 +41,6 @@ public class Plains3 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127493_typ_reg_sty_010.jpg"; - } - public Plains3(final Plains3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java index 97ed92f3566..ae776535396 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Plains4.java @@ -41,11 +41,6 @@ public class Plains4 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127500_typ_reg_sty_010.jpg"; - } - public Plains4(final Plains4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java index a42e068e87b..c03b5db259e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java @@ -72,11 +72,6 @@ public class SeaGateOracle extends CardImpl { public SeaGateOracle copy() { return new SeaGateOracle(this); } - - @Override - public String getArt() { - return "127435_typ_reg_sty_010.jpg"; - } } class SeaGateOracleEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java index 724e44ebf46..245780c0e97 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeeBeyond.java @@ -64,11 +64,6 @@ public class SeeBeyond extends CardImpl { return new SeeBeyond(this); } - @Override - public String getArt() { - return "127361_typ_reg_sty_010.jpg"; - } - } class SeeBeyondEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp1.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp1.java index a8b95721145..176dc0544f1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp1.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp1.java @@ -41,11 +41,6 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127502_typ_reg_sty_010.jpg"; - } - public Swamp1(final Swamp1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp2.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp2.java index ad6e450514d..552609eab18 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp2.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp2.java @@ -41,11 +41,6 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127503_typ_reg_sty_010.jpg"; - } - public Swamp2(final Swamp2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp3.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp3.java index 2d25a871216..80e17d25973 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp3.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp3.java @@ -41,11 +41,6 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127504_typ_reg_sty_010.jpg"; - } - public Swamp3(final Swamp3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp4.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp4.java index ae34e5657d8..359cdd5a548 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp4.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Swamp4.java @@ -41,11 +41,6 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ROE"; } - @Override - public String getArt() { - return "127510_typ_reg_sty_010.jpg"; - } - public Swamp4(final Swamp4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java index d694bde656d..bec55151a6c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UnifiedWill.java @@ -62,11 +62,6 @@ public class UnifiedWill extends CardImpl { return new UnifiedWill(this); } - @Override - public String getArt() { - return "127278_typ_reg_sty_010.jpg"; - } - } class UnifiedWillEffect extends CounterTargetEffect { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java index 4b7f04b5249..bc81c9aa5e0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java @@ -72,11 +72,6 @@ public class Vengevine extends CardImpl { return new Vengevine(this); } - @Override - public String getArt() { - return "127350_typ_reg_sty_010.jpg"; - } - } class VengevineAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java index b1fa10b9c4b..0c9237a7cd1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WallOfOmens.java @@ -64,9 +64,4 @@ public class WallOfOmens extends CardImpl { return new WallOfOmens(this); } - @Override - public String getArt() { - return "127342_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java index a1599ea38cf..bb7c746d3d4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java @@ -107,8 +107,6 @@ public class QuicksilverGargantuan extends CardImpl { for (Ability ability : card.getAbilities()) { permanent.addAbility(ability); } - //permanent.getLoyalty().setValue(card.getLoyalty().getValue()); - permanent.setArt(card.getArt()); return true; } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java index c3921a1ed0b..30c87b881a5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java @@ -52,6 +52,11 @@ import mage.target.common.TargetCreatureOrPlayer; * @author BetaSteward_at_googlemail.com */ public class AjaniVengeant extends CardImpl { + private static final FilterPermanent filter = new FilterPermanent("lands"); + + static { + filter.getCardType().add(CardType.LAND); + } public AjaniVengeant(UUID ownerId) { super(ownerId, 154, "Ajani Vengeant", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{W}"); @@ -73,8 +78,6 @@ public class AjaniVengeant extends CardImpl { ability2.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability2); - FilterPermanent filter = new FilterPermanent("lands"); - filter.getCardType().add(CardType.LAND); LoyaltyAbility ability3 = new LoyaltyAbility(new DestroyAllControlledTargetEffect(filter), -7); ability3.addTarget(new TargetPlayer()); this.addAbility(ability3); @@ -90,9 +93,4 @@ public class AjaniVengeant extends CardImpl { public AjaniVengeant copy() { return new AjaniVengeant(this); } - - @Override - public String getArt() { - return "114969_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java index 559d47e1a91..9cdf89f2d49 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Angelsong.java @@ -60,9 +60,4 @@ public class Angelsong extends CardImpl { return new Angelsong(this); } - @Override - public String getArt() { - return "115068_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java b/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java index f9832cd4ed9..8a787941548 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ArcaneSanctum.java @@ -60,9 +60,4 @@ public class ArcaneSanctum extends CardImpl { public ArcaneSanctum copy() { return new ArcaneSanctum(this); } - - @Override - public String getArt() { - return ""; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java index d0c6bdc4c14..ab44787ac23 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java @@ -60,9 +60,4 @@ public class Blightning extends CardImpl { public Blightning copy() { return new Blightning(this); } - - @Override - public String getArt() { - return "115010_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java index 383348c53f4..d75addb3e89 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BroodmateDragon.java @@ -69,10 +69,4 @@ public class BroodmateDragon extends CardImpl { return new BroodmateDragon(this); } - @Override - public String getArt() { - return "116186_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java b/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java index 8f87cfaa28e..af5ec8f8ecb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Cancel.java @@ -42,11 +42,6 @@ public class Cancel extends mage.sets.tenth.Cancel { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "116179_typ_reg_sty_010.jpg"; - } - public Cancel(final Cancel card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java b/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java index 94dd20eb0da..34fbac7d2e2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CrumblingNecropolis.java @@ -61,9 +61,4 @@ public class CrumblingNecropolis extends CardImpl { return new CrumblingNecropolis(this); } - @Override - public String getArt() { - return "115145_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index 0fbef6e4e44..a291a061bac 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java @@ -35,7 +35,6 @@ import mage.Constants.Layer; import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.Constants.SubLayer; -import mage.MageInt; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; @@ -93,16 +92,11 @@ public class ElspethKnightErrant extends CardImpl { return new ElspethKnightErrant(this); } - @Override - public String getArt() { - return "114973_typ_reg_sty_010.jpg"; - } - } class ElspethKnightErrantEffect extends ContinuousEffectImpl { - private static FilterPermanent filter = new FilterPermanent("artifacts, creatures, enchantments and lands"); + private static final FilterPermanent filter = new FilterPermanent("artifacts, creatures, enchantments and lands"); static { filter.getCardType().add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java index 35f532f25c0..40d0bcde48e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java @@ -57,9 +57,4 @@ public class Excommunicate extends CardImpl { public Excommunicate copy() { return new Excommunicate(this); } - - @Override - public String getArt() { - return "117023_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java index f1fab1b66f5..8824d523889 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest1.java @@ -41,11 +41,6 @@ public class Forest1 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115018_typ_reg_sty_010.jpg"; - } - public Forest1(final Forest1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java index 37772338179..90451774c99 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest2.java @@ -41,11 +41,6 @@ public class Forest2 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115015_typ_reg_sty_010.jpg"; - } - public Forest2(final Forest2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java index 39c6b49d156..47828954d9f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest3.java @@ -41,11 +41,6 @@ public class Forest3 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115016_typ_reg_sty_010.jpg"; - } - public Forest3(final Forest3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java b/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java index 39aae211e2a..89b6a9cd7ce 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Forest4.java @@ -41,11 +41,6 @@ public class Forest4 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115017_typ_reg_sty_010.jpg"; - } - public Forest4(final Forest4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java index e8a725fa5cc..ce41092f330 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HellsThunder.java @@ -71,9 +71,4 @@ public class HellsThunder extends CardImpl { return new HellsThunder(this); } - @Override - public String getArt() { - return "115234_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island1.java b/Mage.Sets/src/mage/sets/shardsofalara/Island1.java index 378d0428e4f..9c1e75a86d1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island1.java @@ -41,11 +41,6 @@ public class Island1 extends mage.cards.basiclands.Island { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115051_typ_reg_sty_010.jpg"; - } - public Island1(final Island1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island2.java b/Mage.Sets/src/mage/sets/shardsofalara/Island2.java index 16038d6663c..6d2b7a3faea 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island2.java @@ -41,11 +41,6 @@ public class Island2 extends mage.cards.basiclands.Island { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115052_typ_reg_sty_010.jpg"; - } - public Island2(final Island2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island3.java b/Mage.Sets/src/mage/sets/shardsofalara/Island3.java index add1cc7e84e..f52aee00ce2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island3.java @@ -41,11 +41,6 @@ public class Island3 extends mage.cards.basiclands.Island { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115054_typ_reg_sty_010.jpg"; - } - public Island3(final Island3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Island4.java b/Mage.Sets/src/mage/sets/shardsofalara/Island4.java index 92a1df5fb53..16e8dde02ba 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Island4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Island4.java @@ -41,11 +41,6 @@ public class Island4 extends mage.cards.basiclands.Island { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115053_typ_reg_sty_010.jpg"; - } - public Island4(final Island4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java index dcc86fcaff8..87149284c16 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundPanorama.java @@ -65,24 +65,21 @@ public class JundPanorama extends CardImpl { return new JundPanorama(this); } - @Override - public String getArt() { - return "116191_typ_reg_sty_010.jpg"; - } - } class JundPanoramaAbility extends ActivatedAbilityImpl { + private static final FilterCard filter = new FilterCard("Swamp, Mountain, or Forest"); + static { + filter.getName().add("Swamp"); + filter.getName().add("Mountain"); + filter.getName().add("Forest"); + } public JundPanoramaAbility() { super(Zone.BATTLEFIELD, null); addCost(new TapSourceCost()); addCost(new GenericManaCost(1)); addCost(new SacrificeSourceCost()); - FilterCard filter = new FilterCard("Swamp, Mountain, or Forest"); - filter.getName().add("Swamp"); - filter.getName().add("Mountain"); - filter.getName().add("Forest"); TargetCardInLibrary target = new TargetCardInLibrary(filter); addEffect(new SearchLibraryPutInPlayEffect(target, true, Outcome.PutLandInPlay)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java b/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java index ed2bdfa3806..814773c44cb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JungleShrine.java @@ -62,9 +62,4 @@ public class JungleShrine extends CardImpl { public JungleShrine copy() { return new JungleShrine(this); } - - @Override - public String getArt() { - return ""; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java index 8f20cfd6d9f..bb06a57b2ab 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java @@ -63,9 +63,4 @@ public class KathariScreecher extends CardImpl { public KathariScreecher copy() { return new KathariScreecher(this); } - - @Override - public String getArt() { - return ""; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java index 84cf56d3dc2..8ce3d5eef88 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java @@ -71,17 +71,12 @@ public class KnightOfTheWhiteOrchid extends CardImpl { return new KnightOfTheWhiteOrchid(this); } - @Override - public String getArt() { - return "116188_typ_reg_sty_010.jpg"; - } - } class KnightOfTheWhiteOrchidAbility extends ZoneChangeTriggeredAbility { - private static FilterCard filter1 = new FilterCard("Plains"); - private static FilterLandPermanent filter2 = new FilterLandPermanent(); + private static final FilterCard filter1 = new FilterCard("Plains"); + private static final FilterLandPermanent filter2 = new FilterLandPermanent(); static { filter1.getName().add("Plains"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java b/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java index a72bdb70bc8..10a8dbca0b7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MarbleChalice.java @@ -58,9 +58,4 @@ public class MarbleChalice extends CardImpl { public MarbleChalice copy() { return new MarbleChalice(this); } - - @Override - public String getArt() { - return ""; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java index 165147116b5..344663df2f6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain1.java @@ -41,11 +41,6 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115081_typ_reg_sty_010.jpg"; - } - public Mountain1(final Mountain1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java index b329005c753..fbc64077aa1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain2.java @@ -41,11 +41,6 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115082_typ_reg_sty_010.jpg"; - } - public Mountain2(final Mountain2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java index 3ba5d6ffaa4..5beff96d0c1 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain3.java @@ -41,11 +41,6 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115080_typ_reg_sty_010.jpg"; - } - public Mountain3(final Mountain3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java b/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java index 88875f0028f..2281d9e784f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mountain4.java @@ -41,11 +41,6 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115083_typ_reg_sty_010.jpg"; - } - public Mountain4(final Mountain4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java b/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java index bfd13089b07..5725c297853 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Naturalize.java @@ -46,12 +46,6 @@ public class Naturalize extends mage.sets.magic2010.Naturalize { super(card); } - @Override - public String getArt() { - return "114994_typ_reg_sty_010.jpg"; - } - - @Override public Naturalize copy() { return new Naturalize(this); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java b/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java index 6e17ecbbc33..9cf148178cf 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OblivionRing.java @@ -73,9 +73,4 @@ public class OblivionRing extends CardImpl { return new OblivionRing(this); } - @Override - public String getArt() { - return "115005_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java b/Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java index b84789a5176..4f28ef1fa2b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java @@ -60,9 +60,4 @@ public class OutriderofJhess extends CardImpl { public OutriderofJhess copy() { return new OutriderofJhess(this); } - - @Override - public String getArt() { - return ""; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java index 3c6164e19dc..3b0441c3ed0 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains1.java @@ -41,11 +41,6 @@ public class Plains1 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115087_typ_reg_sty_010.jpg"; - } - public Plains1(final Plains1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java index 1823a8e3f46..befdf3be46e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains2.java @@ -41,11 +41,6 @@ public class Plains2 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115090_typ_reg_sty_010.jpg"; - } - public Plains2(final Plains2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java index 0f00655b8b8..9e3bc5ae944 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains3.java @@ -41,11 +41,6 @@ public class Plains3 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115089_typ_reg_sty_010.jpg"; - } - public Plains3(final Plains3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java b/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java index 4490ccc370e..b275dcfaf01 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Plains4.java @@ -41,11 +41,6 @@ public class Plains4 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115088_typ_reg_sty_010.jpg"; - } - public Plains4(final Plains4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java index 9556e90f263..3124f902b74 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java @@ -74,11 +74,6 @@ public class RafiqOfTheMany extends CardImpl { return new RafiqOfTheMany(this); } - @Override - public String getArt() { - return "115029_typ_reg_sty_010.jpg"; - } - } class RafiqOfTheManyAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java index a0b09f8ee87..4eccdbedb95 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RangerOfEos.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInLibrary; */ public class RangerOfEos extends CardImpl { - private static FilterCard filter = new FilterCard("creature cards with converted mana cost 1 or less"); + private static final FilterCard filter = new FilterCard("creature cards with converted mana cost 1 or less"); static { filter.getCardType().add(CardType.CREATURE); @@ -75,9 +75,4 @@ public class RangerOfEos extends CardImpl { return new RangerOfEos(this); } - @Override - public String getArt() { - return "114946_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java index e2816e86440..8e028a4f209 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RhoxWarMonk.java @@ -64,9 +64,4 @@ public class RhoxWarMonk extends CardImpl { return new RhoxWarMonk(this); } - @Override - public String getArt() { - return "115055_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java index 0c76f2ed986..540710a3583 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java @@ -90,9 +90,4 @@ public class SarkhanVol extends CardImpl { public SarkhanVol copy() { return new SarkhanVol(this); } - - @Override - public String getArt() { - return "115056_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java b/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java index 205dea21ab1..eb61db02613 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SavageLands.java @@ -61,9 +61,4 @@ public class SavageLands extends CardImpl { return new SavageLands(this); } - @Override - public String getArt() { - return "114986_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java index 876a406fe95..93dfa8016d7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java @@ -67,11 +67,6 @@ public class SproutingThrinax extends CardImpl { return new SproutingThrinax(this); } - @Override - public String getArt() { - return "114974_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Swamp1.java b/Mage.Sets/src/mage/sets/shardsofalara/Swamp1.java index d4ab0777bd9..b263faab890 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Swamp1.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Swamp1.java @@ -41,11 +41,6 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115128_typ_reg_sty_010.jpg"; - } - public Swamp1(final Swamp1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Swamp2.java b/Mage.Sets/src/mage/sets/shardsofalara/Swamp2.java index 9f52e866a10..8b1e00ff805 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Swamp2.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Swamp2.java @@ -41,11 +41,6 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115127_typ_reg_sty_010.jpg"; - } - public Swamp2(final Swamp2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Swamp3.java b/Mage.Sets/src/mage/sets/shardsofalara/Swamp3.java index b28a94dac95..ebb277d2191 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Swamp3.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Swamp3.java @@ -41,11 +41,6 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115126_typ_reg_sty_010.jpg"; - } - public Swamp3(final Swamp3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Swamp4.java b/Mage.Sets/src/mage/sets/shardsofalara/Swamp4.java index e93dd83f59e..459c9c1d85d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Swamp4.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Swamp4.java @@ -41,11 +41,6 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ALA"; } - @Override - public String getArt() { - return "115129_typ_reg_sty_010.jpg"; - } - public Swamp4(final Swamp4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java index 087a8b219fe..59cdb4c7908 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java @@ -45,8 +45,8 @@ import mage.filter.FilterPermanent; */ public class WildNacatl extends CardImpl { - private static FilterPermanent filter1 = new FilterPermanent("Mountain"); - private static FilterPermanent filter2 = new FilterPermanent("Plains"); + private static final FilterPermanent filter1 = new FilterPermanent("Mountain"); + private static final FilterPermanent filter2 = new FilterPermanent("Plains"); static { filter1.getSubtype().add("Mountain"); @@ -75,9 +75,4 @@ public class WildNacatl extends CardImpl { public WildNacatl copy() { return new WildNacatl(this); } - - @Override - public String getArt() { - return "115062_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java index 099d14810df..8d4943510cc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WoollyThoctar.java @@ -60,9 +60,4 @@ public class WoollyThoctar extends CardImpl { return new WoollyThoctar(this); } - @Override - public String getArt() { - return "117002_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java index d20bed2b9a7..6762fdfc084 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java @@ -61,11 +61,6 @@ public class AngelsFeather extends CardImpl { return new AngelsFeather(this); } - @Override - public String getArt() { - return "75223_typ_reg_sty_010.jpg"; - } - } class AngelsFeatherAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/tenth/Assassinate.java b/Mage.Sets/src/mage/sets/tenth/Assassinate.java index ced64ac789c..9c1c21211e8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Assassinate.java +++ b/Mage.Sets/src/mage/sets/tenth/Assassinate.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Assassinate extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.setTapped(true); @@ -67,9 +67,4 @@ public class Assassinate extends CardImpl { return new Assassinate(this); } - @Override - public String getArt() { - return "97461_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java index 71b19ccfe5e..dcc0bd1a56e 100644 --- a/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java +++ b/Mage.Sets/src/mage/sets/tenth/BirdsOfParadise.java @@ -70,9 +70,4 @@ public class BirdsOfParadise extends CardImpl { return new BirdsOfParadise(this); } - @Override - public String getArt() { - return "88690_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Cancel.java b/Mage.Sets/src/mage/sets/tenth/Cancel.java index 5c2aadbdcba..26a8361196a 100644 --- a/Mage.Sets/src/mage/sets/tenth/Cancel.java +++ b/Mage.Sets/src/mage/sets/tenth/Cancel.java @@ -58,9 +58,4 @@ public class Cancel extends CardImpl { return new Cancel(this); } - @Override - public String getArt() { - return "97414_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Clone.java b/Mage.Sets/src/mage/sets/tenth/Clone.java index 3447b756acd..c82c725265a 100644 --- a/Mage.Sets/src/mage/sets/tenth/Clone.java +++ b/Mage.Sets/src/mage/sets/tenth/Clone.java @@ -68,9 +68,4 @@ public class Clone extends CardImpl { return new Clone(this); } - @Override - public String getArt() { - return "86939_typ_reg_sty_010.jpg"; - } - } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/tenth/CloudElemental.java b/Mage.Sets/src/mage/sets/tenth/CloudElemental.java index 0f517b3e6ce..c9402b769b9 100644 --- a/Mage.Sets/src/mage/sets/tenth/CloudElemental.java +++ b/Mage.Sets/src/mage/sets/tenth/CloudElemental.java @@ -64,9 +64,4 @@ public class CloudElemental extends CardImpl { public CloudElemental copy() { return new CloudElemental(this); } - - @Override - public String getArt() { - return "104536_typ_reg_sty_010.jpg"; - } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/tenth/Condemn.java b/Mage.Sets/src/mage/sets/tenth/Condemn.java index 8fe5533f6e8..80485ff685b 100644 --- a/Mage.Sets/src/mage/sets/tenth/Condemn.java +++ b/Mage.Sets/src/mage/sets/tenth/Condemn.java @@ -66,11 +66,6 @@ public class Condemn extends CardImpl { return new Condemn(this); } - @Override - public String getArt() { - return "94551_typ_reg_sty_010.jpg"; - } - } class CondemnEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/tenth/Deathmark.java b/Mage.Sets/src/mage/sets/tenth/Deathmark.java index b921225a7c7..c4453c6599a 100644 --- a/Mage.Sets/src/mage/sets/tenth/Deathmark.java +++ b/Mage.Sets/src/mage/sets/tenth/Deathmark.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Deathmark extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("green or white creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("green or white creature"); static { filter.getColor().setGreen(true); @@ -69,9 +69,4 @@ public class Deathmark extends CardImpl { return new Deathmark(this); } - @Override - public String getArt() { - return "96855_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Demolish.java b/Mage.Sets/src/mage/sets/tenth/Demolish.java index c0dc9840b47..57b187455eb 100644 --- a/Mage.Sets/src/mage/sets/tenth/Demolish.java +++ b/Mage.Sets/src/mage/sets/tenth/Demolish.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class Demolish extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact or land"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -68,9 +68,4 @@ public class Demolish extends CardImpl { return new Demolish(this); } - @Override - public String getArt() { - return "33696_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java index 23ebcc5de1c..a001641e6ad 100644 --- a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java +++ b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java @@ -61,11 +61,6 @@ public class DemonsHorn extends CardImpl { return new DemonsHorn(this); } - @Override - public String getArt() { - return "75220_typ_reg_sty_010.jpg"; - } - } class DemonsHornAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java b/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java index dda02bc9abe..9e37ce3d6dc 100644 --- a/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java +++ b/Mage.Sets/src/mage/sets/tenth/DiabolicTutor.java @@ -57,9 +57,4 @@ public class DiabolicTutor extends CardImpl { public DiabolicTutor copy() { return new DiabolicTutor(this); } - - @Override - public String getArt() { - return "101052_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java index 8d3660359d1..9a0f6773dd3 100644 --- a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java +++ b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java @@ -61,11 +61,6 @@ public class DragonsClaw extends CardImpl { return new DragonsClaw(this); } - @Override - public String getArt() { - return "75221_typ_reg_sty_010.jpg"; - } - } class DragonsClawAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java b/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java index e73bdf9ac96..fabfacc11e1 100644 --- a/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java +++ b/Mage.Sets/src/mage/sets/tenth/Flashfreeze.java @@ -43,7 +43,7 @@ import mage.target.TargetSpell; */ public class Flashfreeze extends CardImpl { - private static FilterSpell filter = new FilterSpell("red or green spell"); + private static final FilterSpell filter = new FilterSpell("red or green spell"); static { filter.getColor().setRed(true); @@ -69,9 +69,4 @@ public class Flashfreeze extends CardImpl { return new Flashfreeze(this); } - @Override - public String getArt() { - return "96954_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest1.java b/Mage.Sets/src/mage/sets/tenth/Forest1.java index f0b4f6cd703..4d53a4e8c98 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest1.java +++ b/Mage.Sets/src/mage/sets/tenth/Forest1.java @@ -41,11 +41,6 @@ public class Forest1 extends mage.cards.basiclands.Forest { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "08946_typ_reg_sty_010.jpg"; - } - public Forest1(final Forest1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest2.java b/Mage.Sets/src/mage/sets/tenth/Forest2.java index ea230416107..7677c15f6ed 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest2.java +++ b/Mage.Sets/src/mage/sets/tenth/Forest2.java @@ -41,11 +41,6 @@ public class Forest2 extends mage.cards.basiclands.Forest { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "89160_typ_reg_sty_010.jpg"; - } - public Forest2(final Forest2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest3.java b/Mage.Sets/src/mage/sets/tenth/Forest3.java index 6b5c89a0667..df7cfcd6f27 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest3.java +++ b/Mage.Sets/src/mage/sets/tenth/Forest3.java @@ -41,11 +41,6 @@ public class Forest3 extends mage.cards.basiclands.Forest { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "80954_typ_reg_sty_010.jpg"; - } - public Forest3(final Forest3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Forest4.java b/Mage.Sets/src/mage/sets/tenth/Forest4.java index 8c7ee689825..97f59ae7968 100644 --- a/Mage.Sets/src/mage/sets/tenth/Forest4.java +++ b/Mage.Sets/src/mage/sets/tenth/Forest4.java @@ -41,11 +41,6 @@ public class Forest4 extends mage.cards.basiclands.Forest { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "25153_typ_reg_sty_010.jpg"; - } - public Forest4(final Forest4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java index 1ab99776169..d47951e644a 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java @@ -58,9 +58,4 @@ public class GiantGrowth extends CardImpl { public GiantGrowth copy() { return new GiantGrowth(this); } - - @Override - public String getArt() { - return "101059_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/GiantSpider.java b/Mage.Sets/src/mage/sets/tenth/GiantSpider.java index abb79b667b0..b49b1057603 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantSpider.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantSpider.java @@ -61,9 +61,4 @@ public class GiantSpider extends CardImpl { return new GiantSpider(this); } - @Override - public String getArt() { - return "6654_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java b/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java index 0ac9ee94b90..45f83a9a4de 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinPiker.java @@ -60,9 +60,4 @@ public class GoblinPiker extends CardImpl { return new GoblinPiker(this); } - @Override - public String getArt() { - return "4588_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Gravedigger.java b/Mage.Sets/src/mage/sets/tenth/Gravedigger.java index f7a66320cd8..e623d79b9f8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Gravedigger.java +++ b/Mage.Sets/src/mage/sets/tenth/Gravedigger.java @@ -67,9 +67,4 @@ public class Gravedigger extends CardImpl { return new Gravedigger(this); } - @Override - public String getArt() { - return "2972_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Island1.java b/Mage.Sets/src/mage/sets/tenth/Island1.java index 07fdb0a00ab..74962891b37 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island1.java +++ b/Mage.Sets/src/mage/sets/tenth/Island1.java @@ -41,11 +41,6 @@ public class Island1 extends mage.cards.basiclands.Island { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "08754_typ_reg_sty_010.jpg"; - } - public Island1(final Island1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Island2.java b/Mage.Sets/src/mage/sets/tenth/Island2.java index 8cedf2494ba..4b527f02bf1 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island2.java +++ b/Mage.Sets/src/mage/sets/tenth/Island2.java @@ -41,11 +41,6 @@ public class Island2 extends mage.cards.basiclands.Island { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "25162_typ_reg_sty_010.jpg"; - } - public Island2(final Island2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Island3.java b/Mage.Sets/src/mage/sets/tenth/Island3.java index df15929e555..d2d0bde1225 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island3.java +++ b/Mage.Sets/src/mage/sets/tenth/Island3.java @@ -41,11 +41,6 @@ public class Island3 extends mage.cards.basiclands.Island { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "80957_typ_reg_sty_010.jpg"; - } - public Island3(final Island3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Island4.java b/Mage.Sets/src/mage/sets/tenth/Island4.java index 0bdfcaf853d..a34d60994d7 100644 --- a/Mage.Sets/src/mage/sets/tenth/Island4.java +++ b/Mage.Sets/src/mage/sets/tenth/Island4.java @@ -41,11 +41,6 @@ public class Island4 extends mage.cards.basiclands.Island { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "89166_typ_reg_sty_010.jpg"; - } - public Island4(final Island4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java index 4e63d07048e..339d620d571 100644 --- a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java @@ -66,11 +66,6 @@ public class Juggernaut extends CardImpl { return new Juggernaut(this); } - @Override - public String getArt() { - return "50815_typ_reg_sty_010.jpg"; - } - } class JuggernautAbility extends EvasionAbility { diff --git a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java index 6d55e08465b..d8d39d4e010 100644 --- a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java +++ b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java @@ -61,11 +61,6 @@ public class KrakensEye extends CardImpl { return new KrakensEye(this); } - @Override - public String getArt() { - return "75197_typ_reg_sty_010.jpg"; - } - } class KrakensEyeAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java index bd7d08b6501..7be785bc6d9 100644 --- a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java @@ -57,9 +57,4 @@ public class LavaAxe extends CardImpl { public LavaAxe copy() { return new LavaAxe(this); } - - @Override - public String getArt() { - return "10394_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java b/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java index d2db41f0e3f..886abe73804 100644 --- a/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java +++ b/Mage.Sets/src/mage/sets/tenth/LlanowarElves.java @@ -61,9 +61,4 @@ public class LlanowarElves extends CardImpl { return new LlanowarElves(this); } - @Override - public String getArt() { - return "86938_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/MindRot.java b/Mage.Sets/src/mage/sets/tenth/MindRot.java index bf334b51a57..106825a43fc 100644 --- a/Mage.Sets/src/mage/sets/tenth/MindRot.java +++ b/Mage.Sets/src/mage/sets/tenth/MindRot.java @@ -57,9 +57,4 @@ public class MindRot extends CardImpl { public MindRot copy() { return new MindRot(this); } - - @Override - public String getArt() { - return "04716_typ_reg_sty_001.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain1.java b/Mage.Sets/src/mage/sets/tenth/Mountain1.java index 70df294f663..2afca257988 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain1.java +++ b/Mage.Sets/src/mage/sets/tenth/Mountain1.java @@ -41,11 +41,6 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "89159_typ_reg_sty_010.jpg"; - } - public Mountain1(final Mountain1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain2.java b/Mage.Sets/src/mage/sets/tenth/Mountain2.java index 3dec10a191b..9e9620bd826 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain2.java +++ b/Mage.Sets/src/mage/sets/tenth/Mountain2.java @@ -41,11 +41,6 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "08637_typ_reg_sty_010.jpg"; - } - public Mountain2(final Mountain2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain3.java b/Mage.Sets/src/mage/sets/tenth/Mountain3.java index b0510aa0423..bf71bc60688 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain3.java +++ b/Mage.Sets/src/mage/sets/tenth/Mountain3.java @@ -41,11 +41,6 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "80963_typ_reg_sty_010.jpg"; - } - public Mountain3(final Mountain3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Mountain4.java b/Mage.Sets/src/mage/sets/tenth/Mountain4.java index 6da9e71a37e..885352917c8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mountain4.java +++ b/Mage.Sets/src/mage/sets/tenth/Mountain4.java @@ -41,11 +41,6 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "25502_typ_reg_sty_010.jpg"; - } - public Mountain4(final Mountain4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Naturalize.java b/Mage.Sets/src/mage/sets/tenth/Naturalize.java index de89f570820..8a6e9d5af02 100644 --- a/Mage.Sets/src/mage/sets/tenth/Naturalize.java +++ b/Mage.Sets/src/mage/sets/tenth/Naturalize.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class Naturalize extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -67,9 +67,4 @@ public class Naturalize extends CardImpl { public Naturalize copy() { return new Naturalize(this); } - - @Override - public String getArt() { - return "49669_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/Ornithopter.java b/Mage.Sets/src/mage/sets/tenth/Ornithopter.java index fdfc25fc7e5..19c1fe028d5 100644 --- a/Mage.Sets/src/mage/sets/tenth/Ornithopter.java +++ b/Mage.Sets/src/mage/sets/tenth/Ornithopter.java @@ -60,9 +60,4 @@ public class Ornithopter extends CardImpl { return new Ornithopter(this); } - @Override - public String getArt() { - return "50214_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Pacifism.java b/Mage.Sets/src/mage/sets/tenth/Pacifism.java index c670eb5a725..77a8e7fb581 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pacifism.java +++ b/Mage.Sets/src/mage/sets/tenth/Pacifism.java @@ -74,11 +74,6 @@ public class Pacifism extends CardImpl { public Pacifism copy() { return new Pacifism(this); } - - @Override - public String getArt() { - return "01988_typ_reg_sty_010.jpg"; - } } class PacifismEffect extends RestrictionEffect { diff --git a/Mage.Sets/src/mage/sets/tenth/Plains1.java b/Mage.Sets/src/mage/sets/tenth/Plains1.java index ff08491e2f6..ca1ac034193 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains1.java +++ b/Mage.Sets/src/mage/sets/tenth/Plains1.java @@ -41,11 +41,6 @@ public class Plains1 extends mage.cards.basiclands.Plains { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "08661_typ_reg_sty_010.jpg"; - } - public Plains1(final Plains1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Plains2.java b/Mage.Sets/src/mage/sets/tenth/Plains2.java index d0d15a4000e..597eef3c5b0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains2.java +++ b/Mage.Sets/src/mage/sets/tenth/Plains2.java @@ -41,11 +41,6 @@ public class Plains2 extends mage.cards.basiclands.Plains { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "80949_typ_reg_sty_010.jpg"; - } - public Plains2(final Plains2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Plains3.java b/Mage.Sets/src/mage/sets/tenth/Plains3.java index d69843e84d4..7071a0786ac 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains3.java +++ b/Mage.Sets/src/mage/sets/tenth/Plains3.java @@ -41,11 +41,6 @@ public class Plains3 extends mage.cards.basiclands.Plains { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "89178_typ_reg_sty_010.jpg"; - } - public Plains3(final Plains3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Plains4.java b/Mage.Sets/src/mage/sets/tenth/Plains4.java index c8a2ce36edb..a6dcce9dc72 100644 --- a/Mage.Sets/src/mage/sets/tenth/Plains4.java +++ b/Mage.Sets/src/mage/sets/tenth/Plains4.java @@ -41,11 +41,6 @@ public class Plains4 extends mage.cards.basiclands.Plains { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "25178_typ_reg_sty_010.jpg"; - } - public Plains4(final Plains4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java index dcfa605783c..04e5f3c9481 100644 --- a/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java +++ b/Mage.Sets/src/mage/sets/tenth/PlatinumAngel.java @@ -70,11 +70,6 @@ public class PlatinumAngel extends CardImpl { return new PlatinumAngel(this); } - @Override - public String getArt() { - return "49681_typ_reg_sty_010.jpg"; - } - class PlatinumAngelEffect extends ReplacementEffectImpl { public PlatinumAngelEffect() { diff --git a/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java b/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java index 9568a670448..4e98b4fefb5 100644 --- a/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/sets/tenth/ProdigalPyromancer.java @@ -69,9 +69,4 @@ public class ProdigalPyromancer extends CardImpl { return new ProdigalPyromancer(this); } - @Override - public String getArt() { - return "100670_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java b/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java index 145e9df1189..9c8e83db419 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java +++ b/Mage.Sets/src/mage/sets/tenth/Pyroclasm.java @@ -56,9 +56,4 @@ public class Pyroclasm extends CardImpl { public Pyroclasm copy() { return new Pyroclasm(this); } - - @Override - public String getArt() { - return "49671_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java index 75c549597be..da301cd30f7 100644 --- a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java @@ -76,11 +76,6 @@ public class RelentlessRats extends CardImpl { public RelentlessRats copy() { return new RelentlessRats(this); } - - @Override - public String getArt() { - return "77220_typ_reg_sty_010.jpg"; - } class RelentlessRatsEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java index 652dd3a8c0c..033cdf05e1d 100644 --- a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java +++ b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class RoyalAssassin extends CardImpl { - private static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.setUseTapped(true); @@ -76,9 +76,4 @@ public class RoyalAssassin extends CardImpl { public RoyalAssassin copy() { return new RoyalAssassin(this); } - - @Override - public String getArt() { - return "48786_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/SerraAngel.java b/Mage.Sets/src/mage/sets/tenth/SerraAngel.java index 3586035bfd5..0eb9025e091 100644 --- a/Mage.Sets/src/mage/sets/tenth/SerraAngel.java +++ b/Mage.Sets/src/mage/sets/tenth/SerraAngel.java @@ -63,9 +63,4 @@ public class SerraAngel extends CardImpl { return new SerraAngel(this); } - @Override - public String getArt() { - return "86905_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java b/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java index 93218d554d9..a4970d170ee 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java +++ b/Mage.Sets/src/mage/sets/tenth/SpinedWurm.java @@ -59,9 +59,4 @@ public class SpinedWurm extends CardImpl { return new SpinedWurm(this); } - @Override - public String getArt() { - return "27799_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/Swamp1.java b/Mage.Sets/src/mage/sets/tenth/Swamp1.java index b02e39f6776..33a797e2aaa 100644 --- a/Mage.Sets/src/mage/sets/tenth/Swamp1.java +++ b/Mage.Sets/src/mage/sets/tenth/Swamp1.java @@ -41,11 +41,6 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "08633_typ_reg_sty_010.jpg"; - } - public Swamp1(final Swamp1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Swamp2.java b/Mage.Sets/src/mage/sets/tenth/Swamp2.java index fe97c820bac..fe40dea5c45 100644 --- a/Mage.Sets/src/mage/sets/tenth/Swamp2.java +++ b/Mage.Sets/src/mage/sets/tenth/Swamp2.java @@ -41,11 +41,6 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "25491_typ_reg_sty_001.jpg"; - } - public Swamp2(final Swamp2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Swamp3.java b/Mage.Sets/src/mage/sets/tenth/Swamp3.java index 03c3add31c6..febf540b69e 100644 --- a/Mage.Sets/src/mage/sets/tenth/Swamp3.java +++ b/Mage.Sets/src/mage/sets/tenth/Swamp3.java @@ -41,11 +41,6 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "80953_typ_reg_sty_010.jpg"; - } - public Swamp3(final Swamp3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/Swamp4.java b/Mage.Sets/src/mage/sets/tenth/Swamp4.java index ee06287aaf9..dbea9ac088d 100644 --- a/Mage.Sets/src/mage/sets/tenth/Swamp4.java +++ b/Mage.Sets/src/mage/sets/tenth/Swamp4.java @@ -41,11 +41,6 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "10E"; } - @Override - public String getArt() { - return "89177_typ_reg_sty_010.jpg"; - } - public Swamp4(final Swamp4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java index b79db7dd764..2f4a83afa09 100644 --- a/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java +++ b/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java @@ -62,11 +62,6 @@ public class TerramorphicExpanse extends CardImpl { return new TerramorphicExpanse(this); } - @Override - public String getArt() { - return "97502_typ_reg_sty_010.jpg"; - } - } class TerramorphicExpanseAbility extends ActivatedAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/tenth/Traumatize.java b/Mage.Sets/src/mage/sets/tenth/Traumatize.java index a1012b5e046..f07b56deeb4 100644 --- a/Mage.Sets/src/mage/sets/tenth/Traumatize.java +++ b/Mage.Sets/src/mage/sets/tenth/Traumatize.java @@ -63,11 +63,6 @@ public class Traumatize extends CardImpl { public Traumatize copy() { return new Traumatize(this); } - - @Override - public String getArt() { - return "33487_typ_reg_sty_010.jpg"; - } } class TraumatizeEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java b/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java index d52f7b3b3f0..685c412ecbe 100644 --- a/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java +++ b/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java @@ -71,9 +71,4 @@ public class UnholyStrength extends CardImpl { public UnholyStrength copy() { return new UnholyStrength(this); } - - @Override - public String getArt() { - return "104535_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/Unsummon.java b/Mage.Sets/src/mage/sets/tenth/Unsummon.java index c2499fbf21e..8fc36d0a2c1 100644 --- a/Mage.Sets/src/mage/sets/tenth/Unsummon.java +++ b/Mage.Sets/src/mage/sets/tenth/Unsummon.java @@ -57,9 +57,4 @@ public class Unsummon extends CardImpl { public Unsummon copy() { return new Unsummon(this); } - - @Override - public String getArt() { - return "27848_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java b/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java index 66814ea56a5..f02912101cc 100644 --- a/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java +++ b/Mage.Sets/src/mage/sets/tenth/WhispersilkCloak.java @@ -68,9 +68,4 @@ public class WhispersilkCloak extends CardImpl { return new WhispersilkCloak(this); } - @Override - public String getArt() { - return "50223_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/WildGriffin.java b/Mage.Sets/src/mage/sets/tenth/WildGriffin.java index 64e822037e6..cef0ede888b 100644 --- a/Mage.Sets/src/mage/sets/tenth/WildGriffin.java +++ b/Mage.Sets/src/mage/sets/tenth/WildGriffin.java @@ -61,9 +61,4 @@ public class WildGriffin extends CardImpl { return new WildGriffin(this); } - @Override - public String getArt() { - return "104359_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java b/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java index ea8e135aa39..a2669c5142e 100644 --- a/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java +++ b/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java @@ -61,11 +61,6 @@ public class WurmsTooth extends CardImpl { return new WurmsTooth(this); } - @Override - public String getArt() { - return "75222_typ_reg_sty_010.jpg"; - } - } class WurmsToothAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java index b02c2e0e005..ddf57bb4b4f 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ArborElf.java +++ b/Mage.Sets/src/mage/sets/worldwake/ArborElf.java @@ -47,7 +47,7 @@ import mage.target.common.TargetLandPermanent; */ public class ArborElf extends CardImpl { - private static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.getName().add("Forest"); @@ -76,9 +76,4 @@ public class ArborElf extends CardImpl { return new ArborElf(this); } - @Override - public String getArt() { - return "126593_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java index 1d0fb71ad00..2d3124b57f7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java +++ b/Mage.Sets/src/mage/sets/worldwake/BasiliskCollar.java @@ -66,9 +66,4 @@ public class BasiliskCollar extends CardImpl { public BasiliskCollar copy() { return new BasiliskCollar(this); } - - @Override - public String getArt() { - return "126549_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java index d84813f14aa..657f21bf727 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java +++ b/Mage.Sets/src/mage/sets/worldwake/BestialMenace.java @@ -61,9 +61,4 @@ public class BestialMenace extends CardImpl { return new BestialMenace(this); } - @Override - public String getArt() { - return "126463_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java index e2aa92ee86c..751c66bcc48 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java +++ b/Mage.Sets/src/mage/sets/worldwake/CelestialColonnade.java @@ -68,11 +68,6 @@ public class CelestialColonnade extends CardImpl { return new CelestialColonnade(this); } - @Override - public String getArt() { - return "126518_typ_reg_sty_010.jpg"; - } - } class CelestialColonnadeToken extends Token { diff --git a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java index e6f7decdca1..a29c72cdddb 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java +++ b/Mage.Sets/src/mage/sets/worldwake/DreadStatuary.java @@ -62,11 +62,6 @@ public class DreadStatuary extends CardImpl { return new DreadStatuary(this); } - @Override - public String getArt() { - return "126755_typ_reg_sty_010.jpg"; - } - } class DreadStatuaryToken extends Token { diff --git a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java index 8dfb696072c..23820235517 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java +++ b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java @@ -72,11 +72,6 @@ public class EverflowingChalice extends CardImpl { return new EverflowingChalice(this); } - @Override - public String getArt() { - return "126542_typ_reg_sty_010.jpg"; - } - } class EverflowingChaliceAbility extends ManaAbility { diff --git a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java index f7925e199eb..5c1c59f3ecc 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java +++ b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java @@ -93,11 +93,6 @@ public class JaceTheMindSculptor extends CardImpl { return new JaceTheMindSculptor(this); } - @Override - public String getArt() { - return "126493_typ_reg_sty_010.jpg"; - } - } class JaceTheMindSculptorEffect1 extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java b/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java index 5994fc72de7..e4d21aea685 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java +++ b/Mage.Sets/src/mage/sets/worldwake/KhalniGarden.java @@ -61,9 +61,4 @@ public class KhalniGarden extends CardImpl { return new KhalniGarden(this); } - @Override - public String getArt() { - return "123552_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java index 77c7265636f..818566c8b64 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java +++ b/Mage.Sets/src/mage/sets/worldwake/LavaclawReaches.java @@ -68,11 +68,6 @@ public class LavaclawReaches extends CardImpl { return new LavaclawReaches(this); } - @Override - public String getArt() { - return "126532_typ_reg_sty_010.jpg"; - } - } class LavaclawReachesToken extends Token { diff --git a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java index e86969da976..2095768c13e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java +++ b/Mage.Sets/src/mage/sets/worldwake/RagingRavine.java @@ -69,11 +69,6 @@ public class RagingRavine extends CardImpl { return new RagingRavine(this); } - @Override - public String getArt() { - return "126537_typ_reg_sty_010.jpg"; - } - } class RagingRavineToken extends Token { diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index 9a324ae57bc..8ab010f7dad 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -73,11 +73,6 @@ public class SearingBlaze extends CardImpl { return new SearingBlaze(this); } - @Override - public String getArt() { - return "126476_typ_reg_sty_010.jpg"; - } - } class SearingBlazeWatcher extends WatcherImpl { diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java index 378fbf8109b..bade206c33f 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java @@ -66,9 +66,4 @@ public class SejiriSteppe extends CardImpl { return new SejiriSteppe(this); } - @Override - public String getArt() { - return "123657_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java b/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java index 0a376fd5aef..0c09e1b6961 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java +++ b/Mage.Sets/src/mage/sets/worldwake/StirringWildwood.java @@ -67,11 +67,6 @@ public class StirringWildwood extends CardImpl { return new StirringWildwood(this); } - @Override - public String getArt() { - return "126541_typ_reg_sty_010.jpg"; - } - } class StirringWildwoodToken extends Token { diff --git a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java index 8c55db9b293..d4dd98d2299 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/sets/worldwake/StoneforgeMystic.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCardInLibrary; */ public class StoneforgeMystic extends CardImpl { - private static FilterCard filter = new FilterCard("an Equipment card"); + private static final FilterCard filter = new FilterCard("an Equipment card"); static { filter.getCardType().add(CardType.ARTIFACT); @@ -84,9 +84,4 @@ public class StoneforgeMystic extends CardImpl { return new StoneforgeMystic(this); } - @Override - public String getArt() { - return "126571_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java index 3a9357cb38c..cc4c77826c3 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java +++ b/Mage.Sets/src/mage/sets/worldwake/TectonicEdge.java @@ -76,11 +76,6 @@ public class TectonicEdge extends CardImpl { return new TectonicEdge(this); } - @Override - public String getArt() { - return "126492_typ_reg_sty_010.jpg"; - } - } class TectonicEdgeCost extends CostImpl { diff --git a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java index 28e6eddb2dd..925ca242910 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java @@ -67,9 +67,4 @@ public class WolfbriarElemental extends CardImpl { return new WolfbriarElemental(this); } - @Override - public String getArt() { - return "126583_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java index 16d3750d3aa..8e0bd530e6a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java +++ b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java @@ -66,11 +66,6 @@ public class AdventuringGear extends CardImpl { return new AdventuringGear(this); } - @Override - public String getArt() { - return "123577_typ_reg_sty_010.jpg"; - } - } class AdventuringGearAbility extends LandfallAbility { diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index 60fa601025d..8bc8c660cd7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -73,9 +73,4 @@ public class AetherFigment extends CardImpl { return new AetherFigment(this); } - @Override - public String getArt() { - return "102621_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index 5ca86f4f4e8..2acb8597fee 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -68,11 +68,6 @@ public class ArchiveTrap extends CardImpl { return new ArchiveTrap(this); } - @Override - public String getArt() { - return "125080_typ_reg_sty_010.jpg"; - } - } class ArchiveTrapWatcher extends WatcherImpl { diff --git a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java index 1980c96248f..964f90c3f02 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AridMesa.java +++ b/Mage.Sets/src/mage/sets/zendikar/AridMesa.java @@ -55,9 +55,4 @@ public class AridMesa extends CardImpl { return new AridMesa(this); } - @Override - public String getArt() { - return "123565_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java index 4d0163c55f7..1f5c2524647 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java @@ -68,11 +68,6 @@ public class BeastmasterAscension extends CardImpl { return new BeastmasterAscension(this); } - @Override - public String getArt() { - return "125085_typ_reg_sty_010.jpg"; - } - } class BeastmasterAscensionAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java index f664c8c401c..6505f97eb80 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java +++ b/Mage.Sets/src/mage/sets/zendikar/BraveTheElements.java @@ -64,11 +64,6 @@ public class BraveTheElements extends CardImpl { return new BraveTheElements(this); } - @Override - public String getArt() { - return "123638_typ_reg_sty_010.jpg"; - } - } class BraveTheElementsEffect extends GainAbilityControlledEffect { diff --git a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java index 296b7107c38..8c899d165aa 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java +++ b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java @@ -64,9 +64,4 @@ public class BurstLightning extends CardImpl { return new BurstLightning(this); } - @Override - public String getArt() { - return "123560_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/Cancel.java b/Mage.Sets/src/mage/sets/zendikar/Cancel.java index 82cf682caa5..c3e61d0b3ea 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Cancel.java +++ b/Mage.Sets/src/mage/sets/zendikar/Cancel.java @@ -42,11 +42,6 @@ public class Cancel extends mage.sets.shardsofalara.Cancel { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123652_typ_reg_sty_010.jpg"; - } - public Cancel(final Cancel card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java index a9d232d7845..e54044a54e7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java @@ -63,11 +63,6 @@ public class ConquerorsPledge extends CardImpl { return new ConquerorsPledge(this); } - @Override - public String getArt() { - return "123781_typ_reg_sty_010.jpg"; - } - } class KorSoldierToken extends Token { diff --git a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java index 76e969b5bd7..3a19099c3ac 100644 --- a/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java +++ b/Mage.Sets/src/mage/sets/zendikar/DayOfJudgment.java @@ -57,9 +57,4 @@ public class DayOfJudgment extends CardImpl { return new DayOfJudgment(this); } - @Override - public String getArt() { - return "123645_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/Demolish.java b/Mage.Sets/src/mage/sets/zendikar/Demolish.java index 280650a9bc8..2c6a7170339 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Demolish.java +++ b/Mage.Sets/src/mage/sets/zendikar/Demolish.java @@ -42,11 +42,6 @@ public class Demolish extends mage.sets.tenth.Demolish { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123684_typ_reg_sty_010.jpg"; - } - public Demolish(final Demolish card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java index 71af3ff5fe5..6d966b1ec69 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java +++ b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java @@ -75,11 +75,6 @@ public class EldraziMonument extends CardImpl { return new EldraziMonument(this); } - @Override - public String getArt() { - return "123741_typ_reg_sty_010.jpg"; - } - } class EldraziMonumentEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java index 3034c37dc37..1fbed693d16 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java +++ b/Mage.Sets/src/mage/sets/zendikar/EmeriaAngel.java @@ -65,11 +65,6 @@ public class EmeriaAngel extends CardImpl { return new EmeriaAngel(this); } - @Override - public String getArt() { - return "123678_typ_reg_sty_010.jpg"; - } - } class BirdToken extends Token { diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest1.java b/Mage.Sets/src/mage/sets/zendikar/Forest1.java index bfc7157ede5..fbe796073c4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest1.java @@ -41,11 +41,6 @@ public class Forest1 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123765_typ_reg_sty_010.jpg"; - } - public Forest1(final Forest1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest2.java b/Mage.Sets/src/mage/sets/zendikar/Forest2.java index 66575b0f335..8ff76a4bc4e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest2.java @@ -41,11 +41,6 @@ public class Forest2 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123761_typ_reg_sty_010.jpg"; - } - public Forest2(final Forest2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest3.java b/Mage.Sets/src/mage/sets/zendikar/Forest3.java index dfdc079e148..7f61244b493 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest3.java @@ -41,11 +41,6 @@ public class Forest3 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123752_typ_reg_sty_010.jpg"; - } - public Forest3(final Forest3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest4.java b/Mage.Sets/src/mage/sets/zendikar/Forest4.java index a6c6d6744c2..c92a75776f9 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest4.java @@ -41,11 +41,6 @@ public class Forest4 extends mage.cards.basiclands.Forest { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123768_typ_reg_sty_010.jpg"; - } - public Forest4(final Forest4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java index cefd0b93cd0..d86ef5ceaa7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinGuide.java @@ -43,7 +43,6 @@ import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.game.Game; -import mage.game.combat.CombatGroup; import mage.players.Player; /** @@ -73,11 +72,6 @@ public class GoblinGuide extends CardImpl { return new GoblinGuide(this); } - @Override - public String getArt() { - return "123540_typ_reg_sty_010.jpg"; - } - } class GoblinGuideEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java index 96580afa304..36cfa6c9208 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java @@ -76,10 +76,5 @@ public class GoblinRuinblaster extends CardImpl { public GoblinRuinblaster copy() { return new GoblinRuinblaster(this); } - - @Override - public String getArt() { - return "123599_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java b/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java index 5fbdd2688af..5bd29898b79 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java +++ b/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java @@ -64,9 +64,4 @@ public class IntoTheRoil extends CardImpl { return new IntoTheRoil(this); } - @Override - public String getArt() { - return "123560_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island1.java b/Mage.Sets/src/mage/sets/zendikar/Island1.java index 77cca9f040b..cdd330e29ec 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island1.java @@ -41,11 +41,6 @@ public class Island1 extends mage.cards.basiclands.Island { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123767_typ_reg_sty_010.jpg"; - } - public Island1(final Island1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island2.java b/Mage.Sets/src/mage/sets/zendikar/Island2.java index 235612ad225..78fa641a4d2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island2.java @@ -41,11 +41,6 @@ public class Island2 extends mage.cards.basiclands.Island { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123756_typ_reg_sty_010.jpg"; - } - public Island2(final Island2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island3.java b/Mage.Sets/src/mage/sets/zendikar/Island3.java index 424e19aedb5..378952cf94c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island3.java @@ -41,11 +41,6 @@ public class Island3 extends mage.cards.basiclands.Island { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123754_typ_reg_sty_010.jpg"; - } - public Island3(final Island3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Island4.java b/Mage.Sets/src/mage/sets/zendikar/Island4.java index 18bb9d89691..26a35a9ba5a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island4.java @@ -41,11 +41,6 @@ public class Island4 extends mage.cards.basiclands.Island { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123757_typ_reg_sty_010.jpg"; - } - public Island4(final Island4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java b/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java index 78b6cf54de5..c9ebbe63b11 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java +++ b/Mage.Sets/src/mage/sets/zendikar/KabiraCrossroads.java @@ -59,9 +59,5 @@ public class KabiraCrossroads extends CardImpl { public KabiraCrossroads copy() { return new KabiraCrossroads(this); } - - @Override - public String getArt() { - return "126610_typ_reg_sty_010.jpg"; - } + } diff --git a/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java b/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java index 8f9c5df1e0d..b05421e2654 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java +++ b/Mage.Sets/src/mage/sets/zendikar/LotusCobra.java @@ -65,9 +65,4 @@ public class LotusCobra extends CardImpl { return new LotusCobra(this); } - @Override - public String getArt() { - return "123641_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java index cf5496d8259..12624ff9e61 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshFlats.java @@ -55,10 +55,4 @@ public class MarshFlats extends CardImpl { return new MarshFlats(this); } - @Override - public String getArt() { - return "123707_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java index 9477c820459..a2ca71e3384 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java +++ b/Mage.Sets/src/mage/sets/zendikar/MistyRainforest.java @@ -55,10 +55,4 @@ public class MistyRainforest extends CardImpl { return new MistyRainforest(this); } - @Override - public String getArt() { - return "123689_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain1.java b/Mage.Sets/src/mage/sets/zendikar/Mountain1.java index 34af296a77c..caf2186865f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain1.java @@ -41,11 +41,6 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123762_typ_reg_sty_010.jp"; - } - public Mountain1(final Mountain1 card) { super(card); } @@ -56,4 +51,3 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { } } - diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain2.java b/Mage.Sets/src/mage/sets/zendikar/Mountain2.java index b0fb37260ff..febfd9e0705 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain2.java @@ -41,11 +41,6 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123758_typ_reg_sty_010.jpg"; - } - public Mountain2(final Mountain2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain3.java b/Mage.Sets/src/mage/sets/zendikar/Mountain3.java index 7cbbf935e91..290639247fe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain3.java @@ -41,11 +41,6 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123764_typ_reg_sty_010.jpg"; - } - public Mountain3(final Mountain3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain4.java b/Mage.Sets/src/mage/sets/zendikar/Mountain4.java index cb08baa5a85..b8c6574b8ea 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain4.java @@ -41,11 +41,6 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123766_typ_reg_sty_010.jpg"; - } - public Mountain4(final Mountain4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java index 25831328722..88fa8363863 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java @@ -69,11 +69,6 @@ public class OranRiefTheVastwood extends CardImpl { return new OranRiefTheVastwood(this); } - @Override - public String getArt() { - return "123692_typ_reg_sty_010.jpg"; - } - } class OranRiefTheVastwoodEffect extends OneShotEffect { diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains1.java b/Mage.Sets/src/mage/sets/zendikar/Plains1.java index ff5e456d5d5..8c00153ac28 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains1.java @@ -41,11 +41,6 @@ public class Plains1 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123755_typ_reg_sty_010.jpg"; - } - public Plains1(final Plains1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains2.java b/Mage.Sets/src/mage/sets/zendikar/Plains2.java index 7b827129cab..89b8b65903e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains2.java @@ -41,11 +41,6 @@ public class Plains2 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123760_typ_reg_sty_010.jpg"; - } - public Plains2(final Plains2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains3.java b/Mage.Sets/src/mage/sets/zendikar/Plains3.java index 60a0f7256a6..b541bf55473 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains3.java @@ -41,11 +41,6 @@ public class Plains3 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123763_typ_reg_sty_010.jpg"; - } - public Plains3(final Plains3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains4.java b/Mage.Sets/src/mage/sets/zendikar/Plains4.java index 593fc883aa6..4525d3de6f2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains4.java @@ -41,11 +41,6 @@ public class Plains4 extends mage.cards.basiclands.Plains { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123770_typ_reg_sty_010.jpg"; - } - public Plains4(final Plains4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java index 2525cb97685..c83e4b8bc13 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java +++ b/Mage.Sets/src/mage/sets/zendikar/RampagingBaloths.java @@ -64,11 +64,6 @@ public class RampagingBaloths extends CardImpl { return new RampagingBaloths(this); } - @Override - public String getArt() { - return "123726_typ_reg_sty_010.jpg"; - } - } class RampagingBalothsToken extends Token { diff --git a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java index 9c757ed241d..9a14a3844ce 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiverBoa.java @@ -65,9 +65,4 @@ public class RiverBoa extends CardImpl { return new RiverBoa(this); } - @Override - public String getArt() { - return "125067_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java index ab2a12cdde7..5c1ae35f9a0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScaldingTarn.java @@ -55,10 +55,5 @@ public class ScaldingTarn extends CardImpl { return new ScaldingTarn(this); } - @Override - public String getArt() { - return "123672_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java index 66be2c6761a..8829eca1706 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java @@ -67,11 +67,6 @@ public class ScuteMob extends CardImpl { return new ScuteMob(this); } - @Override - public String getArt() { - return "123606_typ_reg_sty_010.jpg"; - } - } class ScuteMobAbility extends TriggeredAbilityImpl { diff --git a/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java b/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java index 25dd5beaf39..683f98344c6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java +++ b/Mage.Sets/src/mage/sets/zendikar/SejiriRefuge.java @@ -61,9 +61,4 @@ public class SejiriRefuge extends CardImpl { public SejiriRefuge copy() { return new SejiriRefuge(this); } - - @Override - public String getArt() { - return "126610_typ_reg_sty_010.jpg"; - } } diff --git a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java index 65f2d7aa6fc..fbd6e963623 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java +++ b/Mage.Sets/src/mage/sets/zendikar/SpreadingSeas.java @@ -80,11 +80,6 @@ public class SpreadingSeas extends CardImpl { public SpreadingSeas copy() { return new SpreadingSeas(this); } - - @Override - public String getArt() { - return "123683_typ_reg_sty_010.jpg"; - } } class SpreadingSeasEffect extends ContinuousEffectImpl { diff --git a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java index 1c57efa551a..0e4735d90bc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java +++ b/Mage.Sets/src/mage/sets/zendikar/SteppeLynx.java @@ -63,9 +63,4 @@ public class SteppeLynx extends CardImpl { return new SteppeLynx(this); } - @Override - public String getArt() { - return "123546_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java index 6ef59690509..74425f98594 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java +++ b/Mage.Sets/src/mage/sets/zendikar/SunspringExpedition.java @@ -71,9 +71,4 @@ public class SunspringExpedition extends CardImpl { return new SunspringExpedition(this); } - @Override - public String getArt() { - return "123558_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp1.java b/Mage.Sets/src/mage/sets/zendikar/Swamp1.java index 5a0b05cc79d..f106c9fb5ab 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp1.java @@ -41,11 +41,6 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123759_typ_reg_sty_010.jpg"; - } - public Swamp1(final Swamp1 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp2.java b/Mage.Sets/src/mage/sets/zendikar/Swamp2.java index 54a267ee165..dfea7c4c0ae 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp2.java @@ -41,11 +41,6 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123769_typ_reg_sty_010.jpg"; - } - public Swamp2(final Swamp2 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp3.java b/Mage.Sets/src/mage/sets/zendikar/Swamp3.java index 5319583c51a..8571c6ced7a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp3.java @@ -41,11 +41,6 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123753_typ_reg_sty_010.jpg"; - } - public Swamp3(final Swamp3 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp4.java b/Mage.Sets/src/mage/sets/zendikar/Swamp4.java index 59035e143b8..ade19094037 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp4.java @@ -41,11 +41,6 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { this.expansionSetCode = "ZEN"; } - @Override - public String getArt() { - return "123751_typ_reg_sty_010.jpg"; - } - public Swamp4(final Swamp4 card) { super(card); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java index 0ee41b732dd..6de4cb0cc9f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java +++ b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java @@ -65,9 +65,4 @@ public class TeeteringPeaks extends CardImpl { return new TeeteringPeaks(this); } - @Override - public String getArt() { - return "123557_typ_reg_sty_010.jpg"; - } - } diff --git a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java index 8d314cc8158..023b325f7d7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java +++ b/Mage.Sets/src/mage/sets/zendikar/VerdantCatacombs.java @@ -55,10 +55,4 @@ public class VerdantCatacombs extends CardImpl { return new VerdantCatacombs(this); } - @Override - public String getArt() { - return "123743_typ_reg_sty_010.jpg"; - } - } - diff --git a/Mage/src/mage/abilities/effects/common/CopyEffect.java b/Mage/src/mage/abilities/effects/common/CopyEffect.java index 49596af0d79..4c818fcb96b 100644 --- a/Mage/src/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/mage/abilities/effects/common/CopyEffect.java @@ -81,7 +81,6 @@ public class CopyEffect extends ContinuousEffectImpl { permanent.getPower().setValue(card.getPower().getValue()); permanent.getToughness().setValue(card.getToughness().getValue()); //permanent.getLoyalty().setValue(card.getLoyalty().getValue()); - permanent.setArt(card.getArt()); return true; diff --git a/Mage/src/mage/cards/Card.java b/Mage/src/mage/cards/Card.java index 3be01504845..8c4e03617cd 100644 --- a/Mage/src/mage/cards/Card.java +++ b/Mage/src/mage/cards/Card.java @@ -45,7 +45,6 @@ public interface Card extends MageObject { public UUID getOwnerId(); public int getCardNumber(); public void setCardNumber(int cid); - public String getArt(); public Rarity getRarity(); public void setRarity(Rarity rarity); public void setControllerId(UUID controllerId); diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index e0e40a9cd7a..35ef9de2d77 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -324,11 +324,6 @@ public abstract class CardImpl> extends MageObjectImpl return true; } - @Override - public String getArt() { - return ""; - } - @Override public void setCardNumber(int cid) { this.cardNumber = cid; diff --git a/Mage/src/mage/game/permanent/Permanent.java b/Mage/src/mage/game/permanent/Permanent.java index e4f1a890c95..ee70b69ef5a 100644 --- a/Mage/src/mage/game/permanent/Permanent.java +++ b/Mage/src/mage/game/permanent/Permanent.java @@ -81,7 +81,6 @@ public interface Permanent extends Card { public boolean sacrifice(UUID sourceId, Game game); public void entersBattlefield(UUID sourceId, Game game); public String getValue(); - public void setArt(String art); @Override public void addAbility(Ability ability); diff --git a/Mage/src/mage/game/permanent/PermanentCard.java b/Mage/src/mage/game/permanent/PermanentCard.java index 12d61ca89b4..46331b49719 100644 --- a/Mage/src/mage/game/permanent/PermanentCard.java +++ b/Mage/src/mage/game/permanent/PermanentCard.java @@ -109,7 +109,6 @@ public class PermanentCard extends PermanentImpl { } this.subtype = card.getSubtype(); this.supertype = card.getSupertype(); - this.art = card.getArt(); this.expansionSetCode = card.getExpansionSetCode(); this.rarity = card.getRarity(); this.cardNumber = card.getCardNumber(); @@ -207,16 +206,6 @@ public class PermanentCard extends PermanentImpl { return false; } - @Override - public String getArt() { - return art; - } - - @Override - public void setArt(String art) { - this.art = art; - } - @Override public PermanentCard copy() { return new PermanentCard(this); diff --git a/Mage/src/mage/game/permanent/PermanentToken.java b/Mage/src/mage/game/permanent/PermanentToken.java index c73099b531a..da8654dde81 100644 --- a/Mage/src/mage/game/permanent/PermanentToken.java +++ b/Mage/src/mage/game/permanent/PermanentToken.java @@ -96,14 +96,6 @@ public class PermanentToken extends PermanentImpl { return false; } - @Override - public String getArt() { - return ""; - } - - @Override - public void setArt(String art) { } - public Token getToken() { return token; } diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java index e0f7b7fc7be..8c1431cfc1d 100644 --- a/Mage/src/mage/game/stack/Spell.java +++ b/Mage/src/mage/game/stack/Spell.java @@ -244,11 +244,6 @@ public class Spell> implements StackObject, Card { return card.getOwnerId(); } - @Override - public String getArt() { - return card.getArt(); - } - @Override public void addAbility(Ability ability) {}