diff --git a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java index e68e5215099..c4b40b65035 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java @@ -33,7 +33,8 @@ public final class ElvishEulogist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CardsInControllerGraveyardCount(filter, 1)) + .setText("you gain 1 life for each Elf card in your graveyard"), new SacrificeSourceCost())); } private ElvishEulogist(final ElvishEulogist card) { diff --git a/Mage.Sets/src/mage/cards/h/HarpoonSniper.java b/Mage.Sets/src/mage/cards/h/HarpoonSniper.java index 7913cbc08a4..20724f5b73e 100644 --- a/Mage.Sets/src/mage/cards/h/HarpoonSniper.java +++ b/Mage.Sets/src/mage/cards/h/HarpoonSniper.java @@ -37,7 +37,9 @@ public final class HarpoonSniper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)) + .setText("{this} deals X damage to target attacking or blocking creature, where X is the number of Merfolk you control"), + new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java b/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java index eecbc02fa32..268aa3fa991 100644 --- a/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java +++ b/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java @@ -1,4 +1,3 @@ - package mage.cards.i; import mage.MageInt; @@ -15,6 +14,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterCard; +import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import java.util.UUID; @@ -26,7 +26,7 @@ public final class IncandescentSoulstoke extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.ELEMENTAL, "Elemental creatures"); - private static final FilterCard filter2 = new FilterCard("Elemental card"); + private static final FilterCard filter2 = new FilterCreatureCard("Elemental creature card"); static { filter2.add(SubType.ELEMENTAL.getPredicate()); @@ -46,7 +46,10 @@ public final class IncandescentSoulstoke extends CardImpl { // {1}{R}, {T}: You may put an Elemental creature card from your hand onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility( - new PutCardIntoPlayWithHasteAndSacrificeEffect(filter2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") + new PutCardIntoPlayWithHasteAndSacrificeEffect(filter2, Duration.EndOfTurn) + .setText("You may put an Elemental creature card from your hand onto the battlefield. " + + "That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step."), + new ManaCostsImpl<>("{1}{R}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java index e9ee904a537..e65ad529eaa 100644 --- a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java +++ b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java @@ -29,7 +29,7 @@ import mage.target.TargetPermanent; */ public final class NettlevineBlight extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("creature or land permanent"); + private static final FilterPermanent filter = new FilterPermanent("creature or land"); static { filter.add(Predicates.or(CardType.CREATURE.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/r/RhysTheExiled.java b/Mage.Sets/src/mage/cards/r/RhysTheExiled.java index 369a5d93442..1ca69a348b2 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheExiled.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheExiled.java @@ -7,7 +7,6 @@ import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -16,9 +15,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; /** @@ -40,7 +37,8 @@ public final class RhysTheExiled extends CardImpl { this.toughness = new MageInt(2); // Whenever Rhys the Exiled attacks, you gain 1 life for each Elf you control. - this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(xValue), false)); + this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(xValue) + .setText("you gain 1 life for each Elf you control"), false)); // {B}, Sacrifice an Elf: Regenerate Rhys the Exiled. Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); diff --git a/Mage.Sets/src/mage/cards/t/ToilToRenown.java b/Mage.Sets/src/mage/cards/t/ToilToRenown.java index 91405992320..28a87ebabf5 100644 --- a/Mage.Sets/src/mage/cards/t/ToilToRenown.java +++ b/Mage.Sets/src/mage/cards/t/ToilToRenown.java @@ -1,14 +1,15 @@ - package mage.cards.t; import java.util.UUID; + +import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.hint.ValueHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; -import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -18,7 +19,7 @@ import mage.filter.predicate.permanent.TappedPredicate; */ public final class ToilToRenown extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent("tapped artifact, creature, and land you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("tapped artifact, creature, and land you control"); static { filter.add(TappedPredicate.TAPPED); @@ -26,15 +27,16 @@ public final class ToilToRenown extends CardImpl { CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate())); - filter.add(TargetController.YOU.getControllerPredicate()); } public ToilToRenown(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{G}"); - // You gain 1 life for each tapped artifact, creature, and land you control. - this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); + DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); + this.getSpellAbility().addEffect(new GainLifeEffect(xValue) + .setText("you gain 1 life for each tapped artifact, creature, and land you control")); + this.getSpellAbility().addHint(new ValueHint("Tapped artifacts, creatures, and lands you control", xValue)); } private ToilToRenown(final ToilToRenown card) { diff --git a/Mage.Sets/src/mage/cards/v/Valleymaker.java b/Mage.Sets/src/mage/cards/v/Valleymaker.java index f53e7e3c317..1bf5611ef09 100644 --- a/Mage.Sets/src/mage/cards/v/Valleymaker.java +++ b/Mage.Sets/src/mage/cards/v/Valleymaker.java @@ -48,7 +48,8 @@ public final class Valleymaker extends CardImpl { this.addAbility(ability); // {tap}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G}. - Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(3), "chosen player"), new TapSourceCost()); + Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(3), "chosen player") + .setText("choose a player. That player adds {G}{G}{G}"), new TapSourceCost()); ability2.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter2))); ability2.addTarget(new TargetPlayer(1, 1, true)); this.addAbility(ability2); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java index 948ef45327f..de1fffc7f63 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java @@ -1,5 +1,3 @@ - - package mage.abilities.effects.common; import java.util.UUID; @@ -11,6 +9,7 @@ import mage.cards.Card; import mage.game.Game; import mage.game.stack.StackObject; import mage.target.TargetSpell; +import mage.util.CardUtil; /** * @@ -68,7 +67,7 @@ public class CounterTargetAndSearchGraveyardHandLibraryEffect extends SearchTarg public String getText(Mode mode) { StringBuilder sb = new StringBuilder(); sb.append("Counter target ").append(mode.getTargets().get(0).getFilter().getMessage()).append(". "); - sb.append(super.getText(mode)); + sb.append(CardUtil.getTextWithFirstCharUpperCase(super.getText(mode))); return sb.toString(); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java index 107b5b12113..8edb64006fa 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java @@ -23,7 +23,7 @@ public class ReturnToHandSpellEffect extends OneShotEffect implements MageSingle private ReturnToHandSpellEffect() { super(Outcome.Benefit); - staticText = "Return {this} to its owner's hand"; + staticText = "return {this} to its owner's hand"; } @Override