diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index dab7bfe034f..40216486336 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -1,4 +1,3 @@ - package mage.cards.a; import java.util.UUID; @@ -20,7 +19,6 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetLandPermanent; /** @@ -43,7 +41,7 @@ public final class AnimalBoneyard extends CardImpl { Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnimalBoneyardEffect(), new TapSourceCost()); gainedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to that creature's toughness.\""); + "Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } @@ -59,9 +57,9 @@ public final class AnimalBoneyard extends CardImpl { class AnimalBoneyardEffect extends OneShotEffect { - public AnimalBoneyardEffect() { + AnimalBoneyardEffect() { super(Outcome.GainLife); - staticText = "You gain life equal to that creature's toughness"; + staticText = "You gain life equal to the sacrificed creature's toughness"; } private AnimalBoneyardEffect(final AnimalBoneyardEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CommanderMustard.java b/Mage.Sets/src/mage/cards/c/CommanderMustard.java index 8a629fbf015..1c5f6dfb673 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderMustard.java +++ b/Mage.Sets/src/mage/cards/c/CommanderMustard.java @@ -53,7 +53,7 @@ public final class CommanderMustard extends CardImpl { this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(new AttacksTriggeredAbility( new DamageTargetEffect(1), false, "Whenever this creature attacks, " + "it deals 1 damage to defending player.", SetTargetPointer.PLAYER - ), Duration.EndOfTurn, filter, true).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}{R}{W}"))); + ), Duration.EndOfTurn, filter, false).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}{R}{W}"))); } private CommanderMustard(final CommanderMustard card) { diff --git a/Mage.Sets/src/mage/cards/d/Doorkeeper.java b/Mage.Sets/src/mage/cards/d/Doorkeeper.java index 3af52155cbb..f6f43bf86c2 100644 --- a/Mage.Sets/src/mage/cards/d/Doorkeeper.java +++ b/Mage.Sets/src/mage/cards/d/Doorkeeper.java @@ -25,7 +25,7 @@ import mage.target.TargetPlayer; */ public final class Doorkeeper extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures with defender you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with defender"); static{ filter.add(new AbilityPredicate(DefenderAbility.class)); diff --git a/Mage.Sets/src/mage/cards/j/JoleneThePlunderQueen.java b/Mage.Sets/src/mage/cards/j/JoleneThePlunderQueen.java index d3d87421a3d..60c90b416ae 100644 --- a/Mage.Sets/src/mage/cards/j/JoleneThePlunderQueen.java +++ b/Mage.Sets/src/mage/cards/j/JoleneThePlunderQueen.java @@ -33,7 +33,7 @@ import java.util.UUID; */ public final class JoleneThePlunderQueen extends CardImpl { - private static final FilterControlledPermanent filterTreasures = new FilterControlledPermanent(SubType.TREASURE, "treasures"); + private static final FilterControlledPermanent filterTreasures = new FilterControlledPermanent(SubType.TREASURE, "Treasures"); public JoleneThePlunderQueen(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}"); @@ -115,4 +115,4 @@ class JoleneThePlunderQueenTriggeredAbility extends TriggeredAbilityImpl { return "Whenever a player attacks one or more of your opponents, " + "that attacking player creates a Treasure token."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LowlandBasilisk.java b/Mage.Sets/src/mage/cards/l/LowlandBasilisk.java index 103c1fc4b61..e2868fc9e45 100644 --- a/Mage.Sets/src/mage/cards/l/LowlandBasilisk.java +++ b/Mage.Sets/src/mage/cards/l/LowlandBasilisk.java @@ -27,7 +27,8 @@ public final class LowlandBasilisk extends CardImpl { // Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat. this.addAbility(new DealsDamageToACreatureTriggeredAbility( new CreateDelayedTriggeredAbilityEffect( - new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect("destroy that creature at end of combat")), true), + new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect("destroy that creature at end of combat")) + .setTriggerPhrase(""), true), false, false, true)); diff --git a/Mage.Sets/src/mage/cards/o/OvergrownBattlement.java b/Mage.Sets/src/mage/cards/o/OvergrownBattlement.java index 336d40992ec..88d53a3ecfb 100644 --- a/Mage.Sets/src/mage/cards/o/OvergrownBattlement.java +++ b/Mage.Sets/src/mage/cards/o/OvergrownBattlement.java @@ -20,7 +20,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class OvergrownBattlement extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature with defender you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control with defender"); static { filter.add(new AbilityPredicate(DefenderAbility.class)); diff --git a/Mage.Sets/src/mage/cards/r/RisingPopulace.java b/Mage.Sets/src/mage/cards/r/RisingPopulace.java index cc2d7c0f86f..71d3b91b6eb 100644 --- a/Mage.Sets/src/mage/cards/r/RisingPopulace.java +++ b/Mage.Sets/src/mage/cards/r/RisingPopulace.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; +import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,7 +36,7 @@ public final class RisingPopulace extends CardImpl { this.toughness = new MageInt(2); // Whenever another creature or planeswalker you control dies, put a +1/+1 counter on Rising Populace. - this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( + this.addAbility(new DiesCreatureTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, filter, false )); diff --git a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java index 924101a2048..4b371fafd44 100644 --- a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java +++ b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java @@ -1,41 +1,28 @@ - package mage.cards.w; -import java.util.UUID; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.discard.DiscardHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; -import mage.filter.FilterPlayer; -import mage.target.TargetPlayer; +import mage.target.common.TargetOpponent; + +import java.util.UUID; /** * * @author fireshoes */ public final class WheelAndDeal extends CardImpl { - - private static final FilterPlayer filter = new FilterPlayer("opponent"); - - static { - filter.add(TargetController.OPPONENT.getPlayerPredicate()); - } public WheelAndDeal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}"); // Any number of target opponents each discards their hand and draws seven cards. - Effect effect = new DiscardHandTargetEffect(); - effect.setText("Any number of target opponents each discards their hand"); - this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false, filter)); - this.getSpellAbility().addEffect(effect); - effect = new DrawCardTargetEffect(7); - effect.setText("and draws seven cards"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addTarget(new TargetOpponent(0, Integer.MAX_VALUE, false)); + this.getSpellAbility().addEffect(new DiscardHandTargetEffect().setText("Any number of target opponents each discard their hands")); + this.getSpellAbility().addEffect(new DrawCardTargetEffect(7).setText(", then draw seven cards")); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); diff --git a/Mage/src/main/java/mage/game/permanent/token/RockToken.java b/Mage/src/main/java/mage/game/permanent/token/RockToken.java index b045d2c3cd1..60b3b36875d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RockToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RockToken.java @@ -14,7 +14,7 @@ import mage.target.common.TargetAnyTarget; public final class RockToken extends TokenImpl { public RockToken() { - super("Rock", "artifact equipment token named Rock with \"Equipped creature has '{1}, {T}, Sacrifice Rock: This creature deals 2 damage to any target'\" and equip {1}"); + super("Rock", "colorless Equipment artifact token named Rock with \"Equipped creature has '{1}, {T}, Sacrifice Rock: This creature deals 2 damage to any target'\" and equip {1}"); cardType.add(CardType.ARTIFACT); subtype.add(SubType.EQUIPMENT);