From 5b93f2520657016b26349aea4d8272e232a9d429 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 5 Jul 2021 22:09:16 -0400 Subject: [PATCH] fixed text generation for TapTargetEffect to fit with other effects --- Mage.Sets/src/mage/cards/a/ArtfulTakedown.java | 2 +- Mage.Sets/src/mage/cards/b/BrokenDam.java | 2 +- Mage.Sets/src/mage/cards/d/DAvenantTrapper.java | 2 +- Mage.Sets/src/mage/cards/d/Delirium.java | 2 +- Mage.Sets/src/mage/cards/d/DragonTurtle.java | 2 +- Mage.Sets/src/mage/cards/e/EntrancingLyre.java | 2 +- Mage.Sets/src/mage/cards/f/FrostwalkBastion.java | 2 +- Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java | 2 +- Mage.Sets/src/mage/cards/g/Gridlock.java | 2 +- Mage.Sets/src/mage/cards/g/GunganCaptain.java | 2 +- Mage.Sets/src/mage/cards/g/GyomeMasterChef.java | 2 +- Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java | 2 +- Mage.Sets/src/mage/cards/i/IcyBlast.java | 2 +- Mage.Sets/src/mage/cards/k/KashiTribeElite.java | 2 +- Mage.Sets/src/mage/cards/k/KashiTribeReaver.java | 2 +- .../src/mage/cards/k/KashiTribeWarriors.java | 2 +- Mage.Sets/src/mage/cards/l/LegionGuildmage.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaOpus.java | 2 +- .../src/mage/cards/m/MatsuTribeBirdstalker.java | 2 +- Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java | 2 +- Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java | 2 +- Mage.Sets/src/mage/cards/m/MerchantRaiders.java | 2 +- Mage.Sets/src/mage/cards/m/MercurialKite.java | 2 +- Mage.Sets/src/mage/cards/m/MishrasHelix.java | 2 +- Mage.Sets/src/mage/cards/n/NekoTe.java | 2 +- Mage.Sets/src/mage/cards/o/OrochiRanger.java | 2 +- Mage.Sets/src/mage/cards/q/QueenOfIce.java | 2 +- Mage.Sets/src/mage/cards/r/RimescaleDragon.java | 2 +- Mage.Sets/src/mage/cards/s/ScionOfStygia.java | 4 ++-- .../mage/cards/s/SentinelOfTheEternalWatch.java | 2 +- Mage.Sets/src/mage/cards/s/SternConstable.java | 2 +- .../src/mage/cards/t/ThassaDeepDwelling.java | 2 +- Mage.Sets/src/mage/cards/t/TidalSurge.java | 2 +- Mage.Sets/src/mage/cards/v/VertigoSpawn.java | 2 +- Mage.Sets/src/mage/cards/w/WordOfBinding.java | 2 +- Mage.Sets/src/mage/cards/y/YWing.java | 2 +- .../effects/common/TapTargetEffect.java | 16 +++++++--------- 37 files changed, 44 insertions(+), 46 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ArtfulTakedown.java b/Mage.Sets/src/mage/cards/a/ArtfulTakedown.java index 2a10a73ae54..0cd8dd68646 100644 --- a/Mage.Sets/src/mage/cards/a/ArtfulTakedown.java +++ b/Mage.Sets/src/mage/cards/a/ArtfulTakedown.java @@ -31,7 +31,7 @@ public final class ArtfulTakedown extends CardImpl { // • Tap target creature. this.getSpellAbility().addEffect( - new TapTargetEffect().setText("target creature") + new TapTargetEffect("tap target creature") ); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter1).withChooseHint("tap")); diff --git a/Mage.Sets/src/mage/cards/b/BrokenDam.java b/Mage.Sets/src/mage/cards/b/BrokenDam.java index f1518a4cc04..46f0f144bff 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenDam.java +++ b/Mage.Sets/src/mage/cards/b/BrokenDam.java @@ -28,7 +28,7 @@ public final class BrokenDam extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}"); // Tap one or two target creatures without horsemanship. - this.getSpellAbility().addEffect(new TapTargetEffect("one or two target creatures without horsemanship")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap one or two target creatures without horsemanship")); this.getSpellAbility().addTarget(new TargetCreaturePermanent(1, 2, filter, false)); } diff --git a/Mage.Sets/src/mage/cards/d/DAvenantTrapper.java b/Mage.Sets/src/mage/cards/d/DAvenantTrapper.java index b78b9fe4825..9f56db7c56a 100644 --- a/Mage.Sets/src/mage/cards/d/DAvenantTrapper.java +++ b/Mage.Sets/src/mage/cards/d/DAvenantTrapper.java @@ -36,7 +36,7 @@ public final class DAvenantTrapper extends CardImpl { // Whenever you cast a historic spell, tap target creature an opponent controls. Ability ability = new SpellCastControllerTriggeredAbility( - new TapTargetEffect("target creature an opponent controls. (Artifacts, legendaries, and Sagas are historic.)"), + new TapTargetEffect("tap target creature an opponent controls. (Artifacts, legendaries, and Sagas are historic.)"), filter, false); ability.addTarget(new TargetOpponentsCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Delirium.java b/Mage.Sets/src/mage/cards/d/Delirium.java index 09fffd0ed93..51bacb2e867 100644 --- a/Mage.Sets/src/mage/cards/d/Delirium.java +++ b/Mage.Sets/src/mage/cards/d/Delirium.java @@ -39,7 +39,7 @@ public final class Delirium extends CardImpl { // Cast this spell only during an opponent’s turn. this.addAbility(new CastOnlyIfConditionIsTrueAbility(OnOpponentsTurnCondition.instance, "Cast this spell only during an opponent's turn.")); // Tap target creature that player controls. That creature deals damage equal to its power to the player. Prevent all combat damage that would be dealt to and dealt by the creature this turn. - this.getSpellAbility().addEffect(new TapTargetEffect().setText("target creature that player controls")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap target creature that player controls")); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DeliriumEffect()); this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, true).setText("Prevent all combat damage that would be dealt to")); diff --git a/Mage.Sets/src/mage/cards/d/DragonTurtle.java b/Mage.Sets/src/mage/cards/d/DragonTurtle.java index a808f4bd1aa..b032cdb1674 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTurtle.java +++ b/Mage.Sets/src/mage/cards/d/DragonTurtle.java @@ -34,7 +34,7 @@ public final class DragonTurtle extends CardImpl { // Drag Below — When Dragon Turtle enters the battlefield, tap it and up to one target creature an opponent controls. They don't untap during their controllers' next untap steps. Ability ability = new EntersBattlefieldTriggeredAbility(new TapSourceEffect().setText(null)); - ability.addEffect(new TapTargetEffect("it and up to one target creature an opponent controls")); + ability.addEffect(new TapTargetEffect("tap it and up to one target creature an opponent controls")); ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect().setText(null)); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect().setText("They don't untap during their controllers' next untap steps")); ability.addTarget(new TargetOpponentsCreaturePermanent(0, 1)); diff --git a/Mage.Sets/src/mage/cards/e/EntrancingLyre.java b/Mage.Sets/src/mage/cards/e/EntrancingLyre.java index af0963ae2d1..2aa1717c1a3 100644 --- a/Mage.Sets/src/mage/cards/e/EntrancingLyre.java +++ b/Mage.Sets/src/mage/cards/e/EntrancingLyre.java @@ -33,7 +33,7 @@ public final class EntrancingLyre extends CardImpl { // {X}, {T}: Tap target creature with power X or less. It doesn't untap during its controller's untap step for as long as Entrancing Lyre remains tapped. Ability ability = new SimpleActivatedAbility( - new TapTargetEffect("target creature with power X or less"), new ManaCostsImpl("{X}") + new TapTargetEffect("tap target creature with power X or less"), new ManaCostsImpl("{X}") ); ability.addCost(new TapSourceCost()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FrostwalkBastion.java b/Mage.Sets/src/mage/cards/f/FrostwalkBastion.java index 509ce16554e..a5f44f2a04a 100644 --- a/Mage.Sets/src/mage/cards/f/FrostwalkBastion.java +++ b/Mage.Sets/src/mage/cards/f/FrostwalkBastion.java @@ -39,7 +39,7 @@ public final class FrostwalkBastion extends CardImpl { // Whenever Frostwalk Bastion deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability = new DealsDamageToACreatureTriggeredAbility( - new TapTargetEffect().setText("that creature"), + new TapTargetEffect("tap that creature"), true, false, true ); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect() diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java b/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java index d63334f5b72..b8caf32fe75 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheSunGod.java @@ -24,7 +24,7 @@ public final class GlimpseTheSunGod extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{W}"); // Tap X target creatures. Scry 1. - this.getSpellAbility().addEffect(new TapTargetEffect("X target creatures")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap X target creatures")); this.getSpellAbility().addEffect(new ScryEffect(1)); this.getSpellAbility().setTargetAdjuster(GlimpseTheSunGodAdjuster.instance); } diff --git a/Mage.Sets/src/mage/cards/g/Gridlock.java b/Mage.Sets/src/mage/cards/g/Gridlock.java index 7e0a91171a5..bb691a14598 100644 --- a/Mage.Sets/src/mage/cards/g/Gridlock.java +++ b/Mage.Sets/src/mage/cards/g/Gridlock.java @@ -22,7 +22,7 @@ public final class Gridlock extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}"); // Tap X target nonland permanents. - this.getSpellAbility().addEffect(new TapTargetEffect("X target nonland permanents")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap X target nonland permanents")); this.getSpellAbility().setTargetAdjuster(GridlockAdjuster.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GunganCaptain.java b/Mage.Sets/src/mage/cards/g/GunganCaptain.java index a606249a5b8..fd80c8605a0 100644 --- a/Mage.Sets/src/mage/cards/g/GunganCaptain.java +++ b/Mage.Sets/src/mage/cards/g/GunganCaptain.java @@ -26,7 +26,7 @@ public final class GunganCaptain extends CardImpl { this.toughness = new MageInt(4); // Whenever Gungan Captain deals damage to a creture, tap that creature. That creature does not untap during it controlers untap step. - Ability ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), false, false, true); + Ability ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), false, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("That creature")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java b/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java index 1e51d518f2a..69b4fda07b5 100644 --- a/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java +++ b/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java @@ -67,7 +67,7 @@ public final class GyomeMasterChef extends CardImpl { IndestructibleAbility.getInstance(), Duration.EndOfTurn ), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addEffect(new TapTargetEffect().setText("it")); + ability.addEffect(new TapTargetEffect("tap it")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java b/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java index fd51041bfe3..33a829eaac4 100644 --- a/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java +++ b/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java @@ -41,7 +41,7 @@ public final class HaazdaSnareSquad extends CardImpl { this.toughness = new MageInt(4); // Whenever Haazda Snare Squad attacks you may pay {W}. If you do, tap target creature an opponent controls. - Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new TapTargetEffect(""), new ManaCostsImpl("{W}")),false, + Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new TapTargetEffect(), new ManaCostsImpl("{W}")),false, "Whenever {this} attacks, you may pay {W}. If you do, tap target creature an opponent controls."); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/i/IcyBlast.java b/Mage.Sets/src/mage/cards/i/IcyBlast.java index 8263763fe96..d80e20507ef 100644 --- a/Mage.Sets/src/mage/cards/i/IcyBlast.java +++ b/Mage.Sets/src/mage/cards/i/IcyBlast.java @@ -26,7 +26,7 @@ public final class IcyBlast extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}"); // Tap X target creatures. - this.getSpellAbility().addEffect(new TapTargetEffect("X target creatures")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap X target creatures")); // Ferocious — If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps. Effect effect = new ConditionalContinuousRuleModifyingEffect( diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java index 27d60c74a7b..71dd8341af0 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java @@ -41,7 +41,7 @@ public final class KashiTribeElite extends CardImpl { // Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java b/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java index 324356f2a30..647f25f55fd 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeReaver.java @@ -32,7 +32,7 @@ public final class KashiTribeReaver extends CardImpl { // Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); // {1}{G}: Regenerate Kashi-Tribe Reaver. diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeWarriors.java b/Mage.Sets/src/mage/cards/k/KashiTribeWarriors.java index ae041c5d1ac..ef68c3899ce 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeWarriors.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeWarriors.java @@ -28,7 +28,7 @@ public final class KashiTribeWarriors extends CardImpl { // Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LegionGuildmage.java b/Mage.Sets/src/mage/cards/l/LegionGuildmage.java index 379c9785c83..d511b76f4c4 100644 --- a/Mage.Sets/src/mage/cards/l/LegionGuildmage.java +++ b/Mage.Sets/src/mage/cards/l/LegionGuildmage.java @@ -48,7 +48,7 @@ public final class LegionGuildmage extends CardImpl { // {2}{W}, {T}: Tap another target creature. ability = new SimpleActivatedAbility( - new TapTargetEffect("another target creature"), + new TapTargetEffect("tap another target creature"), new ManaCostsImpl("{2}{W}") ); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MagmaOpus.java b/Mage.Sets/src/mage/cards/m/MagmaOpus.java index 1e21d26eed8..2391d6bcd5d 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaOpus.java +++ b/Mage.Sets/src/mage/cards/m/MagmaOpus.java @@ -32,7 +32,7 @@ public final class MagmaOpus extends CardImpl { // Magma Opus deals 4 damage divided as you choose among any number of targets. Tap two target permanents. Create a 4/4 blue and red Elemental creature token. Draw two cards. this.getSpellAbility().addEffect(new DamageMultiEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4).withChooseHint("damage")); - this.getSpellAbility().addEffect(new TapTargetEffect().setTargetPointer(new SecondTargetPointer()).setText("two target permanents")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap two target permanents").setTargetPointer(new SecondTargetPointer())); this.getSpellAbility().addTarget(new TargetPermanent(2, StaticFilters.FILTER_PERMANENTS).withChooseHint("tap")); this.getSpellAbility().addEffect(new CreateTokenEffect(new Elemental44Token())); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2).setText("Draw two cards")); diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java b/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java index c4b2a80735e..c3a40ffd2b2 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java @@ -35,7 +35,7 @@ public final class MatsuTribeBirdstalker extends CardImpl { // Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java b/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java index 0811257444e..59f568b1f29 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeDecoy.java @@ -37,7 +37,7 @@ public final class MatsuTribeDecoy extends CardImpl { this.addAbility(ability); // Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability2; - ability2 = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability2 = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability2.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java b/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java index c6b21b27d01..d889948437d 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeSniper.java @@ -47,7 +47,7 @@ public final class MatsuTribeSniper extends CardImpl { this.addAbility(ability); // Whenever Matsu-Tribe Sniper deals damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), false, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), false, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerchantRaiders.java b/Mage.Sets/src/mage/cards/m/MerchantRaiders.java index 34aa7833f56..9a9dbd385ca 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantRaiders.java +++ b/Mage.Sets/src/mage/cards/m/MerchantRaiders.java @@ -36,7 +36,7 @@ public final class MerchantRaiders extends CardImpl { // Whenever Merchant Raiders or another Pirate enters the battlefield under your control, tap up to one target creature. That creature doesn't untap during its controller's untap step for as long as you control Merchant Raiders. Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility( - new TapTargetEffect().setText("up to one target creature"), + new TapTargetEffect("tap up to one target creature"), filter, false, true ); ability.addEffect(new MerchantRaidersEffect()); diff --git a/Mage.Sets/src/mage/cards/m/MercurialKite.java b/Mage.Sets/src/mage/cards/m/MercurialKite.java index a3a7c1dae29..1b72fa13aba 100644 --- a/Mage.Sets/src/mage/cards/m/MercurialKite.java +++ b/Mage.Sets/src/mage/cards/m/MercurialKite.java @@ -29,7 +29,7 @@ public final class MercurialKite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Mercurial Kite deals combat damage to a creature, tap that creature. That creature doesn't untap during its controller's next untap step. Ability ability; - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("That creature")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MishrasHelix.java b/Mage.Sets/src/mage/cards/m/MishrasHelix.java index 3497bac9c86..6628f583276 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasHelix.java +++ b/Mage.Sets/src/mage/cards/m/MishrasHelix.java @@ -25,7 +25,7 @@ public final class MishrasHelix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {X}, {tap}: Tap X target lands. - Effect effect = new TapTargetEffect("X target lands"); + Effect effect = new TapTargetEffect("tap X target lands"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); diff --git a/Mage.Sets/src/mage/cards/n/NekoTe.java b/Mage.Sets/src/mage/cards/n/NekoTe.java index 6d92612021d..f9b21606971 100644 --- a/Mage.Sets/src/mage/cards/n/NekoTe.java +++ b/Mage.Sets/src/mage/cards/n/NekoTe.java @@ -36,7 +36,7 @@ public final class NekoTe extends CardImpl { skipUntapEffect.setText("That creature doesn't untap during its controller's untap step for as long as {this} remains on the battlefield"); ConditionalContinuousRuleModifyingEffect effect = new ConditionalContinuousRuleModifyingEffect(skipUntapEffect, new SourceRemainsInZoneCondition(Zone.BATTLEFIELD)); - Ability ability = new DealsDamageToACreatureAttachedTriggeredAbility(new TapTargetEffect("that creature"), false, "equipped creature", false, true); + Ability ability = new DealsDamageToACreatureAttachedTriggeredAbility(new TapTargetEffect("tap that creature"), false, "equipped creature", false, true); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OrochiRanger.java b/Mage.Sets/src/mage/cards/o/OrochiRanger.java index 04823026deb..303dca083ab 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiRanger.java +++ b/Mage.Sets/src/mage/cards/o/OrochiRanger.java @@ -28,7 +28,7 @@ public final class OrochiRanger extends CardImpl { // Whenever Orochi Ranger deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; - ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true); + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), true, false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/q/QueenOfIce.java b/Mage.Sets/src/mage/cards/q/QueenOfIce.java index 429e09e1eb4..4680279dc98 100644 --- a/Mage.Sets/src/mage/cards/q/QueenOfIce.java +++ b/Mage.Sets/src/mage/cards/q/QueenOfIce.java @@ -29,7 +29,7 @@ public final class QueenOfIce extends AdventureCard { // Whenever Queen of Ice deals combat damage to a creature, tap that creature. It doesn't untap during its controller's next untap step. Ability ability = new DealsDamageToACreatureTriggeredAbility( - new TapTargetEffect().setText("that creature"), + new TapTargetEffect("tap that creature"), true, false, true ); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect() diff --git a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java index f105d075128..6c8a1a20f41 100644 --- a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java +++ b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java @@ -45,7 +45,7 @@ public final class RimescaleDragon extends CardImpl { // {2}{snow}: Tap target creature and put an ice counter on it. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new TapTargetEffect("target creature"), + new TapTargetEffect("tap target creature"), new ManaCostsImpl("{2}{S}") ); Effect effect = new AddCountersTargetEffect(CounterType.ICE.createInstance()); diff --git a/Mage.Sets/src/mage/cards/s/ScionOfStygia.java b/Mage.Sets/src/mage/cards/s/ScionOfStygia.java index e3ec3a55d9c..2ef8ef1f9a9 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfStygia.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfStygia.java @@ -40,11 +40,11 @@ public final class ScionOfStygia extends CardImpl { this.addAbility(ability.withFlavorWord("Cone of Cold")); // 1-9 | Tap that creature. - effect.addTableEntry(1, 9, new TapTargetEffect("that creature")); + effect.addTableEntry(1, 9, new TapTargetEffect("tap that creature")); // 10-20 | Tap that creature. It doesn't untap during its controller's next untap step. effect.addTableEntry( - 10, 20, new TapTargetEffect("that creature"), + 10, 20, new TapTargetEffect("tap that creature"), new DontUntapInControllersNextUntapStepTargetEffect("it") ); } diff --git a/Mage.Sets/src/mage/cards/s/SentinelOfTheEternalWatch.java b/Mage.Sets/src/mage/cards/s/SentinelOfTheEternalWatch.java index efe358ba98c..12d7ea7ce6e 100644 --- a/Mage.Sets/src/mage/cards/s/SentinelOfTheEternalWatch.java +++ b/Mage.Sets/src/mage/cards/s/SentinelOfTheEternalWatch.java @@ -42,7 +42,7 @@ public final class SentinelOfTheEternalWatch extends CardImpl { // At the beginning of combat on each opponent's turn, tap target creature that player controls. Ability ability = new BeginningOfCombatTriggeredAbility( - Zone.BATTLEFIELD, new TapTargetEffect("target creature that player controls"), + Zone.BATTLEFIELD, new TapTargetEffect("tap target creature that player controls"), TargetController.OPPONENT, false, false ); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SternConstable.java b/Mage.Sets/src/mage/cards/s/SternConstable.java index 3a6c7cc23b6..e3097516522 100644 --- a/Mage.Sets/src/mage/cards/s/SternConstable.java +++ b/Mage.Sets/src/mage/cards/s/SternConstable.java @@ -30,7 +30,7 @@ public final class SternConstable extends CardImpl { this.toughness = new MageInt(1); // {T}, Discard a card: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect("target creature"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect("tap target creature"), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java b/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java index 4fd1af7f4bd..5df900ab9e5 100644 --- a/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java +++ b/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java @@ -67,7 +67,7 @@ public final class ThassaDeepDwelling extends CardImpl { // {3}{U}: Tap another target creature. ability = new SimpleActivatedAbility( - new TapTargetEffect("another target creature"), new ManaCostsImpl("{3}{U}") + new TapTargetEffect("tap another target creature"), new ManaCostsImpl("{3}{U}") ); ability.addTarget(new TargetPermanent(filterAnother)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TidalSurge.java b/Mage.Sets/src/mage/cards/t/TidalSurge.java index bad342d5bec..0a0b749abad 100644 --- a/Mage.Sets/src/mage/cards/t/TidalSurge.java +++ b/Mage.Sets/src/mage/cards/t/TidalSurge.java @@ -29,7 +29,7 @@ public final class TidalSurge extends CardImpl { // Tap up to three target creatures without flying. - this.getSpellAbility().addEffect(new TapTargetEffect("up to three target creatures without flying")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap up to three target creatures without flying")); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 3, filter, false)); } diff --git a/Mage.Sets/src/mage/cards/v/VertigoSpawn.java b/Mage.Sets/src/mage/cards/v/VertigoSpawn.java index cabb2988060..8c8c4c79751 100644 --- a/Mage.Sets/src/mage/cards/v/VertigoSpawn.java +++ b/Mage.Sets/src/mage/cards/v/VertigoSpawn.java @@ -29,7 +29,7 @@ public final class VertigoSpawn extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Whenever Vertigo Spawn blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step. - Ability ability = new BlocksSourceTriggeredAbility(new TapTargetEffect("that creature"), false, true); + Ability ability = new BlocksSourceTriggeredAbility(new TapTargetEffect("tap that creature"), false, true); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("that creature")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WordOfBinding.java b/Mage.Sets/src/mage/cards/w/WordOfBinding.java index a7e2ba95c23..a51127f5c7e 100644 --- a/Mage.Sets/src/mage/cards/w/WordOfBinding.java +++ b/Mage.Sets/src/mage/cards/w/WordOfBinding.java @@ -21,7 +21,7 @@ public final class WordOfBinding extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); // Tap X target creatures. - this.getSpellAbility().addEffect(new TapTargetEffect("X target creatures")); + this.getSpellAbility().addEffect(new TapTargetEffect("tap X target creatures")); this.getSpellAbility().setTargetAdjuster(WordOfBindingAdjuster.instance); } diff --git a/Mage.Sets/src/mage/cards/y/YWing.java b/Mage.Sets/src/mage/cards/y/YWing.java index fc83b030276..35a62f13db0 100644 --- a/Mage.Sets/src/mage/cards/y/YWing.java +++ b/Mage.Sets/src/mage/cards/y/YWing.java @@ -35,7 +35,7 @@ public final class YWing extends CardImpl { this.addAbility(new CantBlockAbility()); // Whenever Y-Wing can't deals combat damage to a player, tap target creature an opponent controls. It doesn't untap during its controller's next untap step. - Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new TapTargetEffect("target creature an opponent controls."), false); + Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new TapTargetEffect("tap target creature an opponent controls."), false); ability.addTarget(new TargetOpponentsCreaturePermanent()); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect(" It")); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java index c34f0aa9f4f..9afaa42dd2a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java @@ -1,8 +1,5 @@ - - package mage.abilities.effects.common; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -12,18 +9,20 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.util.CardUtil; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com */ public class TapTargetEffect extends OneShotEffect { public TapTargetEffect() { - super(Outcome.Tap); + this((String) null); } public TapTargetEffect(String text) { super(Outcome.Tap); - if(text != null) { + if (text != null) { this.staticText = text; } } @@ -50,8 +49,8 @@ public class TapTargetEffect extends OneShotEffect { @Override public String getText(Mode mode) { - if (!staticText.isEmpty()) { - return "tap " + staticText; + if (staticText != null && !staticText.isEmpty()) { + return staticText; } if (mode.getTargets().isEmpty()) { @@ -65,11 +64,10 @@ public class TapTargetEffect extends OneShotEffect { } else { return "tap up to " + CardUtil.numberToText(target.getMaxNumberOfTargets()) + " target " + target.getTargetName() + 's'; } - } else if (target.getMaxNumberOfTargets() == 0){ + } else if (target.getMaxNumberOfTargets() == 0) { return "tap X target " + mode.getTargets().get(0).getTargetName(); } else { return "tap target " + mode.getTargets().get(0).getTargetName(); } } - }