diff --git a/Mage.Sets/src/mage/cards/a/AnotherChance.java b/Mage.Sets/src/mage/cards/a/AnotherChance.java index ccc7268675a..4cca9b16ad8 100644 --- a/Mage.Sets/src/mage/cards/a/AnotherChance.java +++ b/Mage.Sets/src/mage/cards/a/AnotherChance.java @@ -46,7 +46,7 @@ class AnotherChanceEffect extends OneShotEffect { AnotherChanceEffect() { super(Outcome.Benefit); - staticText = "You may mill two cards. Then you return up to two creature cards from your graveyard to your hand"; + staticText = "You may mill two cards. Then return up to two creature cards from your graveyard to your hand"; } private AnotherChanceEffect(final AnotherChanceEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BurningSunCavalry.java b/Mage.Sets/src/mage/cards/b/BurningSunCavalry.java index 963523ff67a..059fe58e43b 100644 --- a/Mage.Sets/src/mage/cards/b/BurningSunCavalry.java +++ b/Mage.Sets/src/mage/cards/b/BurningSunCavalry.java @@ -35,7 +35,7 @@ public final class BurningSunCavalry extends CardImpl { this.addAbility(new ConditionalTriggeredAbility( new AttacksOrBlocksTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false), condition, - "Whenever {this} attacks or blocks while you control a Dinosaur, it gets +1/+1 until end of turn." + "Whenever {this} attacks or blocks while you control a Dinosaur, {this} gets +1/+1 until end of turn." )); } diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingCave.java b/Mage.Sets/src/mage/cards/c/CaptivatingCave.java index e2c84600b38..f42fce6c3b9 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingCave.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingCave.java @@ -31,14 +31,13 @@ public final class CaptivatingCave extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Add one mana of any color. - Ability ability = new AnyColorManaAbility(); - ability.addCost(new GenericManaCost(1)); + Ability ability = new AnyColorManaAbility(new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}, {T}, Sacrifice Captivating Cave: Put two +1/+1 counters on target creature. Activate only as a sorcery. ability = new ActivateAsSorceryActivatedAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(4) + new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)), new GenericManaCost(4) ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java b/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java index 91249b76a42..ea554e8d872 100644 --- a/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java +++ b/Mage.Sets/src/mage/cards/d/DireBlunderbuss.java @@ -39,7 +39,7 @@ public final class DireBlunderbuss extends CardImpl { this.color.setRed(true); // Equipped creature gets +3/+0 and has "Whenever this creature attacks, you may sacrifice an artifact other than Dire Blunderbuss. When you do, this creature deals damage equal to its power to target creature" - Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 3)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 0)); ability.addEffect(new DireBlunderbussGainAbilityEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrilledCaveWurm.java b/Mage.Sets/src/mage/cards/f/FrilledCaveWurm.java index 4d047833850..7b9391ad060 100644 --- a/Mage.Sets/src/mage/cards/f/FrilledCaveWurm.java +++ b/Mage.Sets/src/mage/cards/f/FrilledCaveWurm.java @@ -30,7 +30,7 @@ public final class FrilledCaveWurm extends CardImpl { // Descend 4 -- Frilled Cave-Wurm gets +2/+0 as long as there are four or more permanent cards in your graveyard. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), DescendCondition.FOUR, - "gets +2/+0 as long as there are four or more permanent cards in your graveyard" + "{this} gets +2/+0 as long as there are four or more permanent cards in your graveyard" )).setAbilityWord(AbilityWord.DESCEND_4).addHint(DescendCondition.getHint())); } diff --git a/Mage.Sets/src/mage/cards/s/ScamperingSurveyor.java b/Mage.Sets/src/mage/cards/s/ScamperingSurveyor.java index f5bccb91d29..415df4965d2 100644 --- a/Mage.Sets/src/mage/cards/s/ScamperingSurveyor.java +++ b/Mage.Sets/src/mage/cards/s/ScamperingSurveyor.java @@ -19,7 +19,7 @@ import java.util.UUID; */ public final class ScamperingSurveyor extends CardImpl { - private static final FilterCard filter = new FilterCard("a basic land card or a Cave card"); + private static final FilterCard filter = new FilterCard("a basic land card or Cave card"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/s/ShipwreckSentry.java b/Mage.Sets/src/mage/cards/s/ShipwreckSentry.java index a1d8d276980..7f53ccd66a7 100644 --- a/Mage.Sets/src/mage/cards/s/ShipwreckSentry.java +++ b/Mage.Sets/src/mage/cards/s/ShipwreckSentry.java @@ -49,7 +49,7 @@ public final class ShipwreckSentry extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), ShipwreckSentryWatcher::checkPlayer ).setText("as long as an artifact entered the battlefield under your control this turn, " + - "{this} can attack as though it didn't have defender")), new ShipwreckSentryWatcher()); + "{this} can attack as though it didn't have defender")).addHint(hint), new ShipwreckSentryWatcher()); } private ShipwreckSentry(final ShipwreckSentry card) { diff --git a/Mage.Sets/src/mage/cards/v/VisageOfDread.java b/Mage.Sets/src/mage/cards/v/VisageOfDread.java index 461372f84cf..a37a21a94d0 100644 --- a/Mage.Sets/src/mage/cards/v/VisageOfDread.java +++ b/Mage.Sets/src/mage/cards/v/VisageOfDread.java @@ -30,7 +30,7 @@ public final class VisageOfDread extends CardImpl { // Craft with two creatures {5}{B} this.addAbility(new CraftAbility( - "{5}{B}", "creatures", "other creatures you control and/or " + + "{5}{B}", "two creatures", "other creatures you control and/or " + "creature cards in your graveyard", 2, 2, CardType.CREATURE.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/v/VolatileFault.java b/Mage.Sets/src/mage/cards/v/VolatileFault.java index 2a8676f8bbb..196d37d837c 100644 --- a/Mage.Sets/src/mage/cards/v/VolatileFault.java +++ b/Mage.Sets/src/mage/cards/v/VolatileFault.java @@ -11,15 +11,14 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayTargetControll import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.FilterPermanent; +import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.game.permanent.token.TreasureToken; import mage.target.TargetPermanent; +import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -50,9 +49,11 @@ public final class VolatileFault extends CardImpl { ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addEffect(new SearchLibraryPutInPlayTargetControllerEffect(false)); + ability.addEffect(new SearchLibraryPutInPlayTargetControllerEffect( + new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), + false, Outcome.PutLandInPlay, "that player")); ability.addTarget(new TargetPermanent(filter)); - ability.addEffect(new CreateTokenEffect(new TreasureToken())); + ability.addEffect(new CreateTokenEffect(new TreasureToken()).concatBy("you")); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/keyword/DauntAbility.java b/Mage/src/main/java/mage/abilities/keyword/DauntAbility.java index ecdc8038a7a..f2cc938c547 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DauntAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DauntAbility.java @@ -12,7 +12,7 @@ import mage.filter.predicate.mageobject.PowerPredicate; */ public class DauntAbility extends SimpleEvasionAbility { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 2 or less"); static { filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));