diff --git a/Mage.Sets/src/mage/cards/c/CatharticParting.java b/Mage.Sets/src/mage/cards/c/CatharticParting.java index 53f0d5c41f5..2c68791046e 100644 --- a/Mage.Sets/src/mage/cards/c/CatharticParting.java +++ b/Mage.Sets/src/mage/cards/c/CatharticParting.java @@ -28,7 +28,8 @@ public final class CatharticParting extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{G}"); // The owner of target artifact or enchantment an opponent controls shuffles it into their library. You may shuffle up to four target cards from your graveyard into your library. - this.getSpellAbility().addEffect(new ShuffleIntoLibraryTargetEffect()); + this.getSpellAbility().addEffect(new ShuffleIntoLibraryTargetEffect() + .setText("the owner of target artifact or enchantment an opponent controls shuffles it into their library")); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ShuffleIntoLibraryTargetEffect(true) .setTargetPointer(new SecondTargetPointer())); diff --git a/Mage.Sets/src/mage/cards/c/CrackedSkull.java b/Mage.Sets/src/mage/cards/c/CrackedSkull.java index 32eafc76f61..3ebc091b072 100644 --- a/Mage.Sets/src/mage/cards/c/CrackedSkull.java +++ b/Mage.Sets/src/mage/cards/c/CrackedSkull.java @@ -44,7 +44,7 @@ public final class CrackedSkull extends CardImpl { this.addAbility(new DealtDamageAttachedTriggeredAbility( Zone.BATTLEFIELD, new DestroyTargetEffect("destroy it"), false, SetTargetPointer.PERMANENT - )); + ).setTriggerPhrase("When enchanted creature is dealt damage, ")); } private CrackedSkull(final CrackedSkull card) { diff --git a/Mage.Sets/src/mage/cards/c/CursedRecording.java b/Mage.Sets/src/mage/cards/c/CursedRecording.java index aced16673f4..9f1ef03f51b 100644 --- a/Mage.Sets/src/mage/cards/c/CursedRecording.java +++ b/Mage.Sets/src/mage/cards/c/CursedRecording.java @@ -37,7 +37,7 @@ public final class CursedRecording extends CardImpl { ); ability.addEffect(new ConditionalOneShotEffect( new RemoveAllCountersSourceEffect(CounterType.TIME), - condition, "then if there are seven or more time counters on it, " + + condition, "Then if there are seven or more time counters on it, " + "remove those counters and it deals 20 damage to you" ).addEffect(new DamageControllerEffect(20))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JumpScare.java b/Mage.Sets/src/mage/cards/j/JumpScare.java index 7e0690f69ee..1856358be54 100644 --- a/Mage.Sets/src/mage/cards/j/JumpScare.java +++ b/Mage.Sets/src/mage/cards/j/JumpScare.java @@ -29,10 +29,10 @@ public final class JumpScare extends CardImpl { .setText(", gains flying")); this.getSpellAbility().addEffect(new AddCardSubTypeTargetEffect( SubType.HORROR, Duration.EndOfTurn - ).setText(", and becomes ")); + ).setText(", and becomes")); this.getSpellAbility().addEffect(new AddCardTypeTargetEffect( Duration.EndOfTurn, CardType.ENCHANTMENT, CardType.CREATURE - ).setText("a Horror enchantment creature in addition to its other types")); + ).setText(" a Horror enchantment creature in addition to its other types")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/n/NecropolisRegent.java b/Mage.Sets/src/mage/cards/n/NecropolisRegent.java index f64f314f3fb..9eaf9838154 100644 --- a/Mage.Sets/src/mage/cards/n/NecropolisRegent.java +++ b/Mage.Sets/src/mage/cards/n/NecropolisRegent.java @@ -32,7 +32,8 @@ public final class NecropolisRegent extends CardImpl { // Whenever a creature you control deals combat damage to a player, put that many +1/+1 counters on it. this.addAbility(new DealsDamageToAPlayerAllTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance(), SavedDamageValue.MANY), + new AddCountersTargetEffect(CounterType.P1P1.createInstance(), SavedDamageValue.MANY) + .setText("put that many +1/+1 counters on it"), StaticFilters.FILTER_CONTROLLED_A_CREATURE, false, SetTargetPointer.PERMANENT, true )); diff --git a/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java index 48227613ddd..91abbc177c2 100644 --- a/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java @@ -1,18 +1,16 @@ - package mage.abilities.common; -import java.util.UUID; - import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.game.Game; -import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author LoneFox */ @@ -27,7 +25,7 @@ public class DealtDamageAttachedTriggeredAbility extends TriggeredAbilityImpl { public DealtDamageAttachedTriggeredAbility(Zone zone, Effect effect, boolean optional, SetTargetPointer setTargetPointer) { super(zone, effect, optional); this.setTargetPointer = setTargetPointer; - setTriggerPhrase("Whenever enchanted creature is dealt damage, "); + setTriggerPhrase(getWhen() + "enchanted creature is dealt damage, "); } protected DealtDamageAttachedTriggeredAbility(final DealtDamageAttachedTriggeredAbility ability) {