diff --git a/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java b/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java index 0efe20e02ad..6d7578c2ff1 100644 --- a/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java +++ b/Mage.Sets/src/mage/cards/q/QarsiHighPriest.java @@ -31,7 +31,7 @@ public final class QarsiHighPriest extends CardImpl { this.toughness = new MageInt(2); // {1}{B}, {t}, Sacrifice another creature: Manifest the top card of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ManifestEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new ManifestEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QasaliPridemage.java b/Mage.Sets/src/mage/cards/q/QasaliPridemage.java index cdc15a7eb65..88f63911079 100644 --- a/Mage.Sets/src/mage/cards/q/QasaliPridemage.java +++ b/Mage.Sets/src/mage/cards/q/QasaliPridemage.java @@ -36,7 +36,7 @@ public final class QasaliPridemage extends CardImpl { this.addAbility(new ExaltedAbility()); // {1}, Sacrifice Qasali Pridemage: 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()); Target target = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/q/QuagmireDruid.java b/Mage.Sets/src/mage/cards/q/QuagmireDruid.java index 1120474ca79..c0a3de747ca 100644 --- a/Mage.Sets/src/mage/cards/q/QuagmireDruid.java +++ b/Mage.Sets/src/mage/cards/q/QuagmireDruid.java @@ -34,7 +34,7 @@ public final class QuagmireDruid extends CardImpl { this.toughness = new MageInt(2); // {G}, {T}, Sacrifice a creature: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java index 831e428ec22..561dc838e7a 100644 --- a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java +++ b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java @@ -37,21 +37,21 @@ public final class QuestingPhelddagrif extends CardImpl { this.toughness = new MageInt(4); // {G}: Questing Phelddagrif gets +1/+1 until end of turn. Target opponent creates a 1/1 green Hippo creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {W}: Questing Phelddagrif gains protection from black and from red until end of turn. Target opponent gains 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), + ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addEffect(new GainLifeTargetEffect(2)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {U}: Questing Phelddagrif gains flying until end of turn. Target opponent may draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), + ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addEffect(new DrawCardTargetEffect(1, true)); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java index 69b83129fa1..91eccb9a09c 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java @@ -41,7 +41,7 @@ public final class QuicksilverDagger extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to target player. You draw a card." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); gainAbility.addTarget(new TargetPlayerOrPlaneswalker()); gainAbility.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java index 610782b724f..99a6a9a5632 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java @@ -38,7 +38,7 @@ public final class QuicksilverDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: If target spell has only one target and that target is Quicksilver Dragon, change that spell's target to another creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new QuicksilverDragonEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new QuicksilverDragonEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QuilledSliver.java b/Mage.Sets/src/mage/cards/q/QuilledSliver.java index 82cc91da7a6..a753f336d9c 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuilledSliver.java @@ -37,7 +37,7 @@ public final class QuilledSliver extends CardImpl { this.toughness = new MageInt(1); // All Slivers have "{tap}: This permanent 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(new SimpleStaticAbility( new GainAbilityAllEffect(ability, diff --git a/Mage.Sets/src/mage/cards/q/QuilledWolf.java b/Mage.Sets/src/mage/cards/q/QuilledWolf.java index 90c03fb76de..433191a4838 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledWolf.java +++ b/Mage.Sets/src/mage/cards/q/QuilledWolf.java @@ -26,7 +26,7 @@ public final class QuilledWolf extends CardImpl { this.toughness = new MageInt(2); // {5}{G}: Quilled Wolf gets +4/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{5}{G}"))); } private QuilledWolf(final QuilledWolf card) { diff --git a/Mage.Sets/src/mage/cards/q/Quillspike.java b/Mage.Sets/src/mage/cards/q/Quillspike.java index 4c5d820b33b..be4613b38a2 100644 --- a/Mage.Sets/src/mage/cards/q/Quillspike.java +++ b/Mage.Sets/src/mage/cards/q/Quillspike.java @@ -33,7 +33,7 @@ public final class Quillspike extends CardImpl { this.toughness = new MageInt(1); // {BG}, Remove a -1/-1 counter from a creature you control: Quillspike gets +3/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{B/G}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{B/G}")); TargetPermanent target = new TargetPermanent(1, 1, StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED, true); ability.addCost(new RemoveCounterCost(target, CounterType.M1M1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QuirionDruid.java b/Mage.Sets/src/mage/cards/q/QuirionDruid.java index 950220e99f6..bb24a6a8423 100644 --- a/Mage.Sets/src/mage/cards/q/QuirionDruid.java +++ b/Mage.Sets/src/mage/cards/q/QuirionDruid.java @@ -35,7 +35,7 @@ public final class QuirionDruid extends CardImpl { this.toughness = new MageInt(2); // {G}, {T}: Target land becomes a 2/2 green creature that’s still a land. (This effect lasts indefinitely.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new QuirionDruidToken(), false, true, Duration.Custom), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new QuirionDruidToken(), false, true, Duration.Custom), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RabidRats.java b/Mage.Sets/src/mage/cards/r/RabidRats.java index 92e42e6be85..77a86379821 100644 --- a/Mage.Sets/src/mage/cards/r/RabidRats.java +++ b/Mage.Sets/src/mage/cards/r/RabidRats.java @@ -29,7 +29,7 @@ public final class RabidRats extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target blocking creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RacecourseFury.java b/Mage.Sets/src/mage/cards/r/RacecourseFury.java index d5ec8eb54cc..bba3d2a1497 100644 --- a/Mage.Sets/src/mage/cards/r/RacecourseFury.java +++ b/Mage.Sets/src/mage/cards/r/RacecourseFury.java @@ -45,7 +45,7 @@ public final class RacecourseFury extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target creature gains haste until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/r/RadiantKavu.java b/Mage.Sets/src/mage/cards/r/RadiantKavu.java index 21707b1cabf..3df303c362d 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantKavu.java +++ b/Mage.Sets/src/mage/cards/r/RadiantKavu.java @@ -35,7 +35,7 @@ public final class RadiantKavu extends CardImpl { this.toughness = new MageInt(3); // {R}{G}{W}: Prevent all combat damage blue creatures and black creatures would deal this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, (new PreventAllDamageByAllPermanentsEffect(filter, + this.addAbility(new SimpleActivatedAbility((new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, true)), new ManaCostsImpl<>("{R}{G}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RadjanSpirit.java b/Mage.Sets/src/mage/cards/r/RadjanSpirit.java index 2182ea6cfc5..47895314868 100644 --- a/Mage.Sets/src/mage/cards/r/RadjanSpirit.java +++ b/Mage.Sets/src/mage/cards/r/RadjanSpirit.java @@ -30,7 +30,7 @@ public final class RadjanSpirit extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature loses flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RagDealer.java b/Mage.Sets/src/mage/cards/r/RagDealer.java index fec9163fb01..fb91ae378f7 100644 --- a/Mage.Sets/src/mage/cards/r/RagDealer.java +++ b/Mage.Sets/src/mage/cards/r/RagDealer.java @@ -30,7 +30,7 @@ public final class RagDealer 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/r/RageWeaver.java b/Mage.Sets/src/mage/cards/r/RageWeaver.java index e644004518e..293a3e8f18e 100644 --- a/Mage.Sets/src/mage/cards/r/RageWeaver.java +++ b/Mage.Sets/src/mage/cards/r/RageWeaver.java @@ -41,7 +41,7 @@ public final class RageWeaver 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 GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RagingRavine.java b/Mage.Sets/src/mage/cards/r/RagingRavine.java index eb7afb16a7a..bbd02a65bdd 100644 --- a/Mage.Sets/src/mage/cards/r/RagingRavine.java +++ b/Mage.Sets/src/mage/cards/r/RagingRavine.java @@ -43,7 +43,7 @@ public final class RagingRavine extends CardImpl { CardType.LAND, Duration.EndOfTurn); effect.setText("Until end of turn, {this} becomes a 3/3 red and green Elemental creature"); // {2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{R}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{R}{G}")); effect = new GainAbilitySourceEffect(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), Duration.EndOfTurn); effect.setText("with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RagingSpirit.java b/Mage.Sets/src/mage/cards/r/RagingSpirit.java index f82f0bd60b2..c2af42b7448 100644 --- a/Mage.Sets/src/mage/cards/r/RagingSpirit.java +++ b/Mage.Sets/src/mage/cards/r/RagingSpirit.java @@ -27,7 +27,7 @@ public final class RagingSpirit extends CardImpl { this.toughness = new MageInt(3); // {2}: Raging Spirit becomes colorless until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(ObjectColor.COLORLESS, Duration.EndOfTurn), new ManaCostsImpl<>("{2}"))); } private RagingSpirit(final RagingSpirit card) { diff --git a/Mage.Sets/src/mage/cards/r/Ragnar.java b/Mage.Sets/src/mage/cards/r/Ragnar.java index f5325d187f2..d59b4c7005f 100644 --- a/Mage.Sets/src/mage/cards/r/Ragnar.java +++ b/Mage.Sets/src/mage/cards/r/Ragnar.java @@ -31,7 +31,7 @@ public final class Ragnar extends CardImpl { this.toughness = new MageInt(2); // {G}{W}{U}, {tap}: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{W}{U}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}{W}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RaidingParty.java b/Mage.Sets/src/mage/cards/r/RaidingParty.java index aefa5d7112b..4284c5b0a1a 100644 --- a/Mage.Sets/src/mage/cards/r/RaidingParty.java +++ b/Mage.Sets/src/mage/cards/r/RaidingParty.java @@ -51,7 +51,7 @@ public final class RaidingParty extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); // Sacrifice an Orc: Each player may tap any number of untapped white creatures they control. For each creature tapped this way, that player chooses up to two Plains. Then destroy all Plains that weren't chosen this way by any player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RaidingPartyEffect(), new SacrificeTargetCost(filterOrc))); + this.addAbility(new SimpleActivatedAbility(new RaidingPartyEffect(), new SacrificeTargetCost(filterOrc))); } private RaidingParty(final RaidingParty card) { diff --git a/Mage.Sets/src/mage/cards/r/RainbowCrow.java b/Mage.Sets/src/mage/cards/r/RainbowCrow.java index 0de48439e64..2e23d459411 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowCrow.java +++ b/Mage.Sets/src/mage/cards/r/RainbowCrow.java @@ -31,7 +31,7 @@ public final class RainbowCrow extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // // {1}: Rainbow Crow becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private RainbowCrow(final RainbowCrow card) { diff --git a/Mage.Sets/src/mage/cards/r/RainbowEfreet.java b/Mage.Sets/src/mage/cards/r/RainbowEfreet.java index fde2f266746..1a6e811f622 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowEfreet.java +++ b/Mage.Sets/src/mage/cards/r/RainbowEfreet.java @@ -29,7 +29,7 @@ public final class RainbowEfreet extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}{U}: Rainbow Efreet phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new PhaseOutSourceEffect(), new ManaCostsImpl<>("{U}{U}"))); } private RainbowEfreet(final RainbowEfreet card) { diff --git a/Mage.Sets/src/mage/cards/r/RakaDisciple.java b/Mage.Sets/src/mage/cards/r/RakaDisciple.java index 46e657ccb4a..c62e6277588 100644 --- a/Mage.Sets/src/mage/cards/r/RakaDisciple.java +++ b/Mage.Sets/src/mage/cards/r/RakaDisciple.java @@ -28,11 +28,11 @@ public final class RakaDisciple extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); + Ability firstAbility = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new TapSourceCost()); firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); + Ability secondAbility = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/r/RakdosCluestone.java b/Mage.Sets/src/mage/cards/r/RakdosCluestone.java index f0ca410a806..482c7ad7e4b 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosCluestone.java +++ b/Mage.Sets/src/mage/cards/r/RakdosCluestone.java @@ -32,7 +32,7 @@ public final class RakdosCluestone extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}, {T}, Sacrifice Rakdos Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java index 031d9bf00dc..141b0fb98e5 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java @@ -36,13 +36,13 @@ public final class RakdosGuildmage extends CardImpl { // ({BR} can be paid with either {B} or {R}.) // {3}{B}, Discard a card: Target creature gets -2/-2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // {3}{R}: Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RakdosGuildmageEffect(), new ManaCostsImpl<>("{3}{R}")); + SimpleActivatedAbility ability2 = new SimpleActivatedAbility(new RakdosGuildmageEffect(), new ManaCostsImpl<>("{3}{R}")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java b/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java index 9508daf5385..6663a117d8c 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java +++ b/Mage.Sets/src/mage/cards/r/RakdosIckspitter.java @@ -29,7 +29,7 @@ public final class RakdosIckspitter extends CardImpl { this.toughness = new MageInt(1); // {tap}: Rakdos Ickspitter deals 1 damage to target creature and that creature's controller loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); Effect effect = new LoseLifeTargetControllerEffect(1); effect.setText("and that creature's controller loses 1 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java index c7c8968fc95..c2d9a9f4018 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java +++ b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java @@ -30,7 +30,7 @@ public final class RakdosKeyrune extends CardImpl { this.addAbility(new RedManaAbility()); // {B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new RakdosKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); } private RakdosKeyrune(final RakdosKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosLocket.java b/Mage.Sets/src/mage/cards/r/RakdosLocket.java index a7fc9e3ebaa..ef679d908fd 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosLocket.java +++ b/Mage.Sets/src/mage/cards/r/RakdosLocket.java @@ -28,7 +28,7 @@ public final class RakdosLocket extends CardImpl { this.addAbility(new RedManaAbility()); // {B/R}{B/R}{B/R}{B/R}, {T}, Sacrifice Rakdos Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{B/R}{B/R}{B/R}{B/R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{B/R}{B/R}{B/R}{B/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RakdosRingleader.java b/Mage.Sets/src/mage/cards/r/RakdosRingleader.java index 25d1c1d7a49..88907565494 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosRingleader.java +++ b/Mage.Sets/src/mage/cards/r/RakdosRingleader.java @@ -36,7 +36,7 @@ public final class RakdosRingleader extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1, true), false, true)); // {B}: Regenerate Rakdos Ringleader. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private RakdosRingleader(final RakdosRingleader card) { diff --git a/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java b/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java index 903e3b0bb77..0b504464ab6 100644 --- a/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java +++ b/Mage.Sets/src/mage/cards/r/RakshasaDeathdealer.java @@ -28,9 +28,9 @@ public final class RakshasaDeathdealer extends CardImpl { this.toughness = new MageInt(2); // {B}{G}: Rakshasa Deathdealer gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2,2,Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); // {B}{G}: Regenerate Rakshasa Deathdealer. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{G}"))); } private RakshasaDeathdealer(final RakshasaDeathdealer card) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java index 291831096f1..f6c7e17b4b6 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java @@ -43,7 +43,7 @@ public final class RamosianCaptain extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {5}, {T}: Search your library for a Rebel 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(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianCommander.java b/Mage.Sets/src/mage/cards/r/RamosianCommander.java index f005b32bbc1..08b1b743810 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCommander.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCommander.java @@ -39,7 +39,7 @@ public final class RamosianCommander extends CardImpl { this.toughness = new MageInt(4); // {6}, {T}: Search your library for a Rebel 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(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java index 9addd4cee58..8ba98f33ae7 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java @@ -39,7 +39,7 @@ public final class RamosianLieutenant extends CardImpl { this.toughness = new MageInt(2); // {4}, {T}: Search your library for a Rebel 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(4)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java index bfda4bedcbc..d3b00479ed7 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java @@ -40,7 +40,7 @@ public final class RamosianRevivalist extends CardImpl { this.toughness = new MageInt(2); // {6}, {tap}: Return target Rebel permanent card with converted mana cost 5 or less from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java index e2b592925d6..67e300f212a 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java @@ -38,7 +38,7 @@ public final class RamosianSergeant extends CardImpl { this.toughness = new MageInt(1); // {3}, {T}: Search your library for a Rebel 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(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java index 71fc7fb68ef..20a8ec932bb 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java @@ -44,7 +44,7 @@ public final class RamosianSkyMarshal extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {7}, {T}: Search your library for a Rebel 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(7)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RampantElephant.java b/Mage.Sets/src/mage/cards/r/RampantElephant.java index f932376d12e..21be7ec0f9e 100644 --- a/Mage.Sets/src/mage/cards/r/RampantElephant.java +++ b/Mage.Sets/src/mage/cards/r/RampantElephant.java @@ -27,7 +27,7 @@ public final class RampantElephant extends CardImpl { this.toughness = new MageInt(2); // {G}: Target creature blocks Rampant Elephant this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamsesOverdark.java b/Mage.Sets/src/mage/cards/r/RamsesOverdark.java index d5b2b9c4b81..93a86234a2a 100644 --- a/Mage.Sets/src/mage/cards/r/RamsesOverdark.java +++ b/Mage.Sets/src/mage/cards/r/RamsesOverdark.java @@ -38,7 +38,7 @@ public final class RamsesOverdark extends CardImpl { this.toughness = new MageInt(3); // {tap}: Destroy target enchanted creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RamunapRuins.java b/Mage.Sets/src/mage/cards/r/RamunapRuins.java index 9549f6155e1..bae168f7d0c 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapRuins.java +++ b/Mage.Sets/src/mage/cards/r/RamunapRuins.java @@ -48,7 +48,7 @@ public final class RamunapRuins extends CardImpl { this.addAbility(manaAbility); // {2}{R}{R}, {t}, Sacrifice a Desert: Ramunap Ruins deals 2 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/r/RangerEnVec.java b/Mage.Sets/src/mage/cards/r/RangerEnVec.java index ef35032fd7d..e39b8bd6ab4 100644 --- a/Mage.Sets/src/mage/cards/r/RangerEnVec.java +++ b/Mage.Sets/src/mage/cards/r/RangerEnVec.java @@ -31,7 +31,7 @@ public final class RangerEnVec extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.G))); } private RangerEnVec(final RangerEnVec card) { diff --git a/Mage.Sets/src/mage/cards/r/RappellingScouts.java b/Mage.Sets/src/mage/cards/r/RappellingScouts.java index f8aaf6a5432..9b9d8d18d2d 100644 --- a/Mage.Sets/src/mage/cards/r/RappellingScouts.java +++ b/Mage.Sets/src/mage/cards/r/RappellingScouts.java @@ -31,7 +31,7 @@ public final class RappellingScouts extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{W}: Rappelling Scouts gains protection from the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}"))); } private RappellingScouts(final RappellingScouts card) { diff --git a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java index 3af693111ef..9e93758cf35 100644 --- a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java +++ b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java @@ -44,7 +44,7 @@ public final class RashidaScalebane extends CardImpl { this.toughness = new MageInt(4); // {tap}: Destroy target attacking or blocking Dragon. It can't be regenerated. You gain life equal to its power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new TapSourceCost()); Effect effect = new GainLifeEffect(TargetPermanentPowerCount.instance); effect.setText("You gain life equal to its power"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java index ce6db651f63..ae03012f912 100644 --- a/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java +++ b/Mage.Sets/src/mage/cards/r/RasputinDreamweaver.java @@ -51,7 +51,7 @@ public final class RasputinDreamweaver extends CardImpl { new CountersSourceCount(CounterType.DREAM))); // Remove a dream counter from Rasputin: Prevent the next 1 damage that would be dealt to Rasputin this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.DREAM.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.DREAM.createInstance()))); // At the beginning of your upkeep, if Rasputin started the turn untapped, put a dream counter on it. this.addAbility( diff --git a/Mage.Sets/src/mage/cards/r/RatchetBomb.java b/Mage.Sets/src/mage/cards/r/RatchetBomb.java index c6668d48da6..12693d8b64b 100644 --- a/Mage.Sets/src/mage/cards/r/RatchetBomb.java +++ b/Mage.Sets/src/mage/cards/r/RatchetBomb.java @@ -27,10 +27,10 @@ public final class RatchetBomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}: Put a charge counter on Ratchet Bomb. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); // {T}, Sacrifice Ratchet Bomb: Destroy each nonland permanent with a converted mana cost equal to the number of charge counters on Ratchet Bomb. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RatchetBombEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RatchetBombEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RathiAssassin.java b/Mage.Sets/src/mage/cards/r/RathiAssassin.java index 494c62f650a..7e5ae73b63b 100644 --- a/Mage.Sets/src/mage/cards/r/RathiAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RathiAssassin.java @@ -53,13 +53,13 @@ public final class RathiAssassin extends CardImpl { this.toughness = new MageInt(2); // {1}{B}{B}, {T}: Destroy target tapped nonblack creature. - Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); + Ability destroyAbility = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{B}{B}")); destroyAbility.addCost(new TapSourceCost()); destroyAbility.addTarget(new TargetCreaturePermanent(destroyFilter)); this.addAbility(destroyAbility); // {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/r/RathiFiend.java b/Mage.Sets/src/mage/cards/r/RathiFiend.java index 33fd7ba6e00..fe2d80ec7d7 100644 --- a/Mage.Sets/src/mage/cards/r/RathiFiend.java +++ b/Mage.Sets/src/mage/cards/r/RathiFiend.java @@ -45,7 +45,7 @@ public final class RathiFiend extends CardImpl { // When Rathi Fiend enters the battlefield, each player loses 3 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeAllPlayersEffect(3), false)); // {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/r/RathiIntimidator.java b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java index ef24ef2eff6..a10d31b8a5b 100644 --- a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java +++ b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java @@ -43,7 +43,7 @@ public final class RathiIntimidator extends CardImpl { this.addAbility(FearAbility.getInstance()); // {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/r/RathiTrapper.java b/Mage.Sets/src/mage/cards/r/RathiTrapper.java index c4fcd7f8b10..71db310be2d 100644 --- a/Mage.Sets/src/mage/cards/r/RathiTrapper.java +++ b/Mage.Sets/src/mage/cards/r/RathiTrapper.java @@ -31,7 +31,7 @@ public final class RathiTrapper extends CardImpl { this.toughness = new MageInt(2); // {B}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RathsEdge.java b/Mage.Sets/src/mage/cards/r/RathsEdge.java index 4ab90ece4e1..cb4795c4c5d 100644 --- a/Mage.Sets/src/mage/cards/r/RathsEdge.java +++ b/Mage.Sets/src/mage/cards/r/RathsEdge.java @@ -33,7 +33,7 @@ public final class RathsEdge extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {4}, {tap}, Sacrifice a land: Rath's Edge deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RatsOfRath.java b/Mage.Sets/src/mage/cards/r/RatsOfRath.java index bf971bcc6ee..85c464e026e 100644 --- a/Mage.Sets/src/mage/cards/r/RatsOfRath.java +++ b/Mage.Sets/src/mage/cards/r/RatsOfRath.java @@ -44,7 +44,7 @@ public final class RatsOfRath extends CardImpl { // {B}: Destroy target artifact, creature, or land you control. Effect effect = new DestroyTargetEffect(); effect.setOutcome(Outcome.AIDontUseIt); // AI can't handle this - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(effect, new ColoredManaCost(ColoredManaSymbol.B)); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RavenousBaloth.java b/Mage.Sets/src/mage/cards/r/RavenousBaloth.java index 71bfccd8872..f7eaa7f50cc 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousBaloth.java +++ b/Mage.Sets/src/mage/cards/r/RavenousBaloth.java @@ -29,7 +29,7 @@ public final class RavenousBaloth extends CardImpl { this.toughness = new MageInt(4); // Sacrifice a Beast: You gain 4 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(4), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java b/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java index 66e2d6d21fb..a8efb23d205 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java +++ b/Mage.Sets/src/mage/cards/r/RavenousBloodseeker.java @@ -27,7 +27,7 @@ public final class RavenousBloodseeker extends CardImpl { this.toughness = new MageInt(3); // Discard a card: Ravenous Bloodseeker gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new DiscardCardCost())); } private RavenousBloodseeker(final RavenousBloodseeker card) { diff --git a/Mage.Sets/src/mage/cards/r/RavenousIntruder.java b/Mage.Sets/src/mage/cards/r/RavenousIntruder.java index c8c3561eaf9..327eb151b79 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousIntruder.java +++ b/Mage.Sets/src/mage/cards/r/RavenousIntruder.java @@ -35,7 +35,7 @@ public final class RavenousIntruder extends CardImpl { this.toughness = new MageInt(2); // Sacrifice an artifact: Ravenous Intruder gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); } private RavenousIntruder(final RavenousIntruder card) { diff --git a/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java b/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java index f16bc876ea3..e14ec9c7c74 100644 --- a/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java +++ b/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java @@ -41,7 +41,7 @@ public final class RazakethTheFoulblooded extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Pay 2 life, Sacrifice another creature: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new PayLifeCost(2)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new PayLifeCost(2)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java index 950660d97d7..efe756e5831 100644 --- a/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RaziaBorosArchangel.java @@ -52,7 +52,7 @@ public final class RaziaBorosArchangel extends CardImpl { // {T}: The next 3 damage that would be dealt to target creature you control this turn is dealt to another target creature instead. Effect effect = new RaziaBorosArchangelEffect(Duration.EndOfTurn, 3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); Target target = new TargetControlledCreaturePermanent(); target.setTargetTag(1); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java b/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java index 52d466341f4..5eb4ebe3cbf 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java +++ b/Mage.Sets/src/mage/cards/r/RazorfinAbolisher.java @@ -39,7 +39,7 @@ public final class RazorfinAbolisher extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: Return target creature with a counter on it 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.addCost(new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/r/RazorfinHunter.java b/Mage.Sets/src/mage/cards/r/RazorfinHunter.java index 33a523dff9d..d946e016fce 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfinHunter.java +++ b/Mage.Sets/src/mage/cards/r/RazorfinHunter.java @@ -28,7 +28,7 @@ public final class RazorfinHunter extends CardImpl { this.power = new MageInt(1); 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 TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RazortipWhip.java b/Mage.Sets/src/mage/cards/r/RazortipWhip.java index 2ed2549ece5..96aa6b4d1aa 100644 --- a/Mage.Sets/src/mage/cards/r/RazortipWhip.java +++ b/Mage.Sets/src/mage/cards/r/RazortipWhip.java @@ -23,7 +23,7 @@ public final class RazortipWhip extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {tap}: Razortip Whip deals 1 damage to target opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RealmSeekers.java b/Mage.Sets/src/mage/cards/r/RealmSeekers.java index 86a0368257d..2047230781f 100644 --- a/Mage.Sets/src/mage/cards/r/RealmSeekers.java +++ b/Mage.Sets/src/mage/cards/r/RealmSeekers.java @@ -42,7 +42,7 @@ public final class RealmSeekers extends CardImpl { "with X +1/+1 counters on it, where X is the total number of cards in all players' hands")); // {2}{G}, Remove a +1/+1 counter from Realm Seekers: Search your library for a land card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java b/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java index 2e1c087fc35..6995996db26 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java @@ -33,9 +33,9 @@ public final class ReaperOfTheWilds extends CardImpl { // Whenever another creature dies, scry 1. this.addAbility(new DiesCreatureTriggeredAbility(new ScryEffect(1, false), false, true)); // {B}: Reaper of the Wilds gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {1}{G}: Reaper of the Wilds gains hexproof until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private ReaperOfTheWilds(final ReaperOfTheWilds card) { diff --git a/Mage.Sets/src/mage/cards/r/RebelInformer.java b/Mage.Sets/src/mage/cards/r/RebelInformer.java index 7dfd244380f..ab8004124b6 100644 --- a/Mage.Sets/src/mage/cards/r/RebelInformer.java +++ b/Mage.Sets/src/mage/cards/r/RebelInformer.java @@ -50,7 +50,7 @@ public final class RebelInformer extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterWhite, Duration.WhileOnBattlefield))); // {3}: Put target nontoken Rebel on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); ability.addTarget(new TargetPermanent(filterRebel)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Recantation.java b/Mage.Sets/src/mage/cards/r/Recantation.java index 6848bf4e656..227c19ebd45 100644 --- a/Mage.Sets/src/mage/cards/r/Recantation.java +++ b/Mage.Sets/src/mage/cards/r/Recantation.java @@ -36,7 +36,7 @@ public final class Recantation extends CardImpl { // {U}, Sacrifice Recantation: Return up to X target permanents to their owners' hands, where X is the number of verse counters on Recantation. Effect effect = new ReturnToHandTargetEffect(); effect.setText("Return up to X target permanents to their owners' hands, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, new FilterPermanent("up to X target permanents, where X is the number of verse counters on {this}."), false)); ability.setTargetAdjuster(new TargetsCountAdjuster(new CountersSourceCount(CounterType.VERSE))); diff --git a/Mage.Sets/src/mage/cards/r/RecklessAssault.java b/Mage.Sets/src/mage/cards/r/RecklessAssault.java index a84a9b4ead0..72b3262da42 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAssault.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAssault.java @@ -24,7 +24,7 @@ public final class RecklessAssault extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{R}"); // {1}, Pay 2 life: Reckless Assault deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new PayLifeCost(2)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java index 03f5da202c6..9446db91015 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java @@ -30,7 +30,7 @@ public final class RecklessEmbermage extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Reckless Embermage deals 1 damage to any target and 1 damage to itself. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addEffect(new DamageSelfEffect(1).setText("and 1 damage to itself")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RecklessReveler.java b/Mage.Sets/src/mage/cards/r/RecklessReveler.java index 42864228173..0f49bb5b6ca 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessReveler.java +++ b/Mage.Sets/src/mage/cards/r/RecklessReveler.java @@ -29,7 +29,7 @@ public final class RecklessReveler extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Reckless Reveler: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RecklessScholar.java b/Mage.Sets/src/mage/cards/r/RecklessScholar.java index d55eaaf39d3..6606208497d 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessScholar.java +++ b/Mage.Sets/src/mage/cards/r/RecklessScholar.java @@ -29,7 +29,7 @@ public final class RecklessScholar extends CardImpl { this.toughness = new MageInt(1); // {T}: Target player draws a card, then discards a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardTargetEffect(1, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawDiscardTargetEffect(1, 1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Reconnaissance.java b/Mage.Sets/src/mage/cards/r/Reconnaissance.java index 2a511d9ea91..3c0555a76d0 100644 --- a/Mage.Sets/src/mage/cards/r/Reconnaissance.java +++ b/Mage.Sets/src/mage/cards/r/Reconnaissance.java @@ -34,7 +34,7 @@ public final class Reconnaissance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); // {0}: Remove target attacking creature you control from combat and untap it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReconnaissanceRemoveFromCombatEffect(), new ManaCostsImpl<>("{0}")); + Ability ability = new SimpleActivatedAbility(new ReconnaissanceRemoveFromCombatEffect(), new ManaCostsImpl<>("{0}")); ability.addTarget(new TargetControlledCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ReefShaman.java b/Mage.Sets/src/mage/cards/r/ReefShaman.java index cd609feb9c5..dbe4e24bce4 100644 --- a/Mage.Sets/src/mage/cards/r/ReefShaman.java +++ b/Mage.Sets/src/mage/cards/r/ReefShaman.java @@ -29,7 +29,7 @@ public final class ReefShaman extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land becomes the basic land type of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Regeneration.java b/Mage.Sets/src/mage/cards/r/Regeneration.java index bc6e1e5b8a0..f670a21c839 100644 --- a/Mage.Sets/src/mage/cards/r/Regeneration.java +++ b/Mage.Sets/src/mage/cards/r/Regeneration.java @@ -31,7 +31,7 @@ public final class Regeneration extends CardImpl { this.addAbility(ability); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{G}"))); } private Regeneration(final Regeneration card) { diff --git a/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java b/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java index 5dad4af8b38..0611c53ec7a 100644 --- a/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java +++ b/Mage.Sets/src/mage/cards/r/ReinforcedBulwark.java @@ -29,7 +29,7 @@ public final class ReinforcedBulwark extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to you this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost())); } private ReinforcedBulwark(final ReinforcedBulwark card) { diff --git a/Mage.Sets/src/mage/cards/r/ReitoLantern.java b/Mage.Sets/src/mage/cards/r/ReitoLantern.java index d211646246b..29e6e55e177 100644 --- a/Mage.Sets/src/mage/cards/r/ReitoLantern.java +++ b/Mage.Sets/src/mage/cards/r/ReitoLantern.java @@ -22,7 +22,7 @@ public final class ReitoLantern extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Put target card from a graveyard on the bottom of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new GenericManaCost(3)); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java b/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java index 1a5a1d51145..9783a2b6844 100644 --- a/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java +++ b/Mage.Sets/src/mage/cards/r/RejuvenationChamber.java @@ -23,7 +23,7 @@ public final class RejuvenationChamber extends CardImpl { // Fading 2 this.addAbility(new FadingAbility(2, this)); // {tap}: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new TapSourceCost())); } private RejuvenationChamber(final RejuvenationChamber card) { diff --git a/Mage.Sets/src/mage/cards/r/RelentlessHunter.java b/Mage.Sets/src/mage/cards/r/RelentlessHunter.java index bd20f4310d5..18fb6e20a57 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessHunter.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessHunter.java @@ -33,7 +33,7 @@ public final class RelentlessHunter extends CardImpl { // {1}{R}{G}: Relentless Hunter gets +1/+1 and gains trample until end of turn. Effect effect1 = new BoostSourceEffect(1, 1, Duration.EndOfTurn); effect1.setText("{this} gets +1/+1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{1}{R}{G}")); + Ability ability = new SimpleActivatedAbility(effect1, new ManaCostsImpl<>("{1}{R}{G}")); Effect effect2 = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect2.setText("and gains trample until end of turn"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/r/RelicBarrier.java b/Mage.Sets/src/mage/cards/r/RelicBarrier.java index 87b431cb100..3414979df05 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBarrier.java +++ b/Mage.Sets/src/mage/cards/r/RelicBarrier.java @@ -22,7 +22,7 @@ public final class RelicBarrier extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Tap target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java index d5ce931e452..a0dae504ccf 100644 --- a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java +++ b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java @@ -33,11 +33,11 @@ public final class RelicOfProgenitus extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {tap}: Target player exiles a card from their graveyard. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RelicOfProgenitusEffect(), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(new RelicOfProgenitusEffect(), new TapSourceCost()); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); // {1}, Exile Relic of Progenitus: Exile all cards from all graveyards. Draw a card. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new ExileGraveyardAllPlayersEffect(), new GenericManaCost(1)); secondAbility.addCost(new ExileSourceCost()); secondAbility.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java b/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java index 5ba43523f87..780e5436c0d 100644 --- a/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java +++ b/Mage.Sets/src/mage/cards/r/RemorsefulCleric.java @@ -32,7 +32,7 @@ public final class RemorsefulCleric extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Contrite Cleric: Exile all cards in target player's graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileGraveyardAllTargetPlayerEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java index 5082f721496..7d58324439e 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java @@ -42,7 +42,7 @@ public final class RenownedWeaponsmith extends CardImpl { this.addAbility(new ConditionalColorlessManaAbility(new TapSourceCost(), 2, new RenownedWeaponsmithManaBuilder())); // {U}, {T}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RenownedWeaponsmithEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new RenownedWeaponsmithEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java index 6ebc3031b62..04827e6dd3a 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java @@ -30,7 +30,7 @@ public final class RenownedWeaver extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Renowned Weaver: Create a 1/3 green Spider enchantment creature token with reach. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResearchAssistant.java b/Mage.Sets/src/mage/cards/r/ResearchAssistant.java index 8b5b9203e4b..957bdc5c0be 100644 --- a/Mage.Sets/src/mage/cards/r/ResearchAssistant.java +++ b/Mage.Sets/src/mage/cards/r/ResearchAssistant.java @@ -29,7 +29,7 @@ public final class ResearchAssistant extends CardImpl { this.toughness = new MageInt(3); // {3}{U}, {T}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResilientWanderer.java b/Mage.Sets/src/mage/cards/r/ResilientWanderer.java index 0dfff57d63d..de53e7976ac 100644 --- a/Mage.Sets/src/mage/cards/r/ResilientWanderer.java +++ b/Mage.Sets/src/mage/cards/r/ResilientWanderer.java @@ -32,7 +32,7 @@ public final class ResilientWanderer extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Discard a card: Resilient Wanderer gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new DiscardCardCost()); this.addAbility(ability); } @@ -45,4 +45,3 @@ public final class ResilientWanderer extends CardImpl { return new ResilientWanderer(this); } } - diff --git a/Mage.Sets/src/mage/cards/r/ResistanceFighter.java b/Mage.Sets/src/mage/cards/r/ResistanceFighter.java index e9723de6e88..feee6c0e615 100644 --- a/Mage.Sets/src/mage/cards/r/ResistanceFighter.java +++ b/Mage.Sets/src/mage/cards/r/ResistanceFighter.java @@ -30,7 +30,7 @@ public final class ResistanceFighter extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Resistance Fighter: Prevent all combat damage target creature would deal this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageByTargetEffect(Duration.EndOfTurn, true) + Ability ability = new SimpleActivatedAbility(new PreventDamageByTargetEffect(Duration.EndOfTurn, true) .withTextOptions(false, true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ResplendentMentor.java b/Mage.Sets/src/mage/cards/r/ResplendentMentor.java index d47b2d7f711..b142c770b01 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentMentor.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentMentor.java @@ -40,7 +40,7 @@ public final class ResplendentMentor extends CardImpl { this.toughness = new MageInt(2); // White creatures you control have {tap}: You gain 1 life. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/r/RestlessApparition.java b/Mage.Sets/src/mage/cards/r/RestlessApparition.java index b4c37445ce1..bfbbacbac79 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessApparition.java +++ b/Mage.Sets/src/mage/cards/r/RestlessApparition.java @@ -28,7 +28,7 @@ public final class RestlessApparition extends CardImpl { this.toughness = new MageInt(2); // {WB}{WB}{WB}: Restless Apparition gets +3/+3 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}{W/B}"))); // Persist this.addAbility(new PersistAbility()); } diff --git a/Mage.Sets/src/mage/cards/r/RestlessBones.java b/Mage.Sets/src/mage/cards/r/RestlessBones.java index 0d085aae1f3..d91f1b0c631 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessBones.java +++ b/Mage.Sets/src/mage/cards/r/RestlessBones.java @@ -30,11 +30,11 @@ public final class RestlessBones extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private RestlessBones(final RestlessBones card) { diff --git a/Mage.Sets/src/mage/cards/r/RestlessDead.java b/Mage.Sets/src/mage/cards/r/RestlessDead.java index 9f02b735320..4db0ef37e0f 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RestlessDead.java @@ -26,7 +26,7 @@ public final class RestlessDead extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Restless Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private RestlessDead(final RestlessDead card) { diff --git a/Mage.Sets/src/mage/cards/r/RetractionHelix.java b/Mage.Sets/src/mage/cards/r/RetractionHelix.java index f92169d115c..99b46eae61d 100644 --- a/Mage.Sets/src/mage/cards/r/RetractionHelix.java +++ b/Mage.Sets/src/mage/cards/r/RetractionHelix.java @@ -28,7 +28,7 @@ public final class RetractionHelix extends CardImpl { // Until end of turn, target creature gains "{T}: Return target nonland permanent to its owner's hand." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); Target target = new TargetNonlandPermanent(); gainedAbility.addTarget(target); Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java b/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java index 1e08686c095..8be03098127 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java +++ b/Mage.Sets/src/mage/cards/r/ReturnedPhalanx.java @@ -31,7 +31,7 @@ public final class ReturnedPhalanx extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {1}{U}: Returned Phalanx can attack this turn as though it didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private ReturnedPhalanx(final ReturnedPhalanx card) { diff --git a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java index 9d4f7bc425c..90e37cf5f64 100644 --- a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java +++ b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java @@ -31,7 +31,7 @@ public final class RevekaWizardSavant extends CardImpl { this.toughness = new MageInt(1); // {tap}: Reveka, Wizard Savant deals 2 damage to any target and doesn't untap during your next untap step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/ReveredDead.java b/Mage.Sets/src/mage/cards/r/ReveredDead.java index 7fdd4fbfc53..ab4932c3f9d 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredDead.java +++ b/Mage.Sets/src/mage/cards/r/ReveredDead.java @@ -26,7 +26,7 @@ public final class ReveredDead extends CardImpl { this.toughness = new MageInt(1); // {W}: Regenerate Revered Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}"))); } private ReveredDead(final ReveredDead card) { diff --git a/Mage.Sets/src/mage/cards/r/ReveredElder.java b/Mage.Sets/src/mage/cards/r/ReveredElder.java index 6035b1c447c..185282b0065 100644 --- a/Mage.Sets/src/mage/cards/r/ReveredElder.java +++ b/Mage.Sets/src/mage/cards/r/ReveredElder.java @@ -27,7 +27,7 @@ public final class ReveredElder extends CardImpl { this.toughness = new MageInt(2); // {1}: Prevent the next 1 damage that would be dealt to Revered Elder this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}"))); } private ReveredElder(final ReveredElder card) { diff --git a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java index 460661c28f5..34ac88a308b 100644 --- a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java +++ b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java @@ -51,7 +51,7 @@ public final class RhonasTheIndomitable extends CardImpl { // {2}{G}: Another target creature gets +2/+0 and gains trample until end of turn. Effect effect = new BoostTargetEffect(2, 0, Duration.EndOfTurn); effect.setText("Another target creature gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{G}")); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/Rhox.java b/Mage.Sets/src/mage/cards/r/Rhox.java index d72e3a7c09a..583636a3554 100644 --- a/Mage.Sets/src/mage/cards/r/Rhox.java +++ b/Mage.Sets/src/mage/cards/r/Rhox.java @@ -30,7 +30,7 @@ public final class Rhox extends CardImpl { // You may have Rhox assign its combat damage as though it weren't blocked. this.addAbility(DamageAsThoughNotBlockedAbility.getInstance()); // {2}{G}: Regenerate Rhox. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private Rhox(final Rhox card) { diff --git a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java index c729359f8e3..8f81452ae61 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java @@ -41,12 +41,12 @@ public final class RhysTheRedeemed extends CardImpl { this.toughness = new MageInt(1); // {2}{GW}, {tap}: Create a 1/1 green and white Elf Warrior creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GreenWhiteElfWarriorToken()), new ManaCostsImpl<>("{2}{G/W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GreenWhiteElfWarriorToken()), new ManaCostsImpl<>("{2}{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}{GW}{GW}, {tap}: For each creature token you control, create a token that's a copy of that creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RhysTheRedeemedEffect(), new ManaCostsImpl<>("{4}{G/W}{G/W}")); + Ability ability2 = new SimpleActivatedAbility(new RhysTheRedeemedEffect(), new ManaCostsImpl<>("{4}{G/W}{G/W}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/r/RhysticDeluge.java b/Mage.Sets/src/mage/cards/r/RhysticDeluge.java index 2549700cc7b..c5e7bb876a1 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticDeluge.java +++ b/Mage.Sets/src/mage/cards/r/RhysticDeluge.java @@ -23,7 +23,7 @@ public final class RhysticDeluge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // {U}: Tap target creature unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new TapTargetEffect(), new ManaCostsImpl<>("{1}")), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new TapTargetEffect(), new ManaCostsImpl<>("{1}")), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RibbonSnake.java b/Mage.Sets/src/mage/cards/r/RibbonSnake.java index 605c60e9729..95a527868ba 100644 --- a/Mage.Sets/src/mage/cards/r/RibbonSnake.java +++ b/Mage.Sets/src/mage/cards/r/RibbonSnake.java @@ -31,7 +31,7 @@ public final class RibbonSnake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}: Ribbon Snake loses flying until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( + SimpleActivatedAbility ability = new SimpleActivatedAbility(new LoseAbilitySourceEffect( FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/r/Riddleform.java b/Mage.Sets/src/mage/cards/r/Riddleform.java index acdbe79a9b3..882d325facf 100644 --- a/Mage.Sets/src/mage/cards/r/Riddleform.java +++ b/Mage.Sets/src/mage/cards/r/Riddleform.java @@ -34,7 +34,7 @@ public final class Riddleform extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(effect, StaticFilters.FILTER_SPELL_A_NON_CREATURE, true)); // {2}{U}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1), new ManaCostsImpl<>("{2}{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RidgedKusite.java b/Mage.Sets/src/mage/cards/r/RidgedKusite.java index ad27f2ca912..be39b8edb25 100644 --- a/Mage.Sets/src/mage/cards/r/RidgedKusite.java +++ b/Mage.Sets/src/mage/cards/r/RidgedKusite.java @@ -36,7 +36,7 @@ public final class RidgedKusite extends CardImpl { // {1}{B}, {tap}, Discard a card: Target creature gets +1/+0 and gains first strike until end of turn. Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); effect.setText("Target creature gets +1/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RidgelineRager.java b/Mage.Sets/src/mage/cards/r/RidgelineRager.java index b5a8d3d2dc7..d1c97e1fb55 100644 --- a/Mage.Sets/src/mage/cards/r/RidgelineRager.java +++ b/Mage.Sets/src/mage/cards/r/RidgelineRager.java @@ -27,7 +27,7 @@ public final class RidgelineRager extends CardImpl { this.toughness = new MageInt(2); // {R}: Ridgeline Rager 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 RidgelineRager(final RidgelineRager card) { diff --git a/Mage.Sets/src/mage/cards/r/RiftElemental.java b/Mage.Sets/src/mage/cards/r/RiftElemental.java index 6910b54c0a2..cb9a06e5890 100644 --- a/Mage.Sets/src/mage/cards/r/RiftElemental.java +++ b/Mage.Sets/src/mage/cards/r/RiftElemental.java @@ -40,7 +40,7 @@ public final class RiftElemental extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, Remove a time counter from a permanent you control or suspended card you own: Rift Elemental gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new RiftElementalCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RighteousAura.java b/Mage.Sets/src/mage/cards/r/RighteousAura.java index b8ba3ca8faf..68e05258df6 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousAura.java +++ b/Mage.Sets/src/mage/cards/r/RighteousAura.java @@ -23,7 +23,7 @@ public final class RighteousAura extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // {W}, Pay 2 life: The next time a source of your choice would deal damage to you this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index 71e1ab12fef..94ee250aea7 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -49,7 +49,7 @@ public final class RimeTransfusion extends CardImpl { // Enchanted creature gets +2/+1 and has "{S}: This creature can't be blocked this turn except by snow creatures." SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl<>("{S}")); + Ability gainedAbility = new SimpleActivatedAbility(new GainAbilitySourceEffect(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn))),new ManaCostsImpl<>("{S}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/r/RimeboundDead.java b/Mage.Sets/src/mage/cards/r/RimeboundDead.java index 6ecf1f2f294..013d935efac 100644 --- a/Mage.Sets/src/mage/cards/r/RimeboundDead.java +++ b/Mage.Sets/src/mage/cards/r/RimeboundDead.java @@ -27,7 +27,7 @@ public final class RimeboundDead extends CardImpl { this.toughness = new MageInt(1); // {S}: Regenerate Rimebound Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{S}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{S}"))); } private RimeboundDead(final RimeboundDead card) { diff --git a/Mage.Sets/src/mage/cards/r/RingOfGix.java b/Mage.Sets/src/mage/cards/r/RingOfGix.java index 06384a75659..6efb7297533 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfGix.java +++ b/Mage.Sets/src/mage/cards/r/RingOfGix.java @@ -38,7 +38,7 @@ public final class RingOfGix extends CardImpl { this.addAbility(new EchoAbility("{3}")); // {1}, {tap}: Tap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java index acb4891dc22..06f23ddd3bb 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java +++ b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java @@ -35,7 +35,7 @@ public final class RingOfImmortals extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {3}, {tap}: Counter target instant or Aura spell that targets a permanent you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RingOfMaruf.java b/Mage.Sets/src/mage/cards/r/RingOfMaruf.java index 25fddf0d9f2..cc7ca17ed00 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfMaruf.java +++ b/Mage.Sets/src/mage/cards/r/RingOfMaruf.java @@ -30,7 +30,7 @@ public final class RingOfMaruf extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {5}, {Tap}, Exile Ring of Maruf: The next time you would draw a card this turn, instead choose a card you own from outside the game and put it into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RingOfMarufEffect(), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new RingOfMarufEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addHint(OpenSideboardHint.instance); diff --git a/Mage.Sets/src/mage/cards/r/RingOfRenewal.java b/Mage.Sets/src/mage/cards/r/RingOfRenewal.java index a2ce8dd7ad1..c6a8a96501e 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfRenewal.java +++ b/Mage.Sets/src/mage/cards/r/RingOfRenewal.java @@ -24,7 +24,7 @@ public final class RingOfRenewal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {5}, {tap}: Discard a card at random, then draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1, true), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new DiscardControllerEffect(1, true), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); Effect effect = new DrawCardSourceControllerEffect(2); effect.setText(", then draw two cards"); diff --git a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java index 2356d1fbd8b..0619ac3869d 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java +++ b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java @@ -29,7 +29,7 @@ public final class RingOfThreeWishes extends CardImpl { // Ring of Three Wishes enters the battlefield with three wish counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), "with three wish counters on it")); // {5}, {T}, Remove a wish counter from Ring of Three Wishes: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java index 008d239514e..b00be3adf1d 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java @@ -35,7 +35,7 @@ public final class RiptideChronologist extends CardImpl { this.toughness = new MageInt(3); // {U}, Sacrifice Riptide Chronologist: Untap all creatures of the creature type of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideChronologistEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new RiptideChronologistEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java index 0b0d22cdb67..3188cd79e22 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java +++ b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java @@ -35,7 +35,7 @@ public final class RiptideLaboratory extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{U}, {tap}: Return target Wizard you control 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.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java index b8559024486..e59f4a62952 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java +++ b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java @@ -44,7 +44,7 @@ public final class RiptideReplicator extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.CHARGE.createInstance()))); // {4}, {T}: Create an X/X creature token of the chosen color and type, where X is the number of charge counters on Riptide Replicator. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideReplicatorEffect(), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new RiptideReplicatorEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java b/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java index 223ba8509dc..a815e3925a7 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java +++ b/Mage.Sets/src/mage/cards/r/RiptideShapeshifter.java @@ -33,7 +33,7 @@ public final class RiptideShapeshifter extends CardImpl { this.toughness = new MageInt(3); // {2}{U}{U}, Sacrifice Riptide Shapeshifter: Choose a creature type. Reveal cards from the top of your library until you reveal a creature card of that type. Put that card onto the battlefield and shuffle the rest into your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideShapeshifterEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new RiptideShapeshifterEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java index d0cdf4602fb..a425674fae7 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java @@ -52,7 +52,7 @@ public final class RiseOfTheHobgoblins extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new RiseOfTheHobgoblinsEffect())); // {RW}: Red creatures and white creatures you control gain first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl<>("{R/W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter), new ManaCostsImpl<>("{R/W}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java index a86adfc6b7f..3b3d1f5c215 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java @@ -38,7 +38,7 @@ public final class RishadanPawnshop extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Shuffle target nontoken permanent you control into its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RishadanPawnshopShuffleIntoLibraryEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new RishadanPawnshopShuffleIntoLibraryEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RishadanPort.java b/Mage.Sets/src/mage/cards/r/RishadanPort.java index ce59a1300ec..6c928a69685 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPort.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPort.java @@ -25,7 +25,7 @@ public final class RishadanPort extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Tap target land. - 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 TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiverBoa.java b/Mage.Sets/src/mage/cards/r/RiverBoa.java index b3071bf88ea..8f32174193e 100644 --- a/Mage.Sets/src/mage/cards/r/RiverBoa.java +++ b/Mage.Sets/src/mage/cards/r/RiverBoa.java @@ -27,7 +27,7 @@ public final class RiverBoa extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new IslandwalkAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private RiverBoa(final RiverBoa card) { diff --git a/Mage.Sets/src/mage/cards/r/RiverHoopoe.java b/Mage.Sets/src/mage/cards/r/RiverHoopoe.java index bfaafdcb6fd..fde83844329 100644 --- a/Mage.Sets/src/mage/cards/r/RiverHoopoe.java +++ b/Mage.Sets/src/mage/cards/r/RiverHoopoe.java @@ -33,7 +33,7 @@ public final class RiverHoopoe extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{G}{U}: You gain 2 life and draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{3}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{3}{G}{U}")); Effect effect = new DrawCardSourceControllerEffect(1); effect.setText("and draw a card"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java b/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java index 3547cbf91e4..d1e671cd5fb 100644 --- a/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RixMaadiGuildmage.java @@ -44,12 +44,12 @@ public final class RixMaadiGuildmage extends CardImpl { this.toughness = new MageInt(2); // {B}{R}: Target blocking creature gets -1/-1 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}{R}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl<>("{B}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}{R}: Target player who lost life this turn loses 1 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}{R}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}{R}")); ability.addTarget(new TargetPlayer(1,1,false, playerFilter)); this.addAbility(ability); } @@ -83,4 +83,4 @@ class PlayerLostLifePredicate implements Predicate { public String toString() { return "Player lost life"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RockHydra.java b/Mage.Sets/src/mage/cards/r/RockHydra.java index 77c48f5d9fe..dc794a77e46 100644 --- a/Mage.Sets/src/mage/cards/r/RockHydra.java +++ b/Mage.Sets/src/mage/cards/r/RockHydra.java @@ -43,7 +43,7 @@ public final class RockHydra extends CardImpl { // For each 1 damage that would be dealt to Rock Hydra, if it has a +1/+1 counter on it, remove a +1/+1 counter from it and prevent that 1 damage. this.addAbility(new SimpleStaticAbility(new RockHydraEffect())); // {R}: Prevent the next 1 damage that would be dealt to Rock Hydra this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{R}"))); // {R}{R}{R}: Put a +1/+1 counter on Rock Hydra. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{R}{R}{R}"), new IsStepCondition(PhaseStep.UPKEEP), null)); } diff --git a/Mage.Sets/src/mage/cards/r/RodOfRuin.java b/Mage.Sets/src/mage/cards/r/RodOfRuin.java index 99d74516505..bbefb2546ec 100644 --- a/Mage.Sets/src/mage/cards/r/RodOfRuin.java +++ b/Mage.Sets/src/mage/cards/r/RodOfRuin.java @@ -21,7 +21,7 @@ public final class RodOfRuin extends CardImpl { public RodOfRuin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RodOfSpanking.java b/Mage.Sets/src/mage/cards/r/RodOfSpanking.java index 13f0a96ae68..0aeca2cee0f 100644 --- a/Mage.Sets/src/mage/cards/r/RodOfSpanking.java +++ b/Mage.Sets/src/mage/cards/r/RodOfSpanking.java @@ -30,7 +30,7 @@ public final class RodOfSpanking extends CardImpl { // 2, T: Rod of Spanking deals 1 damage to target player. Then untap Rod of // Spanking unless that player says "Thank you, sir. May I have another?" - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RodOfSpankingEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new RodOfSpankingEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RoguesPassage.java b/Mage.Sets/src/mage/cards/r/RoguesPassage.java index dbb9ef557e8..1843d1a585d 100644 --- a/Mage.Sets/src/mage/cards/r/RoguesPassage.java +++ b/Mage.Sets/src/mage/cards/r/RoguesPassage.java @@ -27,7 +27,7 @@ public final class RoguesPassage extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new TapSourceCost())); // {4}, {T}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RonomUnicorn.java b/Mage.Sets/src/mage/cards/r/RonomUnicorn.java index f108b3c23bc..99034e7bc8a 100644 --- a/Mage.Sets/src/mage/cards/r/RonomUnicorn.java +++ b/Mage.Sets/src/mage/cards/r/RonomUnicorn.java @@ -28,7 +28,7 @@ public final class RonomUnicorn extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Ronom Unicorn: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java b/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java index 8ca6de938dc..50a4a4c9892 100644 --- a/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java +++ b/Mage.Sets/src/mage/cards/r/RoofstalkerWight.java @@ -27,7 +27,7 @@ public final class RoofstalkerWight extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - 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 RoofstalkerWight(final RoofstalkerWight card) { diff --git a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java index eafd2fc37d6..b28621a44f0 100644 --- a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java +++ b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java @@ -38,7 +38,7 @@ public final class RoonOfTheHiddenRealm extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {2}, {tap}: Exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileReturnBattlefieldNextEndStepTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ExileReturnBattlefieldNextEndStepTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootGreevil.java b/Mage.Sets/src/mage/cards/r/RootGreevil.java index cb48a78c633..4086ac17dad 100644 --- a/Mage.Sets/src/mage/cards/r/RootGreevil.java +++ b/Mage.Sets/src/mage/cards/r/RootGreevil.java @@ -35,7 +35,7 @@ public final class RootGreevil extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {tap}, Sacrifice Root Greevil: Destroy all enchantments of the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RootGreevilEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new RootGreevilEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootKinAlly.java b/Mage.Sets/src/mage/cards/r/RootKinAlly.java index 00a8d441f54..a3ae36850e9 100644 --- a/Mage.Sets/src/mage/cards/r/RootKinAlly.java +++ b/Mage.Sets/src/mage/cards/r/RootKinAlly.java @@ -39,7 +39,7 @@ public final class RootKinAlly extends CardImpl { this.addAbility(new ConvokeAbility()); // Tap two untapped creatures you control: Root-Kin Ally gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true)))); } private RootKinAlly(final RootKinAlly card) { diff --git a/Mage.Sets/src/mage/cards/r/Rootrunner.java b/Mage.Sets/src/mage/cards/r/Rootrunner.java index ef51c205541..9681aa5a164 100644 --- a/Mage.Sets/src/mage/cards/r/Rootrunner.java +++ b/Mage.Sets/src/mage/cards/r/Rootrunner.java @@ -30,7 +30,7 @@ public final class Rootrunner extends CardImpl { this.toughness = new MageInt(3); //{G}{G}, Sacrifice Rootrunner: Put target land on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java b/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java index f66faf5b9d3..072d5bb893f 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java @@ -33,7 +33,7 @@ public final class RootwaterAlligator extends CardImpl { this.toughness = new MageInt(2); // Sacrifice a Forest: Regenerate Rootwater Alligator. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private RootwaterAlligator(final RootwaterAlligator card) { diff --git a/Mage.Sets/src/mage/cards/r/RootwaterHunter.java b/Mage.Sets/src/mage/cards/r/RootwaterHunter.java index 6ae0dea37b4..6527fadc2fd 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterHunter.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterHunter.java @@ -26,7 +26,7 @@ public final class RootwaterHunter extends CardImpl { this.power = new MageInt(1); 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 TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java b/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java index 64455fd0f3a..223ee6e3677 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterMatriarch.java @@ -33,7 +33,7 @@ public final class RootwaterMatriarch extends CardImpl { // {T}: Gain control of target creature for as long as that creature is enchanted ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), EnchantedTargetCondition.instance, "Gain control of target creature for as long as that creature is enchanted"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RootwaterMystic.java b/Mage.Sets/src/mage/cards/r/RootwaterMystic.java index 0a6100f30c5..38230b6dd9b 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterMystic.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterMystic.java @@ -28,7 +28,7 @@ public final class RootwaterMystic extends CardImpl { this.toughness = new MageInt(1); // {1}{U}: Look at the top card of target player's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryTopCardTargetPlayerEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new LookLibraryTopCardTargetPlayerEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RoyalAssassin.java b/Mage.Sets/src/mage/cards/r/RoyalAssassin.java index 1f4f5c9eab9..f806d427d94 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RoyalAssassin.java @@ -37,7 +37,7 @@ public final class RoyalAssassin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java index e902d457f42..2b4e912aa3e 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java +++ b/Mage.Sets/src/mage/cards/r/RoyalHerbalist.java @@ -29,7 +29,7 @@ public final class RoyalHerbalist extends CardImpl { this.toughness = new MageInt(1); // {2}, Exile the top card of your library: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileFromTopOfLibraryCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RuinGhost.java b/Mage.Sets/src/mage/cards/r/RuinGhost.java index 8ca1d14eeba..1546951777b 100644 --- a/Mage.Sets/src/mage/cards/r/RuinGhost.java +++ b/Mage.Sets/src/mage/cards/r/RuinGhost.java @@ -29,7 +29,7 @@ public final class RuinGhost extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}: Exile target land you control, then return it to the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileThenReturnTargetEffect(true, false), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new ExileThenReturnTargetEffect(true, false), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuinousGremlin.java b/Mage.Sets/src/mage/cards/r/RuinousGremlin.java index 33166498d53..cc062764c54 100644 --- a/Mage.Sets/src/mage/cards/r/RuinousGremlin.java +++ b/Mage.Sets/src/mage/cards/r/RuinousGremlin.java @@ -28,7 +28,7 @@ public final class RuinousGremlin extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, Sacrifice Ruinous Gremlin: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java index af6f977faac..b1890609b7b 100644 --- a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java +++ b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java @@ -39,7 +39,7 @@ public final class RuinsOfOranRief extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {T}: Put a +1/+1 counter on target colorless creature that entered the battlefield this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java b/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java index 5e668b1f707..5fb2906740a 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java +++ b/Mage.Sets/src/mage/cards/r/RumblingCrescendo.java @@ -42,7 +42,7 @@ public final class RumblingCrescendo extends CardImpl { // {R}, Sacrifice Rumbling Crescendo: Destroy up to X target lands, where X is the number of verse counters on Rumbling Crescendo. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target lands, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, filter, false)); ability.setTargetAdjuster(new TargetsCountAdjuster(new CountersSourceCount(CounterType.VERSE))); diff --git a/Mage.Sets/src/mage/cards/r/RummagingGoblin.java b/Mage.Sets/src/mage/cards/r/RummagingGoblin.java index 9d90f24207d..6df92d6f778 100644 --- a/Mage.Sets/src/mage/cards/r/RummagingGoblin.java +++ b/Mage.Sets/src/mage/cards/r/RummagingGoblin.java @@ -29,7 +29,7 @@ public final class RummagingGoblin extends CardImpl { this.toughness = new MageInt(1); // {tap}, Discard a card: Draw a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RunWild.java b/Mage.Sets/src/mage/cards/r/RunWild.java index f70f37ff61f..8b78ffd9bb6 100644 --- a/Mage.Sets/src/mage/cards/r/RunWild.java +++ b/Mage.Sets/src/mage/cards/r/RunWild.java @@ -30,7 +30,7 @@ public final class RunWild extends CardImpl { effect1.setText("Until end of turn, target creature gains trample"); this.getSpellAbility().addEffect(effect1); - Effect effect2 = new GainAbilityTargetEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")), Duration.EndOfTurn); + Effect effect2 = new GainAbilityTargetEffect(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")), Duration.EndOfTurn); effect2.setText("and \"{G}: Regenerate this creature.\""); this.getSpellAbility().addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/r/RuneCervinRider.java b/Mage.Sets/src/mage/cards/r/RuneCervinRider.java index b05f8340c60..7b2727cc4e4 100644 --- a/Mage.Sets/src/mage/cards/r/RuneCervinRider.java +++ b/Mage.Sets/src/mage/cards/r/RuneCervinRider.java @@ -29,7 +29,7 @@ public final class RuneCervinRider extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G/W}{G/W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G/W}{G/W}"))); } private RuneCervinRider(final RuneCervinRider card) { diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java index 5743d0a33a9..b754410f49e 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionArtifacts.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionArtifacts extends CardImpl { // {W}: 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java index 29b5c3cf83b..ea231aaeb73 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlack.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionBlack extends CardImpl { // {W}: 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java index 52e9aa1fd78..299bc336506 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionBlue.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionBlue extends CardImpl { // {W}: 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java index 6c8f583779b..17e83c87fa0 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionGreen.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionGreen extends CardImpl { // {W}: 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java index e4302456b8f..e620e0b7fa0 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionLands.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionLands extends CardImpl { // {W}: The next time a land 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java index 84c22a3deff..4af3ccfee3b 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionRed.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionRed extends CardImpl { // {W}: 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java b/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java index 5d9d77bd283..2624dd6d2ff 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfProtectionWhite.java @@ -31,7 +31,7 @@ public final class RuneOfProtectionWhite extends CardImpl { // {W}: 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<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}"))); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/r/Runesword.java b/Mage.Sets/src/mage/cards/r/Runesword.java index 8f225fe4b90..81b71c72ff6 100644 --- a/Mage.Sets/src/mage/cards/r/Runesword.java +++ b/Mage.Sets/src/mage/cards/r/Runesword.java @@ -40,7 +40,7 @@ public final class Runesword extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {3}, {T}: Target attacking creature gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), new GenericManaCost(3)); // When that creature leaves the battlefield this turn, sacrifice Runesword. ability.addEffect(new RuneswordCreateTriggeredAbilityEffect()); // If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. diff --git a/Mage.Sets/src/mage/cards/r/RushwoodGrove.java b/Mage.Sets/src/mage/cards/r/RushwoodGrove.java index 6e0ebdf05ff..c6476100d26 100644 --- a/Mage.Sets/src/mage/cards/r/RushwoodGrove.java +++ b/Mage.Sets/src/mage/cards/r/RushwoodGrove.java @@ -30,7 +30,7 @@ public final class RushwoodGrove extends CardImpl { // Rushwood Grove enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {T}: Put a storage counter on Rushwood Grove. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {T}, Remove any number of storage counters from Rushwood Grove: Add {G} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.GreenMana(1), diff --git a/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java b/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java index 346ce984782..0d5bfef7fc3 100644 --- a/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java +++ b/Mage.Sets/src/mage/cards/r/RushwoodHerbalist.java @@ -30,7 +30,7 @@ public final class RushwoodHerbalist extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}, Discard a card: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/RustTick.java b/Mage.Sets/src/mage/cards/r/RustTick.java index 6da15573aaf..fa71ece5514 100644 --- a/Mage.Sets/src/mage/cards/r/RustTick.java +++ b/Mage.Sets/src/mage/cards/r/RustTick.java @@ -33,7 +33,7 @@ public final class RustTick extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {1}, {tap}: Tap target artifact. It doesn't untap during its controller's untap step for as long as Rust Tick remains tapped. - 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 TargetArtifactPermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); diff --git a/Mage.Sets/src/mage/cards/r/RustedSlasher.java b/Mage.Sets/src/mage/cards/r/RustedSlasher.java index fa796f32ecd..8963ba5d19e 100644 --- a/Mage.Sets/src/mage/cards/r/RustedSlasher.java +++ b/Mage.Sets/src/mage/cards/r/RustedSlasher.java @@ -32,7 +32,7 @@ public final class RustedSlasher extends CardImpl { this.subtype.add(SubType.HORROR); this.power = new MageInt(4); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private RustedSlasher(final RustedSlasher card) { diff --git a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java index b1666045de7..67dafce5755 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java @@ -41,7 +41,7 @@ public final class RuthlessKnave extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, Sacrifice a creature: Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TreasureToken(), 2), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TreasureToken(), 2), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability);