diff --git a/Mage.Sets/src/mage/cards/d/DarkDwellerOracle.java b/Mage.Sets/src/mage/cards/d/DarkDwellerOracle.java index 5557071b28d..a5023748889 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDwellerOracle.java +++ b/Mage.Sets/src/mage/cards/d/DarkDwellerOracle.java @@ -1,6 +1,5 @@ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -11,11 +10,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; -import mage.target.common.TargetControlledCreaturePermanent; +import mage.filter.StaticFilters; +import mage.target.common.TargetControlledPermanent; + +import java.util.UUID; /** - * * @author TheElk801 */ public final class DarkDwellerOracle extends CardImpl { @@ -30,10 +30,13 @@ public final class DarkDwellerOracle extends CardImpl { // {1}, Sacrifice a creature: Exile the top card of your library. You may play that card this turn. Ability ability = new SimpleActivatedAbility( - new ExileTopXMayPlayUntilEndOfTurnEffect(1, true), + new ExileTopXMayPlayUntilEndOfTurnEffect(1, true) + .setText("exile the top card of your library. You may play that card this turn"), new GenericManaCost(1) ); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); + ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent( + StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT + ))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeadMansChest.java b/Mage.Sets/src/mage/cards/d/DeadMansChest.java index 26e257a0c23..e5805813ffb 100644 --- a/Mage.Sets/src/mage/cards/d/DeadMansChest.java +++ b/Mage.Sets/src/mage/cards/d/DeadMansChest.java @@ -68,7 +68,7 @@ class DeadMansChestEffect extends OneShotEffect { public DeadMansChestEffect() { super(Outcome.Benefit); this.staticText = "exile cards equal to its power from the top of its owner's library. " - + "You may cast nonland cards from among them as long as they remain exiled, " + + "You may cast spells from among those cards for as long as they remain exiled, " + "and you may spend mana as though it were mana of any type to cast those spells"; } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetDaredevil.java b/Mage.Sets/src/mage/cards/d/DireFleetDaredevil.java index 1fe3a23b916..676c1d995ea 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetDaredevil.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetDaredevil.java @@ -69,9 +69,9 @@ class DireFleetDaredevilEffect extends OneShotEffect { public DireFleetDaredevilEffect() { super(Outcome.Benefit); - this.staticText = "exile target instant or sorcery card from an opponent's graveyard. " - + "You may cast that card this turn and you may spend mana as though it were mana of any color. " - + "If that card would be put into a graveyard this turn, exile it instead"; + this.staticText = "exile target instant or sorcery card from an opponent's graveyard. " + + "You may cast it this turn, and you may spend mana as though it were mana of any type " + + "to cast that spell. If that spell would be put into a graveyard this turn, exile it instead"; } public DireFleetDaredevilEffect(final DireFleetDaredevilEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DreamPillager.java b/Mage.Sets/src/mage/cards/d/DreamPillager.java index b1d321a76c5..45e5f290a3d 100644 --- a/Mage.Sets/src/mage/cards/d/DreamPillager.java +++ b/Mage.Sets/src/mage/cards/d/DreamPillager.java @@ -84,7 +84,7 @@ class DreamPillagerTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever {this} deals combat damage to a player, exile that many cards from the top of your library. Until end of turn, you may cast nonland cards from among those exiled cards."; + return "Whenever {this} deals combat damage to a player, exile that many cards from the top of your library. Until end of turn, you may cast spells from among those exiled cards."; } } diff --git a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java index 8097bc0b884..64664e0262a 100644 --- a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java +++ b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java @@ -43,7 +43,7 @@ class GratuitousViolenceReplacementEffect extends ReplacementEffectImpl { GratuitousViolenceReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Damage); - staticText = "If a creature you control would deal damage to a permanent or player, it deals double that damage to that creature or player instead"; + staticText = "If a creature you control would deal damage to a permanent or player, it deals double that damage to that permanent or player instead"; } GratuitousViolenceReplacementEffect(final GratuitousViolenceReplacementEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HostageTaker.java b/Mage.Sets/src/mage/cards/h/HostageTaker.java index 3ea7f86aff1..73803f24133 100644 --- a/Mage.Sets/src/mage/cards/h/HostageTaker.java +++ b/Mage.Sets/src/mage/cards/h/HostageTaker.java @@ -64,8 +64,8 @@ class HostageTakerExileEffect extends OneShotEffect { HostageTakerExileEffect() { super(Outcome.Benefit); - this.staticText = "exile another target artifact or creature until {this} leaves the battlefield. " - + "You may cast that card as long as it remains exiled, " + this.staticText = "exile another target creature or artifact until {this} leaves the battlefield. " + + "You may cast that card for as long as it remains exiled, " + "and you may spend mana as though it were mana of any type to cast that spell"; } diff --git a/Mage.Sets/src/mage/cards/t/TheaterOfHorrors.java b/Mage.Sets/src/mage/cards/t/TheaterOfHorrors.java index b046462d3f9..aa5a876037b 100644 --- a/Mage.Sets/src/mage/cards/t/TheaterOfHorrors.java +++ b/Mage.Sets/src/mage/cards/t/TheaterOfHorrors.java @@ -94,8 +94,8 @@ class TheaterOfHorrorsCastEffect extends AsThoughEffectImpl { TheaterOfHorrorsCastEffect() { super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit); - staticText = "During your turn, if an opponent lost life this turn, " + - "you may play cards exiled with {this}"; + staticText = "during your turn, if an opponent lost life this turn, " + + "you may play lands and cast spells from among cards exiled with {this}"; } private TheaterOfHorrorsCastEffect(final TheaterOfHorrorsCastEffect effect) { diff --git a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java index 102bb9f43df..206a9813d23 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java @@ -62,7 +62,7 @@ class UtopiaSprawlEffect extends ManaEffect { UtopiaSprawlEffect() { super(); - staticText = "its controller adds one mana of the chosen color"; + staticText = "its controller adds an additional one mana of the chosen color"; } private UtopiaSprawlEffect(final UtopiaSprawlEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WandOfOrcus.java b/Mage.Sets/src/mage/cards/w/WandOfOrcus.java index 5adae7fd206..8aef1a42196 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfOrcus.java +++ b/Mage.Sets/src/mage/cards/w/WandOfOrcus.java @@ -12,7 +12,7 @@ import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.filter.common.FilterCreaturePermanent; +import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.token.ZombieToken; @@ -23,11 +23,7 @@ import java.util.UUID; */ public final class WandOfOrcus extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombies you control"); - - static { - filter.add(SubType.ZOMBIE.getPredicate()); - } + private static final FilterPermanent filter = new FilterPermanent(SubType.ZOMBIE, "Zombies"); public WandOfOrcus(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}{B}"); diff --git a/Mage.Sets/src/mage/cards/w/WildGrowth.java b/Mage.Sets/src/mage/cards/w/WildGrowth.java index d911066726c..8ced21c954c 100644 --- a/Mage.Sets/src/mage/cards/w/WildGrowth.java +++ b/Mage.Sets/src/mage/cards/w/WildGrowth.java @@ -35,7 +35,9 @@ public final class WildGrowth extends CardImpl { // Whenever enchanted land is tapped for mana, its controller adds {G}. this.addAbility(new EnchantedTappedTriggeredManaAbility( - new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.G), "their") + new AddManaToManaPoolTargetControllerEffect( + new Mana(ColoredManaSymbol.G), "their" + ).setText("its controller adds an additional {G}") )); } diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java index 82060231a4a..cda4c5d72a8 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java @@ -43,7 +43,7 @@ public class AddConditionalManaOfAnyColorEffect extends ManaEffect { this.oneChoice = oneChoice; // staticText = "Add " - + (amount instanceof StaticValue ? (CardUtil.numberToText(amount.toString())) : "") + + (amount instanceof StaticValue ? (CardUtil.numberToText(amount.toString())) : "X") + " mana " + (oneChoice || (amount instanceof StaticValue && (amount.toString()).equals("1")) ? "of any" + (amount instanceof StaticValue && (amount.toString()).equals("1") ? "" : " one") + " color" diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java index 2dffc38e4fc..d0776f4b6a0 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java @@ -17,7 +17,7 @@ public class AddManaAnyColorAttachedControllerEffect extends ManaEffect { public AddManaAnyColorAttachedControllerEffect() { super(); - staticText = "its controller adds one mana of any color"; + staticText = "its controller adds an additional one mana of any color"; } public AddManaAnyColorAttachedControllerEffect(final AddManaAnyColorAttachedControllerEffect effect) {