diff --git a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java index b0fc9e5477b..345a66545fc 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java @@ -41,7 +41,7 @@ public final class FlaringFlameKin extends CardImpl { ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance()), enchanted, ", has trample")); - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability grantedAbility = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(grantedAbility), enchanted, ", and has \"{R}: {this} gets +1/+0 until end of turn.\"")); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java index 8779224c6df..da9c2668d74 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneCrusher.java @@ -26,7 +26,7 @@ public final class FlowstoneCrusher extends CardImpl { this.toughness = new MageInt(4); // {R}: Flowstone Crusher gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java index bf15e5e82a9..9f28d069ade 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneShambler.java @@ -26,7 +26,7 @@ public final class FlowstoneShambler extends CardImpl { this.toughness = new MageInt(2); // {R}: Flowstone Shambler gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FoulPresence.java b/Mage.Sets/src/mage/cards/f/FoulPresence.java index 80c8a539480..2afd026c49f 100644 --- a/Mage.Sets/src/mage/cards/f/FoulPresence.java +++ b/Mage.Sets/src/mage/cards/f/FoulPresence.java @@ -36,7 +36,7 @@ public final class FoulPresence extends CardImpl { this.addAbility(ability); // Enchanted creature gets -1/-1 and has "{T}: Target creature gets -1/-1 until end of turn." ability = new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability gainedAbility = new SimpleActivatedAbility( new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/g/GhostTactician.java b/Mage.Sets/src/mage/cards/g/GhostTactician.java index 073463479c5..b08967257e3 100644 --- a/Mage.Sets/src/mage/cards/g/GhostTactician.java +++ b/Mage.Sets/src/mage/cards/g/GhostTactician.java @@ -30,7 +30,7 @@ public final class GhostTactician extends CardImpl { this.toughness = new MageInt(5); // {W}, {T}, Discard a card: Creatures you control get +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java index 2d1eb884456..7689183f103 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java @@ -36,7 +36,7 @@ public final class GoblinDynamo extends CardImpl { this.addAbility(ability); //{X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java b/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java index e2e0d2cf31b..6ce84bafab1 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarVanguard.java @@ -26,7 +26,7 @@ public final class LlanowarVanguard extends CardImpl { this.toughness = new MageInt(1); // {T}: Llanowar Vanguard gets +0/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(0, 4, Duration.EndOfTurn), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java b/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java index 4bc8022e52b..49d3fd2eab8 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java @@ -33,7 +33,7 @@ public final class ObsidianAcolyte extends CardImpl { // Protection from black this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}: Target creature gains protection from black until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java b/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java index de63b8f4d58..2d99eb67e97 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java @@ -33,7 +33,7 @@ public final class ParallaxInhibitor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Parallax Inhibitor: Put a fade counter on each permanent with fading you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersAllEffect(CounterType.FADE.createInstance(), filter), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverWall.java b/Mage.Sets/src/mage/cards/q/QuicksilverWall.java index 071d4d58249..cc206aa25a1 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverWall.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverWall.java @@ -30,7 +30,7 @@ public final class QuicksilverWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {4}: Return Quicksilver Wall to its owner's hand. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java b/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java index f776ac2fb5e..0830764a3d7 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java +++ b/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java @@ -32,7 +32,7 @@ public final class SilvergladePathfinder extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {tap}, Discard a card: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SkywingAven.java b/Mage.Sets/src/mage/cards/s/SkywingAven.java index d657a83b6c0..53c9d58ed4e 100644 --- a/Mage.Sets/src/mage/cards/s/SkywingAven.java +++ b/Mage.Sets/src/mage/cards/s/SkywingAven.java @@ -30,7 +30,7 @@ public final class SkywingAven extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard a card: Return Skywing Aven to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ReturnToHandSourceEffect(), new DiscardCardCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java b/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java index 5d05386b39d..384c60a1f7b 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java @@ -38,7 +38,7 @@ public final class SoratamiMindsweeper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target player puts the top two cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new MillCardsTargetEffect(2), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetPlayer()); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TeardropKami.java b/Mage.Sets/src/mage/cards/t/TeardropKami.java index 7815032ac45..d5f1df60ad0 100644 --- a/Mage.Sets/src/mage/cards/t/TeardropKami.java +++ b/Mage.Sets/src/mage/cards/t/TeardropKami.java @@ -28,7 +28,7 @@ public final class TeardropKami extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Teardrop Kami: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -42,5 +42,3 @@ public final class TeardropKami extends CardImpl { return new TeardropKami(this); } } - - diff --git a/Mage.Sets/src/mage/cards/t/TriangleOfWar.java b/Mage.Sets/src/mage/cards/t/TriangleOfWar.java index f4a8cef656b..00161dbaaf4 100644 --- a/Mage.Sets/src/mage/cards/t/TriangleOfWar.java +++ b/Mage.Sets/src/mage/cards/t/TriangleOfWar.java @@ -25,7 +25,7 @@ public final class TriangleOfWar extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, Sacrifice Triangle of War: Target creature you control fights target creature an opponent controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new FightTargetsEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/Trollhide.java b/Mage.Sets/src/mage/cards/t/Trollhide.java index b3a6dfa440d..379124574f6 100644 --- a/Mage.Sets/src/mage/cards/t/Trollhide.java +++ b/Mage.Sets/src/mage/cards/t/Trollhide.java @@ -43,7 +43,7 @@ public final class Trollhide extends CardImpl { // Enchanted creature gets +2/+2 and has "{1}{G}: Regenerate this creature." ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, + Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility( new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}")), AttachmentType.AURA); effect.setText("and has \"{1}{G}: Regenerate this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TsabosAssassin.java b/Mage.Sets/src/mage/cards/t/TsabosAssassin.java index 413b19b432e..0fc778da3d2 100644 --- a/Mage.Sets/src/mage/cards/t/TsabosAssassin.java +++ b/Mage.Sets/src/mage/cards/t/TsabosAssassin.java @@ -38,7 +38,7 @@ public final class TsabosAssassin extends CardImpl { this.toughness = new MageInt(1); // {tap}: Destroy target creature if it shares a color with the most common color among all permanents or a color tied for most common. A creature destroyed this way can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new TsabosAssasinEffect(),new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TsabosAssasinEffect(),new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhipSergeant.java b/Mage.Sets/src/mage/cards/w/WhipSergeant.java index 222fe72e3b7..d76b0fe688d 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSergeant.java +++ b/Mage.Sets/src/mage/cards/w/WhipSergeant.java @@ -30,7 +30,7 @@ public final class WhipSergeant extends CardImpl { this.toughness = new MageInt(1); // {R}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability);