diff --git a/Mage.Sets/src/mage/cards/c/Camouflage.java b/Mage.Sets/src/mage/cards/c/Camouflage.java index cf47ceabd55..91fb8397724 100644 --- a/Mage.Sets/src/mage/cards/c/Camouflage.java +++ b/Mage.Sets/src/mage/cards/c/Camouflage.java @@ -62,7 +62,11 @@ class CamouflageEffect extends ContinuousRuleModifyingEffectImpl { CamouflageEffect() { super(Duration.EndOfTurn, Outcome.Benefit, false, false); - staticText = "This turn, instead of declaring blockers, each defending player chooses any number of creatures they control and divides them into a number of piles equal to the number of attacking creatures for whom that player is the defending player. Creatures they control that can block additional creatures may likewise be put into additional piles. Assign each pile to a different one of those attacking creatures at random. Each creature in a pile that can block the creature that pile is assigned to does so"; + staticText = "This turn, instead of declaring blockers, each defending player chooses any number of creatures " + + "they control and divides them into a number of piles equal to the number of attacking creatures for " + + "whom that player is the defending player. Creatures those players control that can block additional creatures " + + "may likewise be put into additional piles. Assign each pile to a different one of those attacking " + + "creatures at random. Each creature in a pile that can block the creature that pile is assigned to does so"; } private CamouflageEffect(final CamouflageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FavoredHoplite.java b/Mage.Sets/src/mage/cards/f/FavoredHoplite.java index 53b3a8d9008..fe9cd730680 100644 --- a/Mage.Sets/src/mage/cards/f/FavoredHoplite.java +++ b/Mage.Sets/src/mage/cards/f/FavoredHoplite.java @@ -30,7 +30,8 @@ public final class FavoredHoplite extends CardImpl { // Heroic - Whenever you cast a spell that targets Favored Hoplite, put a +1/+1 counter on Favored Hoplite and prevent all damage that would be dealt to it this turn. Ability ability = new HeroicAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); - ability.addEffect(new PreventAllDamageToSourceEffect(Duration.EndOfTurn)); + ability.addEffect(new PreventAllDamageToSourceEffect(Duration.EndOfTurn) + .setText("and prevent all damage that would be dealt to it this turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java b/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java index fdc8b1d8a4b..8749db312cf 100644 --- a/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java +++ b/Mage.Sets/src/mage/cards/g/GrimoireOfTheDead.java @@ -67,7 +67,7 @@ class GrimoireOfTheDeadEffect extends OneShotEffect { GrimoireOfTheDeadEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put all creature cards in all graveyards onto the battlefield under your control. " + + staticText = "Put all creature cards from all graveyards onto the battlefield under your control. " + "They're black Zombies in addition to their other colors and types"; } diff --git a/Mage.Sets/src/mage/cards/m/MoonlightGeist.java b/Mage.Sets/src/mage/cards/m/MoonlightGeist.java index e49deb6dcc3..7688ea85fa5 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlightGeist.java +++ b/Mage.Sets/src/mage/cards/m/MoonlightGeist.java @@ -33,8 +33,10 @@ public final class MoonlightGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{W}: Prevent all combat damage that would be dealt to and dealt by Moonlight Geist this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}")); - ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.EndOfTurn) + .setText("prevent all combat damage that would be dealt to"), new ManaCostsImpl<>("{3}{W}")); + ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn) + .setText("and dealt by {this} this turn")); this.addAbility(ability); } @@ -46,4 +48,4 @@ public final class MoonlightGeist extends CardImpl { public MoonlightGeist copy() { return new MoonlightGeist(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/o/OketrasAvenger.java b/Mage.Sets/src/mage/cards/o/OketrasAvenger.java index 0699d2d0a99..1ce5e309f19 100644 --- a/Mage.Sets/src/mage/cards/o/OketrasAvenger.java +++ b/Mage.Sets/src/mage/cards/o/OketrasAvenger.java @@ -27,7 +27,8 @@ public final class OketrasAvenger extends CardImpl { this.toughness = new MageInt(1); // You may exert Oketra's Avenger as it attacks. When you do, prevent all combat damage that would be dealt to it this turn. - BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new PreventCombatDamageToSourceEffect(Duration.EndOfTurn)); + BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new PreventCombatDamageToSourceEffect(Duration.EndOfTurn) + .setText("prevent all combat damage that would be dealt to it this turn")); this.addAbility(new ExertAbility(ability)); } diff --git a/Mage.Sets/src/mage/cards/r/RhonassStalwart.java b/Mage.Sets/src/mage/cards/r/RhonassStalwart.java index cd622708c32..9571782da84 100644 --- a/Mage.Sets/src/mage/cards/r/RhonassStalwart.java +++ b/Mage.Sets/src/mage/cards/r/RhonassStalwart.java @@ -39,7 +39,6 @@ public final class RhonassStalwart extends CardImpl { // You may exert Rhonas's Stalwart as it attacks. When you do, it gets +1/+1 until end of turn and can't be blocked by creatures with power 2 or less this turn. Effect effect = new BoostSourceEffect(1, 1, Duration.EndOfTurn); - effect.setText("it gets +1/+1"); BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(effect); effect = new CantBeBlockedByAllSourceEffect(filter, Duration.EndOfTurn); effect.setText("and can't be blocked by creatures with power 2 or less this turn"); diff --git a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java index 8f1980224bc..112d15558aa 100644 --- a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java @@ -40,7 +40,8 @@ public final class SpurnmageAdvocate extends CardImpl { this.toughness = new MageInt(1); // {T}: Return two target cards from an opponent's graveyard to their hand. Destroy target attacking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect() + .setText("return two target cards from an opponent's graveyard to their hand"), new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(2, 2, filter)); Effect effect = new DestroyTargetEffect(); effect.setTargetPointer(new SecondTargetPointer()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java index 31a934f5806..c8112cc6369 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java @@ -1,5 +1,3 @@ - - package mage.abilities.effects.common; import mage.constants.Duration; @@ -15,7 +13,8 @@ public class PreventCombatDamageToSourceEffect extends PreventionEffectImpl { public PreventCombatDamageToSourceEffect(Duration duration) { super(duration, Integer.MAX_VALUE, true); - staticText = "Prevent all combat damage that would be dealt to {this}" + duration.toString(); + staticText = "prevent all combat damage that would be dealt to {this}" + + (duration == Duration.EndOfTurn ? " this turn" : ""); } protected PreventCombatDamageToSourceEffect(final PreventCombatDamageToSourceEffect effect) { @@ -38,4 +37,3 @@ public class PreventCombatDamageToSourceEffect extends PreventionEffectImpl { } } -