diff --git a/Mage.Sets/src/mage/cards/a/ArenaRector.java b/Mage.Sets/src/mage/cards/a/ArenaRector.java index d32f4d6491..a0ab52bbbe 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaRector.java +++ b/Mage.Sets/src/mage/cards/a/ArenaRector.java @@ -34,7 +34,7 @@ public final class ArenaRector extends CardImpl { new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterPlaneswalkerCard())), new ExileSourceFromGraveCost(), "Exile to search for a planeswalker?" - ).setText("you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle your library"), false + ).setText("you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle"), false )); } diff --git a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java index 3a359c28e2..bba8246e88 100644 --- a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java +++ b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java @@ -51,7 +51,7 @@ class AuratouchedMageEffect extends OneShotEffect { public AuratouchedMageEffect() { super(Outcome.BoostCreature); - staticText = "search your library for an Aura card that could enchant it. If {this} is still on the battlefield, put that Aura card onto the battlefield attached to it. Otherwise, reveal the Aura card and put it into your hand. Then shuffle your library."; + staticText = "search your library for an Aura card that could enchant it. If {this} is still on the battlefield, put that Aura card onto the battlefield attached to it. Otherwise, reveal the Aura card and put it into your hand. Then shuffle"; } public AuratouchedMageEffect(final AuratouchedMageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java b/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java index 2e7a093a3c..fc6dd14922 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java +++ b/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java @@ -39,7 +39,7 @@ public final class BloodsoakedChampion extends CardImpl { new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl<>("{1}{B}"), RaidCondition.instance, - "Raid — {1}{B}: Return {this} from your graveyard to the battlefield. Activate this ability only if you attacked this turn"); + "Raid — {1}{B}: Return {this} from your graveyard to the battlefield. Activate only if you attacked this turn."); ability.setAbilityWord(AbilityWord.RAID); ability.addHint(RaidHint.instance); this.addAbility(ability, new PlayerAttackedWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CivicWayfinder.java b/Mage.Sets/src/mage/cards/c/CivicWayfinder.java index c11434c535..8c706e8ff7 100644 --- a/Mage.Sets/src/mage/cards/c/CivicWayfinder.java +++ b/Mage.Sets/src/mage/cards/c/CivicWayfinder.java @@ -29,7 +29,7 @@ public final class CivicWayfinder extends CardImpl { this.toughness = new MageInt(2); // When Civic Wayfinder enters the battlefield, you may search your library for a basic land card, reveal it, and put it into your hand. If you do, shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, false), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private CivicWayfinder(final CivicWayfinder card) { diff --git a/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java b/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java index 415c84c3b7..3c106d17b3 100644 --- a/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java +++ b/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java @@ -45,7 +45,8 @@ class CongregationAtDawnEffect extends OneShotEffect { public CongregationAtDawnEffect() { super(Outcome.Benefit); - this.staticText = "Search your library for up to three creature cards and reveal them. Shuffle your library, then put those cards on top of it in any order"; + this.staticText = "search your library for up to three creature cards, reveal them, " + + "then shuffle and put those cards on top in any order"; } public CongregationAtDawnEffect(final CongregationAtDawnEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java index 092fe7fbd5..56ed5e0ec7 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java @@ -46,7 +46,7 @@ public final class CyclopeanTomb extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {tap}: Put a mire counter on target non-Swamp land. That land is a Swamp for as long as it has a mire counter on it. Activate this ability only during your upkeep. - Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.MIRE.createInstance()), new GenericManaCost(2), new IsStepCondition(PhaseStep.UPKEEP), "{2}, {T}: Put a mire counter on target non-Swamp land. That land is a Swamp for as long as it has a mire counter on it. Activate this ability only during your upkeep."); + Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.MIRE.createInstance()), new GenericManaCost(2), new IsStepCondition(PhaseStep.UPKEEP), "{2}, {T}: Put a mire counter on target non-Swamp land. That land is a Swamp for as long as it has a mire counter on it. Activate only during your upkeep."); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetLandPermanent(filter)); ability.addEffect(new BecomeSwampEffect()); diff --git a/Mage.Sets/src/mage/cards/d/Disembowel.java b/Mage.Sets/src/mage/cards/d/Disembowel.java index 2ccbf96e1d..d813944a4f 100644 --- a/Mage.Sets/src/mage/cards/d/Disembowel.java +++ b/Mage.Sets/src/mage/cards/d/Disembowel.java @@ -24,7 +24,7 @@ public final class Disembowel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{B}"); // Destroy target creature with converted mana cost X. - this.getSpellAbility().addEffect(new DestroyTargetEffect("creature with mana value X")); + this.getSpellAbility().addEffect(new DestroyTargetEffect("destroy target creature with mana value X")); this.getSpellAbility().setTargetAdjuster(DisembowelAdjuster.instance); } diff --git a/Mage.Sets/src/mage/cards/e/Entomb.java b/Mage.Sets/src/mage/cards/e/Entomb.java index 398885d2c7..e9bbd6ed85 100644 --- a/Mage.Sets/src/mage/cards/e/Entomb.java +++ b/Mage.Sets/src/mage/cards/e/Entomb.java @@ -42,7 +42,7 @@ class SearchLibraryPutInGraveyard extends SearchEffect { public SearchLibraryPutInGraveyard() { super(new TargetCardInLibrary(new FilterCard()), Outcome.Neutral); - staticText = "Search your library for a card and put that card into your graveyard. Then shuffle your library"; + staticText = "Search your library for a card and put that card into your graveyard, then shuffle"; } public SearchLibraryPutInGraveyard(final SearchLibraryPutInGraveyard effect) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java index 2a7680b06f..4ae3757f4d 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java @@ -68,7 +68,7 @@ class FieldOfRuinEffect extends OneShotEffect { FieldOfRuinEffect() { super(Outcome.Benefit); - this.staticText = "Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library"; + this.staticText = "Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles"; } FieldOfRuinEffect(final FieldOfRuinEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FiremaneAngel.java b/Mage.Sets/src/mage/cards/f/FiremaneAngel.java index bb4822bb31..5fb3cc2cc2 100644 --- a/Mage.Sets/src/mage/cards/f/FiremaneAngel.java +++ b/Mage.Sets/src/mage/cards/f/FiremaneAngel.java @@ -44,11 +44,11 @@ public final class FiremaneAngel extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(Zone.ALL, new GainLifeEffect(1), TargetController.YOU, true), SourceOnBattlefieldOrGraveyardCondition.instance, - "At the beginning of your upkeep, if {this} is in your graveyard or on the battlefield, you may gain 1 life"); + "At the beginning of your upkeep, if {this} is in your graveyard or on the battlefield, you may gain 1 life."); this.addAbility(ability); // {6}{R}{R}{W}{W}: Return Firemane Angel from your graveyard to the battlefield. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.GRAVEYARD, - new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{6}{R}{R}{W}{W}"), new IsStepCondition(PhaseStep.UPKEEP), null)); + new ReturnSourceFromGraveyardToBattlefieldEffect(false, false), new ManaCostsImpl("{6}{R}{R}{W}{W}"), new IsStepCondition(PhaseStep.UPKEEP), null)); } private FiremaneAngel(final FiremaneAngel card) { diff --git a/Mage.Sets/src/mage/cards/g/Gamble.java b/Mage.Sets/src/mage/cards/g/Gamble.java index a45b261d1a..79d4114fcf 100644 --- a/Mage.Sets/src/mage/cards/g/Gamble.java +++ b/Mage.Sets/src/mage/cards/g/Gamble.java @@ -25,7 +25,7 @@ public final class Gamble extends CardImpl { effect.setText("Search your library for a card, put that card into your hand"); this.getSpellAbility().addEffect(effect); effect = new DiscardControllerEffect(1, true); - effect.setText(", discard a card at random, then shuffle your library"); + effect.setText(", discard a card at random, then shuffle"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/g/GiftOfEstates.java b/Mage.Sets/src/mage/cards/g/GiftOfEstates.java index ca5f39741d..4291107915 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfEstates.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfEstates.java @@ -33,7 +33,7 @@ public final class GiftOfEstates extends CardImpl { new TargetCardInLibrary(0, 3, filter), true ), new OpponentControlsMoreCondition(StaticFilters.FILTER_LANDS), "if an opponent controls " + "more lands than you, search your library for up to three Plains cards, " + - "reveal them, and put them into your hand. Then shuffle your library" + "reveal them, put them into your hand, then shuffle" )); } diff --git a/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java b/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java index da397fe836..3e4e135085 100644 --- a/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java +++ b/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java @@ -66,7 +66,7 @@ class GravebreakerLamiaSearchEffect extends SearchEffect { GravebreakerLamiaSearchEffect() { super(new TargetCardInLibrary(), Outcome.Neutral); - staticText = "search your library for a card, put it into your graveyard, then shuffle your library"; + staticText = "search your library for a card, put it into your graveyard, then shuffle"; } private GravebreakerLamiaSearchEffect(final GravebreakerLamiaSearchEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/Grozoth.java b/Mage.Sets/src/mage/cards/g/Grozoth.java index 9d4fd5a1eb..efd51bc413 100644 --- a/Mage.Sets/src/mage/cards/g/Grozoth.java +++ b/Mage.Sets/src/mage/cards/g/Grozoth.java @@ -72,7 +72,7 @@ class GrozothEffect extends SearchEffect { public GrozothEffect() { super(new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), Outcome.DrawCard); - staticText = "you may search your library for any number of cards that have mana value 9, reveal them, and put them into your hand. If you do, shuffle your library"; + staticText = "search your library for any number of cards that have mana value 9, reveal them, put them into your hand, then shuffle"; } public GrozothEffect(final GrozothEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/InduceParanoia.java b/Mage.Sets/src/mage/cards/i/InduceParanoia.java index 3b78be8290..724e6c0ab6 100644 --- a/Mage.Sets/src/mage/cards/i/InduceParanoia.java +++ b/Mage.Sets/src/mage/cards/i/InduceParanoia.java @@ -30,7 +30,7 @@ public final class InduceParanoia extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new InduceParanoiaEffect(), new CounterTargetEffect(), - new ManaWasSpentCondition(ColoredManaSymbol.B), "Counter target spell. If {B} was spent to cast this spell, that spell's controller puts the top X cards of their library into their graveyard, where X is the spell's mana value.")); + new ManaWasSpentCondition(ColoredManaSymbol.B), "Counter target spell. If {B} was spent to cast this spell, that spell's controller mills X cards, where X is the spell's mana value.")); // Counter target spell. this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/j/JadeStatue.java b/Mage.Sets/src/mage/cards/j/JadeStatue.java index 4904534dd7..590772a94f 100644 --- a/Mage.Sets/src/mage/cards/j/JadeStatue.java +++ b/Mage.Sets/src/mage/cards/j/JadeStatue.java @@ -27,7 +27,7 @@ public final class JadeStatue extends CardImpl { // {2}: Jade Statue becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat. - this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect (new JadeStatueToken(), "", Duration.EndOfCombat), new ManaCostsImpl("{2}"), new IsPhaseCondition(TurnPhase.COMBAT), "{2}: {this} becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.")); + this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect (new JadeStatueToken(), "", Duration.EndOfCombat), new ManaCostsImpl("{2}"), new IsPhaseCondition(TurnPhase.COMBAT), "{2}: {this} becomes a 3/6 Golem artifact creature until end of combat. Activate only during combat.")); } private JadeStatue(final JadeStatue card) { diff --git a/Mage.Sets/src/mage/cards/j/JungleWayfinder.java b/Mage.Sets/src/mage/cards/j/JungleWayfinder.java index 794f75f8d1..30ab2f8a11 100644 --- a/Mage.Sets/src/mage/cards/j/JungleWayfinder.java +++ b/Mage.Sets/src/mage/cards/j/JungleWayfinder.java @@ -51,7 +51,7 @@ class JungleWayfinderEffect extends OneShotEffect { public JungleWayfinderEffect() { super(Outcome.Benefit); - this.staticText = "each player may search their library for a basic land card, reveal it, put it into their hand, then shuffle their library"; + this.staticText = "each player may search their library for a basic land card, reveal it, put it into their hand, then shuffle"; } public JungleWayfinderEffect(final JungleWayfinderEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LandTax.java b/Mage.Sets/src/mage/cards/l/LandTax.java index 8a9257ee31..00664975ed 100644 --- a/Mage.Sets/src/mage/cards/l/LandTax.java +++ b/Mage.Sets/src/mage/cards/l/LandTax.java @@ -27,7 +27,7 @@ public final class LandTax extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), TargetController.YOU, true), new OpponentControlsMoreCondition(StaticFilters.FILTER_LANDS), - "At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, and put them into your hand. If you do, shuffle your library" + "At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle." )); } diff --git a/Mage.Sets/src/mage/cards/m/MorbidCuriosity.java b/Mage.Sets/src/mage/cards/m/MorbidCuriosity.java index 8f4ee39e27..df0d913a00 100644 --- a/Mage.Sets/src/mage/cards/m/MorbidCuriosity.java +++ b/Mage.Sets/src/mage/cards/m/MorbidCuriosity.java @@ -33,7 +33,9 @@ public final class MorbidCuriosity extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); // Draw cards equal to the converted mana cost of the sacrificed permanent. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new SacrificeCostConvertedMana("permanent"))); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect( + new SacrificeCostConvertedMana("permanent") + ).setText("draw cards equal to the mana value of the sacrificed permanent")); } private MorbidCuriosity(final MorbidCuriosity card) { diff --git a/Mage.Sets/src/mage/cards/n/NaturalSelection.java b/Mage.Sets/src/mage/cards/n/NaturalSelection.java index 270c8d525a..a25f660546 100644 --- a/Mage.Sets/src/mage/cards/n/NaturalSelection.java +++ b/Mage.Sets/src/mage/cards/n/NaturalSelection.java @@ -43,7 +43,7 @@ class NaturalSelectionEffect extends OneShotEffect { public NaturalSelectionEffect() { super(Outcome.DrawCard); - this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle their library."; + this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle"; } public NaturalSelectionEffect(final NaturalSelectionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/Necrosavant.java b/Mage.Sets/src/mage/cards/n/Necrosavant.java index b164672713..29b43a7bad 100644 --- a/Mage.Sets/src/mage/cards/n/Necrosavant.java +++ b/Mage.Sets/src/mage/cards/n/Necrosavant.java @@ -34,7 +34,7 @@ public final class Necrosavant extends CardImpl { // {3}{B}{B}, Sacrifice a creature: Return Necrosavant from your graveyard to the battlefield. Activate this ability only during your upkeep. Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, - new ReturnSourceFromGraveyardToBattlefieldEffect(), + new ReturnSourceFromGraveyardToBattlefieldEffect(false,false), new ManaCostsImpl("{3}{B}{B}"), new IsStepCondition(PhaseStep.UPKEEP), null diff --git a/Mage.Sets/src/mage/cards/n/NyleasIntervention.java b/Mage.Sets/src/mage/cards/n/NyleasIntervention.java index 1fbe570745..ce5df91be8 100644 --- a/Mage.Sets/src/mage/cards/n/NyleasIntervention.java +++ b/Mage.Sets/src/mage/cards/n/NyleasIntervention.java @@ -62,7 +62,7 @@ class NyleasInterventionEffect extends OneShotEffect { NyleasInterventionEffect() { super(Outcome.Benefit); staticText = "search your library for up to X land cards, " + - "reveal them, put them into your hand, then shuffle your library"; + "reveal them, put them into your hand, then shuffle"; } private NyleasInterventionEffect(final NyleasInterventionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/o/OreskosExplorer.java b/Mage.Sets/src/mage/cards/o/OreskosExplorer.java index f57d83046b..47ef467fae 100644 --- a/Mage.Sets/src/mage/cards/o/OreskosExplorer.java +++ b/Mage.Sets/src/mage/cards/o/OreskosExplorer.java @@ -53,7 +53,7 @@ class OreskosExplorerEffect extends OneShotEffect { public OreskosExplorerEffect() { super(Outcome.PutLandInPlay); - this.staticText = "search your library for up to X Plains cards, where X is the number of players who control more lands than you. Reveal those cards, put them into your hand, then shuffle your library"; + this.staticText = "search your library for up to X Plains cards, where X is the number of players who control more lands than you. Reveal those cards, put them into your hand, then shuffle"; } public OreskosExplorerEffect(final OreskosExplorerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PirsWhim.java b/Mage.Sets/src/mage/cards/p/PirsWhim.java index 535d5045b8..eeb076cacc 100644 --- a/Mage.Sets/src/mage/cards/p/PirsWhim.java +++ b/Mage.Sets/src/mage/cards/p/PirsWhim.java @@ -47,7 +47,7 @@ class PirsWhimEffect extends OneShotEffect { super(Outcome.Benefit); this.staticText = "For each player, choose friend or foe. " + "Each friend searches their library for a land card, " - + "puts it onto the battlefield tapped, then shuffles their library. " + + "puts it onto the battlefield tapped, then shuffles. " + "Each foe sacrifices an artifact or enchantment they control."; } diff --git a/Mage.Sets/src/mage/cards/s/SeekTheHorizon.java b/Mage.Sets/src/mage/cards/s/SeekTheHorizon.java index 0374bc852a..39d47a6d18 100644 --- a/Mage.Sets/src/mage/cards/s/SeekTheHorizon.java +++ b/Mage.Sets/src/mage/cards/s/SeekTheHorizon.java @@ -20,7 +20,7 @@ public final class SeekTheHorizon extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); // Search your library for up to three basic land cards, reveal them, and put them into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LANDS), true)); } private SeekTheHorizon(final SeekTheHorizon card) { diff --git a/Mage.Sets/src/mage/cards/s/Sunforger.java b/Mage.Sets/src/mage/cards/s/Sunforger.java index fd8554d753..faa0b72a91 100644 --- a/Mage.Sets/src/mage/cards/s/Sunforger.java +++ b/Mage.Sets/src/mage/cards/s/Sunforger.java @@ -76,7 +76,7 @@ class SunforgerEffect extends OneShotEffect { super(Outcome.PlayForFree); staticText = "Search your library for a red or white instant " + "card with mana value 4 or less and cast that " - + "card without paying its mana cost. Then shuffle your library"; + + "card without paying its mana cost. Then shuffle"; } public SunforgerEffect(final SunforgerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/Tithe.java b/Mage.Sets/src/mage/cards/t/Tithe.java index 107b59f76d..22784469ce 100644 --- a/Mage.Sets/src/mage/cards/t/Tithe.java +++ b/Mage.Sets/src/mage/cards/t/Tithe.java @@ -49,7 +49,7 @@ class TitheEffect extends OneShotEffect { TitheEffect() { super(Outcome.Benefit); - this.staticText = "Search your library for a Plains card. If target opponent controls more lands than you, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library"; + this.staticText = "Search your library for a Plains card. If target opponent controls more lands than you, you may search your library for an additional Plains card. Reveal those cards, put them into your hand, then shuffle"; } TitheEffect(final TitheEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TunnelVision.java b/Mage.Sets/src/mage/cards/t/TunnelVision.java index 0aa3ec49c0..9a37ef1b29 100644 --- a/Mage.Sets/src/mage/cards/t/TunnelVision.java +++ b/Mage.Sets/src/mage/cards/t/TunnelVision.java @@ -48,7 +48,7 @@ class TunnelVisionEffect extends OneShotEffect { + "until a card with that name is revealed. If it is, that player puts " + "the rest of the revealed cards into their graveyard and " + "puts the card with the chosen name on top of their library. " - + "Otherwise, the player shuffles their library"; + + "Otherwise, the player shuffles"; } public TunnelVisionEffect(final TunnelVisionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java index 4e3087d246..0f6eca57ef 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java +++ b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java @@ -55,7 +55,8 @@ class VeteranExplorerEffect extends OneShotEffect { public VeteranExplorerEffect() { super(Outcome.Detriment); - this.staticText = "each player may search their library for up to two basic land cards and put them onto the battlefield. Then each player who searched their library this way shuffles it"; + this.staticText = "each player may search their library for up to two basic land cards, " + + "put them onto the battlefield, then shuffle"; } public VeteranExplorerEffect(final VeteranExplorerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WildPair.java b/Mage.Sets/src/mage/cards/w/WildPair.java index 7deefadacc..5017e553a8 100644 --- a/Mage.Sets/src/mage/cards/w/WildPair.java +++ b/Mage.Sets/src/mage/cards/w/WildPair.java @@ -41,7 +41,7 @@ public final class WildPair extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new WildPairEffect(), filter, true, SetTargetPointer.PERMANENT, ""), new CastFromHandTargetCondition(), - "Whenever a creature enters the battlefield, if you cast it from your hand, you may search your library for a creature card with the same total power and toughness and put it onto the battlefield. If you do, shuffle your library." + "Whenever a creature enters the battlefield, if you cast it from your hand, you may search your library for a creature card with the same total power and toughness, put it onto the battlefield, then shuffle." ), new CastFromHandWatcher()); } diff --git a/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java b/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java index 29d02cd511..5d5abd19b6 100644 --- a/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java +++ b/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java @@ -41,7 +41,7 @@ public final class WolfwillowHaven extends CardImpl { // Whenever enchanted land is tapped for mana, its controller adds an additional {G}. this.addAbility(new EnchantedTappedTriggeredManaAbility(new AddManaToManaPoolTargetControllerEffect( new Mana(ColoredManaSymbol.G), "their" - ))); + ).setText("its controller adds an additional {G}"))); // {4}{G}, Sacrifice Wolfwillow Haven: Create a 2/2 green Wolf creature token. Activate this ability only during your turn. ability = new ActivateIfConditionActivatedAbility( diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java index 79173cd9f4..cf693adca5 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java @@ -78,6 +78,6 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl { || conditionText.startsWith("if")) { additionalText = ""; } - return super.getRule() + " Activate this ability only " + additionalText + condition.toString() + "."; + return super.getRule() + " Activate only " + additionalText + condition.toString() + "."; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java index 1327e85549..f72d478fec 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java @@ -60,7 +60,7 @@ public class RecruiterEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - return "search your library for any number of " + filter.getMessage() - + " and reveal those cards. Shuffle your library, then put them on top of it in any order."; + return "search your library for any number of " + + filter.getMessage() + ", reveal them, then shuffle and put those cards on top in any order"; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java index 645d13e442..47bcfec38e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java @@ -35,7 +35,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect { this.filter = filter; this.forceToSearchBoth = forceToSearchBoth; staticText = (youMay ? "you may " : "") + "search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage() - + ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle your library" : "If you search your library this way, shuffle it"); + + ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle your library" : "If you search your library this way, shuffle"); } public SearchLibraryGraveyardPutInHandEffect(final SearchLibraryGraveyardPutInHandEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java index b2baa90e7e..f3b662d77c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common.search; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.CardsImpl; @@ -11,8 +9,10 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** - * * @author LevelX2 */ public class SearchLibraryPutInPlayTargetPlayerEffect extends SearchEffect { @@ -91,17 +91,17 @@ public class SearchLibraryPutInPlayTargetPlayerEffect extends SearchEffect { } else { sb.append("up to ").append(target.getMaxNumberOfTargets()).append(' '); } - sb.append(target.getTargetName()).append(" and put them onto the battlefield"); + sb.append(target.getTargetName()).append(", puts them onto the battlefield"); } else { - sb.append("a ").append(target.getTargetName()).append(" and put it onto the battlefield"); + sb.append("a ").append(target.getTargetName()).append(", puts it onto the battlefield"); } if (tapped) { sb.append(" tapped"); } if (forceShuffle) { - sb.append(". Then that player shuffles their library"); + sb.append(", then shuffles"); } else { - sb.append(". If that player does, they shuffle their library"); + sb.append(". If that player does, they shuffle"); } staticText = sb.toString(); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java index 231c007b18..006d6c4011 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java @@ -10,6 +10,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import mage.util.CardUtil; /** * @author BetaSteward_at_googlemail.com @@ -69,7 +70,7 @@ public class SearchLibraryPutOnLibraryEffect extends SearchEffect { private void setText() { StringBuilder sb = new StringBuilder(); - sb.append("search your library for a ").append(target.getTargetName()); + sb.append("search your library for ").append(CardUtil.addArticle(target.getTargetName())); if (reveal) { sb.append(", reveal it"); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java index 72d6b6c9d0..cd7466c133 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java @@ -28,7 +28,7 @@ public class SearchLibraryWithLessCMCPutInPlayEffect extends OneShotEffect { public SearchLibraryWithLessCMCPutInPlayEffect(FilterCard filter) { super(Outcome.PutCreatureInPlay); this.filter = filter; - staticText = "Search your library for a " + filter.getMessage() + " with mana value X or less, put it onto the battlefield, then shuffle your library"; + staticText = "Search your library for a " + filter.getMessage() + " with mana value X or less, put it onto the battlefield, then shuffle"; } public SearchLibraryWithLessCMCPutInPlayEffect(final SearchLibraryWithLessCMCPutInPlayEffect effect) {