diff --git a/Mage.Sets/src/mage/cards/c/CabalArchon.java b/Mage.Sets/src/mage/cards/c/CabalArchon.java index a700fa702ad..22719665572 100644 --- a/Mage.Sets/src/mage/cards/c/CabalArchon.java +++ b/Mage.Sets/src/mage/cards/c/CabalArchon.java @@ -39,7 +39,7 @@ public final class CabalArchon extends CardImpl { this.toughness = new MageInt(2); // {B}, Sacrifice a Cleric: Target player loses 2 life and you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}")); Effect effect = new GainLifeEffect(2); effect.setText("and you gain 2 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CabalTrainee.java b/Mage.Sets/src/mage/cards/c/CabalTrainee.java index fd6fac23686..824764e09da 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTrainee.java +++ b/Mage.Sets/src/mage/cards/c/CabalTrainee.java @@ -29,7 +29,7 @@ public final class CabalTrainee extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Cabal Trainee: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CacklingImp.java b/Mage.Sets/src/mage/cards/c/CacklingImp.java index f7959e55059..e5c9f7f28fd 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingImp.java +++ b/Mage.Sets/src/mage/cards/c/CacklingImp.java @@ -31,7 +31,7 @@ public final class CacklingImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java index 0b892ed6521..49cf0a3147e 100644 --- a/Mage.Sets/src/mage/cards/c/CadaverousKnight.java +++ b/Mage.Sets/src/mage/cards/c/CadaverousKnight.java @@ -30,7 +30,7 @@ public final class CadaverousKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {1}{B}{B}: Regenerate Cadaverous Knight. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{B}"))); } private CadaverousKnight(final CadaverousKnight card) { diff --git a/Mage.Sets/src/mage/cards/c/CalciformPools.java b/Mage.Sets/src/mage/cards/c/CalciformPools.java index 53346c4624e..e9eab23afed 100644 --- a/Mage.Sets/src/mage/cards/c/CalciformPools.java +++ b/Mage.Sets/src/mage/cards/c/CalciformPools.java @@ -31,7 +31,7 @@ public final class CalciformPools extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Put a storage counter on Calciform Pools. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, Remove X storage counters from Calciform Pools: Add X mana in any combination of {W} and/or {U}. diff --git a/Mage.Sets/src/mage/cards/c/CalderaKavu.java b/Mage.Sets/src/mage/cards/c/CalderaKavu.java index d7cb8e0150e..587e2a8adf6 100644 --- a/Mage.Sets/src/mage/cards/c/CalderaKavu.java +++ b/Mage.Sets/src/mage/cards/c/CalderaKavu.java @@ -28,9 +28,9 @@ public final class CalderaKavu extends CardImpl { this.toughness = new MageInt(2); // {1}{B}: Caldera Kavu gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); // {G}: Caldera Kavu becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private CalderaKavu(final CalderaKavu card) { diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java index 32477b03dbf..90170c4962e 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheWild.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheWild.java @@ -24,7 +24,7 @@ public final class CallOfTheWild extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}"); // {2}{G}{G}: Reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, put it into your graveyard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CallOfTheWildEffect(), new ManaCostsImpl<>("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CallOfTheWildEffect(), new ManaCostsImpl<>("{2}{G}{G}"))); } private CallOfTheWild(final CallOfTheWild card) { diff --git a/Mage.Sets/src/mage/cards/c/CallerOfGales.java b/Mage.Sets/src/mage/cards/c/CallerOfGales.java index fbddfbe6e2e..96b5f1b66ad 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfGales.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfGales.java @@ -33,7 +33,7 @@ public final class CallerOfGales extends CardImpl { this.toughness = new MageInt(1); // {1}{U}, {T}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java index 61ddb8e5de8..8f7ee193662 100644 --- a/Mage.Sets/src/mage/cards/c/CallousDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CallousDeceiver.java @@ -36,7 +36,7 @@ public final class CallousDeceiver extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, {this} gets +1/+0 and gains flying until end of turn. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CallousDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/c/CallousOppressor.java b/Mage.Sets/src/mage/cards/c/CallousOppressor.java index 690964fda6e..08905a71b70 100644 --- a/Mage.Sets/src/mage/cards/c/CallousOppressor.java +++ b/Mage.Sets/src/mage/cards/c/CallousOppressor.java @@ -49,7 +49,7 @@ public final class CallousOppressor extends CardImpl { new GainControlTargetEffect(Duration.OneUse), SourceTappedCondition.TAPPED, "Gain control of target creature for as long as {this} remains tapped"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new CallousOppressorFilter())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CanalDredger.java b/Mage.Sets/src/mage/cards/c/CanalDredger.java index 745fec83196..a17cda24833 100644 --- a/Mage.Sets/src/mage/cards/c/CanalDredger.java +++ b/Mage.Sets/src/mage/cards/c/CanalDredger.java @@ -37,7 +37,7 @@ public final class CanalDredger extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Each player passes the last card from each booster pack to a player who drafted a card named Canal Dredger - not implemented."))); // {T}: Put target card from your graveyard on the bottom of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java index b8b1a80ff8e..bfee94f79fb 100644 --- a/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java +++ b/Mage.Sets/src/mage/cards/c/CandelabraOfTawnos.java @@ -28,7 +28,7 @@ public final class CandelabraOfTawnos extends CardImpl { // {X}, {T}: Untap X target lands. Effect effect = new UntapTargetEffect(); effect.setText("untap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); ability.setTargetAdjuster(new XTargetsCountAdjuster()); diff --git a/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java b/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java index f23c3917809..8b3ce2a7cf3 100644 --- a/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java +++ b/Mage.Sets/src/mage/cards/c/CandlesOfLeng.java @@ -28,7 +28,7 @@ public final class CandlesOfLeng extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {4}, {tap}: Reveal the top card of your library. If it has the same name as a card in your graveyard, put it into your graveyard. Otherwise, draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CandlesOfLengEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CandlesOfLengEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CanopyDragon.java b/Mage.Sets/src/mage/cards/c/CanopyDragon.java index 2a14fcfc206..300603b262f 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyDragon.java +++ b/Mage.Sets/src/mage/cards/c/CanopyDragon.java @@ -35,7 +35,7 @@ public final class CanopyDragon extends CardImpl { // {1}{G}: Canopy Dragon gains flying and loses trample until end of turn. Effect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("{this} gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{G}")); effect = new LoseAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and loses trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CantinaBand.java b/Mage.Sets/src/mage/cards/c/CantinaBand.java index 933238f154b..36d2de81d0a 100644 --- a/Mage.Sets/src/mage/cards/c/CantinaBand.java +++ b/Mage.Sets/src/mage/cards/c/CantinaBand.java @@ -36,7 +36,7 @@ public final class CantinaBand extends CardImpl { this.toughness = new MageInt(1); // {T}, {1}: Tap target nonartifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CanyonDrake.java b/Mage.Sets/src/mage/cards/c/CanyonDrake.java index 9c103e72d9a..bd25368c9b3 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonDrake.java +++ b/Mage.Sets/src/mage/cards/c/CanyonDrake.java @@ -31,7 +31,7 @@ public final class CanyonDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}, Discard a card at random: Canyon Drake gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CapashenKnight.java b/Mage.Sets/src/mage/cards/c/CapashenKnight.java index b91fa037bca..0f9e596abbb 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenKnight.java +++ b/Mage.Sets/src/mage/cards/c/CapashenKnight.java @@ -30,7 +30,7 @@ public final class CapashenKnight extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {1}{W}: Capashen Knight gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private CapashenKnight(final CapashenKnight card) { diff --git a/Mage.Sets/src/mage/cards/c/CapashenStandard.java b/Mage.Sets/src/mage/cards/c/CapashenStandard.java index b6e6db81af7..b8c4f134d12 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenStandard.java +++ b/Mage.Sets/src/mage/cards/c/CapashenStandard.java @@ -40,7 +40,7 @@ public final class CapashenStandard extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {2}, Sacrifice Capashen Standard: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java index 55a4e92b63c..8a1824db865 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenTemplar.java +++ b/Mage.Sets/src/mage/cards/c/CapashenTemplar.java @@ -28,7 +28,7 @@ public final class CapashenTemplar extends CardImpl { this.toughness = new MageInt(2); // {W}: Capashen Templar gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private CapashenTemplar(final CapashenTemplar card) { diff --git a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java index a080d12ba83..39dc30d3f77 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java +++ b/Mage.Sets/src/mage/cards/c/CapashenUnicorn.java @@ -31,7 +31,7 @@ public final class CapashenUnicorn extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, {tap}, Sacrifice Capashen Unicorn: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index ebfb997e9bf..056ca56bcbb 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -46,7 +46,7 @@ public final class CaptainOfTheMists extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new UntapSourceEffect(), filter)); // {1}{U}, {tap}: You may tap or untap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CaptainSisay.java b/Mage.Sets/src/mage/cards/c/CaptainSisay.java index 1fe7331e7da..7d57746a42e 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainSisay.java +++ b/Mage.Sets/src/mage/cards/c/CaptainSisay.java @@ -37,7 +37,7 @@ public final class CaptainSisay extends CardImpl { this.toughness = new MageInt(2); // {tap}: Search your library for a legendary card, reveal that card, and put it into your hand. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new TapSourceCost())); } private CaptainSisay(final CaptainSisay card) { diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java index 2a2e358476f..c2c1f3224e8 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java @@ -45,7 +45,7 @@ public final class CaptivatingVampire extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Tap five untapped Vampires you control: Gain control of target creature. It becomes a Vampire in addition to its other types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CaptivatingVampireEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); + Ability ability = new SimpleActivatedAbility(new CaptivatingVampireEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter2, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CaptiveFlame.java b/Mage.Sets/src/mage/cards/c/CaptiveFlame.java index a78b7db6be2..1f703e98907 100644 --- a/Mage.Sets/src/mage/cards/c/CaptiveFlame.java +++ b/Mage.Sets/src/mage/cards/c/CaptiveFlame.java @@ -24,7 +24,7 @@ public final class CaptiveFlame extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // {R}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Carapace.java b/Mage.Sets/src/mage/cards/c/Carapace.java index a16077b3126..a450b9e3774 100644 --- a/Mage.Sets/src/mage/cards/c/Carapace.java +++ b/Mage.Sets/src/mage/cards/c/Carapace.java @@ -35,7 +35,7 @@ public final class Carapace extends CardImpl { // Enchanted creature gets +0/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); // Sacrifice Carapace: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } private Carapace(final Carapace card) { diff --git a/Mage.Sets/src/mage/cards/c/Caregiver.java b/Mage.Sets/src/mage/cards/c/Caregiver.java index 0277337394f..075f32f4ab3 100644 --- a/Mage.Sets/src/mage/cards/c/Caregiver.java +++ b/Mage.Sets/src/mage/cards/c/Caregiver.java @@ -34,7 +34,7 @@ public final class Caregiver extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index 20d11dd93ed..90b983d8042 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -47,13 +47,13 @@ public final class CaribouRange extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{W}{W}, {T}: Create a 0/1 white Caribou creature token." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl<>("{W}{W}")); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{W}{W}, {T}: Create a 0/1 white Caribou creature token.\""); this.addAbility(new SimpleStaticAbility(effect)); // Sacrifice a Caribou token: You gain 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/c/CarnageAltar.java b/Mage.Sets/src/mage/cards/c/CarnageAltar.java index a4310799c3b..d22b1ed4824 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageAltar.java +++ b/Mage.Sets/src/mage/cards/c/CarnageAltar.java @@ -22,7 +22,7 @@ public final class CarnageAltar extends CardImpl { public CarnageAltar(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java index 357f9323479..a610925edcb 100644 --- a/Mage.Sets/src/mage/cards/c/CarnageGladiator.java +++ b/Mage.Sets/src/mage/cards/c/CarnageGladiator.java @@ -33,7 +33,7 @@ public final class CarnageGladiator extends CardImpl { this.addAbility(new CarnageGladiatorTriggeredAbility()); // {1}{B}{R}: Renegerate Carnage Gladiator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(),new ManaCostsImpl<>("{1}{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(),new ManaCostsImpl<>("{1}{B}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/c/Carnassid.java b/Mage.Sets/src/mage/cards/c/Carnassid.java index 9826e6092bf..3ff076f2d85 100644 --- a/Mage.Sets/src/mage/cards/c/Carnassid.java +++ b/Mage.Sets/src/mage/cards/c/Carnassid.java @@ -29,7 +29,7 @@ public final class Carnassid extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {1}{G}: Regenerate Carnassid. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private Carnassid(final Carnassid card) { diff --git a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java index 670356a0ab7..8c81dae9adb 100644 --- a/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java +++ b/Mage.Sets/src/mage/cards/c/CarnivorousMossBeast.java @@ -29,7 +29,7 @@ public final class CarnivorousMossBeast extends CardImpl { this.toughness = new MageInt(5); // {5}{G}{G}: Put a +1/+1 counter on Carnivorous Moss-Beast. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{5}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{5}{G}{G}"))); } private CarnivorousMossBeast(final CarnivorousMossBeast card) { diff --git a/Mage.Sets/src/mage/cards/c/CarrionAnts.java b/Mage.Sets/src/mage/cards/c/CarrionAnts.java index ac7d277b66f..d0e805c957d 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionAnts.java +++ b/Mage.Sets/src/mage/cards/c/CarrionAnts.java @@ -26,7 +26,7 @@ public final class CarrionAnts extends CardImpl { this.toughness = new MageInt(1); // {1}: Carrion Ants gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java index b4beb79ff3c..f0fa956f9b9 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionBeetles.java +++ b/Mage.Sets/src/mage/cards/c/CarrionBeetles.java @@ -28,7 +28,7 @@ public final class CarrionBeetles extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, {T}: Exile up to three target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 3, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CarrionHowler.java b/Mage.Sets/src/mage/cards/c/CarrionHowler.java index 856defc68ff..4d884bd98e0 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionHowler.java +++ b/Mage.Sets/src/mage/cards/c/CarrionHowler.java @@ -28,7 +28,7 @@ public final class CarrionHowler extends CardImpl { this.toughness = new MageInt(2); // Pay 1 life: Carrion Howler gets +2/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -1, Duration.EndOfTurn), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -1, Duration.EndOfTurn), new PayLifeCost(1))); } private CarrionHowler(final CarrionHowler card) { diff --git a/Mage.Sets/src/mage/cards/c/CarrionWall.java b/Mage.Sets/src/mage/cards/c/CarrionWall.java index a85aa5682ec..759b86a031e 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionWall.java +++ b/Mage.Sets/src/mage/cards/c/CarrionWall.java @@ -29,7 +29,7 @@ public final class CarrionWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{B}: Regenerate Carrion Wall. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private CarrionWall(final CarrionWall card) { diff --git a/Mage.Sets/src/mage/cards/c/CatapultMaster.java b/Mage.Sets/src/mage/cards/c/CatapultMaster.java index a6cef771cb2..c4829cbf0a0 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultMaster.java +++ b/Mage.Sets/src/mage/cards/c/CatapultMaster.java @@ -38,7 +38,7 @@ public final class CatapultMaster extends CardImpl { this.toughness = new MageInt(3); // Tap five untapped Soldiers you control: Exile target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CatapultSquad.java b/Mage.Sets/src/mage/cards/c/CatapultSquad.java index e9c75b770f7..ab28ba6efdd 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultSquad.java +++ b/Mage.Sets/src/mage/cards/c/CatapultSquad.java @@ -39,7 +39,7 @@ public final class CatapultSquad extends CardImpl { this.toughness = new MageInt(1); // Tap two untapped Soldiers you control: Catapult Squad deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranBrute.java b/Mage.Sets/src/mage/cards/c/CateranBrute.java index 35ac5ea0ccc..04821485eca 100644 --- a/Mage.Sets/src/mage/cards/c/CateranBrute.java +++ b/Mage.Sets/src/mage/cards/c/CateranBrute.java @@ -41,7 +41,7 @@ public final class CateranBrute extends CardImpl { this.toughness = new MageInt(2); // {2}, {T}: Search your library for a Mercenary permanent card with converted mana cost 2 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java index bed35f07988..cd45d11e256 100644 --- a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java +++ b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java @@ -45,7 +45,7 @@ public final class CateranEnforcer extends CardImpl { this.addAbility(FearAbility.getInstance()); // {4}, {T}: Search your library for a Mercenary permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(4)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java index ada5b879e10..20ea4aeae55 100644 --- a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java +++ b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java @@ -40,7 +40,7 @@ public final class CateranKidnappers extends CardImpl { this.toughness = new MageInt(2); // {3}, {T}: Search your library for a Mercenary permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranOverlord.java b/Mage.Sets/src/mage/cards/c/CateranOverlord.java index 0b5e00bec15..5040e4733e1 100644 --- a/Mage.Sets/src/mage/cards/c/CateranOverlord.java +++ b/Mage.Sets/src/mage/cards/c/CateranOverlord.java @@ -44,11 +44,11 @@ public final class CateranOverlord extends CardImpl { this.toughness = new MageInt(5); // Sacrifice a creature: Regenerate Cateran Overlord. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); // {6}, {T}: Search your library for a Mercenary permanent card with converted mana cost 6 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranPersuader.java b/Mage.Sets/src/mage/cards/c/CateranPersuader.java index 71a3564b25f..98669eb8a16 100644 --- a/Mage.Sets/src/mage/cards/c/CateranPersuader.java +++ b/Mage.Sets/src/mage/cards/c/CateranPersuader.java @@ -41,7 +41,7 @@ public final class CateranPersuader extends CardImpl { this.toughness = new MageInt(1); // {1}, {T}: Search your library for a Mercenary permanent card with converted mana cost 1 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CateranSlaver.java b/Mage.Sets/src/mage/cards/c/CateranSlaver.java index 418e9ff8cc3..eeff750768e 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CateranSlaver.java @@ -43,7 +43,7 @@ public final class CateranSlaver extends CardImpl { this.addAbility(new SwampwalkAbility()); // {5}, {T}: Search your library for a Mercenary permanent card with converted mana cost 5 or less and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CatharCommando.java b/Mage.Sets/src/mage/cards/c/CatharCommando.java index 395e4626132..ac951d101f4 100644 --- a/Mage.Sets/src/mage/cards/c/CatharCommando.java +++ b/Mage.Sets/src/mage/cards/c/CatharCommando.java @@ -30,7 +30,7 @@ public final class CatharCommando extends CardImpl { this.addAbility(FlashAbility.getInstance()); // {1}, Sacrifice Cathar Commando: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java b/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java index be0507b42b0..49d6eac6183 100644 --- a/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java +++ b/Mage.Sets/src/mage/cards/c/CauldronOfSouls.java @@ -28,7 +28,7 @@ public final class CauldronOfSouls extends CardImpl { // {tap}: Choose any number of target creatures. Each of those creatures gains persist until end of turn. Effect effect = new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn); effect.setText("choose any number of target creatures. Each of those creatures gains persist until end of turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE, StaticFilters.FILTER_PERMANENT_CREATURE, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java index ea55883c59e..2837178a2f7 100644 --- a/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java +++ b/Mage.Sets/src/mage/cards/c/CausticCaterpillar.java @@ -30,7 +30,7 @@ public final class CausticCaterpillar extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Caustic Caterpillar: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CausticTar.java b/Mage.Sets/src/mage/cards/c/CausticTar.java index 072df12adab..7c05e83a56d 100644 --- a/Mage.Sets/src/mage/cards/c/CausticTar.java +++ b/Mage.Sets/src/mage/cards/c/CausticTar.java @@ -36,7 +36,7 @@ public final class CausticTar extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target player loses 3 life." - Ability tarAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new TapSourceCost()); + Ability tarAbility = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new TapSourceCost()); tarAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(tarAbility, AttachmentType.AURA, Duration.WhileOnBattlefield,"Enchanted land has \"{T}: Target player loses 3 life.\""))); diff --git a/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java b/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java index f41ed1b6973..7798bd24491 100644 --- a/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java +++ b/Mage.Sets/src/mage/cards/c/CaveOfTheFrostDragon.java @@ -44,7 +44,7 @@ public final class CaveOfTheFrostDragon extends CardImpl { this.addAbility(new WhiteManaAbility()); // {4}{W}: Cave of the Frost Dragon becomes a 3/4 white Dragon creature with flying until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 4, "3/4 white Dragon creature with flying") .withColor("W") .withSubType(SubType.DRAGON) diff --git a/Mage.Sets/src/mage/cards/c/CavePeople.java b/Mage.Sets/src/mage/cards/c/CavePeople.java index cf326643e0f..b5346ab3ece 100644 --- a/Mage.Sets/src/mage/cards/c/CavePeople.java +++ b/Mage.Sets/src/mage/cards/c/CavePeople.java @@ -35,7 +35,7 @@ public final class CavePeople extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(1, -2, Duration.EndOfTurn), false)); // {1}{R}{R}, {tap}: Target creature gains mountainwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new MountainwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new MountainwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CavernCrawler.java b/Mage.Sets/src/mage/cards/c/CavernCrawler.java index 860671b51fe..ba8dddad025 100644 --- a/Mage.Sets/src/mage/cards/c/CavernCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CavernCrawler.java @@ -30,7 +30,7 @@ public final class CavernCrawler extends CardImpl { this.addAbility(new MountainwalkAbility()); // {R}: Cavern Crawler gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private CavernCrawler(final CavernCrawler card) { diff --git a/Mage.Sets/src/mage/cards/c/CavernHarpy.java b/Mage.Sets/src/mage/cards/c/CavernHarpy.java index 834ce621f07..d6b8f8d0d4d 100644 --- a/Mage.Sets/src/mage/cards/c/CavernHarpy.java +++ b/Mage.Sets/src/mage/cards/c/CavernHarpy.java @@ -44,7 +44,7 @@ public final class CavernHarpy extends CardImpl { // When Cavern Harpy enters the battlefield, return a blue or black creature you control to its owner's hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter), false)); // Pay 1 life: Return Cavern Harpy to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(1))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayLifeCost(1))); } private CavernHarpy(final CavernHarpy card) { diff --git a/Mage.Sets/src/mage/cards/c/CavernThoctar.java b/Mage.Sets/src/mage/cards/c/CavernThoctar.java index f60399a6226..d89e4d7c995 100644 --- a/Mage.Sets/src/mage/cards/c/CavernThoctar.java +++ b/Mage.Sets/src/mage/cards/c/CavernThoctar.java @@ -26,7 +26,7 @@ public final class CavernThoctar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private CavernThoctar(final CavernThoctar card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java index 1183bf95990..17054982509 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java +++ b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java @@ -35,7 +35,7 @@ public final class CelestialColonnade extends CardImpl { this.addAbility(new WhiteManaAbility()); // {3}{W}{U}: Until end of turn, Celestial Colonnade becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(4, 4, "4/4 white and blue Elemental creature with flying and vigilance") .withColor("WU") .withSubType(SubType.ELEMENTAL) diff --git a/Mage.Sets/src/mage/cards/c/CellarDoor.java b/Mage.Sets/src/mage/cards/c/CellarDoor.java index 26f7c3683e3..8f0ba428501 100644 --- a/Mage.Sets/src/mage/cards/c/CellarDoor.java +++ b/Mage.Sets/src/mage/cards/c/CellarDoor.java @@ -28,7 +28,7 @@ public final class CellarDoor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Target player puts the bottom card of their library into their graveyard. If it's a creature card, you create a 2/2 black Zombie creature token. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CellarDoorEffect(), new GenericManaCost(3)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CellarDoorEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index acd3bf384e1..8b5f5fd7655 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -44,7 +44,7 @@ public final class CemeteryReaper extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {2}{B}, {T} : Exile target creature card from a graveyard. Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateTokenEffect(new ZombieToken())); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/c/CennsTactician.java b/Mage.Sets/src/mage/cards/c/CennsTactician.java index 711c5ef7d97..2bc13f43866 100644 --- a/Mage.Sets/src/mage/cards/c/CennsTactician.java +++ b/Mage.Sets/src/mage/cards/c/CennsTactician.java @@ -37,7 +37,7 @@ public final class CennsTactician extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Put a +1/+1 counter on target Soldier creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filterSoldier)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CentaurArcher.java b/Mage.Sets/src/mage/cards/c/CentaurArcher.java index 8dc75effa43..b848646cc85 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurArcher.java +++ b/Mage.Sets/src/mage/cards/c/CentaurArcher.java @@ -38,7 +38,7 @@ public final class CentaurArcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: Centaur Archer deals 1 damage to target creature with flying. - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability activatedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/cards/c/CentaurGlade.java b/Mage.Sets/src/mage/cards/c/CentaurGlade.java index 2036da19bf0..4ea34d0fd41 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGlade.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGlade.java @@ -21,7 +21,7 @@ public final class CentaurGlade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{G}"); // {2}{G}{G}: Create a 3/3 green Centaur creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl<>("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl<>("{2}{G}{G}"))); } private CentaurGlade(final CentaurGlade card) { diff --git a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java index 1a653f4c9e0..662fea5b9f3 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurVeteran.java +++ b/Mage.Sets/src/mage/cards/c/CentaurVeteran.java @@ -30,7 +30,7 @@ public final class CentaurVeteran extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {G}, Discard a card: Regenerate Centaur Veteran. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CentaursHerald.java b/Mage.Sets/src/mage/cards/c/CentaursHerald.java index b0df14fc535..f0bf852949c 100644 --- a/Mage.Sets/src/mage/cards/c/CentaursHerald.java +++ b/Mage.Sets/src/mage/cards/c/CentaursHerald.java @@ -30,7 +30,7 @@ public final class CentaursHerald extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, Sacrifice Centaur's Herald: Create a 3/3 green Centaur creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidBroker.java b/Mage.Sets/src/mage/cards/c/CephalidBroker.java index 45579c298b7..670c1bfdee6 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidBroker.java +++ b/Mage.Sets/src/mage/cards/c/CephalidBroker.java @@ -29,7 +29,7 @@ public final class CephalidBroker extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target player draws two cards, then discards two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardTargetEffect(2), new TapSourceCost()); ability.addEffect(new DiscardTargetEffect(2).setText(", then discards two cards")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java index 3bbeca35460..fa7fa79dc81 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java @@ -41,7 +41,7 @@ public final class CephalidIllusionist extends CardImpl { Effect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); // and dealt by target creature you control this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{U}")); effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("and dealt by target creature you control this turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java index ff87b6306c3..03935c83147 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidRetainer.java +++ b/Mage.Sets/src/mage/cards/c/CephalidRetainer.java @@ -38,7 +38,7 @@ public final class CephalidRetainer extends CardImpl { this.toughness = new MageInt(3); // {U}{U}: Tap target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidScout.java b/Mage.Sets/src/mage/cards/c/CephalidScout.java index 2cb46ac9243..0e6271b4424 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidScout.java +++ b/Mage.Sets/src/mage/cards/c/CephalidScout.java @@ -34,7 +34,7 @@ public final class CephalidScout extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{U}, Sacrifice a land: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java index 29750705037..c8d7f7ccde8 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java @@ -34,7 +34,7 @@ public final class CephalidSnitch extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Cephalid Snitch: Target creature loses protection from black until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CephalidSnitchEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CephalidSnitchEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java index 40c6d7b76b5..989a8ccebac 100644 --- a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java +++ b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java @@ -32,7 +32,7 @@ public final class CeruleanSphinx extends CardImpl { // {U}: Cerulean Sphinx's owner shuffles it into their library. Effect effect = new ShuffleIntoLibrarySourceEffect(); effect.setText("{this}'s owner shuffles it into their library."); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}"))); } private CeruleanSphinx(final CeruleanSphinx card) { diff --git a/Mage.Sets/src/mage/cards/c/CetaDisciple.java b/Mage.Sets/src/mage/cards/c/CetaDisciple.java index 4f3479dbd58..8e481f33a3e 100644 --- a/Mage.Sets/src/mage/cards/c/CetaDisciple.java +++ b/Mage.Sets/src/mage/cards/c/CetaDisciple.java @@ -30,7 +30,7 @@ public final class CetaDisciple extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability firstAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); diff --git a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java index b404b090605..3d40820b2cd 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java +++ b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java @@ -55,7 +55,7 @@ public final class ChainerDementiaMaster extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, false))); // {B}{B}{B}, Pay 3 life: Put target creature card from a graveyard onto the battlefield under your control. That creature is black and is a Nightmare in addition to its other creature types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChainerDementiaMasterEffect(), new ManaCostsImpl<>("{B}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ChainerDementiaMasterEffect(), new ManaCostsImpl<>("{B}{B}{B}")); ability.addCost(new PayLifeCost(3)); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java b/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java index 2ee61966597..7a3263e9c24 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfDeath.java @@ -25,7 +25,7 @@ public final class ChaliceOfDeath extends CardImpl { this.nightCard = true; // {tap}: Target player loses 5 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(5), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(5), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java b/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java index 3540c3edc55..8f436e29e57 100644 --- a/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java +++ b/Mage.Sets/src/mage/cards/c/ChaliceOfLife.java @@ -30,7 +30,7 @@ public final class ChaliceOfLife extends CardImpl { // {tap}: You gain 1 life. Then if you have at least 10 life more than your starting life total, transform Chalice of Life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChaliceOfLifeEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new ChaliceOfLifeEffect(), new TapSourceCost())); } private ChaliceOfLife(final ChaliceOfLife card) { diff --git a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java index eda43ffe3f9..94d0ae379a7 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java @@ -38,7 +38,7 @@ public final class ChamberOfManipulation extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}, Discard a card: Gain control of target creature until end of turn." - Ability controlAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability controlAbility = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.EndOfTurn), new TapSourceCost()); controlAbility.addTarget(new TargetCreaturePermanent()); controlAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(controlAbility, AttachmentType.AURA, diff --git a/Mage.Sets/src/mage/cards/c/ChamberSentry.java b/Mage.Sets/src/mage/cards/c/ChamberSentry.java index f3e9ec0aba0..6f5d4ab3b1a 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberSentry.java +++ b/Mage.Sets/src/mage/cards/c/ChamberSentry.java @@ -46,7 +46,7 @@ public final class ChamberSentry extends CardImpl { "with a +1/+1 counter on it for each color of mana spent to cast it")); // {X}, {T}, Remove X +1/+1 counters from Chamber Sentry: It deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance) .setText("It deals X damage to any target"), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java index b808ed365c4..7962732fe8b 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java @@ -49,7 +49,7 @@ public final class ChampionOfStraySouls extends CardImpl { // {3}{B}{B}, {T}, Sacrifice X other creatures: Return X target creatures from your graveyard to the battlefield. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); effect.setText("Return X target creature cards from your graveyard to the battlefield"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{B}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeXTargetCost(filter)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/c/Chandler.java b/Mage.Sets/src/mage/cards/c/Chandler.java index d6ea428151e..9a87640b874 100644 --- a/Mage.Sets/src/mage/cards/c/Chandler.java +++ b/Mage.Sets/src/mage/cards/c/Chandler.java @@ -38,7 +38,7 @@ public final class Chandler extends CardImpl { this.toughness = new MageInt(3); // {R}{R}{R}, {tap}: Destroy target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java b/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java index 07e7a9122ee..10885efa17e 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java +++ b/Mage.Sets/src/mage/cards/c/ChandraFireOfKaladesh.java @@ -50,7 +50,7 @@ public final class ChandraFireOfKaladesh extends CardImpl { // {T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new ExileAndReturnSourceEffect(PutCards.BATTLEFIELD_TRANSFORMED,Pronoun.SHE), new SourceDealtDamageCondition(3))); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability, new DamageDoneWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CharRumbler.java b/Mage.Sets/src/mage/cards/c/CharRumbler.java index 3c4c44a02f8..ad982ad0640 100644 --- a/Mage.Sets/src/mage/cards/c/CharRumbler.java +++ b/Mage.Sets/src/mage/cards/c/CharRumbler.java @@ -29,7 +29,7 @@ public final class CharRumbler extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // {R}: Char-Rumbler gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private CharRumbler(final CharRumbler card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingTroll.java b/Mage.Sets/src/mage/cards/c/ChargingTroll.java index 9e12cea803c..335cd3ffb47 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingTroll.java +++ b/Mage.Sets/src/mage/cards/c/ChargingTroll.java @@ -30,7 +30,7 @@ public final class ChargingTroll extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {G}: Regenerate Charging Troll. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CharmPeddler.java b/Mage.Sets/src/mage/cards/c/CharmPeddler.java index c0a8df8f1bc..c157be5a505 100644 --- a/Mage.Sets/src/mage/cards/c/CharmPeddler.java +++ b/Mage.Sets/src/mage/cards/c/CharmPeddler.java @@ -31,7 +31,7 @@ public final class CharmPeddler extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}, Discard a card: The next time a source of your choice would deal damage to target creature this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java index ea894945ab8..f2830d3b257 100644 --- a/Mage.Sets/src/mage/cards/c/ChartoothCougar.java +++ b/Mage.Sets/src/mage/cards/c/ChartoothCougar.java @@ -29,7 +29,7 @@ public final class ChartoothCougar extends CardImpl { this.toughness = new MageInt(4); // {R}: Chartooth Cougar gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // Mountaincycling {2} this.addAbility(new MountaincyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java index 24773df3209..cc6e611327f 100644 --- a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java +++ b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java @@ -46,7 +46,7 @@ public final class ChickenALaKing extends CardImpl { this.addAbility(new ChickenALaKingTriggeredAbility()); // Tap an untapped Bird you control: Roll a six-sided die. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(new RollDiceEffect(6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); } private ChickenALaKing(final ChickenALaKing card) { diff --git a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java index d7c6cf87c13..abfff99e1c6 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfGaea.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfGaea.java @@ -31,7 +31,7 @@ public final class ChildOfGaea extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{G}")))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private ChildOfGaea(final ChildOfGaea card) { diff --git a/Mage.Sets/src/mage/cards/c/ChildOfThorns.java b/Mage.Sets/src/mage/cards/c/ChildOfThorns.java index 4e4623a6ea4..4631cc7d29f 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfThorns.java @@ -28,7 +28,7 @@ public final class ChildOfThorns extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Child of Thorns: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java b/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java index cb822bb779c..9d70a8b80f2 100644 --- a/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java +++ b/Mage.Sets/src/mage/cards/c/ChildrenOfKorlis.java @@ -33,7 +33,7 @@ public final class ChildrenOfKorlis extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Children of Korlis: You gain life equal to the life you've lost this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainLifeEffect(new SourceControllerLostLifeCount(),"You gain life equal to the life you've lost this turn"), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/c/ChillingApparition.java b/Mage.Sets/src/mage/cards/c/ChillingApparition.java index 79285022287..ff116806d63 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingApparition.java +++ b/Mage.Sets/src/mage/cards/c/ChillingApparition.java @@ -27,7 +27,7 @@ public final class ChillingApparition extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Chilling Apparition. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Whenever Chilling Apparition deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); } diff --git a/Mage.Sets/src/mage/cards/c/ChillingShade.java b/Mage.Sets/src/mage/cards/c/ChillingShade.java index db0477a243f..3a953bf2e0c 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingShade.java +++ b/Mage.Sets/src/mage/cards/c/ChillingShade.java @@ -31,7 +31,7 @@ public final class ChillingShade extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {S}: Chilling Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); } private ChillingShade(final ChillingShade card) { diff --git a/Mage.Sets/src/mage/cards/c/ChimericEgg.java b/Mage.Sets/src/mage/cards/c/ChimericEgg.java index 23dfe6018f8..c0217f7e4ab 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericEgg.java +++ b/Mage.Sets/src/mage/cards/c/ChimericEgg.java @@ -40,7 +40,7 @@ public final class ChimericEgg extends CardImpl { this.addAbility(new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), nonArtifactFilter, false)); // Remove three charge counters from Chimeric Egg: Chimeric Egg becomes a 6/6 Construct artifact creature with trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(6, 6, "6/6 Construct artifact creature with trample") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT) diff --git a/Mage.Sets/src/mage/cards/c/ChimericIdol.java b/Mage.Sets/src/mage/cards/c/ChimericIdol.java index bbc8473deac..22123da1e99 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java +++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java @@ -26,7 +26,7 @@ public final class ChimericIdol extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {0}: Tap all lands you control. Chimeric Idol becomes a 3/3 Turtle artifact creature until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(new FilterControlledLandPermanent("lands you control")), new ManaCostsImpl<>("{0}")); + Ability ability = new SimpleActivatedAbility(new TapAllEffect(new FilterControlledLandPermanent("lands you control")), new ManaCostsImpl<>("{0}")); ability.addEffect(new BecomesCreatureSourceEffect( new CreatureToken(3, 3, "3/3 Turtle artifact creature") .withSubType(SubType.TURTLE) diff --git a/Mage.Sets/src/mage/cards/c/ChimericMass.java b/Mage.Sets/src/mage/cards/c/ChimericMass.java index 757f09251ae..a86eca8020e 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericMass.java +++ b/Mage.Sets/src/mage/cards/c/ChimericMass.java @@ -30,7 +30,7 @@ public final class ChimericMass extends CardImpl { // {1}: Until end of turn, Chimeric Mass becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it." CountersSourceCount count = new CountersSourceCount(CounterType.CHARGE); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(0, 0, "Construct artifact creature with \"This creature's power and toughness are each equal to the number of charge counters on it.\"") .withType(CardType.ARTIFACT) .withSubType(SubType.CONSTRUCT) diff --git a/Mage.Sets/src/mage/cards/c/ChimericSphere.java b/Mage.Sets/src/mage/cards/c/ChimericSphere.java index 40bb8b4ec59..dd7c0146354 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericSphere.java +++ b/Mage.Sets/src/mage/cards/c/ChimericSphere.java @@ -26,7 +26,7 @@ public final class ChimericSphere extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}: Until end of turn, Chimeric Sphere becomes a 2/1 Construct artifact creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(2, 1, "2/1 Construct artifact creature with flying") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT) @@ -34,7 +34,7 @@ public final class ChimericSphere extends CardImpl { CardType.ARTIFACT, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}"))); // {2}: Until end of turn, Chimeric Sphere becomes a 3/2 Construct artifact creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 2, "3/2 Construct artifact creature") .withSubType(SubType.CONSTRUCT) .withType(CardType.ARTIFACT), diff --git a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java index cebfe7fabdc..603907e8276 100644 --- a/Mage.Sets/src/mage/cards/c/ChirrutImwe.java +++ b/Mage.Sets/src/mage/cards/c/ChirrutImwe.java @@ -43,7 +43,7 @@ public final class ChirrutImwe extends CardImpl { // {1}{W}: Prevent all combat damage that would be dealt to Chirrut Imwe until end of turn. Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); effect.setText("Prevent all combat damage that would be dealt to {this} until end of turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}"))); } private ChirrutImwe(final ChirrutImwe card) { diff --git a/Mage.Sets/src/mage/cards/c/ChitteringWitch.java b/Mage.Sets/src/mage/cards/c/ChitteringWitch.java index fa21160b9bb..3f1356ced0c 100644 --- a/Mage.Sets/src/mage/cards/c/ChitteringWitch.java +++ b/Mage.Sets/src/mage/cards/c/ChitteringWitch.java @@ -43,7 +43,7 @@ public final class ChitteringWitch extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // {1}{B}, Sacrifice a creature: Target creature gets -2/-2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java index 206174cb155..664608f5dba 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimAlchemist.java @@ -36,7 +36,7 @@ public final class ChoArrimAlchemist extends CardImpl { this.toughness = new MageInt(1); // {1}{W}{W}, {tap}, Discard a card: The next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChoArrimAlchemistEffect(), new ManaCostsImpl<>("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new ChoArrimAlchemistEffect(), new ManaCostsImpl<>("{1}{W}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java index 948760d7298..e4cf9913614 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java +++ b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java @@ -41,7 +41,7 @@ public final class ChokingRestraints extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // {3}{W}{W}, Sacrifice Choking Restraints: Exile enchanted creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAttachedEffect(), new ManaCostsImpl<>("{3}{W}{W}")); + ability = new SimpleActivatedAbility(new ExileAttachedEffect(), new ManaCostsImpl<>("{3}{W}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java index b52ded12bbe..d0d6472ed4e 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java +++ b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java @@ -41,7 +41,7 @@ public final class ChosenOfMarkov extends CardImpl { // {tap}, Tap an untapped Vampire you control: Transform Chosen of Markov. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TransformSourceEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Chronomaton.java b/Mage.Sets/src/mage/cards/c/Chronomaton.java index cfd8529fe46..b4f539f8a80 100644 --- a/Mage.Sets/src/mage/cards/c/Chronomaton.java +++ b/Mage.Sets/src/mage/cards/c/Chronomaton.java @@ -29,7 +29,7 @@ public final class Chronomaton extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}: Put a +1/+1 counter on Chronomaton. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CinderElemental.java b/Mage.Sets/src/mage/cards/c/CinderElemental.java index c965f0950fb..614a9c4f6a7 100644 --- a/Mage.Sets/src/mage/cards/c/CinderElemental.java +++ b/Mage.Sets/src/mage/cards/c/CinderElemental.java @@ -31,7 +31,7 @@ public final class CinderElemental extends CardImpl { this.toughness = new MageInt(2); // {X}{R}, {tap}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}{R}")); + Ability 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/c/CinderPyromancer.java b/Mage.Sets/src/mage/cards/c/CinderPyromancer.java index 4594206425f..8724515bc19 100644 --- a/Mage.Sets/src/mage/cards/c/CinderPyromancer.java +++ b/Mage.Sets/src/mage/cards/c/CinderPyromancer.java @@ -38,7 +38,7 @@ public final class CinderPyromancer extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); diff --git a/Mage.Sets/src/mage/cards/c/CinderShade.java b/Mage.Sets/src/mage/cards/c/CinderShade.java index 5ba6e2076c1..cf38da3d4ff 100644 --- a/Mage.Sets/src/mage/cards/c/CinderShade.java +++ b/Mage.Sets/src/mage/cards/c/CinderShade.java @@ -31,10 +31,10 @@ public final class CinderShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Cinder Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {R}, Sacrifice Cinder Shade: Cinder Shade deals damage equal to its power to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("It deals damage equal to its power to target creature"), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/Cinderbones.java b/Mage.Sets/src/mage/cards/c/Cinderbones.java index fdc43b569ba..859bffb09a5 100644 --- a/Mage.Sets/src/mage/cards/c/Cinderbones.java +++ b/Mage.Sets/src/mage/cards/c/Cinderbones.java @@ -28,7 +28,7 @@ public final class Cinderbones extends CardImpl { this.toughness = new MageInt(1); this.addAbility(WitherAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private Cinderbones(final Cinderbones card) { diff --git a/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java b/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java index 47fd30cb2f2..a7cf0dbcf05 100644 --- a/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java +++ b/Mage.Sets/src/mage/cards/c/CinderhazeWretch.java @@ -40,7 +40,7 @@ public final class CinderhazeWretch extends CardImpl { this.addAbility(ability); // Put a -1/-1 counter on Cinderhaze Wretch: Untap Cinderhaze Wretch. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance(1)))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new PutCountersSourceCost(CounterType.M1M1.createInstance(1)))); } @@ -52,4 +52,4 @@ public final class CinderhazeWretch extends CardImpl { public CinderhazeWretch copy() { return new CinderhazeWretch(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java index 4439aa712fd..9a73859f84f 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionArtifacts.java @@ -30,7 +30,7 @@ public final class CircleOfProtectionArtifacts extends CardImpl { // {2}: The next time an artifact source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}"))); } private CircleOfProtectionArtifacts(final CircleOfProtectionArtifacts card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java index 04ae99ce2c9..a42b75122cf 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlack.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionBlack extends CardImpl { // {1}: The next time a black source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionBlack(final CircleOfProtectionBlack card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java index f8427073049..7a52cc659bd 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionBlue.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionBlue extends CardImpl { // {1}: The next time a blue source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionBlue(final CircleOfProtectionBlue card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java index 642c7a50783..ab565226201 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionGreen.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionGreen extends CardImpl { // {1}: The next time a green source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionGreen(final CircleOfProtectionGreen card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java index 97f0bece75a..7ed4b49518e 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionRed.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionRed extends CardImpl { // {1}: The next time a red source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionRed(final CircleOfProtectionRed card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java index a3a8f069dfa..7eaa168dc64 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionShadow.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionShadow extends CardImpl { // {1}: The next time a creature of your choice with shadow would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); effect.setText("The next time a creature of your choice with shadow would deal damage to you this turn, prevent that damage"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionShadow(final CircleOfProtectionShadow card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java index b94573a3df2..39c6d8ae8bb 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java @@ -33,7 +33,7 @@ public final class CircleOfProtectionWhite extends CardImpl { // {1}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}"))); } private CircleOfProtectionWhite(final CircleOfProtectionWhite card) { diff --git a/Mage.Sets/src/mage/cards/c/CircleOfSolace.java b/Mage.Sets/src/mage/cards/c/CircleOfSolace.java index 53eee7dae07..02513f84e0c 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfSolace.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfSolace.java @@ -26,7 +26,7 @@ public final class CircleOfSolace extends CardImpl { // As Circle of Solace enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Neutral))); // {1}{W}: The next time a creature of the chosen type would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CircleOfSolaceEffect(), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CircleOfSolaceEffect(), new ManaCostsImpl<>("{1}{W}"))); } private CircleOfSolace(final CircleOfSolace card) { diff --git a/Mage.Sets/src/mage/cards/c/CityOfShadows.java b/Mage.Sets/src/mage/cards/c/CityOfShadows.java index 1a260c13fb7..f67dc011964 100644 --- a/Mage.Sets/src/mage/cards/c/CityOfShadows.java +++ b/Mage.Sets/src/mage/cards/c/CityOfShadows.java @@ -27,7 +27,7 @@ public final class CityOfShadows extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {T}, Exile a creature you control: Put a storage counter on City of Shadows. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost()); ability.addCost(new ExileTargetCost(new TargetControlledCreaturePermanent(StaticFilters.FILTER_CONTROLLED_A_CREATURE))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java index 51c905b5b96..2cbd31e078b 100644 --- a/Mage.Sets/src/mage/cards/c/CivicGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CivicGuildmage.java @@ -32,13 +32,13 @@ public final class CivicGuildmage extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Target creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}, {tap}: Put target creature you control on top of its owner's library. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); + ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CivilizedScholar.java b/Mage.Sets/src/mage/cards/c/CivilizedScholar.java index 3f9dae4d5b5..8baaa504abc 100644 --- a/Mage.Sets/src/mage/cards/c/CivilizedScholar.java +++ b/Mage.Sets/src/mage/cards/c/CivilizedScholar.java @@ -35,7 +35,7 @@ public final class CivilizedScholar extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card, then discard a card. If a creature card is discarded this way, untap Civilized Scholar, then transform it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CivilizedScholarEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CivilizedScholarEffect(), new TapSourceCost())); this.addAbility(new TransformAbility()); } diff --git a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java index 4c2aff1899d..1c90ffd7910 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java @@ -36,7 +36,7 @@ public final class ClaimOfErebos extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{B}, {T}: Target player loses 2 life." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); + Ability grantedAbility = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfGix.java b/Mage.Sets/src/mage/cards/c/ClawsOfGix.java index 989826adc5b..cb0ea5ae474 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfGix.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfGix.java @@ -22,7 +22,7 @@ public final class ClawsOfGix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); //{1}, Sacrifice a permanent: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ClayStatue.java b/Mage.Sets/src/mage/cards/c/ClayStatue.java index f5dfd151f3f..66ae29256df 100644 --- a/Mage.Sets/src/mage/cards/c/ClayStatue.java +++ b/Mage.Sets/src/mage/cards/c/ClayStatue.java @@ -24,7 +24,7 @@ public final class ClayStatue extends CardImpl { this.toughness = new MageInt(1); // {2}: Regenerate Clay Statue. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}"))); } private ClayStatue(final ClayStatue card) { @@ -35,4 +35,4 @@ public final class ClayStatue extends CardImpl { public ClayStatue copy() { return new ClayStatue(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java index 454764db51d..b39b34e2f0f 100644 --- a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java +++ b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java @@ -28,7 +28,7 @@ public final class ClergyEnVec extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Clickslither.java b/Mage.Sets/src/mage/cards/c/Clickslither.java index b0dd80f30db..a7f94b4a6f3 100644 --- a/Mage.Sets/src/mage/cards/c/Clickslither.java +++ b/Mage.Sets/src/mage/cards/c/Clickslither.java @@ -38,7 +38,7 @@ public final class Clickslither extends CardImpl { // Sacrifice a Goblin: Clickslither gets +2/+2 and gains trample until end of turn. Effect effect = new BoostSourceEffect(2,2,Duration.EndOfTurn); effect.setText("{this} gets +2/+2"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, + Ability ability = new SimpleActivatedAbility(effect, new SacrificeTargetCost(filter)); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); diff --git a/Mage.Sets/src/mage/cards/c/CliffsideLookout.java b/Mage.Sets/src/mage/cards/c/CliffsideLookout.java index 48e9e05bd78..cd35eebe348 100644 --- a/Mage.Sets/src/mage/cards/c/CliffsideLookout.java +++ b/Mage.Sets/src/mage/cards/c/CliffsideLookout.java @@ -28,7 +28,7 @@ public final class CliffsideLookout extends CardImpl { this.toughness = new MageInt(1); // {4}{W}: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}"))); } private CliffsideLookout(final CliffsideLookout card) { diff --git a/Mage.Sets/src/mage/cards/c/ClockworkDragon.java b/Mage.Sets/src/mage/cards/c/ClockworkDragon.java index 246dd5c029e..675c0fb8796 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkDragon.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkDragon.java @@ -37,7 +37,7 @@ public final class ClockworkDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6)), "with six +1/+1 counters on it")); this.addAbility(new AttacksOrBlocksTriggeredAbility(new ClockworkDragonEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(3))); } private ClockworkDragon(final ClockworkDragon card) { diff --git a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java index c6cf072221b..810b2d41523 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkGnomes.java @@ -35,7 +35,7 @@ public final class ClockworkGnomes extends CardImpl { this.toughness = new MageInt(2); // {3}, {tap}: Regenerate target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java b/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java index 19e6240ea5c..b6d4de744a2 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkVorrac.java @@ -38,7 +38,7 @@ public final class ClockworkVorrac extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), "with four +1/+1 counters on it")); this.addAbility(new AttacksOrBlocksTriggeredAbility(new ClockworkVorracEffect(), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); } private ClockworkVorrac(final ClockworkVorrac card) { diff --git a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java index 8a603ccc80d..b6c73759e9f 100644 --- a/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java +++ b/Mage.Sets/src/mage/cards/c/CloudchaserKestrel.java @@ -39,7 +39,7 @@ public final class CloudchaserKestrel extends CardImpl { ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // {W}: Target permanent becomes white until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java index 406c527474c..9c428b4acaf 100644 --- a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java @@ -50,7 +50,7 @@ public final class CloudgoatRanger extends CardImpl { // Tap three untapped Kithkin you control: Cloudgoat Ranger gets +2/+0 and gains flying until end of turn. Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn); effect.setText("{this} gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false))); + Ability ability = new SimpleActivatedAbility(effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false))); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java index bb7fb564481..ed5fafae89f 100644 --- a/Mage.Sets/src/mage/cards/c/CloudheathDrake.java +++ b/Mage.Sets/src/mage/cards/c/CloudheathDrake.java @@ -29,7 +29,7 @@ public final class CloudheathDrake extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private CloudheathDrake(final CloudheathDrake card) { diff --git a/Mage.Sets/src/mage/cards/c/Cloudseeder.java b/Mage.Sets/src/mage/cards/c/Cloudseeder.java index 2b5e8300809..7c14c46556c 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudseeder.java +++ b/Mage.Sets/src/mage/cards/c/Cloudseeder.java @@ -33,7 +33,7 @@ public final class Cloudseeder extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}, Discard a card: Create a 1/1 blue Faerie creature token named Cloud Sprite. It has flying and "Cloud Sprite can block only creatures with flying." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoalitionRelic.java b/Mage.Sets/src/mage/cards/c/CoalitionRelic.java index ff162656756..4ae44f6e614 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionRelic.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionRelic.java @@ -33,7 +33,7 @@ public final class CoalitionRelic extends CardImpl { // {tap}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); // {tap}: Put a charge counter on Coalition Relic. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new TapSourceCost())); // At the beginning of your precombat main phase, remove all charge counters from Coalition Relic. Add one mana of any color for each charge counter removed this way. this.addAbility(new BeginningOfFirstMainTriggeredAbility(new CoalitionRelicEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CoastalDrake.java b/Mage.Sets/src/mage/cards/c/CoastalDrake.java index b17155e5289..2e37b3766fc 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalDrake.java +++ b/Mage.Sets/src/mage/cards/c/CoastalDrake.java @@ -34,7 +34,7 @@ public final class CoastalDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}, {T} : Return target Kavu to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.KAVU, "Kavu"))); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java b/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java index b9e44d1f4fe..34bec99c472 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java +++ b/Mage.Sets/src/mage/cards/c/CoastalHornclaw.java @@ -34,7 +34,7 @@ public final class CoastalHornclaw extends CardImpl { this.toughness = new MageInt(3); // Sacrifice a land: Coastal Hornclaw gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); } private CoastalHornclaw(final CoastalHornclaw card) { diff --git a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java index d0723428644..3281a546f75 100644 --- a/Mage.Sets/src/mage/cards/c/CoastlineChimera.java +++ b/Mage.Sets/src/mage/cards/c/CoastlineChimera.java @@ -30,7 +30,7 @@ public final class CoastlineChimera extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Coastline Chimera can block an additional creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CanBlockAdditionalCreatureEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}"))); } private CoastlineChimera(final CoastlineChimera card) { diff --git a/Mage.Sets/src/mage/cards/c/CobaltGolem.java b/Mage.Sets/src/mage/cards/c/CobaltGolem.java index 66c77d396cf..d02b6800df9 100644 --- a/Mage.Sets/src/mage/cards/c/CobaltGolem.java +++ b/Mage.Sets/src/mage/cards/c/CobaltGolem.java @@ -25,7 +25,7 @@ public final class CobaltGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private CobaltGolem(final CobaltGolem card) { diff --git a/Mage.Sets/src/mage/cards/c/CoffinQueen.java b/Mage.Sets/src/mage/cards/c/CoffinQueen.java index 2a776d04eba..3934a6df253 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinQueen.java +++ b/Mage.Sets/src/mage/cards/c/CoffinQueen.java @@ -44,7 +44,7 @@ public final class CoffinQueen extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}{B}, {tap}: Put target creature card from a graveyard onto the battlefield under your control. When Coffin Queen becomes untapped or you lose control of Coffin Queen, exile that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); ability.addEffect(new CoffinQueenCreateDelayedTriggerEffect()); diff --git a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java index 8db512dbdd2..67c4c3f3e79 100644 --- a/Mage.Sets/src/mage/cards/c/CogworkAssembler.java +++ b/Mage.Sets/src/mage/cards/c/CogworkAssembler.java @@ -36,7 +36,7 @@ public final class CogworkAssembler extends CardImpl { this.toughness = new MageInt(3); // {7}: Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CogworkAssemblerCreateTokenEffect(), new GenericManaCost(7)); + Ability ability = new SimpleActivatedAbility(new CogworkAssemblerCreateTokenEffect(), new GenericManaCost(7)); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java b/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java index 17e5d82be1b..cb188211c9c 100644 --- a/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/c/CogworkersPuzzleknot.java @@ -27,7 +27,7 @@ public final class CogworkersPuzzleknot extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ServoToken()))); // {1}{W}, Sacrifice Cogworker's Puzzleknot: Create a 1/1 colorless Servo artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ServoToken()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ServoToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ColosYearling.java b/Mage.Sets/src/mage/cards/c/ColosYearling.java index 06a25f6b9b7..af7fe291da9 100644 --- a/Mage.Sets/src/mage/cards/c/ColosYearling.java +++ b/Mage.Sets/src/mage/cards/c/ColosYearling.java @@ -31,7 +31,7 @@ public final class ColosYearling extends CardImpl { this.addAbility(new MountainwalkAbility()); // {R}: Colos Yearling gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private ColosYearling(final ColosYearling card) { diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java index 6f3b4cb1a84..e4af7bddcf2 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -30,7 +30,7 @@ public final class CombatMedic extends CardImpl { this.toughness = new MageInt(2); // {1}{W}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CommandBeacon.java b/Mage.Sets/src/mage/cards/c/CommandBeacon.java index 6a8f450826a..b5666e83eb6 100644 --- a/Mage.Sets/src/mage/cards/c/CommandBeacon.java +++ b/Mage.Sets/src/mage/cards/c/CommandBeacon.java @@ -31,7 +31,7 @@ public final class CommandBeacon extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {T}, Sacrifice Command Beacon: Put your commander into your hand from the command zone. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CommandBeaconEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CommandBeaconEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CommandersSphere.java b/Mage.Sets/src/mage/cards/c/CommandersSphere.java index 4dd425b34cb..4d63d29cbe5 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersSphere.java +++ b/Mage.Sets/src/mage/cards/c/CommandersSphere.java @@ -24,7 +24,7 @@ public final class CommandersSphere extends CardImpl { this.addAbility(new CommanderColorIdentityManaAbility()); // Sacrifice Commander's Sphere: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); } private CommandersSphere(final CommandersSphere card) { diff --git a/Mage.Sets/src/mage/cards/c/Compulsion.java b/Mage.Sets/src/mage/cards/c/Compulsion.java index e2432f91090..f3bf0fcae18 100644 --- a/Mage.Sets/src/mage/cards/c/Compulsion.java +++ b/Mage.Sets/src/mage/cards/c/Compulsion.java @@ -25,12 +25,12 @@ public final class Compulsion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // {1}{U}, Discard a card: Draw a card. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); + Ability ability1 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability1.addCost(new DiscardTargetCost(new TargetCardInHand(1, new FilterCard("a card")))); this.addAbility(ability1); // {1}{U}, Sacrifice Compulsion: Draw a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); + Ability ability2 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java index a6f13062d41..20ec0464d43 100644 --- a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java +++ b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java @@ -46,7 +46,7 @@ public final class CompulsoryRest extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // Enchanted creature has "{2}, Sacrifice this creature: You gain 2 life." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new GenericManaCost(2)); + Ability grantedAbility = new SimpleActivatedAbility(new GainLifeEffect(2), new GenericManaCost(2)); Cost cost = new SacrificeSourceCost(); cost.setText("Sacrifice this creature"); grantedAbility.addCost(cost); diff --git a/Mage.Sets/src/mage/cards/c/ConchHorn.java b/Mage.Sets/src/mage/cards/c/ConchHorn.java index 3249968250b..f01d2f05b13 100644 --- a/Mage.Sets/src/mage/cards/c/ConchHorn.java +++ b/Mage.Sets/src/mage/cards/c/ConchHorn.java @@ -28,7 +28,7 @@ public final class ConchHorn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {1}, {tap}, Sacrifice Conch Horn: Draw two cards, then put a card from your hand on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConchHornEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ConchHornEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java index 576cb0d1c92..c0e8f602938 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfStorms.java @@ -43,7 +43,7 @@ public final class ConduitOfStorms extends CardImpl { this.addAbility(new AttacksTriggeredAbility(effect, false)); // {3}{R}{R}: Transform Conduit of Storms. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{3}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{3}{R}{R}"))); } private ConduitOfStorms(final ConduitOfStorms card) { diff --git a/Mage.Sets/src/mage/cards/c/ConjurersBauble.java b/Mage.Sets/src/mage/cards/c/ConjurersBauble.java index 165b436f4ce..8f462c9faba 100644 --- a/Mage.Sets/src/mage/cards/c/ConjurersBauble.java +++ b/Mage.Sets/src/mage/cards/c/ConjurersBauble.java @@ -27,7 +27,7 @@ public final class ConjurersBauble extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {tap}, Sacrifice Conjurer's Bauble: Put up to one target card from your graveyard on the bottom of your library. Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false, rule), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false, rule), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(0, 1, StaticFilters.FILTER_CARD_FROM_YOUR_GRAVEYARD)); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index a6d7e5b7d22..a13c8dc823b 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -50,7 +50,7 @@ public final class ConsecratedByBlood extends CardImpl { Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); - effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(2, filter)), AttachmentType.AURA); effect.setText("and \"Sacrifice two other creatures: Regenerate this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/Conservator.java b/Mage.Sets/src/mage/cards/c/Conservator.java index 70b29eb88ca..2aa7c616d54 100644 --- a/Mage.Sets/src/mage/cards/c/Conservator.java +++ b/Mage.Sets/src/mage/cards/c/Conservator.java @@ -25,7 +25,7 @@ public final class Conservator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {T}: Prevent the next 2 damage that would be dealt to you this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 2), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 2), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ConsulateTurret.java b/Mage.Sets/src/mage/cards/c/ConsulateTurret.java index 7bc6328ef58..52529de6ac6 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateTurret.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateTurret.java @@ -24,10 +24,10 @@ public final class ConsulateTurret extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {T}: You get {E}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GetEnergyCountersControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GetEnergyCountersControllerEffect(1), new TapSourceCost())); // {T}, Pay {E}{E}{E}: Consulate Turret deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new PayEnergyCost(3)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java index 0d607e5babb..c366f780b6e 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java +++ b/Mage.Sets/src/mage/cards/c/ConsumptiveGoo.java @@ -30,7 +30,7 @@ public final class ConsumptiveGoo extends CardImpl { this.toughness = new MageInt(1); // {2}{B}{B}: Target creature gets -1/-1 until end of turn. Put a +1/+1 counter on Consumptive Goo. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}{B}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ContagionClasp.java b/Mage.Sets/src/mage/cards/c/ContagionClasp.java index 323d1668f3b..e860594488c 100644 --- a/Mage.Sets/src/mage/cards/c/ContagionClasp.java +++ b/Mage.Sets/src/mage/cards/c/ContagionClasp.java @@ -35,7 +35,7 @@ public final class ContagionClasp extends CardImpl { /* {4}, {T}: Proliferate. (You choose any number of permanents and/or players * with counters on them, then give each another counter of a kind already there.) */ - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new ProliferateEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ContagionEngine.java b/Mage.Sets/src/mage/cards/c/ContagionEngine.java index 29e677135d9..f317b6eb481 100644 --- a/Mage.Sets/src/mage/cards/c/ContagionEngine.java +++ b/Mage.Sets/src/mage/cards/c/ContagionEngine.java @@ -35,7 +35,7 @@ public final class ContagionEngine extends CardImpl { this.addAbility(ability); // {4}, {T}: Proliferate, then proliferate again. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there. Then do it again.) - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect("", false), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new ProliferateEffect("", false), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addEffect(new ProliferateEffect(" again", true).concatBy(", then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java index dffd816cbf2..eece6e5d555 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java +++ b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java @@ -40,7 +40,7 @@ public final class ContestedCliffs extends CardImpl { // {R}{G}, {tap}: Choose target Beast creature you control and target creature an opponent controls. Those creatures fight each other. Effect effect = new FightTargetsEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); Target target1 = new TargetCreaturePermanent(filter1); ability.addTarget(target1); diff --git a/Mage.Sets/src/mage/cards/c/ConversionChamber.java b/Mage.Sets/src/mage/cards/c/ConversionChamber.java index 54805724d50..6fbe1595581 100644 --- a/Mage.Sets/src/mage/cards/c/ConversionChamber.java +++ b/Mage.Sets/src/mage/cards/c/ConversionChamber.java @@ -29,13 +29,13 @@ public final class ConversionChamber extends CardImpl { public ConversionChamber(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {2}, {T}: Exile target artifact card from a graveyard. Put a charge counter on Conversion Chamber. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(2)); ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetCardInGraveyard(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {2}, {T}, Remove a charge counter from Conversion Chamber: Create a 3/3 colorless Golem artifact creature token. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PhyrexianGolemToken()), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new PhyrexianGolemToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Conviction.java b/Mage.Sets/src/mage/cards/c/Conviction.java index e80ed6ea7ff..e8960a37cb8 100644 --- a/Mage.Sets/src/mage/cards/c/Conviction.java +++ b/Mage.Sets/src/mage/cards/c/Conviction.java @@ -41,7 +41,7 @@ public final class Conviction extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); // {W}: Return Conviction to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); } private Conviction(final Conviction card) { diff --git a/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java b/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java index adb06087075..f83fa0cf26c 100644 --- a/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java +++ b/Mage.Sets/src/mage/cards/c/CopperLeafAngel.java @@ -34,7 +34,7 @@ public final class CopperLeafAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}, Sacrifice X lands: Put X +1/+1 counters on Copper-Leaf Angel. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(), GetXValue.instance, false), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(), GetXValue.instance, false), new TapSourceCost()); ability.addCost(new SacrificeXTargetCost(new FilterControlledLandPermanent("lands"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CoralHelm.java b/Mage.Sets/src/mage/cards/c/CoralHelm.java index c59acb5d14b..77a1d47819c 100644 --- a/Mage.Sets/src/mage/cards/c/CoralHelm.java +++ b/Mage.Sets/src/mage/cards/c/CoralHelm.java @@ -24,7 +24,7 @@ public final class CoralHelm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, Discard a card at random: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CoralReef.java b/Mage.Sets/src/mage/cards/c/CoralReef.java index 02f39c91d02..46bd9d0d43e 100644 --- a/Mage.Sets/src/mage/cards/c/CoralReef.java +++ b/Mage.Sets/src/mage/cards/c/CoralReef.java @@ -53,11 +53,11 @@ public final class CoralReef extends CardImpl { // Sacrifice an Island: Put two polyp counters on Coral Reef. effect = new AddCountersSourceEffect(CounterType.POLYP.createInstance(2), true); effect.setText("Put two polyp counters on {this}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, + this.addAbility(new SimpleActivatedAbility(effect, new SacrificeTargetCost(islandFilter))); // {U}, Tap an untapped blue creature you control, Remove a polyp counter from Coral Reef: Put a +0/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P0P1.createInstance()), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P0P1.createInstance()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(untappedBlueCreatureFilter))); ability.addCost(new RemoveCountersSourceCost(CounterType.POLYP.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java b/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java index b950f0b2a69..ab01cd840c7 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmGuide.java @@ -30,7 +30,7 @@ public final class CoralhelmGuide extends CardImpl { this.toughness = new MageInt(1); // {4}{U}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{4}{U}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{4}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Coretapper.java b/Mage.Sets/src/mage/cards/c/Coretapper.java index 9d07cb9b6a6..16d9793a271 100644 --- a/Mage.Sets/src/mage/cards/c/Coretapper.java +++ b/Mage.Sets/src/mage/cards/c/Coretapper.java @@ -34,10 +34,10 @@ public final class Coretapper extends CardImpl { this.subtype.add(SubType.MYR); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); firstAbility.addTarget(new TargetPermanent(filter)); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); secondAbility.addTarget(new TargetPermanent(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/c/CorpseHauler.java b/Mage.Sets/src/mage/cards/c/CorpseHauler.java index a0940b85c58..4a311386e08 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHauler.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHauler.java @@ -38,7 +38,7 @@ public final class CorpseHauler extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, Sacrifice Corpse Hauler: Return another target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Corpseweft.java b/Mage.Sets/src/mage/cards/c/Corpseweft.java index 28d491c1759..715bb9eae0c 100644 --- a/Mage.Sets/src/mage/cards/c/Corpseweft.java +++ b/Mage.Sets/src/mage/cards/c/Corpseweft.java @@ -29,7 +29,7 @@ public final class Corpseweft extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // {1}{B}, Exile one or more creature cards from your graveyard: Create a tapped X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CorpseweftEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new CorpseweftEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(1, Integer.MAX_VALUE, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java index ce60b5577bd..540cda3ba4e 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java +++ b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java @@ -27,7 +27,7 @@ public final class CorruptOfficial extends CardImpl { this.toughness = new MageInt(1); // {2}{B}: Regenerate Corrupt Official. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); // Whenever Corrupt Official becomes blocked, defending player discards a card at random. this.addAbility(new BecomesBlockedSourceTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java index b9ee3758386..d70708055e7 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedHarvester.java @@ -29,7 +29,7 @@ public final class CorruptedHarvester extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java index 1ed7745a89b..d06adb661dd 100644 --- a/Mage.Sets/src/mage/cards/c/CouriersCapsule.java +++ b/Mage.Sets/src/mage/cards/c/CouriersCapsule.java @@ -24,7 +24,7 @@ public final class CouriersCapsule extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{U}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java b/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java index c0972146140..39010bcf10f 100644 --- a/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java +++ b/Mage.Sets/src/mage/cards/c/CourtlyProvocateur.java @@ -29,12 +29,12 @@ public final class CourtlyProvocateur extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature attacks this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {tap}: Target creature blocks this turn if able. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/c/CrabUmbra.java b/Mage.Sets/src/mage/cards/c/CrabUmbra.java index bb0cdbb4414..ea749eaeb36 100644 --- a/Mage.Sets/src/mage/cards/c/CrabUmbra.java +++ b/Mage.Sets/src/mage/cards/c/CrabUmbra.java @@ -37,7 +37,7 @@ public final class CrabUmbra extends CardImpl { this.addAbility(ability); // {2}{U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new ManaCostsImpl<>("{2}{U}"))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index bae011bb75d..861aecc1944 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -51,14 +51,14 @@ public final class Crackleburr extends CardImpl { this.toughness = new MageInt(2); // {UR}{UR}, {tap}, Tap two untapped red creatures you control: Crackleburr deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{U/R}{U/R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new ManaCostsImpl<>("{U/R}{U/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {UR}{UR}, {untap}, Untap two tapped blue creatures you control: Return target creature to its owner's hand. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U/R}{U/R}")); + Ability ability2 = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U/R}{U/R}")); ability2.addCost(new UntapSourceCost()); ability2.addCost(new UntapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter2, true))); ability2.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CracklingClub.java b/Mage.Sets/src/mage/cards/c/CracklingClub.java index 8e93c3c3e82..d7d53da9229 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingClub.java +++ b/Mage.Sets/src/mage/cards/c/CracklingClub.java @@ -39,7 +39,7 @@ public final class CracklingClub extends CardImpl { // Enchanted creature gets +1/+0. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); // Sacrifice Crackling Club: Crackling Club deals 1 damage to target creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java index 379e123bdcd..4ad9ed4790a 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java @@ -33,7 +33,7 @@ public final class CracklingPerimeter extends CardImpl { // Tap an untapped Gate you control: Crackling Perimeter deals 1 damage to each opponent. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new TapTargetCost(new TargetControlledPermanent(filter)))); + this.addAbility(new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new TapTargetCost(new TargetControlledPermanent(filter)))); } private CracklingPerimeter(final CracklingPerimeter card) { diff --git a/Mage.Sets/src/mage/cards/c/CracklingTriton.java b/Mage.Sets/src/mage/cards/c/CracklingTriton.java index f329fa11fd4..35ecf010041 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingTriton.java +++ b/Mage.Sets/src/mage/cards/c/CracklingTriton.java @@ -30,7 +30,7 @@ public final class CracklingTriton extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CraftyPathmage.java b/Mage.Sets/src/mage/cards/c/CraftyPathmage.java index 652598ed405..0da1201b615 100644 --- a/Mage.Sets/src/mage/cards/c/CraftyPathmage.java +++ b/Mage.Sets/src/mage/cards/c/CraftyPathmage.java @@ -38,7 +38,7 @@ public final class CraftyPathmage extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CragPuca.java b/Mage.Sets/src/mage/cards/c/CragPuca.java index e1da4680ada..26f65c425fe 100644 --- a/Mage.Sets/src/mage/cards/c/CragPuca.java +++ b/Mage.Sets/src/mage/cards/c/CragPuca.java @@ -28,7 +28,7 @@ public final class CragPuca extends CardImpl { this.toughness = new MageInt(4); // {UR}: Switch Crag Puca's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CranialArchive.java b/Mage.Sets/src/mage/cards/c/CranialArchive.java index c052a1a7770..7f04779de04 100644 --- a/Mage.Sets/src/mage/cards/c/CranialArchive.java +++ b/Mage.Sets/src/mage/cards/c/CranialArchive.java @@ -27,7 +27,7 @@ public final class CranialArchive extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, Exile Cranial Archive: Target player shuffles their graveyard into their library. Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CranialArchiveEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CranialArchiveEffect(), new GenericManaCost(2)); ability.addCost(new ExileSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java index cfe0b0f4ad3..b2f0bf8d9df 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodGhoul.java @@ -29,7 +29,7 @@ public final class CreakwoodGhoul extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B/G}{B/G}")) ; + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{B/G}{B/G}")) ; ability.addTarget(new TargetCardInGraveyard()); ability.addEffect(new GainLifeEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreditVoucher.java b/Mage.Sets/src/mage/cards/c/CreditVoucher.java index 1f03f0c96ab..8a241efd5ce 100644 --- a/Mage.Sets/src/mage/cards/c/CreditVoucher.java +++ b/Mage.Sets/src/mage/cards/c/CreditVoucher.java @@ -30,7 +30,7 @@ public final class CreditVoucher extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {tap}, Sacrifice Credit Voucher: Shuffle any number of cards from your hand into your library, then draw that many cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreditVoucherEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreditVoucherEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CreepingInn.java b/Mage.Sets/src/mage/cards/c/CreepingInn.java index b6ea4234afe..22cdd1d9244 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingInn.java +++ b/Mage.Sets/src/mage/cards/c/CreepingInn.java @@ -45,7 +45,7 @@ public final class CreepingInn extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new CreepingInnEffect())); // {4}: Creeping Inn phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl<>("{4}"))); + this.addAbility(new SimpleActivatedAbility(new PhaseOutSourceEffect(), new ManaCostsImpl<>("{4}"))); } private CreepingInn(final CreepingInn card) { diff --git a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java index 9eb3690be9a..4d9fbc50242 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java +++ b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java @@ -35,7 +35,7 @@ public final class CreepingTarPit extends CardImpl { this.addAbility(new BlackManaAbility()); // {1}{U}{B}: Until end of turn, Creeping Tar Pit becomes a 3/2 blue and black Elemental creature and can't be blocked. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new CreatureToken(3, 2, "3/2 blue and black Elemental creature") .withColor("BU") .withSubType(SubType.ELEMENTAL) diff --git a/Mage.Sets/src/mage/cards/c/CrenellatedWall.java b/Mage.Sets/src/mage/cards/c/CrenellatedWall.java index 6d7e51d159a..b9a7f4688c5 100644 --- a/Mage.Sets/src/mage/cards/c/CrenellatedWall.java +++ b/Mage.Sets/src/mage/cards/c/CrenellatedWall.java @@ -31,7 +31,7 @@ public final class CrenellatedWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Target creature gets +0/+4 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 4, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 4, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java index d9eb2c30534..5f7fe4060f8 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonAcolyte.java @@ -34,7 +34,7 @@ public final class CrimsonAcolyte extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {W}: Target creature gains protection from red until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java index 8b32f1e67d2..0c455f94a0c 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHellkite.java @@ -45,7 +45,7 @@ public final class CrimsonHellkite extends CardImpl { // {X}, {tap}: Crimson Hellkite deals X damage to target creature. Spend only red mana on X. Effect effect = new DamageTargetEffect(GetXValue.instance); effect.setText("{this} deals X damage to target creature. Spend only red mana on X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMage.java b/Mage.Sets/src/mage/cards/c/CrimsonMage.java index 6cefeef6707..b50e0d7128a 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMage.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMage.java @@ -30,7 +30,7 @@ public final class CrimsonMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java index 84a30b10914..fc3c1e0125b 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonManticore.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonManticore.java @@ -32,7 +32,7 @@ public final class CrimsonManticore extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}, {tap}: Crimson Manticore deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java index f559bfef3c8..50cca3350b1 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -37,7 +37,7 @@ public final class CrimsonMuckwader extends CardImpl { // Crimson Muckwader gets +1/+1 as long as you control a Swamp. this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {2}{B}: Regenerate Crimson Muckwader. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private CrimsonMuckwader(final CrimsonMuckwader card) { diff --git a/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java b/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java index 07a101111b8..4e125c024c6 100644 --- a/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java +++ b/Mage.Sets/src/mage/cards/c/CrookOfCondemnation.java @@ -26,13 +26,13 @@ public final class CrookOfCondemnation extends CardImpl { // {1}, {t}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); // {1}, Exile Crook of Condemnation: Exile all cards from all graveyards. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl<>("{1}")); + Ability ability2 = new SimpleActivatedAbility(new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl<>("{1}")); ability2.addCost(new ExileSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/c/CrookedScales.java b/Mage.Sets/src/mage/cards/c/CrookedScales.java index f14d5fe51f4..65937fa24ef 100644 --- a/Mage.Sets/src/mage/cards/c/CrookedScales.java +++ b/Mage.Sets/src/mage/cards/c/CrookedScales.java @@ -30,7 +30,7 @@ public final class CrookedScales extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}: Flip a coin. If you win the flip, destroy target creature an opponent controls. If you lose the flip, destroy target creature you control unless you pay {3} and repeat this process. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrookedScalesEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CrookedScalesEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetOpponentsCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java b/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java index b4ef9d95a12..6f578bd8125 100644 --- a/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java +++ b/Mage.Sets/src/mage/cards/c/CrossbowInfantry.java @@ -30,7 +30,7 @@ public final class CrossbowInfantry extends CardImpl { this.toughness = new MageInt(1); // {tap}: Crossbow Infantry deals 1 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java index 85b37bfd06e..08cadec78a3 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxAscendantHero.java @@ -47,7 +47,7 @@ public final class CrovaxAscendantHero extends CardImpl { // Nonwhite creatures get -1/-1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter2, false))); // Pay 2 life: Return Crovax, Ascendant Hero to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayLifeCost(2))); } private CrovaxAscendantHero(final CrovaxAscendantHero card) { diff --git a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java index 02d38c43b27..37b6d157f49 100644 --- a/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java +++ b/Mage.Sets/src/mage/cards/c/CrovaxTheCursed.java @@ -43,7 +43,7 @@ public final class CrovaxTheCursed extends CardImpl { this.addAbility(ability); // {B}: Crovax gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java index 580f6b1042e..519f181e425 100644 --- a/Mage.Sets/src/mage/cards/c/CrowdFavorites.java +++ b/Mage.Sets/src/mage/cards/c/CrowdFavorites.java @@ -30,11 +30,11 @@ public final class CrowdFavorites extends CardImpl { this.toughness = new MageInt(4); // {3}{W}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{W}: Crowd Favorites gets +0/+5 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); } private CrowdFavorites(final CrowdFavorites card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java index 11d7699fbec..1360af11e59 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfConvergence.java @@ -43,7 +43,7 @@ public final class CrownOfConvergence extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {G}{W}: Put the top card of your library on the bottom of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfConvergenceEffect(), new ManaCostsImpl<>("{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CrownOfConvergenceEffect(), new ManaCostsImpl<>("{G}{W}"))); } private CrownOfConvergence(final CrownOfConvergence card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java index 08e928f2c3a..d7c4e88a5e0 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfEmpires.java @@ -28,7 +28,7 @@ public final class CrownOfEmpires extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfEmpiresEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CrownOfEmpiresEffect(), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java index a7641c91210..c271fb6add8 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java @@ -33,10 +33,10 @@ public final class CrownOfFlames extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // {R}: Return Crown of Flames to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.R))); } private CrownOfFlames(final CrownOfFlames card) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java index 0ea7698a3ad..cf6c9951c26 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java @@ -41,7 +41,7 @@ public final class CrownOfTheAges extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {4}, {tap}: Attach target Aura attached to a creature to another creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfTheAgesEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new CrownOfTheAgesEffect(), new GenericManaCost(4)); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java index 457aed3658f..f30b9a61d2e 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfTheSpiritDragon.java @@ -37,7 +37,7 @@ public final class CrucibleOfTheSpiritDragon extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Put a storage counter on Crucible of the Spirit Dragon. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java index a9a8bef807f..db1d48f65c4 100644 --- a/Mage.Sets/src/mage/cards/c/CruelDeceiver.java +++ b/Mage.Sets/src/mage/cards/c/CruelDeceiver.java @@ -37,7 +37,7 @@ public final class CruelDeceiver extends CardImpl { this.toughness = new MageInt(1); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, Cruel Deceiver gains "Whenever Cruel Deceiver deals damage to a creature, destroy that creature" until end of turn. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CruelDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/c/CryptCreeper.java b/Mage.Sets/src/mage/cards/c/CryptCreeper.java index 2d489c7d80b..5a0522142e8 100644 --- a/Mage.Sets/src/mage/cards/c/CryptCreeper.java +++ b/Mage.Sets/src/mage/cards/c/CryptCreeper.java @@ -27,7 +27,7 @@ public final class CryptCreeper extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Crypt Creeper: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CryptRats.java b/Mage.Sets/src/mage/cards/c/CryptRats.java index fedf3955a9d..01d7f4dc7ef 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRats.java +++ b/Mage.Sets/src/mage/cards/c/CryptRats.java @@ -40,7 +40,7 @@ public final class CryptRats extends CardImpl { // {X}: Crypt Rats deals X damage to each creature and each player. Spend only black mana on X. Effect effect = new DamageEverythingEffect(GetXValue.instance); effect.setText("{this} deals X damage to each creature and each player. Spend only black mana on X"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect,new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(effect,new ManaCostsImpl<>("{X}")); VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { ((VariableManaCost) variableCost).setFilter(filterBlack); diff --git a/Mage.Sets/src/mage/cards/c/CryptRipper.java b/Mage.Sets/src/mage/cards/c/CryptRipper.java index 5ff537f90fa..858a270872e 100644 --- a/Mage.Sets/src/mage/cards/c/CryptRipper.java +++ b/Mage.Sets/src/mage/cards/c/CryptRipper.java @@ -28,7 +28,7 @@ public final class CryptRipper extends CardImpl { this.toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private CryptRipper(final CryptRipper card) { diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index 16d6652d2b1..6b29d91c78a 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -42,14 +42,14 @@ public final class Cryptbreaker extends CardImpl { this.toughness = new MageInt(1); // {1}{B}, {T}, Discard a card: Create a 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // Tap three untapped Zombies you control: You draw a card and you lose 1 life. Effect effect = new DrawCardSourceControllerEffect(1, true); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, true))); + ability = new SimpleActivatedAbility(effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, true))); effect = new LoseLifeSourceControllerEffect(1); ability.addEffect(effect.concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrypticCruiser.java b/Mage.Sets/src/mage/cards/c/CrypticCruiser.java index 740ffbffb68..bbcdf0bf7fa 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticCruiser.java +++ b/Mage.Sets/src/mage/cards/c/CrypticCruiser.java @@ -32,7 +32,7 @@ public final class CrypticCruiser extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // {2}{U}, Put a card an opponent owns from exile into that player's graveyard: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new ExileOpponentsCardFromExileToGraveyardCost(true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrystalBall.java b/Mage.Sets/src/mage/cards/c/CrystalBall.java index f131ca6191e..de0dd15d798 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalBall.java +++ b/Mage.Sets/src/mage/cards/c/CrystalBall.java @@ -19,7 +19,7 @@ public final class CrystalBall extends CardImpl { public CrystalBall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScryEffect(2), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CrystalChimes.java b/Mage.Sets/src/mage/cards/c/CrystalChimes.java index b79d1273781..318b1a6f21b 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalChimes.java +++ b/Mage.Sets/src/mage/cards/c/CrystalChimes.java @@ -27,7 +27,7 @@ public final class CrystalChimes extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}, {tap}, Sacrifice Crystal Chimes: Return all enchantment cards from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrystalChimesEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CrystalChimesEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrystalSeer.java b/Mage.Sets/src/mage/cards/c/CrystalSeer.java index 07d8d11f18f..a5551f9d47e 100644 --- a/Mage.Sets/src/mage/cards/c/CrystalSeer.java +++ b/Mage.Sets/src/mage/cards/c/CrystalSeer.java @@ -34,7 +34,7 @@ public final class CrystalSeer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryControllerEffect(4))); // {4}{U}: Return Crystal Seer to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{4}{U}"))); } private CrystalSeer(final CrystalSeer card) { @@ -47,4 +47,3 @@ public final class CrystalSeer extends CardImpl { } } - diff --git a/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java b/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java index 22b6ad577b2..f8ada92671b 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineCrawler.java @@ -40,7 +40,7 @@ public final class CrystallineCrawler extends CardImpl { new CountersSourceCount(CounterType.P1P1), false)); // {T}: Put a +1/+1 counter on Crystalline Crawler. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost())); } private CrystallineCrawler(final CrystallineCrawler card) { diff --git a/Mage.Sets/src/mage/cards/c/CudgelTroll.java b/Mage.Sets/src/mage/cards/c/CudgelTroll.java index 8a103ab4e7b..6095a64d043 100644 --- a/Mage.Sets/src/mage/cards/c/CudgelTroll.java +++ b/Mage.Sets/src/mage/cards/c/CudgelTroll.java @@ -26,7 +26,7 @@ public final class CudgelTroll extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private CudgelTroll(final CudgelTroll card) { diff --git a/Mage.Sets/src/mage/cards/c/CullingDais.java b/Mage.Sets/src/mage/cards/c/CullingDais.java index 50af94bbda8..08c954cb44f 100644 --- a/Mage.Sets/src/mage/cards/c/CullingDais.java +++ b/Mage.Sets/src/mage/cards/c/CullingDais.java @@ -30,10 +30,10 @@ public final class CullingDais extends CardImpl { public CullingDais(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CullingDaisEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(new CullingDaisEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CultGuildmage.java b/Mage.Sets/src/mage/cards/c/CultGuildmage.java index 1b121527451..e69e83fcf07 100644 --- a/Mage.Sets/src/mage/cards/c/CultGuildmage.java +++ b/Mage.Sets/src/mage/cards/c/CultGuildmage.java @@ -37,7 +37,7 @@ public final class CultGuildmage extends CardImpl { this.addAbility(ability); // {R}, {T}: Cult Guildmage deals 1 damage to target opponent or planeswalker. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java index dc9662a95ef..908a210dbe1 100644 --- a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java +++ b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java @@ -30,7 +30,7 @@ public final class CunningSparkmage extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java index 43233ce7df9..2389a6b11b8 100644 --- a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java +++ b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java @@ -37,7 +37,7 @@ public final class CuombajjWitches extends CardImpl { // {T}: Cuombajj Witches deals 1 damage to any target and 1 damage to any target of an opponent's choice. Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to any target and 1 damage to any target of an opponent's choice"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addTarget(new TargetAnyTarget()); ability.setTargetAdjuster(CuombajjWitchesAdjuster.instance); @@ -75,4 +75,4 @@ enum CuombajjWitchesAdjuster implements TargetAdjuster { } } } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CursedRonin.java b/Mage.Sets/src/mage/cards/c/CursedRonin.java index 666dbcfadda..1f80e13e943 100644 --- a/Mage.Sets/src/mage/cards/c/CursedRonin.java +++ b/Mage.Sets/src/mage/cards/c/CursedRonin.java @@ -30,7 +30,7 @@ public final class CursedRonin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new BushidoAbility(1)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } private CursedRonin(final CursedRonin card) { diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 3d3f1fb38c5..035feba7dae 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -28,7 +28,7 @@ public final class CursedScroll extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {3}, {T}: Name a card. Reveal a card at random from your hand. If it's the named card, Cursed Scroll deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL), new ManaCostsImpl<>("{3}")); ability.addEffect(new CursedScrollEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java index 4e639378247..296798f508d 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java @@ -49,7 +49,7 @@ public final class CustodiSoulbinders extends CardImpl { // {2}{W}, Remove a +1/+1 counter from Custodi Soulbinders: Create a 1/1 white Spirit creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java b/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java index 7d67b93df91..fef2634d734 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanSnare.java @@ -24,7 +24,7 @@ public final class CyclopeanSnare extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Tap target creature, then return Cyclopean Snare to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new ReturnToHandSourceEffect(true).concatBy(", then")); diff --git a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java index d5228930c80..2c91d858969 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java @@ -42,7 +42,7 @@ public final class CytoplastManipulator extends CardImpl { new GainControlTargetEffect(Duration.Custom, true), new SourceRemainsInZoneCondition(Zone.BATTLEFIELD), "gain control of target creature with a +1/+1 counter on it for as long as {this} remains on the battlefield"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java index 1454b52b5f4..273225097ce 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java @@ -39,7 +39,7 @@ public final class CytoplastRootKin extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_OTHER_CONTROLLED_CREATURE_P1P1))); // {2}: Move a +1/+1 counter from target creature you control onto Cytoplast Root-Kin. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCountersFromTargetToSourceEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new MoveCountersFromTargetToSourceEffect(), new GenericManaCost(2)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java index e1fd6c175d9..93a3487f1b2 100644 --- a/Mage.Sets/src/mage/cards/c/CytospawnShambler.java +++ b/Mage.Sets/src/mage/cards/c/CytospawnShambler.java @@ -35,7 +35,7 @@ public final class CytospawnShambler extends CardImpl { this.addAbility(new GraftAbility(this, 6)); // {G}: Target creature with a +1/+1 counter on it gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); }