diff --git a/Mage.Sets/src/mage/cards/a/AncientGrudge.java b/Mage.Sets/src/mage/cards/a/AncientGrudge.java index d216bf04ce..9068dfe957 100644 --- a/Mage.Sets/src/mage/cards/a/AncientGrudge.java +++ b/Mage.Sets/src/mage/cards/a/AncientGrudge.java @@ -34,8 +34,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.TimingRule; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; import java.util.UUID; @@ -48,7 +47,7 @@ public class AncientGrudge extends CardImpl { // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); // Flashback {G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java index 3f5702fa38..b61d2e88a4 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java @@ -34,9 +34,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; import mage.game.permanent.token.SaprolingToken; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -50,7 +49,7 @@ public class ArtifactMutation extends CardImpl { // Destroy target artifact. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); // create X 1/1 green Saproling creature tokens, where X is that artifact's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java index 6b32ae3737..9e88fe3dbf 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishScrapper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishScrapper.java @@ -40,8 +40,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -60,7 +59,7 @@ public class ElvishScrapper extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(new FilterArtifactPermanent())); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java b/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java index a6f7c0596f..9ed3358eed 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArchaeologist.java @@ -18,11 +18,10 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; -import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -41,7 +40,7 @@ public class GoblinArchaeologist extends CardImpl { // {R}, {T]: Flip a coin. If you win the flip, destroy target artifact and untap Goblin Archaeologist. If you lose the flip, sacrifice Goblin Archaeologist. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinArchaeologistEffect(),new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(new FilterArtifactPermanent())); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/ManicVandal.java b/Mage.Sets/src/mage/cards/m/ManicVandal.java index 5ba5888727..3cbe0d120c 100644 --- a/Mage.Sets/src/mage/cards/m/ManicVandal.java +++ b/Mage.Sets/src/mage/cards/m/ManicVandal.java @@ -35,9 +35,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -54,8 +52,7 @@ public class ManicVandal extends CardImpl { this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(new FilterArtifactPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoggSalvage.java b/Mage.Sets/src/mage/cards/m/MoggSalvage.java index f67a58e9e7..70a35c91da 100644 --- a/Mage.Sets/src/mage/cards/m/MoggSalvage.java +++ b/Mage.Sets/src/mage/cards/m/MoggSalvage.java @@ -38,9 +38,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; -import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -67,7 +66,7 @@ public class MoggSalvage extends CardImpl { // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public MoggSalvage(final MoggSalvage card) { diff --git a/Mage.Sets/src/mage/cards/o/Oxidize.java b/Mage.Sets/src/mage/cards/o/Oxidize.java index 9196ba25e4..94c04d1fad 100644 --- a/Mage.Sets/src/mage/cards/o/Oxidize.java +++ b/Mage.Sets/src/mage/cards/o/Oxidize.java @@ -32,8 +32,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @author Loki @@ -44,7 +43,7 @@ public class Oxidize extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}"); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public Oxidize(final Oxidize card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTribute.java b/Mage.Sets/src/mage/cards/p/PhyrexianTribute.java index 80490dd1c5..c58fc9e169 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTribute.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTribute.java @@ -34,8 +34,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -51,7 +50,7 @@ public class PhyrexianTribute extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(2))); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public PhyrexianTribute(final PhyrexianTribute card) { diff --git a/Mage.Sets/src/mage/cards/s/Scrap.java b/Mage.Sets/src/mage/cards/s/Scrap.java index 876b04824e..38cc5da917 100644 --- a/Mage.Sets/src/mage/cards/s/Scrap.java +++ b/Mage.Sets/src/mage/cards/s/Scrap.java @@ -34,8 +34,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -47,7 +46,7 @@ public class Scrap extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/s/Shatter.java b/Mage.Sets/src/mage/cards/s/Shatter.java index 0aca2e69e3..4ace259d3e 100644 --- a/Mage.Sets/src/mage/cards/s/Shatter.java +++ b/Mage.Sets/src/mage/cards/s/Shatter.java @@ -32,8 +32,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -45,7 +44,7 @@ public class Shatter extends CardImpl { // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public Shatter (final Shatter card) { diff --git a/Mage.Sets/src/mage/cards/s/ShatteringPulse.java b/Mage.Sets/src/mage/cards/s/ShatteringPulse.java index 20447916e1..1714629d1e 100644 --- a/Mage.Sets/src/mage/cards/s/ShatteringPulse.java +++ b/Mage.Sets/src/mage/cards/s/ShatteringPulse.java @@ -30,11 +30,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.BuybackAbility; -import mage.target.TargetPermanent; -import mage.filter.common.FilterArtifactPermanent; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.target.common.TargetArtifactPermanent; /** * @@ -50,7 +49,7 @@ public class ShatteringPulse extends CardImpl { // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public ShatteringPulse(final ShatteringPulse card) { diff --git a/Mage.Sets/src/mage/cards/s/ShatteringSpree.java b/Mage.Sets/src/mage/cards/s/ShatteringSpree.java index e88e4aaf59..24cb353f7d 100644 --- a/Mage.Sets/src/mage/cards/s/ShatteringSpree.java +++ b/Mage.Sets/src/mage/cards/s/ShatteringSpree.java @@ -33,8 +33,7 @@ import mage.abilities.keyword.ReplicateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -49,7 +48,7 @@ public class ShatteringSpree extends CardImpl { this.addAbility(new ReplicateAbility(this, "{R}")); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public ShatteringSpree(final ShatteringSpree card) { diff --git a/Mage.Sets/src/mage/cards/s/Smash.java b/Mage.Sets/src/mage/cards/s/Smash.java index d5fcc6433e..6b136f2c75 100644 --- a/Mage.Sets/src/mage/cards/s/Smash.java +++ b/Mage.Sets/src/mage/cards/s/Smash.java @@ -33,8 +33,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @author Loki @@ -46,7 +45,7 @@ public class Smash extends CardImpl { // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/v/Verdigris.java b/Mage.Sets/src/mage/cards/v/Verdigris.java index b25d6cad0a..660e0dc946 100644 --- a/Mage.Sets/src/mage/cards/v/Verdigris.java +++ b/Mage.Sets/src/mage/cards/v/Verdigris.java @@ -32,8 +32,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -45,7 +44,7 @@ public class Verdigris extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}"); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); + this.getSpellAbility().addTarget(new TargetArtifactPermanent()); } public Verdigris(final Verdigris card) { diff --git a/Mage.Sets/src/mage/cards/v/ViridianCorrupter.java b/Mage.Sets/src/mage/cards/v/ViridianCorrupter.java index 0e11ffcd95..60639510b3 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianCorrupter.java +++ b/Mage.Sets/src/mage/cards/v/ViridianCorrupter.java @@ -36,9 +36,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -57,8 +55,7 @@ public class ViridianCorrupter extends CardImpl { // When Viridian Corrupter enters the battlefield, destroy target artifact. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(new FilterArtifactPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VithianRenegades.java b/Mage.Sets/src/mage/cards/v/VithianRenegades.java index e2b068957d..4e5a921d3d 100644 --- a/Mage.Sets/src/mage/cards/v/VithianRenegades.java +++ b/Mage.Sets/src/mage/cards/v/VithianRenegades.java @@ -35,8 +35,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -54,7 +53,7 @@ public class VithianRenegades extends CardImpl { // When Vithian Renegades enters the battlefield, destroy target artifact. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(new FilterArtifactPermanent())); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java b/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java index 0885fb0d39..0d6f76f1f1 100644 --- a/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java +++ b/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java @@ -44,14 +44,12 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; -import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @@ -95,8 +93,7 @@ class WerewolfRansackerAbility extends TriggeredAbilityImpl { public WerewolfRansackerAbility() { super(Zone.BATTLEFIELD, new WerewolfRansackerEffect(), true); - Target target = new TargetPermanent(new FilterArtifactPermanent()); - this.addTarget(target); + this.addTarget(new TargetArtifactPermanent()); } public WerewolfRansackerAbility(final WerewolfRansackerAbility ability) { diff --git a/Mage.Sets/src/mage/cards/y/YukiOnna.java b/Mage.Sets/src/mage/cards/y/YukiOnna.java index ce3cedb398..a37ae953de 100644 --- a/Mage.Sets/src/mage/cards/y/YukiOnna.java +++ b/Mage.Sets/src/mage/cards/y/YukiOnna.java @@ -38,8 +38,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterSpiritOrArcaneCard; -import mage.filter.common.FilterArtifactPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetArtifactPermanent; /** * @author Loki @@ -55,7 +54,7 @@ public class YukiOnna extends CardImpl { // When Yuki-Onna enters the battlefield, destroy target artifact. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(new FilterArtifactPermanent())); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Yuki-Onna to its owner's hand. this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(true), new FilterSpiritOrArcaneCard(), true));