refactor: SimpleActivatedAbility default zone (cards Q R)

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);

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);

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());

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());

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(

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);
         

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,

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) {

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);

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. <i>(This effect lasts indefinitely.)</i>
-        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);

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);
     }

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)));
     }

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}")));
     }
 

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);
     }

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);

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);
     }

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);

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) {

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);

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) {

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) {

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) {

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);

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);

Mage.Sets/src/mage/cards/r/RakdosGuildmage.java

@@ -36,13 +36,13 @@ public final class RakdosGuildmage extends CardImpl {
 
         // <i>({BR} can be paid with either {B} or {R}.)</i>
         // {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);
     }
 

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);

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) {

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);

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) {

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) {

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);
     }

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);
     }

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);
     }

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);

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);
     }

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);
     }

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);
     }

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);
     }

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));

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) {

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) {

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);

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(

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);
     }

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);
     }

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);
     }

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);
     }

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);

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());

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);
     }

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)));
     }
 

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) {

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) {

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);
     }

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);

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);

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);
     }

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);

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);
     }

Mage.Sets/src/mage/cards/r/ReaperOfTheWilds.java

@@ -33,9 +33,9 @@ public final class ReaperOfTheWilds extends CardImpl {
         // Whenever another creature dies, scry 1.</i>
         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) {

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);
     }

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)));

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);

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);

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());
         

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);
     }

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);
     }

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);
     }

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) {

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) {

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);
 

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) {

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);

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);
     }

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);

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);
     }

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);
 

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);
 

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);
 

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);
     }
 }
-

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);

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)));
     }
 

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());
     }

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) {

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) {

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);

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) {

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);

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) {

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) {

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);

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) {

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);
 

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);
     }

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"));

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);
     }
 

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);

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) {

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);
     }

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);
     }