diff --git a/Mage.Sets/src/mage/cards/a/AmbitiousFarmhand.java b/Mage.Sets/src/mage/cards/a/AmbitiousFarmhand.java index 9070dbea35b..b292ac13b41 100644 --- a/Mage.Sets/src/mage/cards/a/AmbitiousFarmhand.java +++ b/Mage.Sets/src/mage/cards/a/AmbitiousFarmhand.java @@ -41,7 +41,7 @@ public final class AmbitiousFarmhand extends CardImpl { // When Ambitious Farmhand enters the battlefield, you may search your library for a basic Plains card, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter)), true + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true )); // Coven—{1}{W}{W}: Transform Ambitious Farmhand. Activate only if you control three or more creatures with different powers. diff --git a/Mage.Sets/src/mage/cards/f/FlareOfFaith.java b/Mage.Sets/src/mage/cards/f/FlareOfFaith.java index ecb33ddb942..b11c7654992 100644 --- a/Mage.Sets/src/mage/cards/f/FlareOfFaith.java +++ b/Mage.Sets/src/mage/cards/f/FlareOfFaith.java @@ -45,7 +45,7 @@ class FlareOfFaithEffect extends OneShotEffect { FlareOfFaithEffect() { super(Outcome.Benefit); staticText = "target creature gets +2/+2 until end of turn. If it's a Human, " + - "it gets +3/+3 and gains indestructible until end of turn instead"; + "instead it gets +3/+3 and gains indestructible until end of turn"; } private FlareOfFaithEffect(final FlareOfFaithEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HeirloomMirror.java b/Mage.Sets/src/mage/cards/h/HeirloomMirror.java index e0328627bfd..43f576e01c1 100644 --- a/Mage.Sets/src/mage/cards/h/HeirloomMirror.java +++ b/Mage.Sets/src/mage/cards/h/HeirloomMirror.java @@ -55,7 +55,7 @@ class HeirloomMirrorEffect extends OneShotEffect { HeirloomMirrorEffect() { super(Outcome.Benefit); staticText = "draw a card, mill a card, then put a ritual counter on {this}. " + - "Then if it has 3 or more ritual counters on it, remove them and transform it"; + "Then if it has three or more ritual counters on it, remove them and transform it"; } private HeirloomMirrorEffect(final HeirloomMirrorEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LierDiscipleOfTheDrowned.java b/Mage.Sets/src/mage/cards/l/LierDiscipleOfTheDrowned.java index 2eb3748b1a3..be1d8508ebb 100644 --- a/Mage.Sets/src/mage/cards/l/LierDiscipleOfTheDrowned.java +++ b/Mage.Sets/src/mage/cards/l/LierDiscipleOfTheDrowned.java @@ -85,7 +85,7 @@ class LierDiscipleOfTheDrownedFlashbackEffect extends ContinuousEffectImpl { public LierDiscipleOfTheDrownedFlashbackEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); this.staticText = "Each instant and sorcery card in your graveyard has flashback. " + - "The flashback cost is equal to its mana cost"; + "The flashback cost is equal to that card's mana cost"; } public LierDiscipleOfTheDrownedFlashbackEffect(final LierDiscipleOfTheDrownedFlashbackEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheForsaken.java b/Mage.Sets/src/mage/cards/l/LordOfTheForsaken.java index 04041271e1e..4381e644fab 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheForsaken.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheForsaken.java @@ -80,7 +80,7 @@ class LordOfTheForsakenManaBuilder extends ConditionalManaBuilder { @Override public String getRule() { - return "Spend this mana only to cast a spell from a graveyard"; + return "Spend this mana only to cast a spell from your graveyard"; } } @@ -88,7 +88,7 @@ class LordOfTheForsakenConditionalMana extends ConditionalMana { public LordOfTheForsakenConditionalMana(Mana mana) { super(mana); - staticText = "Spend this mana only to cast a spell from a graveyard"; + staticText = "Spend this mana only to cast a spell from your graveyard"; addCondition(LordOfTheForsakenManaCondition.instance); } } @@ -98,7 +98,8 @@ enum LordOfTheForsakenManaCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - if (game == null || !game.inCheckPlayableState()) { + if (game == null || !game.inCheckPlayableState() + || !source.isControlledBy(game.getOwnerId(source.getSourceId()))) { return false; } if (game.getCard(source.getSourceId()) != null diff --git a/Mage.Sets/src/mage/cards/o/OldStickfingers.java b/Mage.Sets/src/mage/cards/o/OldStickfingers.java index 64bf0dbb52a..136f8f94fa7 100644 --- a/Mage.Sets/src/mage/cards/o/OldStickfingers.java +++ b/Mage.Sets/src/mage/cards/o/OldStickfingers.java @@ -51,7 +51,7 @@ class OldStickfingersEffect extends OneShotEffect { public OldStickfingersEffect() { super(Outcome.Discard); - this.staticText = "reveal cards from the top of your library until you reveal X creature cards. Put all the creature cards revealed this way into your graveyard and the rest on the bottom of your library in a random order"; + this.staticText = "reveal cards from the top of your library until you reveal X creature cards. Put all creature cards revealed this way into your graveyard, then put the rest on the bottom of your library in a random order"; } public OldStickfingersEffect(final OldStickfingersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PurifyingDragon.java b/Mage.Sets/src/mage/cards/p/PurifyingDragon.java index 036cb0aa637..4324c57b7d9 100644 --- a/Mage.Sets/src/mage/cards/p/PurifyingDragon.java +++ b/Mage.Sets/src/mage/cards/p/PurifyingDragon.java @@ -62,7 +62,7 @@ class PurifyingDragonEffect extends OneShotEffect { PurifyingDragonEffect() { super(Outcome.Benefit); staticText = "it deals 1 damage to target creature defending player controls. " + - "If that creature is a Zombie, {this} deals 2 damage to that creature instead"; + "If that creature is a Zombie, {this} deals 2 damage to it instead"; } private PurifyingDragonEffect(final PurifyingDragonEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RootcoilCreeper.java b/Mage.Sets/src/mage/cards/r/RootcoilCreeper.java index 248b8e5a938..3d995608343 100644 --- a/Mage.Sets/src/mage/cards/r/RootcoilCreeper.java +++ b/Mage.Sets/src/mage/cards/r/RootcoilCreeper.java @@ -58,7 +58,7 @@ public final class RootcoilCreeper extends CardImpl { // {G}{U}, {T}, Exile Rootcoil Creeper: Return target card with flashback you own in exile to your hand. Ability ability = new SimpleActivatedAbility( new ReturnToHandTargetEffect() - .setText("return target card with flashback you own in exile to your hand"), + .setText("return target card with flashback you own from exile to your hand"), new ManaCostsImpl<>("{G}{U}") ); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SeizeTheStorm.java b/Mage.Sets/src/mage/cards/s/SeizeTheStorm.java index 420f316c59c..45f52e91d3f 100644 --- a/Mage.Sets/src/mage/cards/s/SeizeTheStorm.java +++ b/Mage.Sets/src/mage/cards/s/SeizeTheStorm.java @@ -75,6 +75,6 @@ enum SeizeTheStormValue implements DynamicValue { @Override public String getMessage() { - return "instant and sorcery cards in your graveyard, plus the number of cards with flashback you own in exile"; + return "instant and sorcery cards in your graveyard plus the number of cards with flashback you own in exile"; } } diff --git a/Mage.Sets/src/mage/cards/s/StormTheFestival.java b/Mage.Sets/src/mage/cards/s/StormTheFestival.java index cf0293f5fb8..185b64c24a7 100644 --- a/Mage.Sets/src/mage/cards/s/StormTheFestival.java +++ b/Mage.Sets/src/mage/cards/s/StormTheFestival.java @@ -32,7 +32,7 @@ public final class StormTheFestival extends CardImpl { // Look at the top five cards of your library. Put up to two permanent cards with mana value 5 or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect( - 5, 2, filter, false, true, Zone.BATTLEFIELD, false + 5, 2, filter, false, true, Zone.BATTLEFIELD, true ).setBackInRandomOrder(true)); // Flashback {7}{G}{G}{G} diff --git a/Mage.Sets/src/mage/cards/s/StranglingGrasp.java b/Mage.Sets/src/mage/cards/s/StranglingGrasp.java index 90644555175..c3665cff1ae 100644 --- a/Mage.Sets/src/mage/cards/s/StranglingGrasp.java +++ b/Mage.Sets/src/mage/cards/s/StranglingGrasp.java @@ -74,7 +74,7 @@ class StranglingGraspEffect extends OneShotEffect { StranglingGraspEffect() { super(Outcome.Benefit); - staticText = "enchanted permanent's controller sacrifices a nonland permanent and loses 1 life"; + staticText = "enchanted permanent's controller sacrifices a nonland permanent, then that player loses 1 life"; } private StranglingGraspEffect(final StranglingGraspEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TaintedAdversary.java b/Mage.Sets/src/mage/cards/t/TaintedAdversary.java index f8c4be05151..a542742e27d 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedAdversary.java +++ b/Mage.Sets/src/mage/cards/t/TaintedAdversary.java @@ -59,7 +59,7 @@ class TaintedAdversaryEffect extends OneShotEffect { TaintedAdversaryEffect() { super(Outcome.Benefit); staticText = "put that many +1/+1 counters on {this}, " + - "then create twice that many black 2/2 Zombie creature tokens with decayed"; + "then create twice that many 2/2 black Zombie creature tokens with decayed"; } private TaintedAdversaryEffect(final TaintedAdversaryEffect effect) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobToken.java b/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobToken.java index c64de225556..d3d113fc666 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobToken.java @@ -16,7 +16,7 @@ import mage.game.Game; public final class ConsumingBlobToken extends TokenImpl { public ConsumingBlobToken() { - super("Ooze", "green Ooze creature token with \"This creature's power is equal to the number of card types among cards in your graveyard and its toughness is equal to that number plus 1\"."); + super("Ooze", "green Ooze creature token with \"This creature's power is equal to the number of card types among cards in your graveyard and its toughness is equal to that number plus 1.\""); setOriginalExpansionSetCode("MID"); cardType.add(CardType.CREATURE); subtype.add(SubType.OOZE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormToken.java b/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormToken.java index 35004de4eef..fdcc76e93c8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormToken.java @@ -18,7 +18,7 @@ public final class SeizeTheStormToken extends TokenImpl { public SeizeTheStormToken(DynamicValue xValue, Hint hint) { super("Elemental", "red Elemental creature token with trample and " + "\"This creature's power and toughness are each equal to the number of instant " + - "and sorcery cards in your graveyard, plus the number of cards with flashback you own in exile.\""); + "and sorcery cards in your graveyard plus the number of cards with flashback you own in exile.\""); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL);