From 2bedb4a1eea5e16a22f08f965412df373b236f10 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:15:44 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (cards T) --- Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java | 2 +- Mage.Sets/src/mage/cards/t/TaintedRemedy.java | 2 +- Mage.Sets/src/mage/cards/t/TaintedWell.java | 2 +- Mage.Sets/src/mage/cards/t/TajuruPreserver.java | 2 +- Mage.Sets/src/mage/cards/t/TakePossession.java | 2 +- Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java | 2 +- Mage.Sets/src/mage/cards/t/TalonSliver.java | 2 +- Mage.Sets/src/mage/cards/t/TalruumPiper.java | 2 +- Mage.Sets/src/mage/cards/t/TandemLookout.java | 2 +- Mage.Sets/src/mage/cards/t/TangleKelp.java | 2 +- Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java | 2 +- Mage.Sets/src/mage/cards/t/Tanglewalker.java | 2 +- Mage.Sets/src/mage/cards/t/TasteForMayhem.java | 4 ++-- Mage.Sets/src/mage/cards/t/Tatterkite.java | 2 +- Mage.Sets/src/mage/cards/t/TauntingElf.java | 2 +- Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java | 4 ++-- Mage.Sets/src/mage/cards/t/TeferisCurse.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisMoat.java | 2 +- Mage.Sets/src/mage/cards/t/Tek.java | 2 +- Mage.Sets/src/mage/cards/t/Telepathy.java | 2 +- Mage.Sets/src/mage/cards/t/TemperedSteel.java | 2 +- Mage.Sets/src/mage/cards/t/TempestDjinn.java | 2 +- Mage.Sets/src/mage/cards/t/TempleAltisaur.java | 2 +- Mage.Sets/src/mage/cards/t/TemporalIsolation.java | 4 ++-- Mage.Sets/src/mage/cards/t/TemptingLicid.java | 2 +- Mage.Sets/src/mage/cards/t/TemurAscendancy.java | 2 +- Mage.Sets/src/mage/cards/t/TemurRunemark.java | 2 +- Mage.Sets/src/mage/cards/t/TerentatekCub.java | 2 +- Mage.Sets/src/mage/cards/t/TerritorialDispute.java | 2 +- Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java | 2 +- Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java | 2 +- Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java | 2 +- Mage.Sets/src/mage/cards/t/TezzeretsTouch.java | 2 +- Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThassasEmissary.java | 2 +- Mage.Sets/src/mage/cards/t/TheBrute.java | 2 +- Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java | 2 +- Mage.Sets/src/mage/cards/t/TheEternalWanderer.java | 2 +- Mage.Sets/src/mage/cards/t/TheFallenApart.java | 2 +- Mage.Sets/src/mage/cards/t/TheGitrogMonster.java | 2 +- Mage.Sets/src/mage/cards/t/TheImmortalSun.java | 6 +++--- Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java | 2 +- Mage.Sets/src/mage/cards/t/TheThirdDoctor.java | 2 +- Mage.Sets/src/mage/cards/t/TheUrDragon.java | 2 +- Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java | 2 +- Mage.Sets/src/mage/cards/t/TheloniteHermit.java | 2 +- Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java | 2 +- Mage.Sets/src/mage/cards/t/Thirst.java | 2 +- Mage.Sets/src/mage/cards/t/ThirstingAxe.java | 2 +- Mage.Sets/src/mage/cards/t/ThistledownLiege.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThopterEngineer.java | 2 +- Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java | 2 +- Mage.Sets/src/mage/cards/t/ThornbiteStaff.java | 2 +- Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThoughtReflection.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtVessel.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtweftTrio.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/ThrabenFoulbloods.java | 2 +- Mage.Sets/src/mage/cards/t/ThranGolem.java | 2 +- Mage.Sets/src/mage/cards/t/ThranLens.java | 2 +- Mage.Sets/src/mage/cards/t/ThranPortal.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java | 2 +- Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java | 3 +-- Mage.Sets/src/mage/cards/t/ThrowingKnife.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullChampion.java | 2 +- Mage.Sets/src/mage/cards/t/ThrullRetainer.java | 2 +- Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderblust.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderingSpineback.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderstaff.java | 2 +- Mage.Sets/src/mage/cards/t/TideDrifter.java | 2 +- Mage.Sets/src/mage/cards/t/TigerClaws.java | 2 +- Mage.Sets/src/mage/cards/t/TighteningCoils.java | 2 +- Mage.Sets/src/mage/cards/t/TilonallisCrown.java | 2 +- Mage.Sets/src/mage/cards/t/TimberlineRidge.java | 2 +- Mage.Sets/src/mage/cards/t/TimberpackWolf.java | 6 +----- Mage.Sets/src/mage/cards/t/TimeOfHeroes.java | 2 +- Mage.Sets/src/mage/cards/t/TimeVault.java | 4 ++-- Mage.Sets/src/mage/cards/t/TinStreetMarket.java | 2 +- Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java | 2 +- Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java | 2 +- Mage.Sets/src/mage/cards/t/TitanOfLittjara.java | 4 ++-- Mage.Sets/src/mage/cards/t/TitaniasSong.java | 2 +- Mage.Sets/src/mage/cards/t/TitheTaker.java | 4 ++-- Mage.Sets/src/mage/cards/t/Togglodyte.java | 2 +- Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java | 4 ++-- Mage.Sets/src/mage/cards/t/TorchGauntlet.java | 2 +- Mage.Sets/src/mage/cards/t/Torment.java | 2 +- Mage.Sets/src/mage/cards/t/TormentorsTrident.java | 2 +- Mage.Sets/src/mage/cards/t/TorporDust.java | 2 +- Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java | 2 +- Mage.Sets/src/mage/cards/t/TrainingDrone.java | 2 +- Mage.Sets/src/mage/cards/t/Transcendence.java | 2 +- Mage.Sets/src/mage/cards/t/TravelersCloak.java | 3 +-- Mage.Sets/src/mage/cards/t/TravelingPlague.java | 2 +- Mage.Sets/src/mage/cards/t/TreacherousLink.java | 2 +- Mage.Sets/src/mage/cards/t/Treachery.java | 2 +- Mage.Sets/src/mage/cards/t/Trinisphere.java | 2 +- Mage.Sets/src/mage/cards/t/Trollhide.java | 2 +- Mage.Sets/src/mage/cards/t/Tromokratis.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrooperArmor.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrooperCommando.java | 2 +- Mage.Sets/src/mage/cards/t/TroveOfTemptation.java | 2 +- Mage.Sets/src/mage/cards/t/TrueBeliever.java | 2 +- Mage.Sets/src/mage/cards/t/TrueConviction.java | 2 +- Mage.Sets/src/mage/cards/t/TrueFaithCenser.java | 2 +- Mage.Sets/src/mage/cards/t/TrueheartDuelist.java | 2 +- Mage.Sets/src/mage/cards/t/TrustedForcemage.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrustyMachete.java | 2 +- Mage.Sets/src/mage/cards/t/TsabosWeb.java | 2 +- Mage.Sets/src/mage/cards/t/TwentyToedToad.java | 2 +- Mage.Sets/src/mage/cards/t/TwilekSeductress.java | 2 +- Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java | 2 +- Mage.Sets/src/mage/cards/t/TwistedExperiment.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java | 2 +- Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java | 2 +- 122 files changed, 138 insertions(+), 144 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java index 70bf7024231..0dfd4b2c825 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java +++ b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java @@ -51,7 +51,7 @@ public final class TaigamOjutaiMaster extends CardImpl { this.toughness = new MageInt(4); // Instant, sorcery, and Dragon spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filter, null, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filter, null, Duration.WhileOnBattlefield))); // Whenever you cast an instant or sorcery spell from your hand, if Taigam, Ojutai Master attacked this turn, that spell gains rebound. Ability ability = new ConditionalInterveningIfTriggeredAbility(new TaigamOjutaiMasterTriggeredAbility(), diff --git a/Mage.Sets/src/mage/cards/t/TaintedRemedy.java b/Mage.Sets/src/mage/cards/t/TaintedRemedy.java index 685a511c987..e4f09f84b4d 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedRemedy.java +++ b/Mage.Sets/src/mage/cards/t/TaintedRemedy.java @@ -25,7 +25,7 @@ public final class TaintedRemedy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); // If an opponent would gain life, that player loses that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TaintedRemedyReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new TaintedRemedyReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TaintedWell.java b/Mage.Sets/src/mage/cards/t/TaintedWell.java index 61f785d356e..35faa261a22 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedWell.java +++ b/Mage.Sets/src/mage/cards/t/TaintedWell.java @@ -39,7 +39,7 @@ public final class TaintedWell extends CardImpl { // When Tainted Well enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted land is a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); } private TaintedWell(final TaintedWell card) { diff --git a/Mage.Sets/src/mage/cards/t/TajuruPreserver.java b/Mage.Sets/src/mage/cards/t/TajuruPreserver.java index b105bc547e8..02330bed9c0 100644 --- a/Mage.Sets/src/mage/cards/t/TajuruPreserver.java +++ b/Mage.Sets/src/mage/cards/t/TajuruPreserver.java @@ -28,7 +28,7 @@ public final class TajuruPreserver extends CardImpl { this.toughness = new MageInt(1); // Spells and abilities your opponents control can't cause you to sacrifice permanents. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TajuruPreserverEffect())); + this.addAbility(new SimpleStaticAbility(new TajuruPreserverEffect())); } private TajuruPreserver(final TajuruPreserver card) { diff --git a/Mage.Sets/src/mage/cards/t/TakePossession.java b/Mage.Sets/src/mage/cards/t/TakePossession.java index 62c8157e359..842ebdfd454 100644 --- a/Mage.Sets/src/mage/cards/t/TakePossession.java +++ b/Mage.Sets/src/mage/cards/t/TakePossession.java @@ -36,7 +36,7 @@ public final class TakePossession extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); } private TakePossession(final TakePossession card) { diff --git a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java index c18bc5c6394..59606ff5ad4 100644 --- a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java +++ b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java @@ -31,7 +31,7 @@ public final class TakenoSamuraiGeneral extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new BushidoAbility(2)); // Each other Samurai creature you control gets +1/+1 for each point of bushido it has. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TakenoSamuraiGeneralEffect())); + this.addAbility(new SimpleStaticAbility(new TakenoSamuraiGeneralEffect())); } private TakenoSamuraiGeneral(final TakenoSamuraiGeneral card) { diff --git a/Mage.Sets/src/mage/cards/t/TalonSliver.java b/Mage.Sets/src/mage/cards/t/TalonSliver.java index e5d8b0ddca4..0f88f5db66d 100644 --- a/Mage.Sets/src/mage/cards/t/TalonSliver.java +++ b/Mage.Sets/src/mage/cards/t/TalonSliver.java @@ -31,7 +31,7 @@ public final class TalonSliver extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private TalonSliver(final TalonSliver card) { diff --git a/Mage.Sets/src/mage/cards/t/TalruumPiper.java b/Mage.Sets/src/mage/cards/t/TalruumPiper.java index 12d833523d4..99b855258ea 100644 --- a/Mage.Sets/src/mage/cards/t/TalruumPiper.java +++ b/Mage.Sets/src/mage/cards/t/TalruumPiper.java @@ -34,7 +34,7 @@ public final class TalruumPiper extends CardImpl { this.toughness = new MageInt(3); // All creatures with flying able to block Talruum Piper do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield, filter))); } private TalruumPiper(final TalruumPiper card) { diff --git a/Mage.Sets/src/mage/cards/t/TandemLookout.java b/Mage.Sets/src/mage/cards/t/TandemLookout.java index 3fb2a738459..e02b5aa1819 100644 --- a/Mage.Sets/src/mage/cards/t/TandemLookout.java +++ b/Mage.Sets/src/mage/cards/t/TandemLookout.java @@ -35,7 +35,7 @@ public final class TandemLookout extends CardImpl { // As long as Tandem Lookout is paired with another creature, each of those creatures has "Whenever this creature deals damage to an opponent, draw a card." Ability ability = new DealsDamageToOpponentTriggeredAbility(new DrawCardSourceControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private TandemLookout(final TandemLookout card) { diff --git a/Mage.Sets/src/mage/cards/t/TangleKelp.java b/Mage.Sets/src/mage/cards/t/TangleKelp.java index cd2d0597a18..978c146938d 100644 --- a/Mage.Sets/src/mage/cards/t/TangleKelp.java +++ b/Mage.Sets/src/mage/cards/t/TangleKelp.java @@ -48,7 +48,7 @@ public final class TangleKelp extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step if it attacked during its controller's last turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapIfAttackedLastTurnEnchantedEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new DontUntapIfAttackedLastTurnEnchantedEffect()), new AttackedLastTurnWatcher()); } private TangleKelp(final TangleKelp card) { diff --git a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java index 5ddfe0c12bc..7ac373df9d8 100644 --- a/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java +++ b/Mage.Sets/src/mage/cards/t/TangleclawWerewolf.java @@ -32,7 +32,7 @@ public final class TangleclawWerewolf extends CardImpl { this.secondSideCardClazz = mage.cards.f.FibrousEntangler.class; // Tangleclaw Werewolf can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); // {6}{G}: Transform Tangleclaw Werewolf. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/t/Tanglewalker.java b/Mage.Sets/src/mage/cards/t/Tanglewalker.java index 0a2cf0622f5..7bf18e717e5 100644 --- a/Mage.Sets/src/mage/cards/t/Tanglewalker.java +++ b/Mage.Sets/src/mage/cards/t/Tanglewalker.java @@ -42,7 +42,7 @@ public final class Tanglewalker extends CardImpl { new CantBeBlockedAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES, Duration.WhileOnBattlefield), new DefendingPlayerControlsSourceAttackingCondition(filter)); effect.setText("Each creature you control can't be blocked as long as defending player controls an artifact land"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Tanglewalker(final Tanglewalker card) { diff --git a/Mage.Sets/src/mage/cards/t/TasteForMayhem.java b/Mage.Sets/src/mage/cards/t/TasteForMayhem.java index 3a9e6486aad..f69e6ead765 100644 --- a/Mage.Sets/src/mage/cards/t/TasteForMayhem.java +++ b/Mage.Sets/src/mage/cards/t/TasteForMayhem.java @@ -36,10 +36,10 @@ public final class TasteForMayhem extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 0), HellbentCondition.instance, "Hellbent — Enchanted creature gets an additional +2/+0 as long as you have no cards in hand"))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 0), HellbentCondition.instance, "Hellbent — Enchanted creature gets an additional +2/+0 as long as you have no cards in hand"))); } private TasteForMayhem(final TasteForMayhem card) { diff --git a/Mage.Sets/src/mage/cards/t/Tatterkite.java b/Mage.Sets/src/mage/cards/t/Tatterkite.java index 0d8406dd797..88845ec0d43 100644 --- a/Mage.Sets/src/mage/cards/t/Tatterkite.java +++ b/Mage.Sets/src/mage/cards/t/Tatterkite.java @@ -28,7 +28,7 @@ public final class Tatterkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Tatterkite can't have counters put on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantHaveCountersSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantHaveCountersSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TauntingElf.java b/Mage.Sets/src/mage/cards/t/TauntingElf.java index 1932f585174..aeeab24db79 100644 --- a/Mage.Sets/src/mage/cards/t/TauntingElf.java +++ b/Mage.Sets/src/mage/cards/t/TauntingElf.java @@ -25,7 +25,7 @@ public final class TauntingElf extends CardImpl { this.toughness = new MageInt(1); // All creatures able to block Taunting Elf do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); } private TauntingElf(final TauntingElf card) { diff --git a/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java b/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java index cc1034d57d2..283a6df888f 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java +++ b/Mage.Sets/src/mage/cards/t/TeferiMageOfZhalfir.java @@ -35,10 +35,10 @@ public final class TeferiMageOfZhalfir extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Creature cards you own that aren't on the battlefield have flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TeferiMageOfZhalfirAddFlashEffect())); + this.addAbility(new SimpleStaticAbility(new TeferiMageOfZhalfirAddFlashEffect())); // Each opponent can cast spells only any time they could cast a sorcery. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TeferiMageOfZhalfirReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new TeferiMageOfZhalfirReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TeferisCurse.java b/Mage.Sets/src/mage/cards/t/TeferisCurse.java index 6d98831b557..d887dc5aeef 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisCurse.java +++ b/Mage.Sets/src/mage/cards/t/TeferisCurse.java @@ -32,7 +32,7 @@ public final class TeferisCurse extends CardImpl { this.addAbility(ability); // Enchanted permanent has phasing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(PhasingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(PhasingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"))); } private TeferisCurse(final TeferisCurse card) { diff --git a/Mage.Sets/src/mage/cards/t/TeferisMoat.java b/Mage.Sets/src/mage/cards/t/TeferisMoat.java index d1b1d19b238..e672d2ab4ec 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisMoat.java +++ b/Mage.Sets/src/mage/cards/t/TeferisMoat.java @@ -30,7 +30,7 @@ public final class TeferisMoat extends CardImpl { // As Teferi's Moat enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // Creatures of the chosen color without flying can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TeferisMoatRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new TeferisMoatRestrictionEffect())); } private TeferisMoat(final TeferisMoat card) { diff --git a/Mage.Sets/src/mage/cards/t/Tek.java b/Mage.Sets/src/mage/cards/t/Tek.java index 4df8f731c51..41e8ecae5da 100644 --- a/Mage.Sets/src/mage/cards/t/Tek.java +++ b/Mage.Sets/src/mage/cards/t/Tek.java @@ -49,7 +49,7 @@ public final class Tek extends CardImpl { this.toughness = new MageInt(2); // Tek gets +0/+2 as long as you control a Plains, has flying as long as you control an Island, gets +2/+0 as long as you control a Swamp, has first strike as long as you control a Mountain, and has trample as long as you control a Forest. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filterPlains), "{this} gets +0/+2 as long as you control a Plains")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filterIsland), ", has flying as long as you control an Island")); diff --git a/Mage.Sets/src/mage/cards/t/Telepathy.java b/Mage.Sets/src/mage/cards/t/Telepathy.java index ccdc693c08d..784b8f50b95 100644 --- a/Mage.Sets/src/mage/cards/t/Telepathy.java +++ b/Mage.Sets/src/mage/cards/t/Telepathy.java @@ -20,7 +20,7 @@ public final class Telepathy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // Your opponents play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new PlayWithHandRevealedEffect(TargetController.OPPONENT))); } private Telepathy(final Telepathy card) { diff --git a/Mage.Sets/src/mage/cards/t/TemperedSteel.java b/Mage.Sets/src/mage/cards/t/TemperedSteel.java index e3be048a1fc..f93d66e68cd 100644 --- a/Mage.Sets/src/mage/cards/t/TemperedSteel.java +++ b/Mage.Sets/src/mage/cards/t/TemperedSteel.java @@ -26,7 +26,7 @@ public final class TemperedSteel extends CardImpl { public TemperedSteel (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private TemperedSteel(final TemperedSteel card) { diff --git a/Mage.Sets/src/mage/cards/t/TempestDjinn.java b/Mage.Sets/src/mage/cards/t/TempestDjinn.java index 6d7b6800bdb..3671435ca72 100644 --- a/Mage.Sets/src/mage/cards/t/TempestDjinn.java +++ b/Mage.Sets/src/mage/cards/t/TempestDjinn.java @@ -42,7 +42,7 @@ public final class TempestDjinn extends CardImpl { // Tempest Djinn gets +1/+0 for each basic Island you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); } private TempestDjinn(final TempestDjinn card) { diff --git a/Mage.Sets/src/mage/cards/t/TempleAltisaur.java b/Mage.Sets/src/mage/cards/t/TempleAltisaur.java index a4519b6b46a..bf43fdce9d6 100644 --- a/Mage.Sets/src/mage/cards/t/TempleAltisaur.java +++ b/Mage.Sets/src/mage/cards/t/TempleAltisaur.java @@ -30,7 +30,7 @@ public final class TempleAltisaur extends CardImpl { this.toughness = new MageInt(4); // If a source would deal damage to another Dinosaur you control, prevent all but 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TempleAltisaurPreventEffect())); + this.addAbility(new SimpleStaticAbility(new TempleAltisaurPreventEffect())); } private TempleAltisaur(final TempleAltisaur card) { diff --git a/Mage.Sets/src/mage/cards/t/TemporalIsolation.java b/Mage.Sets/src/mage/cards/t/TemporalIsolation.java index 612c5431479..038f53f86ee 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalIsolation.java +++ b/Mage.Sets/src/mage/cards/t/TemporalIsolation.java @@ -40,9 +40,9 @@ public final class TemporalIsolation extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shadow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); } private TemporalIsolation(final TemporalIsolation card) { diff --git a/Mage.Sets/src/mage/cards/t/TemptingLicid.java b/Mage.Sets/src/mage/cards/t/TemptingLicid.java index 70dd120d0e8..ca6607b2fa5 100644 --- a/Mage.Sets/src/mage/cards/t/TemptingLicid.java +++ b/Mage.Sets/src/mage/cards/t/TemptingLicid.java @@ -31,7 +31,7 @@ public final class TemptingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.G), new ColoredManaCost(ColoredManaSymbol.G))); // All creatures able to block enchanted creature do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); } private TemptingLicid(final TemptingLicid card) { diff --git a/Mage.Sets/src/mage/cards/t/TemurAscendancy.java b/Mage.Sets/src/mage/cards/t/TemurAscendancy.java index 12057bcd39c..266e0613e78 100644 --- a/Mage.Sets/src/mage/cards/t/TemurAscendancy.java +++ b/Mage.Sets/src/mage/cards/t/TemurAscendancy.java @@ -33,7 +33,7 @@ public final class TemurAscendancy extends CardImpl { // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); // Whenever a creature with power 4 or greater you control enters, you may draw a card. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), filter, true)); diff --git a/Mage.Sets/src/mage/cards/t/TemurRunemark.java b/Mage.Sets/src/mage/cards/t/TemurRunemark.java index e9ae4697ff7..8a357973e2c 100644 --- a/Mage.Sets/src/mage/cards/t/TemurRunemark.java +++ b/Mage.Sets/src/mage/cards/t/TemurRunemark.java @@ -49,7 +49,7 @@ public final class TemurRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has trample as long as you control a blue or red permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/t/TerentatekCub.java b/Mage.Sets/src/mage/cards/t/TerentatekCub.java index 7b71719c3ca..945532f6d07 100644 --- a/Mage.Sets/src/mage/cards/t/TerentatekCub.java +++ b/Mage.Sets/src/mage/cards/t/TerentatekCub.java @@ -38,7 +38,7 @@ public final class TerentatekCub extends CardImpl { this.toughness = new MageInt(2); // As long as an opponent controls a Jedi or Sith, {this} gets +1/+1 and attacks each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "As long as an opponent controls a Jedi or Sith, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/t/TerritorialDispute.java b/Mage.Sets/src/mage/cards/t/TerritorialDispute.java index 86b472d109d..eff906fcff1 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialDispute.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialDispute.java @@ -33,7 +33,7 @@ public final class TerritorialDispute extends CardImpl { )); // Players can't play lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TerritorialDisputeEffect())); + this.addAbility(new SimpleStaticAbility(new TerritorialDisputeEffect())); } private TerritorialDispute(final TerritorialDispute card) { diff --git a/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java b/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java index 6ad18b41d9c..cc818c9ecf9 100644 --- a/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java +++ b/Mage.Sets/src/mage/cards/t/TetsukoUmezawaFugitive.java @@ -46,7 +46,7 @@ public final class TetsukoUmezawaFugitive extends CardImpl { // Creatures you control with power or toughness 1 or less can't be blocked. Effect effect = new CantBeBlockedAllEffect(filter, Duration.Custom); effect.setText("Creatures you control with power or toughness 1 or less can't be blocked"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private TetsukoUmezawaFugitive(final TetsukoUmezawaFugitive card) { diff --git a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java index 2c89477b8cb..b829a581764 100644 --- a/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/TetsuoUmezawa.java @@ -47,7 +47,7 @@ public final class TetsuoUmezawa extends CardImpl { this.toughness = new MageInt(3); // Tetsuo Umezawa can't be the target of Aura spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TetsuoUmezawaEffect())); + 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.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java index 4dc3e1202ce..9f85674d95b 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java @@ -43,7 +43,7 @@ public final class TezzeretMasterOfTheBridge extends CardImpl { this.setStartingLoyalty(5); // Creature and planeswalker spells you cast have affinity for artifacts. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect( new AffinityForArtifactsAbility(), filter ))); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java index a9f5e70c08a..ae2d414bb39 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java @@ -39,7 +39,7 @@ public final class TezzeretsTouch extends CardImpl { this.addAbility(ability); // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new CreatureToken(5, 5, "5/5 creature"),"Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types", Duration.WhileOnBattlefield))); // When enchanted artifact is put into a graveyard, return that card to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java b/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java index 073487ab1f9..d3d773eeb3e 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java +++ b/Mage.Sets/src/mage/cards/t/ThaliaGuardianOfThraben.java @@ -35,7 +35,7 @@ public final class ThaliaGuardianOfThraben extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } @@ -47,4 +47,4 @@ public final class ThaliaGuardianOfThraben extends CardImpl { public ThaliaGuardianOfThraben copy() { return new ThaliaGuardianOfThraben(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/ThassasEmissary.java b/Mage.Sets/src/mage/cards/t/ThassasEmissary.java index 6c706a54354..412b82c35e6 100644 --- a/Mage.Sets/src/mage/cards/t/ThassasEmissary.java +++ b/Mage.Sets/src/mage/cards/t/ThassasEmissary.java @@ -38,7 +38,7 @@ public final class ThassasEmissary extends CardImpl { // Whenever Thassa's Emissary or enchanted creature deals combat damage to a player, draw a card. this.addAbility(new ThassasEmissaryTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3,3))); } private ThassasEmissary(final ThassasEmissary card) { diff --git a/Mage.Sets/src/mage/cards/t/TheBrute.java b/Mage.Sets/src/mage/cards/t/TheBrute.java index 8aef9e9115f..58e57434fb7 100644 --- a/Mage.Sets/src/mage/cards/t/TheBrute.java +++ b/Mage.Sets/src/mage/cards/t/TheBrute.java @@ -36,7 +36,7 @@ public final class TheBrute extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0))); + 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}"))); diff --git a/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java b/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java index f19c245855d..151e4f4dcc8 100644 --- a/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java +++ b/Mage.Sets/src/mage/cards/t/TheCheeseStandsAlone.java @@ -27,7 +27,7 @@ public final class TheCheeseStandsAlone extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}"); // When you control no permanents other than The Cheese Stands Alone and have no cards in hand, you win the game. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CheeseStandsAloneContinuousEffect()); + Ability ability = new SimpleStaticAbility(new CheeseStandsAloneContinuousEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java b/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java index 62796fd3fef..ef6212bfd3f 100644 --- a/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java +++ b/Mage.Sets/src/mage/cards/t/TheEternalWanderer.java @@ -57,7 +57,7 @@ public final class TheEternalWanderer extends CardImpl { this.setStartingLoyalty(5); // No more than one creature can attack The Eternal Wanderer each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheEternalWandererAttackRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new TheEternalWandererAttackRestrictionEffect())); // +1: Exile up to one target artifact or creature. Return that card to the battlefield under its owner's control at the beginning of that player's next end step. Ability ability = new LoyaltyAbility(new TheEternalWandererExileEffect(), 1); diff --git a/Mage.Sets/src/mage/cards/t/TheFallenApart.java b/Mage.Sets/src/mage/cards/t/TheFallenApart.java index b78314dcd6a..71609346d17 100644 --- a/Mage.Sets/src/mage/cards/t/TheFallenApart.java +++ b/Mage.Sets/src/mage/cards/t/TheFallenApart.java @@ -37,7 +37,7 @@ public final class TheFallenApart extends CardImpl { this.addAbility(new DealtDamageToSourceTriggeredAbility(new TheFallenApartToggleEffect(), false)); // The Fallen Apart can’t attack if it has no legs and can’t block if it has no arms. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheFallenApartRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new TheFallenApartRestrictionEffect())); } private TheFallenApart(final TheFallenApart card) { diff --git a/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java b/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java index fbb1b849059..61850d8d3ac 100644 --- a/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java +++ b/Mage.Sets/src/mage/cards/t/TheGitrogMonster.java @@ -40,7 +40,7 @@ public final class TheGitrogMonster extends CardImpl { new SacrificeTargetCost(StaticFilters.FILTER_LAND)))); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Whenever one or more land cards are put into your graveyard from anywhere, draw a card. this.addAbility(new TheGitrogMonsterTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TheImmortalSun.java b/Mage.Sets/src/mage/cards/t/TheImmortalSun.java index f1cce7298c2..9cf3916339d 100644 --- a/Mage.Sets/src/mage/cards/t/TheImmortalSun.java +++ b/Mage.Sets/src/mage/cards/t/TheImmortalSun.java @@ -31,17 +31,17 @@ public final class TheImmortalSun extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Players can't activate planeswalkers' loyalty abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheImmortalSunCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new TheImmortalSunCantActivateEffect())); // At the beginning of your draw step, draw an additional card. this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardSourceControllerEffect(1) .setText("draw an additional card"), false)); // Spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCard("Spells"), 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterCard("Spells"), 1))); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); } private TheImmortalSun(final TheImmortalSun card) { diff --git a/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java b/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java index b6095869891..1e694da122a 100644 --- a/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java +++ b/Mage.Sets/src/mage/cards/t/TheMasterMultiplied.java @@ -46,7 +46,7 @@ public final class TheMasterMultiplied extends CardImpl { this.addAbility(new SimpleStaticAbility(new LegendRuleDoesntApplyEffect(filter))); // Triggered abilities you control can't cause you to sacrifice or exile creature tokens you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TheMasterMultipliedEffect())); + this.addAbility(new SimpleStaticAbility(new TheMasterMultipliedEffect())); } private TheMasterMultiplied(final TheMasterMultiplied card) { diff --git a/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java b/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java index 28494275eb5..982d733500c 100644 --- a/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheThirdDoctor.java @@ -52,7 +52,7 @@ public final class TheThirdDoctor extends CardImpl { // The Third Doctor gets +1/+1 for each noncreature token you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // When The Third Doctor enters the battlefield, create your choice of a Clue token, a Food token, or a Treasure token. this.addAbility(new EntersBattlefieldTriggeredAbility(new TheThirdDoctorEffect())); diff --git a/Mage.Sets/src/mage/cards/t/TheUrDragon.java b/Mage.Sets/src/mage/cards/t/TheUrDragon.java index beb8c081d1e..38286a68a34 100644 --- a/Mage.Sets/src/mage/cards/t/TheUrDragon.java +++ b/Mage.Sets/src/mage/cards/t/TheUrDragon.java @@ -43,7 +43,7 @@ public final class TheUrDragon extends CardImpl { // Eminence — As long as The Ur-Dragon is in the command zone or on the battlefield, other Dragon spells you cast cost {1} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 1); effect.setText("As long as {this} is in the command zone or on the battlefield, other Dragon spells you cast cost {1} less to cast"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.setAbilityWord(AbilityWord.EMINENCE); this.addAbility(ability); effect = new SpellsCostReductionControllerEffect(filter, 1); diff --git a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java index 7eeffdeffa5..a920c320c8c 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java +++ b/Mage.Sets/src/mage/cards/t/ThelonOfHavenwood.java @@ -43,7 +43,7 @@ public final class ThelonOfHavenwood extends CardImpl { this.toughness = new MageInt(2); // Each Fungus creature gets +1/+1 for each spore counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThelonOfHavenwoodBoostEffect())); + 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}")); diff --git a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java index e80cf2ccb2d..02cd5065f6b 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java @@ -39,7 +39,7 @@ public final class TheloniteHermit extends CardImpl { this.toughness = new MageInt(1); // Saproling creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Morph {3}{G}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{G}"))); diff --git a/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java b/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java index 3f4bb2dec90..e74de4d2ee3 100644 --- a/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java +++ b/Mage.Sets/src/mage/cards/t/ThickSkinnedGoblin.java @@ -31,7 +31,7 @@ public final class ThickSkinnedGoblin extends CardImpl { this.toughness = new MageInt(1); // You may pay {0} rather than pay the echo cost for permanents you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThickSkinnedGoblinCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new ThickSkinnedGoblinCostModificationEffect())); // {R}: Thick-Skinned Goblin gains protection from red until end of turn. this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/t/Thirst.java b/Mage.Sets/src/mage/cards/t/Thirst.java index 8341b8597a3..972f1213bc3 100644 --- a/Mage.Sets/src/mage/cards/t/Thirst.java +++ b/Mage.Sets/src/mage/cards/t/Thirst.java @@ -38,7 +38,7 @@ public final class Thirst extends CardImpl { // When Thirst enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // At the beginning of your upkeep, sacrifice Thirst unless you pay {U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}")) )); diff --git a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java index 1ea9d5706a8..bd7e6e56dad 100644 --- a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java +++ b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java @@ -40,7 +40,7 @@ public final class ThirstingAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 0))); // At the beginning of your end step, if equipped creature didn't deal combat damage to a creature this turn, sacrifice it. TriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new SacrificeEquippedEffect()); diff --git a/Mage.Sets/src/mage/cards/t/ThistledownLiege.java b/Mage.Sets/src/mage/cards/t/ThistledownLiege.java index 05ef4e64b74..52c0cfdbe83 100644 --- a/Mage.Sets/src/mage/cards/t/ThistledownLiege.java +++ b/Mage.Sets/src/mage/cards/t/ThistledownLiege.java @@ -40,9 +40,9 @@ public final class ThistledownLiege extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); } private ThistledownLiege(final ThistledownLiege card) { diff --git a/Mage.Sets/src/mage/cards/t/ThopterEngineer.java b/Mage.Sets/src/mage/cards/t/ThopterEngineer.java index 198bd9d1571..4a1b5963a71 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterEngineer.java +++ b/Mage.Sets/src/mage/cards/t/ThopterEngineer.java @@ -40,7 +40,7 @@ public final class ThopterEngineer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), 1))); // Artifact creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private ThopterEngineer(final ThopterEngineer card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java b/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java index dd8d587def7..f0f8080d47b 100644 --- a/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java +++ b/Mage.Sets/src/mage/cards/t/ThornOfAmethyst.java @@ -27,7 +27,7 @@ public final class ThornOfAmethyst extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private ThornOfAmethyst(final ThornOfAmethyst card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index 1b59f2acd78..2c93014a1d3 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -41,7 +41,7 @@ public final class ThornbiteStaff extends CardImpl { gainedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{2}, {T}: This creature deals 1 damage to any target\""); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(new DiesCreatureTriggeredAbility(new UntapSourceEffect(),false), AttachmentType.EQUIPMENT); effect.setText("and \"Whenever a creature dies, untap this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java b/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java index e66724ad3a7..da8ae76e503 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeFamiliar.java @@ -37,7 +37,7 @@ public final class ThornscapeFamiliar extends CardImpl { this.toughness = new MageInt(1); // Red spells and white spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private ThornscapeFamiliar(final ThornscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java b/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java index 22c349b87f3..dc108596460 100644 --- a/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java +++ b/Mage.Sets/src/mage/cards/t/ThornwatchScarecrow.java @@ -45,11 +45,11 @@ public final class ThornwatchScarecrow extends CardImpl { // Thornwatch Scarecrow has wither as long as you control a green creature. ContinuousEffect effect = new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Thornwatch Scarecrow has vigilance as long as you control a white creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtReflection.java b/Mage.Sets/src/mage/cards/t/ThoughtReflection.java index 673d320e4c0..4b2f58ff4d7 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtReflection.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtReflection.java @@ -27,7 +27,7 @@ public final class ThoughtReflection extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}{U}"); // If you would draw a card, draw two cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThoughtReflectionReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ThoughtReflectionReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtVessel.java b/Mage.Sets/src/mage/cards/t/ThoughtVessel.java index 3f80895d33f..896bdcf76f9 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtVessel.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtVessel.java @@ -23,7 +23,7 @@ public final class ThoughtVessel extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java b/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java index 4ba212246e3..1bc4a09249c 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtweftTrio.java @@ -37,7 +37,7 @@ public final class ThoughtweftTrio extends CardImpl { this.addAbility(new ChampionAbility(this, SubType.KITHKIN)); // Thoughtweft Trio can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private ThoughtweftTrio(final ThoughtweftTrio card) { diff --git a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java index b45d8594e66..7e6e3081339 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java +++ b/Mage.Sets/src/mage/cards/t/ThousandYearElixir.java @@ -30,7 +30,7 @@ public final class ThousandYearElixir extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // You may activate abilities of creatures you control as though those creatures had haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThousandYearElixirEffect())); + this.addAbility(new SimpleStaticAbility(new ThousandYearElixirEffect())); // {1}, {tap}: Untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java index a8b44b89cd9..4c2ed207216 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java @@ -34,7 +34,7 @@ public final class ThrabenDoomsayer extends CardImpl { // {tap}: Create a 1/1 white Human creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, 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(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), + 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/ThrabenFoulbloods.java b/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java index 891b4887550..2b011cce9a5 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java @@ -32,7 +32,7 @@ public final class ThrabenFoulbloods extends CardImpl { // Delirium — Thraben Foulbloods gets +1/+1 and has menace as long as there are four or more card types among cards in your graveyard. (A creature with menace can't be blocked except by two or more creatures.) ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility()), DeliriumCondition.instance, "and has menace as long as there are four or more card types among cards in your graveyard. (A creature with menace can't be blocked except by two or more creatures.)")); ability.addHint(CardTypesInGraveyardHint.YOU); diff --git a/Mage.Sets/src/mage/cards/t/ThranGolem.java b/Mage.Sets/src/mage/cards/t/ThranGolem.java index e6009178c30..e355dc210db 100644 --- a/Mage.Sets/src/mage/cards/t/ThranGolem.java +++ b/Mage.Sets/src/mage/cards/t/ThranGolem.java @@ -34,7 +34,7 @@ public final class ThranGolem extends CardImpl { // As long as Thran Golem is enchanted, it gets +2/+2 and has flying, first strike, and trample. EnchantedSourceCondition enchanted = new EnchantedSourceCondition(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, "As long as {this} is enchanted, it gets +2/+2")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), diff --git a/Mage.Sets/src/mage/cards/t/ThranLens.java b/Mage.Sets/src/mage/cards/t/ThranLens.java index 772d250a621..1e62c401a5e 100644 --- a/Mage.Sets/src/mage/cards/t/ThranLens.java +++ b/Mage.Sets/src/mage/cards/t/ThranLens.java @@ -21,7 +21,7 @@ public final class ThranLens extends CardImpl { public ThranLens(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // All permanents are colorless. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThranLensEffect())); + this.addAbility(new SimpleStaticAbility(new ThranLensEffect())); } private ThranLens(final ThranLens card) { diff --git a/Mage.Sets/src/mage/cards/t/ThranPortal.java b/Mage.Sets/src/mage/cards/t/ThranPortal.java index 8366d5963bd..01dd82ddf01 100644 --- a/Mage.Sets/src/mage/cards/t/ThranPortal.java +++ b/Mage.Sets/src/mage/cards/t/ThranPortal.java @@ -51,7 +51,7 @@ public class ThranPortal extends CardImpl { AsEntersBattlefieldAbility chooseLandTypeAbility = new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.AddAbility)); chooseLandTypeAbility.addEffect(new EnterAttributeAddChosenSubtypeEffect()); // While it enters this.addAbility(chooseLandTypeAbility); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); // While on the battlefield + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // While on the battlefield // Mana abilities of Thran Portal cost an additional 1 life to activate. // This also adds the mana ability @@ -172,4 +172,4 @@ class ThranPortalAdditionalCostEffect extends CostModificationEffectImpl { return abilityToModify instanceof ManaAbility; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java index 7f17f17e714..c6cbcfa1b02 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java +++ b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java @@ -40,7 +40,7 @@ public final class ThrashOfRaptors extends CardImpl { this.toughness = new MageInt(3); // As long as you control another Dinosaur, Thrash of Raptors gets +2/+0 and has trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another Dinosaur, {this} gets +2/+0")); diff --git a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java index dfdeca389f3..ce924743d93 100644 --- a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java @@ -45,7 +45,7 @@ public final class ThreadsOfDisloyalty extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } @@ -58,4 +58,3 @@ public final class ThreadsOfDisloyalty extends CardImpl { return new ThreadsOfDisloyalty(this); } } - diff --git a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java index fdeaaf760ed..bf958508b51 100644 --- a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java +++ b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java @@ -31,7 +31,7 @@ public final class ThrowingKnife extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Whenever equipped creature attacks, you may sacrifice Throwing Knife. If you do, Throwing Knife deals 2 damage to any target. Effect effect = new SacrificeSourceEffect(); effect.setText("you may sacrifice {this}. If you do, "); diff --git a/Mage.Sets/src/mage/cards/t/ThrullChampion.java b/Mage.Sets/src/mage/cards/t/ThrullChampion.java index f715edf9914..b190e6141ce 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullChampion.java +++ b/Mage.Sets/src/mage/cards/t/ThrullChampion.java @@ -32,7 +32,7 @@ public final class ThrullChampion extends CardImpl { this.toughness = new MageInt(2); // Thrull creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // {tap}: Gain control of target Thrull for as long as you control Thrull Champion. Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.WhileControlled) diff --git a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java index 15389b938d3..871bad88ec6 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java +++ b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java @@ -38,7 +38,7 @@ public final class ThrullRetainer extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + 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())); } diff --git a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java index 2cc0e24b5a9..42da65135d9 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java +++ b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java @@ -42,7 +42,7 @@ public final class ThrunBreakerOfSilence extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Thrun, Breaker of Silence can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThrunBreakerOfSilenceEffect())); + this.addAbility(new SimpleStaticAbility(new ThrunBreakerOfSilenceEffect())); // As long as it's your turn, Thrun has indestructible. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/t/Thunderblust.java b/Mage.Sets/src/mage/cards/t/Thunderblust.java index fec3973f392..c75c7b22444 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderblust.java +++ b/Mage.Sets/src/mage/cards/t/Thunderblust.java @@ -38,7 +38,7 @@ public final class Thunderblust extends CardImpl { // Thunderblust has trample as long as it has a -1/-1 counter on it. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.M1M1), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Persist this.addAbility(new PersistAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java b/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java index 2160f51f186..2f38a98d809 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java +++ b/Mage.Sets/src/mage/cards/t/ThunderclapWyvern.java @@ -44,7 +44,7 @@ public final class ThunderclapWyvern extends CardImpl { // Other creatures you control with flying get +1/+1. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true); effect.setText("Other creatures you control with flying get +1/+1"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java index 16a65420fea..caaf6938cb5 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java +++ b/Mage.Sets/src/mage/cards/t/ThunderingSpineback.java @@ -37,7 +37,7 @@ public final class ThunderingSpineback extends CardImpl { this.toughness = new MageInt(5); // Other Dinosaurs you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + 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}"))); diff --git a/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java b/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java index 4f629ab1068..b700d4cc591 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/ThunderscapeFamiliar.java @@ -40,7 +40,7 @@ public final class ThunderscapeFamiliar extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Black spells and green spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private ThunderscapeFamiliar(final ThunderscapeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/t/Thunderstaff.java b/Mage.Sets/src/mage/cards/t/Thunderstaff.java index 4f1b16aaf1d..cf9535a1f13 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderstaff.java +++ b/Mage.Sets/src/mage/cards/t/Thunderstaff.java @@ -29,7 +29,7 @@ public final class Thunderstaff extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // As long as Thunderstaff is untapped, if a creature would deal combat damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ThunderstaffPreventionEffect())); + 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.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TideDrifter.java b/Mage.Sets/src/mage/cards/t/TideDrifter.java index 5d27cb3933c..1c62b25e23f 100644 --- a/Mage.Sets/src/mage/cards/t/TideDrifter.java +++ b/Mage.Sets/src/mage/cards/t/TideDrifter.java @@ -37,7 +37,7 @@ public final class TideDrifter extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // Other colorless creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/t/TigerClaws.java b/Mage.Sets/src/mage/cards/t/TigerClaws.java index 825607751f6..c8b76033f21 100644 --- a/Mage.Sets/src/mage/cards/t/TigerClaws.java +++ b/Mage.Sets/src/mage/cards/t/TigerClaws.java @@ -44,7 +44,7 @@ public final class TigerClaws extends CardImpl { // Enchanted creature gets +1/+1 and has trample. Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TighteningCoils.java b/Mage.Sets/src/mage/cards/t/TighteningCoils.java index 9f79b3bbe52..2b193782975 100644 --- a/Mage.Sets/src/mage/cards/t/TighteningCoils.java +++ b/Mage.Sets/src/mage/cards/t/TighteningCoils.java @@ -39,7 +39,7 @@ public final class TighteningCoils extends CardImpl { this.addAbility(ability); // Enchanted creature gets -6/-0 and loses flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-6, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-6, 0, Duration.WhileOnBattlefield)); Effect effect = new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and loses flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TilonallisCrown.java b/Mage.Sets/src/mage/cards/t/TilonallisCrown.java index a8cde4c15c1..a1d7bc3c9c6 100644 --- a/Mage.Sets/src/mage/cards/t/TilonallisCrown.java +++ b/Mage.Sets/src/mage/cards/t/TilonallisCrown.java @@ -44,7 +44,7 @@ public final class TilonallisCrown extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DamageAttachedEffect(1, "it"))); // Enchanted creature gets +3/+0 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 0)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TimberlineRidge.java b/Mage.Sets/src/mage/cards/t/TimberlineRidge.java index 7a0ba66a211..ebad3e35930 100644 --- a/Mage.Sets/src/mage/cards/t/TimberlineRidge.java +++ b/Mage.Sets/src/mage/cards/t/TimberlineRidge.java @@ -33,7 +33,7 @@ public final class TimberlineRidge extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Timberline Ridge. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java index b2b5242bf48..b13644f46e6 100644 --- a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java +++ b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java @@ -35,7 +35,7 @@ public final class TimberpackWolf extends CardImpl { this.toughness = new MageInt(2); // Timberpack Wolf gets +1/+1 for each other creature you control named Timberpack Wolf. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TimberpackWolfEffect())); + this.addAbility(new SimpleStaticAbility(new TimberpackWolfEffect())); } private TimberpackWolf(final TimberpackWolf card) { @@ -79,7 +79,3 @@ public final class TimberpackWolf extends CardImpl { } } } - - - - diff --git a/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java b/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java index c6e9cf89415..61aadc6d97d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java +++ b/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java @@ -30,7 +30,7 @@ public final class TimeOfHeroes extends CardImpl { // Each creature you control with a level counter on it gets +2/+2. ContinuousEffect boost = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, boost)); + this.addAbility(new SimpleStaticAbility(boost)); } private TimeOfHeroes(final TimeOfHeroes card) { diff --git a/Mage.Sets/src/mage/cards/t/TimeVault.java b/Mage.Sets/src/mage/cards/t/TimeVault.java index 381712a94f5..5592240ed3b 100644 --- a/Mage.Sets/src/mage/cards/t/TimeVault.java +++ b/Mage.Sets/src/mage/cards/t/TimeVault.java @@ -35,10 +35,10 @@ public final class TimeVault extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Time Vault doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // If you would begin your turn while Time Vault is tapped, you may skip that turn instead. If you do, untap Time Vault. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TimeVaultReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new TimeVaultReplacementEffect())); // {tap}: Take an extra turn after this one. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, 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 ca164fdca72..5e529458a10 100644 --- a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java +++ b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java @@ -40,7 +40,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()); gainAbility.addCost(new DiscardCardCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "land"))); } diff --git a/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java b/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java index abcfdea2c54..2fbb6ac1215 100644 --- a/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java +++ b/Mage.Sets/src/mage/cards/t/TishanaVoiceOfThunder.java @@ -37,7 +37,7 @@ public final class TishanaVoiceOfThunder extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // When Tishana enters the battlefield, draw a card for each creature you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE)))); diff --git a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java index 9c5c5816ca0..397a30c2dba 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java @@ -39,7 +39,7 @@ public final class TitanOfEternalFire extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.HUMAN, "Each Human creature")); effect.setText("Each Human creature you control has \"{R}, {T}: This creature deals 1 damage to any target.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private TitanOfEternalFire(final TitanOfEternalFire card) { diff --git a/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java b/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java index 76ed7c1bee2..22dad8ad94b 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfLittjara.java @@ -43,7 +43,7 @@ public final class TitanOfLittjara extends CardImpl { // Titan of Littjara is the chosen type in addition to its other types. ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // Whenever Titan of Littjara enters the battlefield or attacks, you may draw a card for each other creature you control that shares a creature type with it. If you do, discard a card. this.addAbility(new EntersBattlefieldOrAttacksSourceTriggeredAbility( @@ -98,4 +98,4 @@ class TitanOfLittjaraEffect extends OneShotEffect { return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TitaniasSong.java b/Mage.Sets/src/mage/cards/t/TitaniasSong.java index ab1f6455c30..a9306e863f8 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniasSong.java +++ b/Mage.Sets/src/mage/cards/t/TitaniasSong.java @@ -31,7 +31,7 @@ public final class TitaniasSong extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // Each noncreature artifact loses all abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. If Titania's Song leaves the battlefield, this effect continues until end of turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TitaniasSongEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new TitaniasSongEffect(Duration.WhileOnBattlefield))); this.addAbility(new LeavesBattlefieldTriggeredAbility(new TitaniasSongEffect(Duration.EndOfTurn), false)); } diff --git a/Mage.Sets/src/mage/cards/t/TitheTaker.java b/Mage.Sets/src/mage/cards/t/TitheTaker.java index f13dd9bb8b9..295a2b253bf 100644 --- a/Mage.Sets/src/mage/cards/t/TitheTaker.java +++ b/Mage.Sets/src/mage/cards/t/TitheTaker.java @@ -30,7 +30,7 @@ public final class TitheTaker extends CardImpl { this.toughness = new MageInt(1); // During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TitheTakerCostReductionEffect()) + this.addAbility(new SimpleStaticAbility(new TitheTakerCostReductionEffect()) .addHint(MyTurnHint.instance)); // Afterlife 1 @@ -83,4 +83,4 @@ class TitheTakerCostReductionEffect extends CostModificationEffectImpl { return new TitheTakerCostReductionEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/Togglodyte.java b/Mage.Sets/src/mage/cards/t/Togglodyte.java index 4108e4a76c0..9626e8afb82 100644 --- a/Mage.Sets/src/mage/cards/t/Togglodyte.java +++ b/Mage.Sets/src/mage/cards/t/Togglodyte.java @@ -41,7 +41,7 @@ public final class Togglodyte extends CardImpl { this.addAbility(new SpellCastAllTriggeredAbility(new TogglodyteToggleEffect(), false)); // As long as Togglodyte is turned off, it can’t attack or block, and prevent all damage it would deal. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalRestrictionEffect(new TogglodyteRestrictionEffect(), new TogglodyteCondition())); + Ability ability = new SimpleStaticAbility(new ConditionalRestrictionEffect(new TogglodyteRestrictionEffect(), new TogglodyteCondition())); ability.addEffect(new ConditionalReplacementEffect(new TogglodytePreventionEffect(), new TogglodyteCondition())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index a521ec38595..b62c81e52f7 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -42,9 +42,9 @@ public final class TolsimirWolfblood extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + 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())); } diff --git a/Mage.Sets/src/mage/cards/t/TorchGauntlet.java b/Mage.Sets/src/mage/cards/t/TorchGauntlet.java index ca1bd7eebf0..593e374c38d 100644 --- a/Mage.Sets/src/mage/cards/t/TorchGauntlet.java +++ b/Mage.Sets/src/mage/cards/t/TorchGauntlet.java @@ -24,7 +24,7 @@ public final class TorchGauntlet extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/t/Torment.java b/Mage.Sets/src/mage/cards/t/Torment.java index 0959bb55c02..05f3e1d2ab2 100644 --- a/Mage.Sets/src/mage/cards/t/Torment.java +++ b/Mage.Sets/src/mage/cards/t/Torment.java @@ -34,7 +34,7 @@ public final class Torment extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); } private Torment(final Torment card) { diff --git a/Mage.Sets/src/mage/cards/t/TormentorsTrident.java b/Mage.Sets/src/mage/cards/t/TormentorsTrident.java index 26333cb4495..7437a150258 100644 --- a/Mage.Sets/src/mage/cards/t/TormentorsTrident.java +++ b/Mage.Sets/src/mage/cards/t/TormentorsTrident.java @@ -30,7 +30,7 @@ public final class TormentorsTrident extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+0 and attacks each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 0)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TorporDust.java b/Mage.Sets/src/mage/cards/t/TorporDust.java index 91d2e012773..7e5f11c96d5 100644 --- a/Mage.Sets/src/mage/cards/t/TorporDust.java +++ b/Mage.Sets/src/mage/cards/t/TorporDust.java @@ -41,7 +41,7 @@ public final class TorporDust extends CardImpl { // Enchanted creature gets -3/-0. Effect effect = new BoostEnchantedEffect(-3, -0, Duration.WhileOnBattlefield); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability2 = new SimpleStaticAbility(effect); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java index 37ca7c7ab33..f9e5bf0f843 100644 --- a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java +++ b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java @@ -40,7 +40,7 @@ public final class TradeFederationBattleship extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // Droid creatures you control get +1/+1 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + 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())); diff --git a/Mage.Sets/src/mage/cards/t/TrainingDrone.java b/Mage.Sets/src/mage/cards/t/TrainingDrone.java index 82564ad57c4..0cbb8c164b3 100644 --- a/Mage.Sets/src/mage/cards/t/TrainingDrone.java +++ b/Mage.Sets/src/mage/cards/t/TrainingDrone.java @@ -28,7 +28,7 @@ public final class TrainingDrone extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TrainingDroneEffect())); + this.addAbility(new SimpleStaticAbility(new TrainingDroneEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/Transcendence.java b/Mage.Sets/src/mage/cards/t/Transcendence.java index cdc2849b9f4..5bd4fba4146 100644 --- a/Mage.Sets/src/mage/cards/t/Transcendence.java +++ b/Mage.Sets/src/mage/cards/t/Transcendence.java @@ -31,7 +31,7 @@ public final class Transcendence extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}{W}{W}"); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // When you have 20 or more life, you lose the game. this.addAbility(new TranscendenceStateTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TravelersCloak.java b/Mage.Sets/src/mage/cards/t/TravelersCloak.java index 077f0abf02f..7fa1ebab1e0 100644 --- a/Mage.Sets/src/mage/cards/t/TravelersCloak.java +++ b/Mage.Sets/src/mage/cards/t/TravelersCloak.java @@ -57,7 +57,7 @@ public final class TravelersCloak extends CardImpl { // Enchanted creature has landwalk of the chosen type. Effect effect = new TravelersCloakGainAbilityAttachedEffect(filter); effect.setText("Enchanted creature has landwalk of the chosen type"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private TravelersCloak(final TravelersCloak card) { @@ -109,4 +109,3 @@ enum TravelersCloakChosenSubtypePredicate implements ObjectSourcePlayerPredicate return "Chosen subtype"; } } - diff --git a/Mage.Sets/src/mage/cards/t/TravelingPlague.java b/Mage.Sets/src/mage/cards/t/TravelingPlague.java index a252c053b11..35ff32237c5 100644 --- a/Mage.Sets/src/mage/cards/t/TravelingPlague.java +++ b/Mage.Sets/src/mage/cards/t/TravelingPlague.java @@ -53,7 +53,7 @@ public final class TravelingPlague extends CardImpl { DynamicValue boostValue = new MultipliedValue(new CountersSourceCount(CounterType.PLAGUE), -1); Effect effect = new BoostEnchantedEffect(boostValue, boostValue, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets -1/-1 for each plague counter on {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // When enchanted creature leaves the battlefield, that creature's controller returns Traveling Plague from its owner's graveyard to the battlefield. this.addAbility(new TravelingPlagueTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousLink.java b/Mage.Sets/src/mage/cards/t/TreacherousLink.java index c595d31c800..ac9b0c30087 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousLink.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousLink.java @@ -39,7 +39,7 @@ public final class TreacherousLink extends CardImpl { this.addAbility(ability); // All damage that would be dealt to enchanted creature is dealt to its controller instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TreacherousLinkEffect())); + this.addAbility(new SimpleStaticAbility(new TreacherousLinkEffect())); } private TreacherousLink(final TreacherousLink card) { diff --git a/Mage.Sets/src/mage/cards/t/Treachery.java b/Mage.Sets/src/mage/cards/t/Treachery.java index a20da3fe547..a6429f0e116 100644 --- a/Mage.Sets/src/mage/cards/t/Treachery.java +++ b/Mage.Sets/src/mage/cards/t/Treachery.java @@ -38,7 +38,7 @@ public final class Treachery extends CardImpl { // When Treachery enters the battlefield, untap up to five lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(5))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/Trinisphere.java b/Mage.Sets/src/mage/cards/t/Trinisphere.java index 1da0a078f97..466591f520f 100644 --- a/Mage.Sets/src/mage/cards/t/Trinisphere.java +++ b/Mage.Sets/src/mage/cards/t/Trinisphere.java @@ -27,7 +27,7 @@ public final class Trinisphere extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // As long as Trinisphere is untapped, each spell that would cost less than three mana to cast costs three mana to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TrinisphereEffect())); + this.addAbility(new SimpleStaticAbility(new TrinisphereEffect())); } private Trinisphere(final Trinisphere card) { diff --git a/Mage.Sets/src/mage/cards/t/Trollhide.java b/Mage.Sets/src/mage/cards/t/Trollhide.java index 34a6bb9e67a..b3a6dfa440d 100644 --- a/Mage.Sets/src/mage/cards/t/Trollhide.java +++ b/Mage.Sets/src/mage/cards/t/Trollhide.java @@ -42,7 +42,7 @@ public final class Trollhide extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{1}{G}: Regenerate this creature." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}")), AttachmentType.AURA); effect.setText("and has \"{1}{G}: Regenerate this creature.\""); diff --git a/Mage.Sets/src/mage/cards/t/Tromokratis.java b/Mage.Sets/src/mage/cards/t/Tromokratis.java index 16be7aac13c..59229b3895f 100644 --- a/Mage.Sets/src/mage/cards/t/Tromokratis.java +++ b/Mage.Sets/src/mage/cards/t/Tromokratis.java @@ -42,10 +42,10 @@ public final class Tromokratis extends CardImpl { new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new SourceMatchesFilterCondition(new FilterAttackingOrBlockingCreature())), "{this} has hexproof unless it's attacking or blocking"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Tromokratis can't be blocked unless all creatures defending player controls block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedUnlessAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedUnlessAllEffect())); } private Tromokratis(final Tromokratis card) { diff --git a/Mage.Sets/src/mage/cards/t/TrooperArmor.java b/Mage.Sets/src/mage/cards/t/TrooperArmor.java index a4fccd8a0b4..cc094d2f01d 100644 --- a/Mage.Sets/src/mage/cards/t/TrooperArmor.java +++ b/Mage.Sets/src/mage/cards/t/TrooperArmor.java @@ -25,8 +25,8 @@ public final class TrooperArmor extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equiped creature gets +1/+1 and is a Trooper in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect(SubType.TROOPER, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new AddCardSubtypeAttachedEffect(SubType.TROOPER, AttachmentType.EQUIPMENT))); // Whenever a Trooper you control enters, you may attach {this} to it. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/t/TrooperCommando.java b/Mage.Sets/src/mage/cards/t/TrooperCommando.java index f263c14abc6..00ef11ba019 100644 --- a/Mage.Sets/src/mage/cards/t/TrooperCommando.java +++ b/Mage.Sets/src/mage/cards/t/TrooperCommando.java @@ -34,7 +34,7 @@ public final class TrooperCommando extends CardImpl { this.toughness = new MageInt(3); // Trooper creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java b/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java index 8da2949c1a3..983a4a03f97 100644 --- a/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java +++ b/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java @@ -27,7 +27,7 @@ public final class TroveOfTemptation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // Each opponent must attack you or a planeswalker you control with at least one creature each combat if able. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TroveOfTemptationForceAttackEffect(Duration.WhileOnBattlefield))); + addAbility(new SimpleStaticAbility(new TroveOfTemptationForceAttackEffect(Duration.WhileOnBattlefield))); // At the beginning of your end step, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color.” addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); diff --git a/Mage.Sets/src/mage/cards/t/TrueBeliever.java b/Mage.Sets/src/mage/cards/t/TrueBeliever.java index 88fc918ebe5..39d287baa7a 100644 --- a/Mage.Sets/src/mage/cards/t/TrueBeliever.java +++ b/Mage.Sets/src/mage/cards/t/TrueBeliever.java @@ -28,7 +28,7 @@ public final class TrueBeliever extends CardImpl { this.toughness = new MageInt(2); // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield))); } private TrueBeliever(final TrueBeliever card) { diff --git a/Mage.Sets/src/mage/cards/t/TrueConviction.java b/Mage.Sets/src/mage/cards/t/TrueConviction.java index dfeda4a8dbe..7962cebb460 100644 --- a/Mage.Sets/src/mage/cards/t/TrueConviction.java +++ b/Mage.Sets/src/mage/cards/t/TrueConviction.java @@ -26,7 +26,7 @@ public final class TrueConviction extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}{W}"); // Creatures you control have double strike and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES)); + Ability ability = new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES)); Effect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText(" and lifelink"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java index 602d8675833..fa6d474b188 100644 --- a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java +++ b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java @@ -30,7 +30,7 @@ public final class TrueFaithCenser extends CardImpl { // Equipped creature gets +1/+1 and has vigilance. Effect effect = new BoostEquippedEffect(1, 1); effect.setText("Equipped creature gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java b/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java index 4a263ec13a8..83e05c4b47f 100644 --- a/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java +++ b/Mage.Sets/src/mage/cards/t/TrueheartDuelist.java @@ -29,7 +29,7 @@ public final class TrueheartDuelist extends CardImpl { this.toughness = new MageInt(2); // Trueheart Duelist can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); // Embalm {2}{W} this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{2}{W}"), this)); diff --git a/Mage.Sets/src/mage/cards/t/TrustedForcemage.java b/Mage.Sets/src/mage/cards/t/TrustedForcemage.java index 364d0405f09..ed84132e1c9 100644 --- a/Mage.Sets/src/mage/cards/t/TrustedForcemage.java +++ b/Mage.Sets/src/mage/cards/t/TrustedForcemage.java @@ -31,7 +31,7 @@ public final class TrustedForcemage extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Trusted Forcemage is paired with another creature, each of those creatures gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(1, 1, ruleText))); + this.addAbility(new SimpleStaticAbility(new BoostPairedEffect(1, 1, ruleText))); } private TrustedForcemage(final TrustedForcemage card) { @@ -42,4 +42,4 @@ public final class TrustedForcemage extends CardImpl { public TrustedForcemage copy() { return new TrustedForcemage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TrustyMachete.java b/Mage.Sets/src/mage/cards/t/TrustyMachete.java index 7bad10bb7c6..beb41e301e3 100644 --- a/Mage.Sets/src/mage/cards/t/TrustyMachete.java +++ b/Mage.Sets/src/mage/cards/t/TrustyMachete.java @@ -23,7 +23,7 @@ public final class TrustyMachete extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 1))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); } diff --git a/Mage.Sets/src/mage/cards/t/TsabosWeb.java b/Mage.Sets/src/mage/cards/t/TsabosWeb.java index 186b5d5956c..2e1bcf23bc8 100644 --- a/Mage.Sets/src/mage/cards/t/TsabosWeb.java +++ b/Mage.Sets/src/mage/cards/t/TsabosWeb.java @@ -26,7 +26,7 @@ public final class TsabosWeb extends CardImpl { // When Tsabo's Web enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Each land with an activated ability that isn't a mana ability doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TsabosWebPreventUntapEffect())); + this.addAbility(new SimpleStaticAbility(new TsabosWebPreventUntapEffect())); } private TsabosWeb(final TsabosWeb card) { diff --git a/Mage.Sets/src/mage/cards/t/TwentyToedToad.java b/Mage.Sets/src/mage/cards/t/TwentyToedToad.java index 08cfc2f57c3..9a2ab1d652e 100644 --- a/Mage.Sets/src/mage/cards/t/TwentyToedToad.java +++ b/Mage.Sets/src/mage/cards/t/TwentyToedToad.java @@ -36,7 +36,7 @@ public final class TwentyToedToad extends CardImpl { this.toughness = new MageInt(3); // Your maximum hand size is twenty. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(20, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET))); + this.addAbility(new SimpleStaticAbility(new MaximumHandSizeControllerEffect(20, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET))); // Whenever you attack with two or more creatures, put a +1/+1 counter on Twenty-Toed Toad and draw a card. Ability ability = new AttacksWithCreaturesTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), 2); diff --git a/Mage.Sets/src/mage/cards/t/TwilekSeductress.java b/Mage.Sets/src/mage/cards/t/TwilekSeductress.java index 635449f527d..fa50e1a6bc6 100644 --- a/Mage.Sets/src/mage/cards/t/TwilekSeductress.java +++ b/Mage.Sets/src/mage/cards/t/TwilekSeductress.java @@ -29,7 +29,7 @@ public final class TwilekSeductress extends CardImpl { this.toughness = new MageInt(1); // {this} must be blocked it if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); // Whenever {this} becomes blocked by a creature, put a bounty counter on that creature this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), false)); diff --git a/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java b/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java index c4272da8685..3ee182e07c0 100644 --- a/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java +++ b/Mage.Sets/src/mage/cards/t/TwinsOfDiscord.java @@ -43,7 +43,7 @@ public final class TwinsOfDiscord extends CardImpl { this.addAbility(new AttacksWithCreaturesTriggeredAbility(new TwinsOfDiscordEffect(), 1)); // Each other colorless creature you control has bloodthirst 2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new BloodthirstAbility(2), Duration.WhileOnBattlefield, colorlessCreatureFilter, true).setText("Each other colorless creature you control has bloodthirst 2"))); diff --git a/Mage.Sets/src/mage/cards/t/TwistedExperiment.java b/Mage.Sets/src/mage/cards/t/TwistedExperiment.java index 12e4c4a9765..a5b7e87c41b 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedExperiment.java +++ b/Mage.Sets/src/mage/cards/t/TwistedExperiment.java @@ -34,7 +34,7 @@ public final class TwistedExperiment extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield))); } private TwistedExperiment(final TwistedExperiment card) { diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java index d1bcd5b5961..856ae820831 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedDragon.java @@ -40,7 +40,7 @@ public final class TwoHeadedDragon extends CardImpl { this.addAbility(new MenaceAbility()); // Two-Headed Dragon can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java b/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java index 66b6472afb9..b918a5b478f 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedGiantOfForiys.java @@ -27,7 +27,7 @@ public final class TwoHeadedGiantOfForiys extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Two-Headed Giant of Foriys can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private TwoHeadedGiantOfForiys(final TwoHeadedGiantOfForiys card) { diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java b/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java index 09529fa6510..1798f5c5ed7 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedSliver.java @@ -29,7 +29,7 @@ public final class TwoHeadedSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have menace. (They can't be blocked except by two or more creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new MenaceAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Sliver creatures have menace. (They can't be blocked except by two or more creatures.)")));