From 76d422b548bd0703b5ecf3c0fbc50958da958858 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:30:27 -0500 Subject: [PATCH] refactor: SimpleActivatedAbility default zone (cards T) --- Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java | 2 +- Mage.Sets/src/mage/cards/t/TalonOfPain.java | 2 +- Mage.Sets/src/mage/cards/t/Talonrend.java | 2 +- Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java | 2 +- Mage.Sets/src/mage/cards/t/TamiyosJournal.java | 2 +- Mage.Sets/src/mage/cards/t/TangleAngler.java | 4 ++-- Mage.Sets/src/mage/cards/t/TangleHulk.java | 2 +- Mage.Sets/src/mage/cards/t/Tanglebloom.java | 2 +- Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java | 2 +- Mage.Sets/src/mage/cards/t/TarPitcher.java | 2 +- Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java | 2 +- Mage.Sets/src/mage/cards/t/TatteredDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TattermungeWitch.java | 2 +- Mage.Sets/src/mage/cards/t/TavernSwindler.java | 2 +- Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java | 2 +- Mage.Sets/src/mage/cards/t/TawnossCoffin.java | 2 +- Mage.Sets/src/mage/cards/t/TawnossWand.java | 2 +- Mage.Sets/src/mage/cards/t/TawnossWeaponry.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisCare.java | 4 ++-- Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java | 2 +- Mage.Sets/src/mage/cards/t/TelJiladExile.java | 2 +- Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java | 2 +- Mage.Sets/src/mage/cards/t/TelJiladStylus.java | 2 +- Mage.Sets/src/mage/cards/t/TelekineticSliver.java | 2 +- Mage.Sets/src/mage/cards/t/Telethopter.java | 2 +- Mage.Sets/src/mage/cards/t/TelimTorsDarts.java | 2 +- Mage.Sets/src/mage/cards/t/TempleBell.java | 2 +- Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java | 2 +- Mage.Sets/src/mage/cards/t/TemporalAdept.java | 2 +- Mage.Sets/src/mage/cards/t/TemporalAperture.java | 2 +- Mage.Sets/src/mage/cards/t/TemurBanner.java | 2 +- Mage.Sets/src/mage/cards/t/TemurSabertooth.java | 2 +- Mage.Sets/src/mage/cards/t/TerminalMoraine.java | 2 +- Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java | 2 +- Mage.Sets/src/mage/cards/t/ThalakosDrifters.java | 2 +- Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java | 2 +- Mage.Sets/src/mage/cards/t/ThalakosScout.java | 2 +- Mage.Sets/src/mage/cards/t/Thallid.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidDevourer.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidGerminator.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThallidOmnivore.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidShellDweller.java | 2 +- Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java | 2 +- Mage.Sets/src/mage/cards/t/ThassasIre.java | 2 +- Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java | 2 +- Mage.Sets/src/mage/cards/t/TheBigIdea.java | 4 ++-- Mage.Sets/src/mage/cards/t/TheBrute.java | 2 +- Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java | 2 +- Mage.Sets/src/mage/cards/t/TheDeathStar.java | 6 +++--- Mage.Sets/src/mage/cards/t/TheHive.java | 2 +- Mage.Sets/src/mage/cards/t/TheLocustGod.java | 2 +- Mage.Sets/src/mage/cards/t/TheScarabGod.java | 2 +- Mage.Sets/src/mage/cards/t/TheScorpionGod.java | 2 +- Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java | 2 +- Mage.Sets/src/mage/cards/t/TheloniteMonk.java | 2 +- Mage.Sets/src/mage/cards/t/ThermalDetonator.java | 2 +- Mage.Sets/src/mage/cards/t/ThermalNavigator.java | 2 +- Mage.Sets/src/mage/cards/t/Thermopod.java | 2 +- Mage.Sets/src/mage/cards/t/ThespiansStage.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThopterFoundry.java | 2 +- Mage.Sets/src/mage/cards/t/ThornThrashViashino.java | 2 +- Mage.Sets/src/mage/cards/t/ThornbiteStaff.java | 2 +- Mage.Sets/src/mage/cards/t/Thornling.java | 10 +++++----- Mage.Sets/src/mage/cards/t/ThornscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThornwindFaeries.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtCourier.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtDissector.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtLash.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java | 2 +- Mage.Sets/src/mage/cards/t/ThousandYearElixir.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenHeretic.java | 2 +- Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java | 2 +- Mage.Sets/src/mage/cards/t/ThranFoundry.java | 2 +- Mage.Sets/src/mage/cards/t/ThranWeaponry.java | 2 +- Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java | 2 +- Mage.Sets/src/mage/cards/t/ThrashingWumpus.java | 2 +- Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java | 2 +- Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java | 2 +- Mage.Sets/src/mage/cards/t/ThroneOfGeth.java | 2 +- Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullParasite.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullRetainer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullWizard.java | 2 +- Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderWall.java | 2 +- Mage.Sets/src/mage/cards/t/ThundercloudElemental.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThunderingSpineback.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderstaff.java | 2 +- Mage.Sets/src/mage/cards/t/TickingGnomes.java | 2 +- Mage.Sets/src/mage/cards/t/TidalControl.java | 2 +- Mage.Sets/src/mage/cards/t/TidalCourier.java | 2 +- Mage.Sets/src/mage/cards/t/TidalFlats.java | 2 +- Mage.Sets/src/mage/cards/t/TidalVisionary.java | 2 +- Mage.Sets/src/mage/cards/t/TidalWarrior.java | 2 +- Mage.Sets/src/mage/cards/t/TidewaterMinion.java | 2 +- Mage.Sets/src/mage/cards/t/TimeBomb.java | 2 +- Mage.Sets/src/mage/cards/t/TimeElemental.java | 2 +- Mage.Sets/src/mage/cards/t/TimeSieve.java | 2 +- Mage.Sets/src/mage/cards/t/TimeVault.java | 2 +- Mage.Sets/src/mage/cards/t/TinStreetMarket.java | 2 +- Mage.Sets/src/mage/cards/t/TinWingChimera.java | 2 +- Mage.Sets/src/mage/cards/t/TirelessTribe.java | 2 +- Mage.Sets/src/mage/cards/t/TitanForge.java | 4 ++-- Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java | 2 +- Mage.Sets/src/mage/cards/t/TitaniumGolem.java | 2 +- Mage.Sets/src/mage/cards/t/TolarianSentinel.java | 2 +- Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java | 2 +- Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java | 2 +- Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java | 2 +- Mage.Sets/src/mage/cards/t/TombRobber.java | 4 ++-- Mage.Sets/src/mage/cards/t/TonicPeddler.java | 2 +- Mage.Sets/src/mage/cards/t/ToothAndClaw.java | 2 +- Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java | 2 +- Mage.Sets/src/mage/cards/t/TopanAscetic.java | 2 +- Mage.Sets/src/mage/cards/t/TorWauki.java | 2 +- Mage.Sets/src/mage/cards/t/TorchDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TorchFiend.java | 2 +- Mage.Sets/src/mage/cards/t/TormodsCrypt.java | 2 +- Mage.Sets/src/mage/cards/t/TorturedExistence.java | 2 +- Mage.Sets/src/mage/cards/t/Touchstone.java | 2 +- Mage.Sets/src/mage/cards/t/TourachsGate.java | 2 +- Mage.Sets/src/mage/cards/t/TowerDrake.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfCalamities.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfChampions.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfCoireall.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfEons.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfFortunes.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java | 2 +- Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java | 2 +- Mage.Sets/src/mage/cards/t/ToweringThunderfist.java | 2 +- Mage.Sets/src/mage/cards/t/TownGossipmonger.java | 4 ++-- Mage.Sets/src/mage/cards/t/ToxicNim.java | 2 +- Mage.Sets/src/mage/cards/t/Toymaker.java | 2 +- Mage.Sets/src/mage/cards/t/Tracker.java | 2 +- .../src/mage/cards/t/TradeFederationBattleship.java | 2 +- Mage.Sets/src/mage/cards/t/TradeRoutes.java | 4 ++-- Mage.Sets/src/mage/cards/t/TradewindRider.java | 2 +- Mage.Sets/src/mage/cards/t/TradingPost.java | 8 ++++---- Mage.Sets/src/mage/cards/t/TragicPoet.java | 2 +- Mage.Sets/src/mage/cards/t/TrainedPronghorn.java | 4 +--- Mage.Sets/src/mage/cards/t/TranquilGrove.java | 2 +- Mage.Sets/src/mage/cards/t/Transluminant.java | 2 +- Mage.Sets/src/mage/cards/t/TrapDigger.java | 4 ++-- Mage.Sets/src/mage/cards/t/TravelersAmulet.java | 2 +- Mage.Sets/src/mage/cards/t/TreasureCove.java | 2 +- Mage.Sets/src/mage/cards/t/TreasureMap.java | 2 +- Mage.Sets/src/mage/cards/t/TreasureTrove.java | 2 +- Mage.Sets/src/mage/cards/t/TreeOfPerdition.java | 2 +- Mage.Sets/src/mage/cards/t/TreeOfRedemption.java | 2 +- Mage.Sets/src/mage/cards/t/TreetopVillage.java | 2 +- Mage.Sets/src/mage/cards/t/TrenchWurm.java | 2 +- Mage.Sets/src/mage/cards/t/TrespasserIlVec.java | 2 +- Mage.Sets/src/mage/cards/t/TrestleTroll.java | 4 ++-- Mage.Sets/src/mage/cards/t/TriadOfFates.java | 6 +++--- Mage.Sets/src/mage/cards/t/TricksterMage.java | 2 +- Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfMending.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfRage.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrigonOfThought.java | 4 ++-- Mage.Sets/src/mage/cards/t/TripNoose.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelavus.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelion.java | 2 +- Mage.Sets/src/mage/cards/t/TrollAscetic.java | 2 +- Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java | 2 +- Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java | 2 +- Mage.Sets/src/mage/cards/t/TruefirePaladin.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java | 2 +- Mage.Sets/src/mage/cards/t/TsaboTavoc.java | 2 +- Mage.Sets/src/mage/cards/t/TuknirDeathlock.java | 2 +- Mage.Sets/src/mage/cards/t/TundraKavu.java | 2 +- Mage.Sets/src/mage/cards/t/TunnelerWurm.java | 2 +- Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java | 2 +- Mage.Sets/src/mage/cards/t/TwilightDrover.java | 2 +- Mage.Sets/src/mage/cards/t/TwistedAbomination.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java | 2 +- Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java | 2 +- Mage.Sets/src/mage/cards/t/TyrantsMachine.java | 2 +- Mage.Sets/src/mage/cards/t/Tyrranax.java | 2 +- 185 files changed, 217 insertions(+), 219 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java index 75f9d3cf8e2..c32375af098 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthTalruumHero.java @@ -34,7 +34,7 @@ public final class TahngarthTalruumHero extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {1}{R}, {tap}: Tahngarth, Talruum Hero deals damage equal to its power to target creature. That creature deals damage equal to its power to Tahngarth. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TalonOfPain.java b/Mage.Sets/src/mage/cards/t/TalonOfPain.java index ecb6b7222c3..6582912bf66 100644 --- a/Mage.Sets/src/mage/cards/t/TalonOfPain.java +++ b/Mage.Sets/src/mage/cards/t/TalonOfPain.java @@ -43,7 +43,7 @@ public final class TalonOfPain extends CardImpl { this.addAbility(new TalonOfPainTriggeredAbility()); // {X}, {T}, Remove X charge counters from Talon of Pain: Talon of Pain deals X damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(GetXValue.instance, "it"), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addCost(new TalonOfPainRemoveVariableCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/Talonrend.java b/Mage.Sets/src/mage/cards/t/Talonrend.java index ad181db0e29..f60ea0daec0 100644 --- a/Mage.Sets/src/mage/cards/t/Talonrend.java +++ b/Mage.Sets/src/mage/cards/t/Talonrend.java @@ -27,7 +27,7 @@ public final class Talonrend extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private Talonrend(final Talonrend card) { diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java index cfc3fe2ff6c..1aa5966421e 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java @@ -40,7 +40,7 @@ public final class TalonsOfFalkenrath extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{1}{R}: This creature gets +2/+0 until end of turn." this.addAbility(new SimpleStaticAbility( - new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), + new GainAbilityAttachedEffect(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java index 8e5ac103922..d20fb32195a 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java +++ b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java @@ -35,7 +35,7 @@ public final class TamiyosJournal extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InvestigateEffect())); // {T}, Sacrifice three Clues: 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 TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TangleAngler.java b/Mage.Sets/src/mage/cards/t/TangleAngler.java index 312f301427c..718256eafe2 100644 --- a/Mage.Sets/src/mage/cards/t/TangleAngler.java +++ b/Mage.Sets/src/mage/cards/t/TangleAngler.java @@ -30,7 +30,7 @@ public final class TangleAngler extends CardImpl { this.toughness = new MageInt(5); this.addAbility(InfectAbility.getInstance()); - 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); } @@ -44,4 +44,4 @@ public final class TangleAngler extends CardImpl { return new TangleAngler(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TangleHulk.java b/Mage.Sets/src/mage/cards/t/TangleHulk.java index ad454f798a2..f3109ec61e1 100644 --- a/Mage.Sets/src/mage/cards/t/TangleHulk.java +++ b/Mage.Sets/src/mage/cards/t/TangleHulk.java @@ -25,7 +25,7 @@ public final class TangleHulk extends CardImpl { this.subtype.add(SubType.BEAST); this.power = new MageInt(5); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private TangleHulk(final TangleHulk card) { diff --git a/Mage.Sets/src/mage/cards/t/Tanglebloom.java b/Mage.Sets/src/mage/cards/t/Tanglebloom.java index 23d5531dc9d..2899d3bc902 100644 --- a/Mage.Sets/src/mage/cards/t/Tanglebloom.java +++ b/Mage.Sets/src/mage/cards/t/Tanglebloom.java @@ -20,7 +20,7 @@ public final class Tanglebloom extends CardImpl { public Tanglebloom(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {1}, {tap}: You gain 1 life. diff --git a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java index 7ac373df9d8..4777b4073b6 100644 --- a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java +++ b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java @@ -36,7 +36,7 @@ public final class TangleclawWerewolf extends CardImpl { // {6}{G}: Transform Tangleclaw Werewolf. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{6}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{6}{G}"))); } private TangleclawWerewolf(final TangleclawWerewolf card) { diff --git a/Mage.Sets/src/mage/cards/t/TarPitcher.java b/Mage.Sets/src/mage/cards/t/TarPitcher.java index c2404286e2a..8ff666c8d9b 100644 --- a/Mage.Sets/src/mage/cards/t/TarPitcher.java +++ b/Mage.Sets/src/mage/cards/t/TarPitcher.java @@ -31,7 +31,7 @@ public final class TarPitcher extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java b/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java index f70585844be..2a11a1f5d54 100644 --- a/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java +++ b/Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java @@ -37,7 +37,7 @@ public final class TarielReckonerOfSouls extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {T}: Choose a creature card at random from target opponent's graveyard. Put that card onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TarielReckonerOfSoulsEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TarielReckonerOfSoulsEffect(), new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TatteredDrake.java b/Mage.Sets/src/mage/cards/t/TatteredDrake.java index 2ec2a197dc4..6a61b8e79e5 100644 --- a/Mage.Sets/src/mage/cards/t/TatteredDrake.java +++ b/Mage.Sets/src/mage/cards/t/TatteredDrake.java @@ -28,7 +28,7 @@ public final class TatteredDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private TatteredDrake(final TatteredDrake card) { diff --git a/Mage.Sets/src/mage/cards/t/TattermungeWitch.java b/Mage.Sets/src/mage/cards/t/TattermungeWitch.java index 6983c456942..2f4b04af09f 100644 --- a/Mage.Sets/src/mage/cards/t/TattermungeWitch.java +++ b/Mage.Sets/src/mage/cards/t/TattermungeWitch.java @@ -38,7 +38,7 @@ public final class TattermungeWitch extends CardImpl { this.toughness = new MageInt(1); // {R}{G}: Each blocked creature gets +1/+0 and gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false).setText("each blocked creature gets +1/+0"), new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false).setText("each blocked creature gets +1/+0"), new ManaCostsImpl<>("{R}{G}")); ability.addEffect(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, filter, "and gains trample until end of turn")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TavernSwindler.java b/Mage.Sets/src/mage/cards/t/TavernSwindler.java index d25296f42cf..ecc0cca34e6 100644 --- a/Mage.Sets/src/mage/cards/t/TavernSwindler.java +++ b/Mage.Sets/src/mage/cards/t/TavernSwindler.java @@ -32,7 +32,7 @@ public final class TavernSwindler extends CardImpl { this.toughness = new MageInt(2); // {T}, Pay 3 life: Flip a coin. If you win the flip, you gain 6 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TavernSwindlerEffect(),new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TavernSwindlerEffect(),new TapSourceCost()); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java index 917dbb37304..edd6695ff7b 100644 --- a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java +++ b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java @@ -42,7 +42,7 @@ public final class TawnosUrzasApprentice extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {U}{R}, {T}: Copy target activated or triggered ability you control from an artifact source. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{U}{R}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{U}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetActivatedOrTriggeredAbility(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TawnossCoffin.java b/Mage.Sets/src/mage/cards/t/TawnossCoffin.java index 77c7ff63908..94133d3d2bd 100644 --- a/Mage.Sets/src/mage/cards/t/TawnossCoffin.java +++ b/Mage.Sets/src/mage/cards/t/TawnossCoffin.java @@ -45,7 +45,7 @@ public final class TawnossCoffin extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {3}, {T}: Exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TawnossCoffinEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TawnossCoffinEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TawnossWand.java b/Mage.Sets/src/mage/cards/t/TawnossWand.java index b7852d9e4d5..34c1271b4e8 100644 --- a/Mage.Sets/src/mage/cards/t/TawnossWand.java +++ b/Mage.Sets/src/mage/cards/t/TawnossWand.java @@ -32,7 +32,7 @@ public final class TawnossWand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Target creature with power 2 or less is unblockable this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java b/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java index 1ca1009206a..03844f94748 100644 --- a/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java +++ b/Mage.Sets/src/mage/cards/t/TawnossWeaponry.java @@ -29,7 +29,7 @@ public final class TawnossWeaponry extends CardImpl { // You may choose not to untap Tawnos's Weaponry during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Target creature gets +1/+1 for as long as Tawnos's Weaponry remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(1, 1, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +1/+1 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TeferisCare.java b/Mage.Sets/src/mage/cards/t/TeferisCare.java index 1cd6a9ae295..deca4044a2a 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisCare.java +++ b/Mage.Sets/src/mage/cards/t/TeferisCare.java @@ -37,12 +37,12 @@ public final class TeferisCare extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); // {W}, Sacrifice an enchantment: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // {3}{U}{U}: Counter target enchantment spell. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{3}{U}{U}")); + ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{3}{U}{U}")); ability.addTarget(new TargetSpell(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java b/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java index ac64fb97e06..5784d065779 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java +++ b/Mage.Sets/src/mage/cards/t/TeferisHonorGuard.java @@ -30,7 +30,7 @@ public final class TeferisHonorGuard extends CardImpl { this.addAbility(new FlankingAbility()); // {U}{U}: Teferi's Honor Guard 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 TeferisHonorGuard(final TeferisHonorGuard card) { diff --git a/Mage.Sets/src/mage/cards/t/TelJiladExile.java b/Mage.Sets/src/mage/cards/t/TelJiladExile.java index 6b4b514608b..039d5e13985 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladExile.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladExile.java @@ -25,7 +25,7 @@ public final class TelJiladExile extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private TelJiladExile(final TelJiladExile card) { diff --git a/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java b/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java index f3b1689ffd2..7f4b12d97c0 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladLifebreather.java @@ -38,7 +38,7 @@ public final class TelJiladLifebreather extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}, Sacrifice a Forest: 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 SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java index bd321df4704..732fa282866 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java @@ -32,7 +32,7 @@ public final class TelJiladStylus extends CardImpl { // {T}: Put target permanent you own on the bottom of your library. Effect effect = new PutOnLibraryTargetEffect(false,"put target permanent you own on the bottom of your library"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java index ae8a0ed07d4..e2c106c1647 100644 --- a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java +++ b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java @@ -33,7 +33,7 @@ public final class TelekineticSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{T}: Tap target permanent." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Tap target permanent.\""))); diff --git a/Mage.Sets/src/mage/cards/t/Telethopter.java b/Mage.Sets/src/mage/cards/t/Telethopter.java index 3ab16844e89..14ffaeed362 100644 --- a/Mage.Sets/src/mage/cards/t/Telethopter.java +++ b/Mage.Sets/src/mage/cards/t/Telethopter.java @@ -33,7 +33,7 @@ public final class Telethopter extends CardImpl { this.subtype.add(SubType.THOPTER); this.power = new MageInt(3); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)))); } private Telethopter(final Telethopter card) { diff --git a/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java b/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java index e72667da0ae..6f4b003ab42 100644 --- a/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java +++ b/Mage.Sets/src/mage/cards/t/TelimTorsDarts.java @@ -23,7 +23,7 @@ public final class TelimTorsDarts extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {tap}: Telim'Tor's Darts deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TempleBell.java b/Mage.Sets/src/mage/cards/t/TempleBell.java index 5bc10f0ecca..fb68fc72beb 100644 --- a/Mage.Sets/src/mage/cards/t/TempleBell.java +++ b/Mage.Sets/src/mage/cards/t/TempleBell.java @@ -19,7 +19,7 @@ public final class TempleBell extends CardImpl { public TempleBell(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardAllEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardAllEffect(1), new TapSourceCost())); } private TempleBell(final TempleBell card) { diff --git a/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java b/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java index de71f820e1a..9493630ae49 100644 --- a/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java +++ b/Mage.Sets/src/mage/cards/t/TempleOfAclazotz.java @@ -36,7 +36,7 @@ public final class TempleOfAclazotz extends CardImpl { this.addAbility(new BlackManaAbility()); // {T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TempleOfAclazotzEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TempleOfAclazotzEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TemporalAdept.java b/Mage.Sets/src/mage/cards/t/TemporalAdept.java index eaad47f7944..5e48965c6af 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalAdept.java +++ b/Mage.Sets/src/mage/cards/t/TemporalAdept.java @@ -30,7 +30,7 @@ public final class TemporalAdept extends CardImpl { this.toughness = new MageInt(1); // {U}{U}{U}, {tap}: Return target permanent to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TemporalAperture.java b/Mage.Sets/src/mage/cards/t/TemporalAperture.java index 9aa9db3d216..466aef04ed3 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalAperture.java +++ b/Mage.Sets/src/mage/cards/t/TemporalAperture.java @@ -23,7 +23,7 @@ public final class TemporalAperture extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {5}, {tap}: Shuffle your library, then reveal the top card. Until end of turn, for as long as that card remains on top of your library, play with the top card of your library revealed and you may play that card without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TemporalApertureEffect(), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(new TemporalApertureEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TemurBanner.java b/Mage.Sets/src/mage/cards/t/TemurBanner.java index 2ba92e8d333..0875be98c31 100644 --- a/Mage.Sets/src/mage/cards/t/TemurBanner.java +++ b/Mage.Sets/src/mage/cards/t/TemurBanner.java @@ -31,7 +31,7 @@ public final class TemurBanner extends CardImpl { this.addAbility(new RedManaAbility()); // {G}{U}{R}, {T}, Sacrifice Temur Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java index 7501dabf80d..8ecd953d200 100644 --- a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java +++ b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java @@ -35,7 +35,7 @@ public final class TemurSabertooth extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: You may return another creature you control to its owner's hand. If you do, Temur Sabertooth gains indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TemurSabertoothEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TemurSabertoothEffect(), new ManaCostsImpl<>("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TerminalMoraine.java b/Mage.Sets/src/mage/cards/t/TerminalMoraine.java index d03b0e8c786..36eda28a3ce 100644 --- a/Mage.Sets/src/mage/cards/t/TerminalMoraine.java +++ b/Mage.Sets/src/mage/cards/t/TerminalMoraine.java @@ -29,7 +29,7 @@ public final class TerminalMoraine extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}, Sacrifice Terminal Moraine: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java index b829a581764..9442bcb7522 100644 --- a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java @@ -49,7 +49,7 @@ public final class TetsuoUmezawa extends CardImpl { // Tetsuo Umezawa can't be the target of Aura spells. this.addAbility(new SimpleStaticAbility(new TetsuoUmezawaEffect())); // {U}{B}{B}{R}, {tap}: Destroy target tapped or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{U}{B}{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(creatureFilter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java b/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java index bc609f1db7a..5a7e9d5a4a5 100644 --- a/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java +++ b/Mage.Sets/src/mage/cards/t/ThalakosDrifters.java @@ -27,7 +27,7 @@ public final class ThalakosDrifters extends CardImpl { this.toughness = new MageInt(3); // Discard a card: Thalakos Drifters gains shadow until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); } private ThalakosDrifters(final ThalakosDrifters card) { diff --git a/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java b/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java index f1391609d95..35681d86fd9 100644 --- a/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java +++ b/Mage.Sets/src/mage/cards/t/ThalakosMistfolk.java @@ -29,7 +29,7 @@ public final class ThalakosMistfolk extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {U}: Put Thalakos Mistfolk on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private ThalakosMistfolk(final ThalakosMistfolk card) { diff --git a/Mage.Sets/src/mage/cards/t/ThalakosScout.java b/Mage.Sets/src/mage/cards/t/ThalakosScout.java index 9aeaf594739..9ec0672a307 100644 --- a/Mage.Sets/src/mage/cards/t/ThalakosScout.java +++ b/Mage.Sets/src/mage/cards/t/ThalakosScout.java @@ -31,7 +31,7 @@ public final class ThalakosScout extends CardImpl { this.addAbility(ShadowAbility.getInstance()); // Discard a card: Return Thalakos Scout to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(), new DiscardCardCost())); } private ThalakosScout(final ThalakosScout card) { diff --git a/Mage.Sets/src/mage/cards/t/Thallid.java b/Mage.Sets/src/mage/cards/t/Thallid.java index df0de583db2..b97f2812040 100644 --- a/Mage.Sets/src/mage/cards/t/Thallid.java +++ b/Mage.Sets/src/mage/cards/t/Thallid.java @@ -32,7 +32,7 @@ public final class Thallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } private Thallid(final Thallid card) { diff --git a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java index 1fd22ee89e6..511c7281d1d 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java @@ -38,7 +38,7 @@ public final class ThallidDevourer extends CardImpl { new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Thallid Devourer gets +1/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 2, Duration.EndOfTurn), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/t/ThallidGerminator.java b/Mage.Sets/src/mage/cards/t/ThallidGerminator.java index 91717bbaa19..2cbce350896 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidGerminator.java +++ b/Mage.Sets/src/mage/cards/t/ThallidGerminator.java @@ -37,9 +37,9 @@ public final class ThallidGerminator extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Germinator. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid Germinator: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java b/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java index e78af6483d6..5c5abbd526c 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java +++ b/Mage.Sets/src/mage/cards/t/ThallidOmnivore.java @@ -40,7 +40,7 @@ public final class ThallidOmnivore extends CardImpl { // {1}, Sacrifice another creature: Thallid Omnivore gets +2/+2 until end of turn. If a saproling was sacrificed in this way you gain 2 life. Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addEffect(new ThallidOmnivoreEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java b/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java index 7a70799488b..b740bbb49e1 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java +++ b/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java @@ -35,7 +35,7 @@ public final class ThallidShellDweller extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Shell-Dweller. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid Shell-Dweller: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java b/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java index 7ff2cd5a366..deeeeed60c2 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidSoothsayer.java @@ -29,7 +29,7 @@ public final class ThallidSoothsayer extends CardImpl { this.toughness = new MageInt(3); // {2}, Sacrifice a creature: Draw a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThassasIre.java b/Mage.Sets/src/mage/cards/t/ThassasIre.java index fa55fde68cc..f464218acb1 100644 --- a/Mage.Sets/src/mage/cards/t/ThassasIre.java +++ b/Mage.Sets/src/mage/cards/t/ThassasIre.java @@ -23,7 +23,7 @@ public final class ThassasIre extends CardImpl { // {3}{U}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index ee74d061c54..88a616a5cac 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -43,7 +43,7 @@ public final class ThatWhichWasTaken extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {4}, {T}: Put a divinity counter on target permanent other than That Which Was Taken. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheBigIdea.java b/Mage.Sets/src/mage/cards/t/TheBigIdea.java index b9f1108f14e..cdcf4333958 100644 --- a/Mage.Sets/src/mage/cards/t/TheBigIdea.java +++ b/Mage.Sets/src/mage/cards/t/TheBigIdea.java @@ -43,12 +43,12 @@ public final class TheBigIdea extends CardImpl { this.toughness = new MageInt(4); // {2}{B/R}{B/R}, {T}: Roll a six-sided dice. Create a number of 1/1 red Brainiac creature tokens equal to the result. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheBigIdeaEffect(), new ManaCostsImpl<>("{2}{B/R}{B/R}")); + Ability ability = new SimpleActivatedAbility(new TheBigIdeaEffect(), new ManaCostsImpl<>("{2}{B/R}{B/R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // Tap three untapped Brainiacs you control: The next time you would roll a six-sided die, instead roll two six-sided dice and use the total of those results. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheBigIdeaReplacementEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new TheBigIdeaReplacementEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true)))); } private TheBigIdea(final TheBigIdea card) { diff --git a/Mage.Sets/src/mage/cards/t/TheBrute.java b/Mage.Sets/src/mage/cards/t/TheBrute.java index 58e57434fb7..77ab08d36be 100644 --- a/Mage.Sets/src/mage/cards/t/TheBrute.java +++ b/Mage.Sets/src/mage/cards/t/TheBrute.java @@ -39,7 +39,7 @@ public final class TheBrute extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0))); // {R}{R}{R}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{R}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{R}{R}{R}"))); } private TheBrute(final TheBrute card) { diff --git a/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java b/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java index 61bb6999cdc..f901e56682b 100644 --- a/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java +++ b/Mage.Sets/src/mage/cards/t/TheCinematicPhoenix.java @@ -56,7 +56,7 @@ public final class TheCinematicPhoenix extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {1}, {T}: Return target legendary creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheDeathStar.java b/Mage.Sets/src/mage/cards/t/TheDeathStar.java index 94ef47dee24..1c06d6016ed 100644 --- a/Mage.Sets/src/mage/cards/t/TheDeathStar.java +++ b/Mage.Sets/src/mage/cards/t/TheDeathStar.java @@ -35,12 +35,12 @@ public final class TheDeathStar extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2},{T}: Put a charge counter on The Death Star. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {T}, Remove three charge counters from The Death Star: Destroy target permanent. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); @@ -48,7 +48,7 @@ public final class TheDeathStar extends CardImpl { // {T}, Remove ten charge counters from The Death Star: Destroy target player. Effect effect = new LoseGameTargetPlayerEffect(); effect.setText("Destroy target player"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(10))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheHive.java b/Mage.Sets/src/mage/cards/t/TheHive.java index f1b1e0ae208..97427dc332d 100644 --- a/Mage.Sets/src/mage/cards/t/TheHive.java +++ b/Mage.Sets/src/mage/cards/t/TheHive.java @@ -23,7 +23,7 @@ public final class TheHive extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {5}, {T}: Create a 1/1 colorless Insect artifact creature token with flying named Wasp. (It can’t be blocked except by creatures with flying or reach.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WaspToken(), 1), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new WaspToken(), 1), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheLocustGod.java b/Mage.Sets/src/mage/cards/t/TheLocustGod.java index e78dd25ed1e..f1d0f8526c1 100644 --- a/Mage.Sets/src/mage/cards/t/TheLocustGod.java +++ b/Mage.Sets/src/mage/cards/t/TheLocustGod.java @@ -48,7 +48,7 @@ public final class TheLocustGod extends CardImpl { this.addAbility(new DrawCardControllerTriggeredAbility(new CreateTokenEffect(new TheLocustGodInsectToken(), 1, false, false), false)); // {2}{U}{R}: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}{R}")); this.addAbility(ability); // When The Locust God dies, return it to its owner's hand at the beginning of the next end step. diff --git a/Mage.Sets/src/mage/cards/t/TheScarabGod.java b/Mage.Sets/src/mage/cards/t/TheScarabGod.java index 014b5e2b01d..8e2ec515794 100644 --- a/Mage.Sets/src/mage/cards/t/TheScarabGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScarabGod.java @@ -54,7 +54,7 @@ public final class TheScarabGod extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TheScarabGodEffect(xValue)).addHint(hint)); // {2}{U}{B}: Exile target creature card from a graveyard. Create a token that's a copy of it, except it's a 4/4 black Zombie. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TheScarabGodEffect2(), new ManaCostsImpl<>("{2}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new TheScarabGodEffect2(), new ManaCostsImpl<>("{2}{U}{B}")); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java index 58d83b6ae41..632c9a2b0cb 100644 --- a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java @@ -49,7 +49,7 @@ public final class TheScorpionGod extends CardImpl { this.addAbility(new TheScorpionGodTriggeredAbility()); // {1}{B}{R}: Put a -1/-1 counter on another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{1}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{1}{B}{R}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java index a920c320c8c..530cc23cdbc 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java +++ b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java @@ -46,7 +46,7 @@ public final class ThelonOfHavenwood extends CardImpl { this.addAbility(new SimpleStaticAbility(new ThelonOfHavenwoodBoostEffect())); // {B}{G}, Exile a Fungus card from a graveyard: Put a spore counter on each Fungus on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.SPORE.createInstance(), filterPermanent), new ManaCostsImpl<>("{B}{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filterPermanent), new ManaCostsImpl<>("{B}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInASingleGraveyard(1, 1, filterCard), "exile a Fungus card from a graveyard")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheloniteMonk.java b/Mage.Sets/src/mage/cards/t/TheloniteMonk.java index bd5cd2bb8ea..5d2a69785ce 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteMonk.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteMonk.java @@ -42,7 +42,7 @@ public final class TheloniteMonk extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice a green creature: Target land becomes a Forest. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield, SubType.FOREST), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield, SubType.FOREST), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThermalDetonator.java b/Mage.Sets/src/mage/cards/t/ThermalDetonator.java index 090982519b2..fb259b601d0 100644 --- a/Mage.Sets/src/mage/cards/t/ThermalDetonator.java +++ b/Mage.Sets/src/mage/cards/t/ThermalDetonator.java @@ -34,7 +34,7 @@ public final class ThermalDetonator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, Sacrifice Thermal Detonator: Thermal Detonator deals 2 damage to target creature without spaceflight or target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlayer(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThermalNavigator.java b/Mage.Sets/src/mage/cards/t/ThermalNavigator.java index 5bceb752496..d6572ebb373 100644 --- a/Mage.Sets/src/mage/cards/t/ThermalNavigator.java +++ b/Mage.Sets/src/mage/cards/t/ThermalNavigator.java @@ -31,7 +31,7 @@ public final class ThermalNavigator extends CardImpl { this.toughness = new MageInt(2); // Sacrifice an artifact: Thermal Navigator gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT))); } private ThermalNavigator(final ThermalNavigator card) { diff --git a/Mage.Sets/src/mage/cards/t/Thermopod.java b/Mage.Sets/src/mage/cards/t/Thermopod.java index 17495120422..b76fef80577 100644 --- a/Mage.Sets/src/mage/cards/t/Thermopod.java +++ b/Mage.Sets/src/mage/cards/t/Thermopod.java @@ -36,7 +36,7 @@ public final class Thermopod extends CardImpl { this.toughness = new MageInt(3); // {S}: Thermopod gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{S}"))); // Sacrifice a creature: Add {R}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.RedMana(1), CreaturesYouControlCount.instance), diff --git a/Mage.Sets/src/mage/cards/t/ThespiansStage.java b/Mage.Sets/src/mage/cards/t/ThespiansStage.java index eebcf0ce6aa..8b81e62a8b2 100644 --- a/Mage.Sets/src/mage/cards/t/ThespiansStage.java +++ b/Mage.Sets/src/mage/cards/t/ThespiansStage.java @@ -31,7 +31,7 @@ public final class ThespiansStage extends CardImpl { this.addAbility(new ColorlessManaAbility()); // 2, {T}: Thespian's Stage becomes a copy of target land, except it has this ability. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ThespiansStageCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); @@ -70,7 +70,7 @@ class ThespiansStageCopyEffect extends OneShotEffect { Permanent copyFromPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (sourcePermanent != null && copyFromPermanent != null) { Permanent newPermanent = game.copyPermanent(copyFromPermanent, sourcePermanent.getId(), source, new EmptyCopyApplier()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThespiansStageCopyEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ThespiansStageCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); newPermanent.addAbility(ability, source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java index faad63ac16a..ba04ba644db 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java +++ b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java @@ -34,7 +34,7 @@ public final class ThopterFoundry extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{W/B}{U}"); // {1}, Sacrifice a nontoken artifact: Create a 1/1 blue Thopter artifact creature token with flying. You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ThopterToken()), new GenericManaCost(1)); ability.addEffect(new GainLifeEffect(1)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java b/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java index efb225e9090..6cc3e3d0916 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java +++ b/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java @@ -34,7 +34,7 @@ public final class ThornThrashViashino extends CardImpl { this.addAbility(new DevourAbility(2)); // {G}: Thorn-Thrash Viashino gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl<>("{G}"))); } private ThornThrashViashino(final ThornThrashViashino card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index 2c93014a1d3..5c37dd7284d 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -36,7 +36,7 @@ public final class ThornbiteStaff extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{2}, {T}: This creature deals 1 damage to any target" and "Whenever a creature dies, untap this creature." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(2)); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/t/Thornling.java b/Mage.Sets/src/mage/cards/t/Thornling.java index 94b65e2a2b0..197a6340e1a 100644 --- a/Mage.Sets/src/mage/cards/t/Thornling.java +++ b/Mage.Sets/src/mage/cards/t/Thornling.java @@ -32,11 +32,11 @@ public final class Thornling extends CardImpl { this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private Thornling(final Thornling card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java b/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java index 0d339ea3cbf..fe3b0479429 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeMaster.java @@ -33,14 +33,14 @@ public final class ThornscapeMaster extends CardImpl { this.toughness = new MageInt(2); // {R}{R}, {T}: Thornscape Master deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {W}{W}, {T}: Target creature gains protection from the color of your choice until end of turn. Effect effect = new GainProtectionFromColorTargetEffect(Duration.EndOfTurn); effect.setText("Target creature gains protection from the color of your choice until end of turn."); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{W}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java index 46c4787ba0a..d58dc82fbb3 100644 --- a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java +++ b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java @@ -31,7 +31,7 @@ public final class ThornwindFaeries extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Thornwind Faeries deals 1 damage to any target. - 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/t/ThoughtCourier.java b/Mage.Sets/src/mage/cards/t/ThoughtCourier.java index ce9405cb62b..60be3a33476 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtCourier.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtCourier.java @@ -27,7 +27,7 @@ public final class ThoughtCourier extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new TapSourceCost())); } private ThoughtCourier(final ThoughtCourier card) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtDissector.java b/Mage.Sets/src/mage/cards/t/ThoughtDissector.java index be534090e70..fab3867ec31 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtDissector.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtDissector.java @@ -31,7 +31,7 @@ public final class ThoughtDissector extends CardImpl { // {X}, {tap}: Target opponent reveals cards from the top of their library until an artifact card or X cards are revealed, whichever comes first. If an artifact card is revealed this way, put it onto the battlefield under your control and sacrifice Thought Dissector. Put the rest of the revealed cards into that player's graveyard. - SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThoughtDissectorEffect(), new VariableManaCost(VariableCostType.NORMAL)); + SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(new ThoughtDissectorEffect(), new VariableManaCost(VariableCostType.NORMAL)); abilitiy.addCost(new TapSourceCost()); abilitiy.addTarget(new TargetOpponent()); this.addAbility(abilitiy); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtLash.java b/Mage.Sets/src/mage/cards/t/ThoughtLash.java index 810cda64846..6b77d009303 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtLash.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtLash.java @@ -38,7 +38,7 @@ public final class ThoughtLash extends CardImpl { this.addAbility(new ThoughtLashTriggeredAbility()); // Exile the top card of your library: 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 ExileFromTopOfLibraryCost(1))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new ExileFromTopOfLibraryCost(1))); } private ThoughtLash(final ThoughtLash card) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java b/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java index 2cc35a22529..4e3f8ec2f6f 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java @@ -33,7 +33,7 @@ public final class ThoughtcutterAgent extends CardImpl { this.toughness = new MageInt(1); // {U}{B}, {tap}: Target player loses 1 life and reveals their hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); Effect revealEffect = new RevealHandTargetEffect(TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java b/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java index 22a1b132b78..8f5d89c63e2 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java @@ -41,7 +41,7 @@ public final class ThoughtpickerWitch extends CardImpl { this.toughness = new MageInt(1); // {1}, Sacrifice a creature: Look at the top two cards of target opponent's library, then exile one of them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThoughtpickerWitchEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ThoughtpickerWitchEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java index 7e6e3081339..d8ed2a26c9b 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java +++ b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java @@ -33,7 +33,7 @@ public final class ThousandYearElixir extends CardImpl { this.addAbility(new SimpleStaticAbility(new ThousandYearElixirEffect())); // {1}, {tap}: Untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java index 4c2ed207216..52acdd3f2a4 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java @@ -32,7 +32,7 @@ public final class ThrabenDoomsayer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Create a 1/1 white Human creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +2/+2"))); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java b/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java index d2861c441bc..58d9fdb799e 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenGargoyle.java @@ -33,7 +33,7 @@ public final class ThrabenGargoyle extends CardImpl { // {6}: Transform Thraben Gargoyle. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new GenericManaCost(6))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new GenericManaCost(6))); } private ThrabenGargoyle(final ThrabenGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java b/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java index eb2fb56b274..ba7735e0545 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenHeretic.java @@ -31,7 +31,7 @@ public final class ThrabenHeretic extends CardImpl { this.toughness = new MageInt(2); // {tap}: Exile target creature card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java b/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java index a4e4c820460..b0915e152b8 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java @@ -30,7 +30,7 @@ public final class ThrabenStandardBearer extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {T}, Discard a card: Create a 1/1 white Human Soldier creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanSoldierToken()), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new HumanSoldierToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThranFoundry.java b/Mage.Sets/src/mage/cards/t/ThranFoundry.java index 5ca5f4cc0c6..2084f428558 100644 --- a/Mage.Sets/src/mage/cards/t/ThranFoundry.java +++ b/Mage.Sets/src/mage/cards/t/ThranFoundry.java @@ -28,7 +28,7 @@ public final class ThranFoundry extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, {tap}, Exile Thran Foundry: Target player shuffles their graveyard into their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThranFoundryEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ThranFoundryEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/ThranWeaponry.java b/Mage.Sets/src/mage/cards/t/ThranWeaponry.java index 43e17445d60..cafc735c331 100644 --- a/Mage.Sets/src/mage/cards/t/ThranWeaponry.java +++ b/Mage.Sets/src/mage/cards/t/ThranWeaponry.java @@ -32,7 +32,7 @@ public final class ThranWeaponry extends CardImpl { this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: All creatures get +2/+2 for as long as Thran Weaponry remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThranWeaponryEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new ThranWeaponryEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java b/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java index ab2e9984abc..c3485c9f453 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingBrontodon.java @@ -29,7 +29,7 @@ public final class ThrashingBrontodon extends CardImpl { this.toughness = new MageInt(4); // {1}, Sacrifice Thrashing Brontodon: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java b/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java index c55288ed663..d3e8605c4a4 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingWumpus.java @@ -26,7 +26,7 @@ public final class ThrashingWumpus extends CardImpl { this.toughness = new MageInt(3); // {B}: Thrashing Wumpus deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); } private ThrashingWumpus(final ThrashingWumpus card) { diff --git a/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java index b411f5be1c1..ec664312fde 100644 --- a/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java +++ b/Mage.Sets/src/mage/cards/t/ThrissNantukoPrimus.java @@ -32,7 +32,7 @@ public final class ThrissNantukoPrimus extends CardImpl { this.toughness = new MageInt(5); //G}, {T}: Target creature gets +5/+5 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java index 103cc7baa9d..714fde0f1da 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java @@ -26,7 +26,7 @@ public final class ThroneOfEmpires extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {1}, {tap}: Create a 1/1 white Soldier creature token. Create five of those tokens instead if you control artifacts named Crown of Empires and Scepter of Empires. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThroneOfEmpiresEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ThroneOfEmpiresEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java b/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java index 4d9e74d896b..1b937f44954 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfGeth.java @@ -30,7 +30,7 @@ public final class ThroneOfGeth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}, Sacrifice an artifact: Proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ProliferateEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java b/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java index 4e910500e6c..7d6d5422fdb 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfTheHighCity.java @@ -28,7 +28,7 @@ public final class ThroneOfTheHighCity extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}, {T}, Sacrifice Throne of the High City: You become the monarch. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesMonarchSourceEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new BecomesMonarchSourceEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addHint(MonarchHint.instance); diff --git a/Mage.Sets/src/mage/cards/t/ThrullParasite.java b/Mage.Sets/src/mage/cards/t/ThrullParasite.java index 75a8c6440a9..f2df82afe19 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullParasite.java +++ b/Mage.Sets/src/mage/cards/t/ThrullParasite.java @@ -33,7 +33,7 @@ public final class ThrullParasite extends CardImpl { this.addAbility(new ExtortAbility()); // {tap}, Pay 2 life: Remove a counter from target nonland permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RemoveCounterTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetNonlandPermanent()); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java index 871bad88ec6..45bc681a136 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java +++ b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java @@ -40,7 +40,7 @@ public final class ThrullRetainer extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice Thrull Retainer: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } private ThrullRetainer(final ThrullRetainer card) { diff --git a/Mage.Sets/src/mage/cards/t/ThrullWizard.java b/Mage.Sets/src/mage/cards/t/ThrullWizard.java index 3670181f233..499d2690adf 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullWizard.java +++ b/Mage.Sets/src/mage/cards/t/ThrullWizard.java @@ -41,7 +41,7 @@ public final class ThrullWizard extends CardImpl { // {1}{B}: Counter target black spell unless that spell's controller pays {B} or {3}. Cost cost = new OrCost("pay {B} or pay {3}", new ColoredManaCost(ColoredManaSymbol.B), new GenericManaCost(3)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(cost), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(cost), new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java b/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java index 9f2d42a9096..bbc0136b758 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java +++ b/Mage.Sets/src/mage/cards/t/ThrunTheLastTroll.java @@ -33,7 +33,7 @@ public final class ThrunTheLastTroll extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantBeCounteredSourceEffect())); this.addAbility(HexproofAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private ThrunTheLastTroll(final ThrunTheLastTroll card) { diff --git a/Mage.Sets/src/mage/cards/t/ThunderWall.java b/Mage.Sets/src/mage/cards/t/ThunderWall.java index 70a03029913..1dee1d77e4f 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderWall.java +++ b/Mage.Sets/src/mage/cards/t/ThunderWall.java @@ -34,7 +34,7 @@ public final class ThunderWall extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Thunder Wall gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private ThunderWall(final ThunderWall card) { diff --git a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java index f483a192bb8..2f78d312a8b 100644 --- a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java +++ b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java @@ -44,12 +44,12 @@ public final class ThundercloudElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{U}: Tap all creatures with toughness 2 or less. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(toughnessFilter), new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new TapAllEffect(toughnessFilter), new ManaCostsImpl<>("{3}{U}"))); // {3}{U}: All other creatures lose flying until end of turn. Effect effect = new LoseAbilityAllEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, flyingFilter); effect.setText("All other creatures lose flying until end of turn"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java index caaf6938cb5..ce78a14e030 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java +++ b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java @@ -40,7 +40,7 @@ public final class ThunderingSpineback extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {5}{G}: Create a 3/3 green Dinosaur creature token with trample. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DinosaurToken()), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DinosaurToken()), new ManaCostsImpl<>("{5}{G}"))); } private ThunderingSpineback(final ThunderingSpineback card) { diff --git a/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java b/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java index 7560846d9f4..619bedb7493 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/t/ThunderscapeApprentice.java @@ -30,12 +30,12 @@ public final class ThunderscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Target player loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}, {tap}: Target creature gets +1/+1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); + ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java b/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java index 0a4f7b762c5..8c83dfdbfae 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java +++ b/Mage.Sets/src/mage/cards/t/ThunderscapeMaster.java @@ -33,13 +33,13 @@ public final class ThunderscapeMaster extends CardImpl { this.toughness = new MageInt(2); // {B}{B}, {tap}: Target player loses 2 life and you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new GainLifeEffect(2).setText("and you gain 2 life")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}{G}, {tap}: Creatures you control get +2/+2 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); + ability = new SimpleActivatedAbility(new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java b/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java index 952c68ece15..8ee969e90ea 100644 --- a/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java +++ b/Mage.Sets/src/mage/cards/t/ThundersongTrumpeter.java @@ -29,7 +29,7 @@ public final class ThundersongTrumpeter extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature can't attack or block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantAttackBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantAttackBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/Thunderstaff.java b/Mage.Sets/src/mage/cards/t/Thunderstaff.java index cf9535a1f13..fd1d79ce090 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderstaff.java +++ b/Mage.Sets/src/mage/cards/t/Thunderstaff.java @@ -31,7 +31,7 @@ public final class Thunderstaff extends CardImpl { // As long as Thunderstaff is untapped, if a creature would deal combat damage to you, prevent 1 of that damage. this.addAbility(new SimpleStaticAbility(new ThunderstaffPreventionEffect())); // {2}, {tap}: Attacking creatures get +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,0,Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1,0,Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TickingGnomes.java b/Mage.Sets/src/mage/cards/t/TickingGnomes.java index e9cd153a227..cb682f0c0bf 100644 --- a/Mage.Sets/src/mage/cards/t/TickingGnomes.java +++ b/Mage.Sets/src/mage/cards/t/TickingGnomes.java @@ -31,7 +31,7 @@ public final class TickingGnomes extends CardImpl { // Echo {3} this.addAbility(new EchoAbility("{3}")); // Sacrifice Ticking Gnomes: Ticking Gnomes deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TidalControl.java b/Mage.Sets/src/mage/cards/t/TidalControl.java index 0ca2a356d47..088b7e406bf 100644 --- a/Mage.Sets/src/mage/cards/t/TidalControl.java +++ b/Mage.Sets/src/mage/cards/t/TidalControl.java @@ -37,7 +37,7 @@ public final class TidalControl extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // Pay 2 life or {2}: Counter target red or green spell. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new OrCost("pay 2 life or pay {2}", new PayLifeCost(2), new ManaCostsImpl<>("{2}"))); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CounterTargetEffect(), new OrCost("pay 2 life or pay {2}", new PayLifeCost(2), new ManaCostsImpl<>("{2}"))); ability.addTarget(new TargetSpell(filter)); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/t/TidalCourier.java b/Mage.Sets/src/mage/cards/t/TidalCourier.java index 70cf4cda5c4..74eec951d18 100644 --- a/Mage.Sets/src/mage/cards/t/TidalCourier.java +++ b/Mage.Sets/src/mage/cards/t/TidalCourier.java @@ -38,7 +38,7 @@ public final class TidalCourier extends CardImpl { // When Tidal Courier enters the battlefield, reveal the top four cards of your library. Put all Merfolk cards revealed this way into your hand and the rest on the bottom of your library in any order. this.addAbility(new EntersBattlefieldTriggeredAbility(new RevealLibraryPutIntoHandEffect(4, filter, Zone.LIBRARY))); // {3}{U}: Tidal Courier gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TidalFlats.java b/Mage.Sets/src/mage/cards/t/TidalFlats.java index 03d9bcb9c78..ab667efc71b 100644 --- a/Mage.Sets/src/mage/cards/t/TidalFlats.java +++ b/Mage.Sets/src/mage/cards/t/TidalFlats.java @@ -38,7 +38,7 @@ public final class TidalFlats extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}"); // {U}{U}: For each attacking creature without flying, its controller may pay {1}. If they don't, creatures you control blocking that creature gain first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TidalFlatsEffect(), new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new TidalFlatsEffect(), new ManaCostsImpl<>("{U}{U}"))); } private TidalFlats(final TidalFlats card) { diff --git a/Mage.Sets/src/mage/cards/t/TidalVisionary.java b/Mage.Sets/src/mage/cards/t/TidalVisionary.java index 230fd3d5669..5227aab5c95 100644 --- a/Mage.Sets/src/mage/cards/t/TidalVisionary.java +++ b/Mage.Sets/src/mage/cards/t/TidalVisionary.java @@ -29,7 +29,7 @@ public final class TidalVisionary extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature becomes the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TidalWarrior.java b/Mage.Sets/src/mage/cards/t/TidalWarrior.java index 3445fafd8a0..352e2179b0c 100644 --- a/Mage.Sets/src/mage/cards/t/TidalWarrior.java +++ b/Mage.Sets/src/mage/cards/t/TidalWarrior.java @@ -31,7 +31,7 @@ public final class TidalWarrior extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target land becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TidewaterMinion.java b/Mage.Sets/src/mage/cards/t/TidewaterMinion.java index b341a95364a..955fe0079d7 100644 --- a/Mage.Sets/src/mage/cards/t/TidewaterMinion.java +++ b/Mage.Sets/src/mage/cards/t/TidewaterMinion.java @@ -41,7 +41,7 @@ public final class TidewaterMinion extends CardImpl { new ManaCostsImpl<>("{4}"))); // {tap}: Untap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TimeBomb.java b/Mage.Sets/src/mage/cards/t/TimeBomb.java index 426b656d5d8..02d109c748f 100644 --- a/Mage.Sets/src/mage/cards/t/TimeBomb.java +++ b/Mage.Sets/src/mage/cards/t/TimeBomb.java @@ -34,7 +34,7 @@ public final class TimeBomb extends CardImpl { // {1}, {tap}, Sacrifice Time Bomb: Time Bomb deals damage equal to the number of time counters on it to each creature and each player. Effect effect = new DamageEverythingEffect(new CountersSourceCount(CounterType.TIME), new FilterCreaturePermanent()); effect.setText("{this} deals damage equal to the number of time counters on it to each creature and each player"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TimeElemental.java b/Mage.Sets/src/mage/cards/t/TimeElemental.java index 46438c3ad6d..8c018f9ca8d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeElemental.java +++ b/Mage.Sets/src/mage/cards/t/TimeElemental.java @@ -49,7 +49,7 @@ public final class TimeElemental extends CardImpl { this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(ability, true), false)); // {2}{U}{U}, {tap}: Return target permanent that isn't enchanted to its owner's hand. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); + Ability ability2 = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{2}{U}{U}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetPermanent(filter)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/t/TimeSieve.java b/Mage.Sets/src/mage/cards/t/TimeSieve.java index 052c1f83154..22466a916bc 100644 --- a/Mage.Sets/src/mage/cards/t/TimeSieve.java +++ b/Mage.Sets/src/mage/cards/t/TimeSieve.java @@ -27,7 +27,7 @@ public final class TimeSieve extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{U}{B}"); // {tap}, Sacrifice five artifacts: Take an extra turn after this one. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddExtraTurnControllerEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(5, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TimeVault.java b/Mage.Sets/src/mage/cards/t/TimeVault.java index 5592240ed3b..9c30a86b26d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeVault.java +++ b/Mage.Sets/src/mage/cards/t/TimeVault.java @@ -41,7 +41,7 @@ public final class TimeVault extends CardImpl { this.addAbility(new SimpleStaticAbility(new TimeVaultReplacementEffect())); // {tap}: Take an extra turn after this one. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddExtraTurnControllerEffect(), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java index 5e529458a10..a0d2dc2f4b8 100644 --- a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java +++ b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java @@ -38,7 +38,7 @@ public final class TinStreetMarket extends CardImpl { // Enchanted land has "{T}, Discard a card: Draw a card." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); gainAbility.addCost(new DiscardCardCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "land"))); diff --git a/Mage.Sets/src/mage/cards/t/TinWingChimera.java b/Mage.Sets/src/mage/cards/t/TinWingChimera.java index 58354c79201..82860ddb9fc 100644 --- a/Mage.Sets/src/mage/cards/t/TinWingChimera.java +++ b/Mage.Sets/src/mage/cards/t/TinWingChimera.java @@ -42,7 +42,7 @@ public final class TinWingChimera extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Tin-Wing Chimera: Put a +2/+2 counter on target Chimera creature. It gains flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P2P2.createInstance()), new SacrificeSourceCost()); ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield) .setText("It gains flying. (This effect lasts indefinitely.)")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TirelessTribe.java b/Mage.Sets/src/mage/cards/t/TirelessTribe.java index 0acb7ff428d..39b3eb6f5f4 100644 --- a/Mage.Sets/src/mage/cards/t/TirelessTribe.java +++ b/Mage.Sets/src/mage/cards/t/TirelessTribe.java @@ -29,7 +29,7 @@ public final class TirelessTribe extends CardImpl { this.toughness = new MageInt(1); // Discard a card: Tireless Tribe gets +0/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 4, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand()))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 4, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand()))); } private TirelessTribe(final TirelessTribe card) { diff --git a/Mage.Sets/src/mage/cards/t/TitanForge.java b/Mage.Sets/src/mage/cards/t/TitanForge.java index dda3fb7e9bb..a318bc651eb 100644 --- a/Mage.Sets/src/mage/cards/t/TitanForge.java +++ b/Mage.Sets/src/mage/cards/t/TitanForge.java @@ -24,11 +24,11 @@ public final class TitanForge extends CardImpl { public TitanForge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TitanForgeGolemToken()), new TapSourceCost()); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new TitanForgeGolemToken()), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java index 397a30c2dba..0aaf8e17da6 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java @@ -34,7 +34,7 @@ public final class TitanOfEternalFire extends CardImpl { this.toughness = new MageInt(6); // Each Human creature you control has "{R}, {T}: This creature deals 1 damage to any target." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.HUMAN, "Each Human creature")); diff --git a/Mage.Sets/src/mage/cards/t/TitaniumGolem.java b/Mage.Sets/src/mage/cards/t/TitaniumGolem.java index 7e70a6c04fe..4d196b8548d 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniumGolem.java +++ b/Mage.Sets/src/mage/cards/t/TitaniumGolem.java @@ -25,7 +25,7 @@ public final class TitaniumGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private TitaniumGolem(final TitaniumGolem card) { diff --git a/Mage.Sets/src/mage/cards/t/TolarianSentinel.java b/Mage.Sets/src/mage/cards/t/TolarianSentinel.java index 67fa95fb7f9..c80d37bd8dc 100644 --- a/Mage.Sets/src/mage/cards/t/TolarianSentinel.java +++ b/Mage.Sets/src/mage/cards/t/TolarianSentinel.java @@ -35,7 +35,7 @@ public final class TolarianSentinel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}, {tap}, Discard a card: Return target permanent you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetControlledPermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index b62c81e52f7..739b763f8b9 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -46,7 +46,7 @@ public final class TolsimirWolfblood extends CardImpl { // Other white creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // {tap}: Create a legendary 2/2 green and white Wolf creature token named Voja. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VojaToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new VojaToken()), new TapSourceCost())); } private TolsimirWolfblood(final TolsimirWolfblood card) { diff --git a/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java b/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java index b32f6aa6755..35cffef463a 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java +++ b/Mage.Sets/src/mage/cards/t/TombOfTheDuskRose.java @@ -41,7 +41,7 @@ public final class TombOfTheDuskRose extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {2}{W}{B}，{T} : Put a creature card exiled with this permanent onto the battlefield under your control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TombOfTheDuskRoseEffect(), new ManaCostsImpl<>("{2}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new TombOfTheDuskRoseEffect(), new ManaCostsImpl<>("{2}{W}{B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java index 06e4fff92a4..eb5a10285be 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java @@ -34,7 +34,7 @@ public final class TombOfTheSpiritDragon extends CardImpl { // T: Add 1 this.addAbility(new ColorlessManaAbility()); // 2, T: You gain 1 life for each colorless creature you control - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)) + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)) .setText("you gain 1 life for each colorless creature you control"), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TombRobber.java b/Mage.Sets/src/mage/cards/t/TombRobber.java index 93827110050..94aa2cf0da7 100644 --- a/Mage.Sets/src/mage/cards/t/TombRobber.java +++ b/Mage.Sets/src/mage/cards/t/TombRobber.java @@ -35,7 +35,7 @@ public final class TombRobber extends CardImpl { // {1}, Discard a card: Tomb Robber explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) Effect effect = new ExploreSourceEffect(true, "{this}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardCardCost()); + Ability ability = new SimpleActivatedAbility(effect, new DiscardCardCost()); ability.addCost(new ManaCostsImpl<>("{1}")); this.addAbility(ability); } @@ -48,4 +48,4 @@ public final class TombRobber extends CardImpl { public TombRobber copy() { return new TombRobber(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TonicPeddler.java b/Mage.Sets/src/mage/cards/t/TonicPeddler.java index 922eee02a1e..885fe9cda3c 100644 --- a/Mage.Sets/src/mage/cards/t/TonicPeddler.java +++ b/Mage.Sets/src/mage/cards/t/TonicPeddler.java @@ -30,7 +30,7 @@ public final class TonicPeddler extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}, Discard a card: Target player gains 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(3), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeTargetEffect(3), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/ToothAndClaw.java b/Mage.Sets/src/mage/cards/t/ToothAndClaw.java index c441f0418b4..872ac3d4e86 100644 --- a/Mage.Sets/src/mage/cards/t/ToothAndClaw.java +++ b/Mage.Sets/src/mage/cards/t/ToothAndClaw.java @@ -23,7 +23,7 @@ public final class ToothAndClaw extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // Sacrifice two creatures: Create a 3/1 red Beast creature token named Carnivore. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CarnivoreToken(), 1), + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new CarnivoreToken(), 1), new SacrificeTargetCost(2, StaticFilters.FILTER_PERMANENT_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java b/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java index 9654e2b74ff..68b494da8b0 100644 --- a/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java +++ b/Mage.Sets/src/mage/cards/t/ToothOfChissGoria.java @@ -28,7 +28,7 @@ public final class ToothOfChissGoria extends CardImpl { // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TopanAscetic.java b/Mage.Sets/src/mage/cards/t/TopanAscetic.java index c7634e66880..6343817994c 100644 --- a/Mage.Sets/src/mage/cards/t/TopanAscetic.java +++ b/Mage.Sets/src/mage/cards/t/TopanAscetic.java @@ -37,7 +37,7 @@ public final class TopanAscetic extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped creature you control: Topan Ascetic gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); } private TopanAscetic(final TopanAscetic card) { diff --git a/Mage.Sets/src/mage/cards/t/TorWauki.java b/Mage.Sets/src/mage/cards/t/TorWauki.java index 3bc8d493568..fe42b5123ef 100644 --- a/Mage.Sets/src/mage/cards/t/TorWauki.java +++ b/Mage.Sets/src/mage/cards/t/TorWauki.java @@ -30,7 +30,7 @@ public final class TorWauki extends CardImpl { this.toughness = new MageInt(3); // {T}: Tor Wauki deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TorchDrake.java b/Mage.Sets/src/mage/cards/t/TorchDrake.java index 8a1d99502f8..4e9134c486a 100644 --- a/Mage.Sets/src/mage/cards/t/TorchDrake.java +++ b/Mage.Sets/src/mage/cards/t/TorchDrake.java @@ -29,7 +29,7 @@ public final class TorchDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private TorchDrake(final TorchDrake card) { diff --git a/Mage.Sets/src/mage/cards/t/TorchFiend.java b/Mage.Sets/src/mage/cards/t/TorchFiend.java index 7a38f1bd43c..190dc7c8e13 100644 --- a/Mage.Sets/src/mage/cards/t/TorchFiend.java +++ b/Mage.Sets/src/mage/cards/t/TorchFiend.java @@ -30,7 +30,7 @@ public final class TorchFiend extends CardImpl { this.toughness = new MageInt(1); // {R}, Sacrifice Torch Fiend: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TormodsCrypt.java b/Mage.Sets/src/mage/cards/t/TormodsCrypt.java index 0fc386167f6..eb6860d66d0 100644 --- a/Mage.Sets/src/mage/cards/t/TormodsCrypt.java +++ b/Mage.Sets/src/mage/cards/t/TormodsCrypt.java @@ -22,7 +22,7 @@ public final class TormodsCrypt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); // {tap}, Sacrifice Tormod's Crypt: Exile all cards from target player's graveyard. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TorturedExistence.java b/Mage.Sets/src/mage/cards/t/TorturedExistence.java index 80df2b3606d..24e6510f26d 100644 --- a/Mage.Sets/src/mage/cards/t/TorturedExistence.java +++ b/Mage.Sets/src/mage/cards/t/TorturedExistence.java @@ -23,7 +23,7 @@ public final class TorturedExistence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}"); // {B}, Discard a creature card: Return target creature card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new DiscardCardCost(StaticFilters.FILTER_CARD_CREATURE_A)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Touchstone.java b/Mage.Sets/src/mage/cards/t/Touchstone.java index fa2c4141269..2b2157e6116 100644 --- a/Mage.Sets/src/mage/cards/t/Touchstone.java +++ b/Mage.Sets/src/mage/cards/t/Touchstone.java @@ -30,7 +30,7 @@ public final class Touchstone extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Tap target artifact you don't control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TourachsGate.java b/Mage.Sets/src/mage/cards/t/TourachsGate.java index c2b32c1fefb..b59271eef10 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsGate.java +++ b/Mage.Sets/src/mage/cards/t/TourachsGate.java @@ -69,7 +69,7 @@ public final class TourachsGate extends CardImpl { this.addAbility(ability); // Sacrifice a Thrull: Put three time counters on Tourach's Gate. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.TIME.createInstance(3)), + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(3)), new SacrificeTargetCost(filterThrull))); // At the beginning of your upkeep, remove a time counter from Tourach's Gate. If there are no time counters on Tourach's Gate, sacrifice it. diff --git a/Mage.Sets/src/mage/cards/t/TowerDrake.java b/Mage.Sets/src/mage/cards/t/TowerDrake.java index 6a23163f950..0727b8ce493 100644 --- a/Mage.Sets/src/mage/cards/t/TowerDrake.java +++ b/Mage.Sets/src/mage/cards/t/TowerDrake.java @@ -32,7 +32,7 @@ public final class TowerDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}: Tower Drake gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private TowerDrake(final TowerDrake card) { diff --git a/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java b/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java index fa23b365a06..fb191ef5024 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfCalamities.java @@ -22,7 +22,7 @@ public final class TowerOfCalamities extends CardImpl { public TowerOfCalamities (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(12), new ManaCostsImpl<>("{8}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(12), new ManaCostsImpl<>("{8}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TowerOfChampions.java b/Mage.Sets/src/mage/cards/t/TowerOfChampions.java index fae0e9264b7..0c1fc2702e2 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfChampions.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfChampions.java @@ -23,7 +23,7 @@ public final class TowerOfChampions extends CardImpl { public TowerOfChampions (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(6, 6, Duration.EndOfTurn), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(6, 6, Duration.EndOfTurn), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java b/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java index ea5757c6c2c..4d7d816c78a 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfCoireall.java @@ -30,7 +30,7 @@ public final class TowerOfCoireall extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}: Target creature can't be blocked by Walls this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn).setText("Target creature can't be blocked by Walls this turn"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn).setText("Target creature can't be blocked by Walls this turn"), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TowerOfEons.java b/Mage.Sets/src/mage/cards/t/TowerOfEons.java index 7a85e854b68..ca89e080ab9 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfEons.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfEons.java @@ -21,7 +21,7 @@ public final class TowerOfEons extends CardImpl { public TowerOfEons (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(10), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(10), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java b/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java index d2719cd0d29..e0058549693 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfFortunes.java @@ -22,7 +22,7 @@ public final class TowerOfFortunes extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {8}, {T} : Draw four cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(4), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java b/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java index cfc2f1847e6..a8f246a883a 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfMurmurs.java @@ -22,7 +22,7 @@ public final class TowerOfMurmurs extends CardImpl { public TowerOfMurmurs (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(8), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(8), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java b/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java index b73e7fce2c0..5631a386306 100644 --- a/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java +++ b/Mage.Sets/src/mage/cards/t/TowerOfTheMagistrate.java @@ -29,7 +29,7 @@ public final class TowerOfTheMagistrate extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Target creature gains protection from artifacts until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts")), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts")), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java b/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java index cbe54730708..55c179fb171 100644 --- a/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java +++ b/Mage.Sets/src/mage/cards/t/ToweringThunderfist.java @@ -29,7 +29,7 @@ public final class ToweringThunderfist extends CardImpl { this.toughness = new MageInt(4); // {W}: Towering Thunderfist gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private ToweringThunderfist(final ToweringThunderfist card) { diff --git a/Mage.Sets/src/mage/cards/t/TownGossipmonger.java b/Mage.Sets/src/mage/cards/t/TownGossipmonger.java index 1d032506c25..50cbd67ab97 100644 --- a/Mage.Sets/src/mage/cards/t/TownGossipmonger.java +++ b/Mage.Sets/src/mage/cards/t/TownGossipmonger.java @@ -40,7 +40,7 @@ public final class TownGossipmonger extends CardImpl { // {T}, Tap an untapped creature you control: Transform Town Gossipmonger. this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TransformSourceEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); } @@ -53,4 +53,4 @@ public final class TownGossipmonger extends CardImpl { public TownGossipmonger copy() { return new TownGossipmonger(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/ToxicNim.java b/Mage.Sets/src/mage/cards/t/ToxicNim.java index 5896fbbf3dd..3e9ada7a0ef 100644 --- a/Mage.Sets/src/mage/cards/t/ToxicNim.java +++ b/Mage.Sets/src/mage/cards/t/ToxicNim.java @@ -28,7 +28,7 @@ public final class ToxicNim extends CardImpl { this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private ToxicNim(final ToxicNim card) { diff --git a/Mage.Sets/src/mage/cards/t/Toymaker.java b/Mage.Sets/src/mage/cards/t/Toymaker.java index b4506555d34..2dd8bd47339 100644 --- a/Mage.Sets/src/mage/cards/t/Toymaker.java +++ b/Mage.Sets/src/mage/cards/t/Toymaker.java @@ -44,7 +44,7 @@ public final class Toymaker extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}, Discard a card: Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ToymakerEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new ToymakerEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/Tracker.java b/Mage.Sets/src/mage/cards/t/Tracker.java index 7bc575077bc..d65578ea2fa 100644 --- a/Mage.Sets/src/mage/cards/t/Tracker.java +++ b/Mage.Sets/src/mage/cards/t/Tracker.java @@ -28,7 +28,7 @@ public final class Tracker extends CardImpl { this.toughness = new MageInt(2); // {G}{G}, {tap}: Tracker deals damage equal to its power to target creature. That creature deals damage equal to its power to Tracker. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new ManaCostsImpl<>("{G}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java index f9e5bf0f843..c56f95b48c7 100644 --- a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java +++ b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java @@ -43,7 +43,7 @@ public final class TradeFederationBattleship extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {T}: Create two 1/1 colorless Droid artifact token cretures. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DroidToken(), 2), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DroidToken(), 2), new TapSourceCost())); } private TradeFederationBattleship(final TradeFederationBattleship card) { diff --git a/Mage.Sets/src/mage/cards/t/TradeRoutes.java b/Mage.Sets/src/mage/cards/t/TradeRoutes.java index 6b94d70b13d..acd0a079b18 100644 --- a/Mage.Sets/src/mage/cards/t/TradeRoutes.java +++ b/Mage.Sets/src/mage/cards/t/TradeRoutes.java @@ -32,12 +32,12 @@ public final class TradeRoutes extends CardImpl { // {1}: Return target land you control to its owner's hand. Effect returnToHand = new ReturnToHandTargetEffect(); Target targetLandYouControl = new TargetPermanent(new FilterControlledLandPermanent()); - Ability returnLandToHand = new SimpleActivatedAbility(Zone.BATTLEFIELD, returnToHand, new GenericManaCost(1)); + Ability returnLandToHand = new SimpleActivatedAbility(returnToHand, new GenericManaCost(1)); returnLandToHand.addTarget(targetLandYouControl); this.addAbility(returnLandToHand); // {1}, Discard a land card: Draw a card. - Ability drawACard = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability drawACard = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); drawACard.addCost(new DiscardTargetCost(new TargetCardInHand(new FilterLandCard("a land card")))); this.addAbility(drawACard); } diff --git a/Mage.Sets/src/mage/cards/t/TradewindRider.java b/Mage.Sets/src/mage/cards/t/TradewindRider.java index 889f601c219..f4263b54f89 100644 --- a/Mage.Sets/src/mage/cards/t/TradewindRider.java +++ b/Mage.Sets/src/mage/cards/t/TradewindRider.java @@ -37,7 +37,7 @@ public final class TradewindRider extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TradingPost.java b/Mage.Sets/src/mage/cards/t/TradingPost.java index cac1b9ae591..82006d364a3 100644 --- a/Mage.Sets/src/mage/cards/t/TradingPost.java +++ b/Mage.Sets/src/mage/cards/t/TradingPost.java @@ -33,26 +33,26 @@ public final class TradingPost extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {1}, {T}, Discard a card: You gain 4 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new GenericManaCost(1)); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(4), new GenericManaCost(1)); ability1.addCost(new TapSourceCost()); ability1.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability1); // {1}, {T}, Pay 1 life: Create a 0/1 white Goat creature token. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); ability2.addCost(new TapSourceCost()); ability2.addCost(new PayLifeCost(1)); this.addAbility(ability2); // {1}, {T}, Sacrifice a creature: Return target artifact card from your graveyard to your hand. - Ability ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new GenericManaCost(1)); + Ability ability3 = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new GenericManaCost(1)); ability3.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); ability3.addCost(new TapSourceCost()); ability3.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability3); // {1}, {T}, Sacrifice an artifact: Draw a card. - Ability ability4 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability4 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability4.addCost(new TapSourceCost()); ability4.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); this.addAbility(ability4); diff --git a/Mage.Sets/src/mage/cards/t/TragicPoet.java b/Mage.Sets/src/mage/cards/t/TragicPoet.java index 5d660ec8a64..3ac6bf460ea 100644 --- a/Mage.Sets/src/mage/cards/t/TragicPoet.java +++ b/Mage.Sets/src/mage/cards/t/TragicPoet.java @@ -36,7 +36,7 @@ public final class TragicPoet extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice Tragic Poet: Return target enchantment card from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect() + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect() .setText("Return target enchantment card from your graveyard to your hand"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java b/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java index 49b687feadc..0db1d27755e 100644 --- a/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java +++ b/Mage.Sets/src/mage/cards/t/TrainedPronghorn.java @@ -25,7 +25,7 @@ public final class TrainedPronghorn extends CardImpl { this.toughness = new MageInt(1); //Discard a card: Prevent all damage that would be dealt to Trained Pronghorn this turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageToSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new PreventAllDamageToSourceEffect(Duration.EndOfTurn), new DiscardCardCost())); } @@ -38,5 +38,3 @@ public final class TrainedPronghorn extends CardImpl { return new TrainedPronghorn(this); } } - - diff --git a/Mage.Sets/src/mage/cards/t/TranquilGrove.java b/Mage.Sets/src/mage/cards/t/TranquilGrove.java index ef469aa2489..198596dec34 100644 --- a/Mage.Sets/src/mage/cards/t/TranquilGrove.java +++ b/Mage.Sets/src/mage/cards/t/TranquilGrove.java @@ -30,7 +30,7 @@ public final class TranquilGrove extends CardImpl { // {1}{G}{G}: Destroy all other enchantments. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new ManaCostsImpl<>("{1}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new DestroyAllEffect(filter), new ManaCostsImpl<>("{1}{G}{G}"))); } private TranquilGrove(final TranquilGrove card) { diff --git a/Mage.Sets/src/mage/cards/t/Transluminant.java b/Mage.Sets/src/mage/cards/t/Transluminant.java index ef9a6b2b2d8..40d61f10b9f 100644 --- a/Mage.Sets/src/mage/cards/t/Transluminant.java +++ b/Mage.Sets/src/mage/cards/t/Transluminant.java @@ -31,7 +31,7 @@ public final class Transluminant extends CardImpl { this.toughness = new MageInt(2); // {W}, Sacrifice Transluminant: Create a 1/1 white Spirit creature token with flying at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect( + Ability ability = new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TrapDigger.java b/Mage.Sets/src/mage/cards/t/TrapDigger.java index d9c909ce0b6..098bccd2010 100644 --- a/Mage.Sets/src/mage/cards/t/TrapDigger.java +++ b/Mage.Sets/src/mage/cards/t/TrapDigger.java @@ -46,12 +46,12 @@ public final class TrapDigger extends CardImpl { this.toughness = new MageInt(3); // {2}{W}, {tap}: Put a trap counter on target land you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.TRAP.createInstance()), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.TRAP.createInstance()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(new FilterControlledLandPermanent())); this.addAbility(ability); // Sacrifice a land with a trap counter on it: Trap Digger deals 3 damage to target attacking creature without flying. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new SacrificeTargetCost(filter1)); + ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new SacrificeTargetCost(filter1)); ability.addTarget(new TargetPermanent(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TravelersAmulet.java b/Mage.Sets/src/mage/cards/t/TravelersAmulet.java index 76be4cde936..2140b175b1a 100644 --- a/Mage.Sets/src/mage/cards/t/TravelersAmulet.java +++ b/Mage.Sets/src/mage/cards/t/TravelersAmulet.java @@ -26,7 +26,7 @@ public final class TravelersAmulet extends CardImpl { // {1}, Sacrifice Traveler's Amulet: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreasureCove.java b/Mage.Sets/src/mage/cards/t/TreasureCove.java index 1c0f5f6ff51..62aa078d389 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureCove.java +++ b/Mage.Sets/src/mage/cards/t/TreasureCove.java @@ -37,7 +37,7 @@ public final class TreasureCove extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}, Sacrifice a Treasure: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreasureMap.java b/Mage.Sets/src/mage/cards/t/TreasureMap.java index b674a8579a9..073470aaa2a 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureMap.java +++ b/Mage.Sets/src/mage/cards/t/TreasureMap.java @@ -33,7 +33,7 @@ public final class TreasureMap extends CardImpl { // {1}, {T}: Scry 1. Put a landmark counter on Treasure Map. Then if there are three or more landmark counters on it, remove those counters, transform Treasure Map, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color." this.addAbility(new TransformAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TreasureMapEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new TreasureMapEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreasureTrove.java b/Mage.Sets/src/mage/cards/t/TreasureTrove.java index f6ce0b37f64..b7dcc259cda 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureTrove.java +++ b/Mage.Sets/src/mage/cards/t/TreasureTrove.java @@ -21,7 +21,7 @@ public final class TreasureTrove extends CardImpl { // {2}{U}{U}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}{U}"))); } private TreasureTrove(final TreasureTrove card) { diff --git a/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java b/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java index 86d4ecfc129..07de60bce02 100644 --- a/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java +++ b/Mage.Sets/src/mage/cards/t/TreeOfPerdition.java @@ -33,7 +33,7 @@ public final class TreeOfPerdition extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {tap}: Exchange target opponent's life total with Tree of Perdition's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TreeOfPerditionEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TreeOfPerditionEffect(), new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java b/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java index 7da031b785e..25a6806d764 100644 --- a/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java +++ b/Mage.Sets/src/mage/cards/t/TreeOfRedemption.java @@ -31,7 +31,7 @@ public final class TreeOfRedemption extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {T}: Exchange your life total with Tree of Redemption's toughness. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TreeOfRedemptionEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new TreeOfRedemptionEffect(), new TapSourceCost())); } private TreeOfRedemption(final TreeOfRedemption card) { diff --git a/Mage.Sets/src/mage/cards/t/TreetopVillage.java b/Mage.Sets/src/mage/cards/t/TreetopVillage.java index 8711f1ab229..ced8f02384d 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopVillage.java +++ b/Mage.Sets/src/mage/cards/t/TreetopVillage.java @@ -32,7 +32,7 @@ public final class TreetopVillage extends CardImpl { this.addAbility(new GreenManaAbility()); // {1}{G}: Treetop Village becomes a 3/3 green Ape creature with trample until end of turn. It’s still a land. (It can deal excess combat damage to the player or planeswalker it’s attacking.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ApeToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new ApeToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private TreetopVillage(final TreetopVillage card) { diff --git a/Mage.Sets/src/mage/cards/t/TrenchWurm.java b/Mage.Sets/src/mage/cards/t/TrenchWurm.java index 1078932b4f4..08439880d8e 100644 --- a/Mage.Sets/src/mage/cards/t/TrenchWurm.java +++ b/Mage.Sets/src/mage/cards/t/TrenchWurm.java @@ -28,7 +28,7 @@ public final class TrenchWurm extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, {tap}: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetNonBasicLandPermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java b/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java index cbe81bc624d..d9c92bdeea2 100644 --- a/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java +++ b/Mage.Sets/src/mage/cards/t/TrespasserIlVec.java @@ -28,7 +28,7 @@ public final class TrespasserIlVec extends CardImpl { this.toughness = new MageInt(1); // Discard a card: Trespasser il-Vec gains shadow until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost())); } diff --git a/Mage.Sets/src/mage/cards/t/TrestleTroll.java b/Mage.Sets/src/mage/cards/t/TrestleTroll.java index b486ce50599..093ca4e2825 100644 --- a/Mage.Sets/src/mage/cards/t/TrestleTroll.java +++ b/Mage.Sets/src/mage/cards/t/TrestleTroll.java @@ -35,7 +35,7 @@ public final class TrestleTroll extends CardImpl { this.addAbility(ReachAbility.getInstance()); // {1}{B}{G}: Regenerate Trestle Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); } private TrestleTroll(final TrestleTroll card) { @@ -46,4 +46,4 @@ public final class TrestleTroll extends CardImpl { public TrestleTroll copy() { return new TrestleTroll(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TriadOfFates.java b/Mage.Sets/src/mage/cards/t/TriadOfFates.java index f2b5f392f1c..7018bf840ce 100644 --- a/Mage.Sets/src/mage/cards/t/TriadOfFates.java +++ b/Mage.Sets/src/mage/cards/t/TriadOfFates.java @@ -41,21 +41,21 @@ public final class TriadOfFates extends CardImpl { this.toughness = new MageInt(3); // {1}, {T}: Put a fate counter on another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.FATE.createInstance()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); Target target = new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE); ability.addTarget(target); this.addAbility(ability); // {W}, {T}: Exile target creature that has a fate counter on it, then return it to the battlefield under its owner's control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileThenReturnTargetEffect(false, false), new ManaCostsImpl<>("{W}")); + ability = new SimpleActivatedAbility(new ExileThenReturnTargetEffect(false, false), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); target = new TargetCreaturePermanent(filterCounter); ability.addTarget(target); this.addAbility(ability); // {B}, {T}: Exile target creature that has a fate counter on it. Its controller draws two cards. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); target = new TargetCreaturePermanent(filterCounter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/t/TricksterMage.java b/Mage.Sets/src/mage/cards/t/TricksterMage.java index cf2d02464b0..ac8db101d8c 100644 --- a/Mage.Sets/src/mage/cards/t/TricksterMage.java +++ b/Mage.Sets/src/mage/cards/t/TricksterMage.java @@ -41,7 +41,7 @@ public final class TricksterMage extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}, Discard a card: You may tap or untap target artifact, creature, or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java b/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java index 43b147b9a3a..89b4c0c5e9d 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfCorruption.java @@ -31,12 +31,12 @@ public final class TrigonOfCorruption extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {B}{B}, {T}: Put a charge counter on Trigon of Corruption. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{B}{B}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Corruption: Put a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java b/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java index 8770cc2bd52..36df7dac2c4 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfInfestation.java @@ -29,12 +29,12 @@ public final class TrigonOfInfestation extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {G}{G}, {T}: Put a charge counter on Trigon of Infestation. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{G}{G}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Infestation: Create a 1/1 green Phyrexian Insect creature token with infect. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new InsectInfectToken()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new InsectInfectToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfMending.java b/Mage.Sets/src/mage/cards/t/TrigonOfMending.java index 3faccb4894e..bbaca3b279a 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfMending.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfMending.java @@ -29,12 +29,12 @@ public final class TrigonOfMending extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {W}{W}, {T}: Put a charge counter on Trigon of Mending. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{W}{W}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Mending: Target player gains 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(3), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainLifeTargetEffect(3), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfRage.java b/Mage.Sets/src/mage/cards/t/TrigonOfRage.java index 3798144ca8d..2aabcd6c28e 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfRage.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfRage.java @@ -31,13 +31,13 @@ public final class TrigonOfRage extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {R}{R}, {T}: Put a charge counter on Trigon of Rage. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{R}{R}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Rage: Target creature gets +3/+0 until end of turn. Effect pumpEffect = new BoostTargetEffect(3, 0, Duration.EndOfTurn); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, pumpEffect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(pumpEffect, new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/TrigonOfThought.java b/Mage.Sets/src/mage/cards/t/TrigonOfThought.java index 8c946b4ce99..baad3600844 100644 --- a/Mage.Sets/src/mage/cards/t/TrigonOfThought.java +++ b/Mage.Sets/src/mage/cards/t/TrigonOfThought.java @@ -28,12 +28,12 @@ public final class TrigonOfThought extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "with three charge counters on it")); // {U}{U}, {T}: Put a charge counter on Trigon of Thought. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); ability2.addCost(new ManaCostsImpl<>("{U}{U}")); this.addAbility(ability2); // {2}, {T}, Remove a charge counter from Trigon of Thought: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TripNoose.java b/Mage.Sets/src/mage/cards/t/TripNoose.java index d1ccd29ca87..2d1b760cb6e 100644 --- a/Mage.Sets/src/mage/cards/t/TripNoose.java +++ b/Mage.Sets/src/mage/cards/t/TripNoose.java @@ -23,7 +23,7 @@ public final class TripNoose extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Triskelavus.java b/Mage.Sets/src/mage/cards/t/Triskelavus.java index 3e51d7d23ce..0ea2027facf 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelavus.java +++ b/Mage.Sets/src/mage/cards/t/Triskelavus.java @@ -38,7 +38,7 @@ public final class Triskelavus extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {1}, Remove a +1/+1 counter from Triskelavus: Create a 1/1 colorless Triskelavite artifact creature token with flying. It has "Sacrifice this creature: This creature deals 1 damage to any target." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TriskelaviteToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new TriskelaviteToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/Triskelion.java b/Mage.Sets/src/mage/cards/t/Triskelion.java index fa00b8f4df2..1ab500d52f4 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelion.java +++ b/Mage.Sets/src/mage/cards/t/Triskelion.java @@ -33,7 +33,7 @@ public final class Triskelion extends CardImpl { "with three +1/+1 counters on it")); // Remove a +1/+1 counter from Triskelion: Triskelion deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrollAscetic.java b/Mage.Sets/src/mage/cards/t/TrollAscetic.java index 97d14f3b3ce..3b72eaea491 100644 --- a/Mage.Sets/src/mage/cards/t/TrollAscetic.java +++ b/Mage.Sets/src/mage/cards/t/TrollAscetic.java @@ -27,7 +27,7 @@ public final class TrollAscetic extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(HexproofAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private TrollAscetic(final TrollAscetic card) { diff --git a/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java b/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java index 3e61e9534c7..157c8e61170 100644 --- a/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java +++ b/Mage.Sets/src/mage/cards/t/TrollsOfTelJilad.java @@ -36,7 +36,7 @@ public final class TrollsOfTelJilad extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(6); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java index 87ac40013af..f37d608447e 100644 --- a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java +++ b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java @@ -43,7 +43,7 @@ public final class TrostaniSelesnyasVoice extends CardImpl { this.addAbility(new TrostaniSelesnyasVoiceTriggeredAbility()); // {1}{G}{W}, {T}: Populate. (Create a token that's a copy of a creature token you control.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl<>("{1}{G}{W}")); + Ability ability = new SimpleActivatedAbility(new PopulateEffect(), new ManaCostsImpl<>("{1}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TruefirePaladin.java b/Mage.Sets/src/mage/cards/t/TruefirePaladin.java index 5e14889874f..a0c0ff8b89c 100644 --- a/Mage.Sets/src/mage/cards/t/TruefirePaladin.java +++ b/Mage.Sets/src/mage/cards/t/TruefirePaladin.java @@ -34,10 +34,10 @@ public final class TruefirePaladin extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {R}{W}: Truefire Paladin gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); // {R}{W}: Truefire Paladin gets first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java b/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java index 8d5e6a325c3..9bc77933c32 100644 --- a/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java +++ b/Mage.Sets/src/mage/cards/t/TrumpetingArmodon.java @@ -27,7 +27,7 @@ public final class TrumpetingArmodon extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Target creature blocks Trumpeting Armodon this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java index de7057e60f0..3d86fcb903b 100644 --- a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java +++ b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java @@ -47,7 +47,7 @@ public final class TsaboTavoc extends CardImpl { // protection from legendary creatures this.addAbility(new ProtectionAbility(filter)); // {B}{B}, {tap}: Destroy target legendary creature. It can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new ManaCostsImpl<>("{B}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filterDestroy)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java b/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java index 203d725db52..ecfd315e275 100644 --- a/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java +++ b/Mage.Sets/src/mage/cards/t/TuknirDeathlock.java @@ -35,7 +35,7 @@ public final class TuknirDeathlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}{G}, {tap}: Target creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TundraKavu.java b/Mage.Sets/src/mage/cards/t/TundraKavu.java index 06882a814b4..77a5e3ec0f0 100644 --- a/Mage.Sets/src/mage/cards/t/TundraKavu.java +++ b/Mage.Sets/src/mage/cards/t/TundraKavu.java @@ -33,7 +33,7 @@ public final class TundraKavu extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land becomes a Plains or an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TundraKavuEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TundraKavuEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TunnelerWurm.java b/Mage.Sets/src/mage/cards/t/TunnelerWurm.java index 8134edfb9c8..0bd44c8666d 100644 --- a/Mage.Sets/src/mage/cards/t/TunnelerWurm.java +++ b/Mage.Sets/src/mage/cards/t/TunnelerWurm.java @@ -25,7 +25,7 @@ public final class TunnelerWurm extends CardImpl { this.toughness = new MageInt(6); // Discard a card: Regenerate Tunneler Wurm. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new DiscardCardCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new DiscardCardCost())); } private TunnelerWurm(final TunnelerWurm card) { diff --git a/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java b/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java index 723bf169264..654ebaa398f 100644 --- a/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java +++ b/Mage.Sets/src/mage/cards/t/TurtleshellChangeling.java @@ -31,7 +31,7 @@ public final class TurtleshellChangeling extends CardImpl { this.addAbility(new ChangelingAbility()); //{1}{U}: Switch {this}'s power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private TurtleshellChangeling(final TurtleshellChangeling card) { diff --git a/Mage.Sets/src/mage/cards/t/TwilightDrover.java b/Mage.Sets/src/mage/cards/t/TwilightDrover.java index 0c061dce05e..61509b86082 100644 --- a/Mage.Sets/src/mage/cards/t/TwilightDrover.java +++ b/Mage.Sets/src/mage/cards/t/TwilightDrover.java @@ -42,7 +42,7 @@ public final class TwilightDrover extends CardImpl { this.addAbility(new LeavesBattlefieldAllTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter)); // {2}{W}, Remove a +1/+1 counter from Twilight Drover: Create two 1/1 white Spirit creature tokens with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken(), 2), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpiritWhiteToken(), 2), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TwistedAbomination.java b/Mage.Sets/src/mage/cards/t/TwistedAbomination.java index 2159dcba523..0669bc2fda4 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedAbomination.java +++ b/Mage.Sets/src/mage/cards/t/TwistedAbomination.java @@ -28,7 +28,7 @@ public final class TwistedAbomination extends CardImpl { this.toughness = new MageInt(3); // {B}: Regenerate Twisted Abomination. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Swampcycling {2} this.addAbility(new SwampcyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java index 856ae820831..29180ec202a 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java @@ -34,7 +34,7 @@ public final class TwoHeadedDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Two-Headed Dragon gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,0, Duration.EndOfTurn),new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2,0, Duration.EndOfTurn),new ManaCostsImpl<>("{1}{R}"))); // Menace (This creature can't be blocked except by two or more creatures.) this.addAbility(new MenaceAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java b/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java index 8c10e07d68e..37b63879c41 100644 --- a/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java +++ b/Mage.Sets/src/mage/cards/t/TymaretTheMurderKing.java @@ -36,7 +36,7 @@ public final class TymaretTheMurderKing extends CardImpl { this.toughness = new MageInt(2); // {1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TyrantsMachine.java b/Mage.Sets/src/mage/cards/t/TyrantsMachine.java index 8c3643c250b..1b28b4eb43f 100644 --- a/Mage.Sets/src/mage/cards/t/TyrantsMachine.java +++ b/Mage.Sets/src/mage/cards/t/TyrantsMachine.java @@ -23,7 +23,7 @@ public final class TyrantsMachine extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {4}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Tyrranax.java b/Mage.Sets/src/mage/cards/t/Tyrranax.java index 0536257ab18..b61ac692392 100644 --- a/Mage.Sets/src/mage/cards/t/Tyrranax.java +++ b/Mage.Sets/src/mage/cards/t/Tyrranax.java @@ -28,7 +28,7 @@ public final class Tyrranax extends CardImpl { this.toughness = new MageInt(4); // {1}{G}: Tyrranax gets -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private Tyrranax(final Tyrranax card) {