diff --git a/Mage.Sets/src/mage/cards/a/ArcTrail.java b/Mage.Sets/src/mage/cards/a/ArcTrail.java index e0a9fe36d2d..f9463c770f7 100644 --- a/Mage.Sets/src/mage/cards/a/ArcTrail.java +++ b/Mage.Sets/src/mage/cards/a/ArcTrail.java @@ -17,7 +17,7 @@ import java.util.UUID; */ public final class ArcTrail extends CardImpl { - private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another target"); + private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("any other target"); static { filter2.getPermanentFilter().add(new AnotherTargetPredicate(2)); diff --git a/Mage.Sets/src/mage/cards/c/CrashingWave.java b/Mage.Sets/src/mage/cards/c/CrashingWave.java index f4815dd3d1e..a6764c02cc3 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingWave.java +++ b/Mage.Sets/src/mage/cards/c/CrashingWave.java @@ -65,7 +65,7 @@ class CrashingWaveEffect extends OneShotEffect { CrashingWaveEffect() { super(Outcome.Benefit); - staticText = ", then distribute three stun counters among tapped creatures your opponents control"; + staticText = ", then distribute three stun counters among any number of tapped creatures your opponents control"; } private CrashingWaveEffect(final CrashingWaveEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EddieBrock.java b/Mage.Sets/src/mage/cards/e/EddieBrock.java index feb1f69ff93..b79099576c0 100644 --- a/Mage.Sets/src/mage/cards/e/EddieBrock.java +++ b/Mage.Sets/src/mage/cards/e/EddieBrock.java @@ -34,7 +34,7 @@ import java.util.UUID; */ public final class EddieBrock extends ModalDoubleFacedCard { - private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 1 or less"); + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value 1 or less from your graveyard"); static { filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)); diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java b/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java index cc289f7797b..6fd62744f63 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java @@ -54,7 +54,7 @@ class FeastOfTheVictoriousDeadEffect extends OneShotEffect { FeastOfTheVictoriousDeadEffect() { super(Outcome.BoostCreature); - staticText = "and distribute that many +1/+1 counters among creatures you control"; + staticText = "and distribute that many +1/+1 counters among any number of creatures you control"; } private FeastOfTheVictoriousDeadEffect(final FeastOfTheVictoriousDeadEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java index ca890cf5573..e9bdb01585d 100644 --- a/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java +++ b/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java @@ -8,6 +8,7 @@ import mage.abilities.common.WerewolfFrontTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.keyword.TrampleAbility; import mage.cards.CardSetInfo; import mage.cards.TransformingDoubleFacedCard; import mage.constants.CardType; @@ -48,6 +49,10 @@ public final class HuntmasterOfTheFells extends TransformingDoubleFacedCard { // At the beginning of each upkeep, if no spells were cast last turn, transform Huntmaster of the Fells. this.getLeftHalfCard().addAbility(new WerewolfFrontTriggeredAbility()); + // Ravager of the Fells + + // Trample + this.getRightHalfCard().addAbility(TrampleAbility.getInstance()); // Whenever this creature transforms into Ravager of the Fells, it deals 2 damage to target opponent and 2 damage to up to one target creature that player controls. Ability ravagerAbility = new TransformIntoSourceTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/l/LucyMacLeanPositivelyArmed.java b/Mage.Sets/src/mage/cards/l/LucyMacLeanPositivelyArmed.java index a76bcbfa659..9c7d440fa0b 100644 --- a/Mage.Sets/src/mage/cards/l/LucyMacLeanPositivelyArmed.java +++ b/Mage.Sets/src/mage/cards/l/LucyMacLeanPositivelyArmed.java @@ -79,7 +79,7 @@ class LucyMacLeanPositivelyArmedEffect extends OneShotEffect { LucyMacLeanPositivelyArmedEffect() { super(Outcome.Benefit); staticText = "you may have target player other than its controller create a token that's a copy of it, " + - "then you draw a card if an opponent created a token this way. Do this only once each turn"; + "then you draw a card if an opponent created a token this way"; } private LucyMacLeanPositivelyArmedEffect(final LucyMacLeanPositivelyArmedEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java b/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java index ef56a4cafcb..7a1b655fe85 100644 --- a/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java +++ b/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java @@ -1,12 +1,11 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.TargetPlayerGainControlSourceEffect; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -35,8 +34,7 @@ public final class MeasureOfWickedness extends CardImpl { // At the beginning of your end step, sacrifice Measure of Wickedness and you lose 8 life. Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new SacrificeSourceEffect(), false, null); - Effect effect = new LoseLifeSourceControllerEffect(8); - ability.addEffect(effect); + ability.addEffect(new LoseLifeSourceControllerEffect(8).concatBy("and")); this.addAbility(ability); // Whenever another card is put into your graveyard from anywhere, target opponent gains control of Measure of Wickedness. diff --git a/Mage.Sets/src/mage/cards/m/MisterNegative.java b/Mage.Sets/src/mage/cards/m/MisterNegative.java index 01f556e6c58..bc6f5dbfcfe 100644 --- a/Mage.Sets/src/mage/cards/m/MisterNegative.java +++ b/Mage.Sets/src/mage/cards/m/MisterNegative.java @@ -59,7 +59,7 @@ class MisterNegativeEffect extends OneShotEffect { MisterNegativeEffect() { super(Outcome.Neutral); - staticText = "you may exchange life totals with target opponent. If you lose life this way, draw that many cards."; + staticText = "you may exchange life totals with target opponent. If you lost life this way, draw that many cards."; } protected MisterNegativeEffect(final MisterNegativeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NormanOsborn.java b/Mage.Sets/src/mage/cards/n/NormanOsborn.java index 96b5f24f0d9..6eb729856f8 100644 --- a/Mage.Sets/src/mage/cards/n/NormanOsborn.java +++ b/Mage.Sets/src/mage/cards/n/NormanOsborn.java @@ -64,7 +64,7 @@ public final class NormanOsborn extends ModalDoubleFacedCard { this.getRightHalfCard().addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); // Goblin Formula -- Each nonland card in your graveyard has mayhem. The mayhem cost is equal to its mana cost. - this.getRightHalfCard().addAbility(new SimpleStaticAbility(new GreenGoblinEffect())); + this.getRightHalfCard().addAbility(new SimpleStaticAbility(new GreenGoblinEffect()).withFlavorWord("Goblin Formula")); } private NormanOsborn(final NormanOsborn card) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java index 51b21230ae7..1e7910494d7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java @@ -210,9 +210,13 @@ public class CreateTokenEffect extends OneShotEffect { if (tokenDescription.endsWith("token")) { sb.append("s"); } - int tokenLocation = sb.indexOf("token "); + int tokenLocation = sb.indexOf("token with"); if (tokenLocation != -1) { - sb.replace(tokenLocation, tokenLocation + 6, "tokens "); + sb.replace(tokenLocation, tokenLocation + 10, "tokens with"); + } + tokenLocation = sb.indexOf("token named"); + if (tokenLocation != -1) { + sb.replace(tokenLocation, tokenLocation + 11, "tokens named"); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java index 734262d45a2..d9becef9d95 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAllCreatureTypesTargetEffect.java @@ -50,6 +50,6 @@ public class GainAllCreatureTypesTargetEffect extends ContinuousEffectImpl { } return getTargetPointer().describeTargets(mode.getTargets(), "it") + " gains all creature types" + - (duration.toString().isEmpty() ? "" : duration.toString()); + (duration.toString().isEmpty() ? "" : ' ' + duration.toString()); } }