diff --git a/Mage.Sets/src/mage/cards/b/BlankaFerociousFriend.java b/Mage.Sets/src/mage/cards/b/BlankaFerociousFriend.java index 00987da429..090f31fe73 100644 --- a/Mage.Sets/src/mage/cards/b/BlankaFerociousFriend.java +++ b/Mage.Sets/src/mage/cards/b/BlankaFerociousFriend.java @@ -47,8 +47,9 @@ public final class BlankaFerociousFriend extends CardImpl { // Electric Thunder—Whenever Blanka becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent. Ability ability = new BecomesTargetTriggeredAbility(new BoostSourceEffect( 2, 2, Duration.EndOfTurn - ).setText("he gets +2/+2 until end of turn"), StaticFilters.FILTER_SPELL_A); - ability.addEffect(new DamagePlayersEffect(2, TargetController.OPPONENT)); + ).setText("he gets +2/+2 until end of turn"), StaticFilters.FILTER_SPELL_A).setTriggerPhrase("Whenever {this} becomes the target of a spell, "); + ability.addEffect(new DamagePlayersEffect(2, TargetController.OPPONENT) + .setText("and deals 2 damage to each opponent")); this.addAbility(ability.withFlavorWord("Electric Thunder")); } diff --git a/Mage.Sets/src/mage/cards/c/ChunLiCountlessKicks.java b/Mage.Sets/src/mage/cards/c/ChunLiCountlessKicks.java index 5c93d96213..542de6e0e0 100644 --- a/Mage.Sets/src/mage/cards/c/ChunLiCountlessKicks.java +++ b/Mage.Sets/src/mage/cards/c/ChunLiCountlessKicks.java @@ -42,7 +42,7 @@ public final class ChunLiCountlessKicks extends CardImpl { .setTargetAdjuster(ChunLiCountlessKicksAdjuster.instance)); // Lightning Kick—Whenever Chun-Li attacks, copy each exiled card you own with a kick counter on it. You may cast the copies. - this.addAbility(new AttacksTriggeredAbility(new ChunLiCountlessKicksCastEffect())); + this.addAbility(new AttacksTriggeredAbility(new ChunLiCountlessKicksCastEffect()).withFlavorWord("Lightning Kick")); } private ChunLiCountlessKicks(final ChunLiCountlessKicks card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 51e57715cf..b0b6dcc953 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -53,7 +53,7 @@ public final class GoblinRabblemaster extends CardImpl { this.addAbility(new BeginningOfCombatTriggeredAbility(new CreateTokenEffect(new GoblinToken(true)), TargetController.YOU, false)); // When Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin. - this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(attackingFilter), StaticValue.get(0), Duration.EndOfTurn, true), false)); + this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(attackingFilter), StaticValue.get(0), Duration.EndOfTurn, true, "it"), false)); } private GoblinRabblemaster(final GoblinRabblemaster card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowOfDoubt.java b/Mage.Sets/src/mage/cards/s/ShadowOfDoubt.java index 19c3cea0f0..75a2a3f864 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowOfDoubt.java +++ b/Mage.Sets/src/mage/cards/s/ShadowOfDoubt.java @@ -27,7 +27,7 @@ public final class ShadowOfDoubt extends CardImpl { // Players can't search libraries this turn. this.getSpellAbility().addEffect(new LibrariesCantBeSearchedEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private ShadowOfDoubt(final ShadowOfDoubt card) { diff --git a/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java index 88d27e8ad8..6b2f271d4f 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/cards/t/TamiyoTheMoonSage.java @@ -38,7 +38,7 @@ public final class TamiyoTheMoonSage extends CardImpl { // +1: Tap target permanent. It doesn't untap during its controller's next untap step. LoyaltyAbility ability = new LoyaltyAbility(new TapTargetEffect(), 1); - ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect()); + ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("it")); Target target = new TargetPermanent(); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index cb473e8bf9..c26b756402 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -62,7 +62,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODE = "KLD"; // check all abilities and output cards with wrong abilities texts; + private static final String FULL_ABILITIES_CHECK_SET_CODE = "SLD"; // check all abilities and output cards with wrong abilities texts; private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run private static final boolean ONLY_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java index 47bbb94eb1..5c11da1c4d 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effects.java +++ b/Mage/src/main/java/mage/abilities/effects/Effects.java @@ -109,6 +109,7 @@ public class Effects extends ArrayList { && !lastRule.endsWith(".]") && !lastRule.startsWith("Level ") && !lastRule.endsWith(".)") + && !lastRule.endsWith("
") && !lastRule.endsWith("")) { sbText.append('.'); } diff --git a/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java index 6034f77158..cb910858cb 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TamiyoTheMoonSageEmblem.java @@ -1,10 +1,7 @@ - package mage.game.command.emblems; -import mage.abilities.Ability; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect.HandSizeModification; @@ -12,11 +9,10 @@ import mage.constants.Duration; import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; -import mage.filter.FilterCard; +import mage.filter.StaticFilters; import mage.game.command.Emblem; /** - * * @author spjspj */ public final class TamiyoTheMoonSageEmblem extends Emblem { @@ -28,11 +24,12 @@ public final class TamiyoTheMoonSageEmblem extends Emblem { public TamiyoTheMoonSageEmblem() { this.setName("Emblem Tamiyo"); - Ability ability = new SimpleStaticAbility(Zone.COMMAND, new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.EndOfGame, HandSizeModification.SET)); - this.getAbilities().add(ability); - Effect effect = new ReturnToHandTargetEffect(); - effect.setText("return it to your hand"); + this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new MaximumHandSizeControllerEffect( + Integer.MAX_VALUE, Duration.Custom, HandSizeModification.SET + ))); this.getAbilities().add(new PutCardIntoGraveFromAnywhereAllTriggeredAbility( - Zone.COMMAND, effect, true, new FilterCard("a card"), TargetController.YOU, SetTargetPointer.CARD)); + Zone.COMMAND, new ReturnToHandTargetEffect().setText("return it to your hand"), + true, StaticFilters.FILTER_CARD_A, TargetController.YOU, SetTargetPointer.CARD + )); } }