diff --git a/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java b/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java index 8bbd3c1e2b2..c20f2a16940 100644 --- a/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java +++ b/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java @@ -36,7 +36,7 @@ public final class BonecrusherGiant extends AdventureCard { // Stomp // Damage can’t be prevented this turn. Stomp deals 2 damage to any target. - this.getSpellCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); + this.getSpellCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn)); this.getSpellCard().getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellCard().getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CallInAProfessional.java b/Mage.Sets/src/mage/cards/c/CallInAProfessional.java index 19faa87a99d..977146613de 100644 --- a/Mage.Sets/src/mage/cards/c/CallInAProfessional.java +++ b/Mage.Sets/src/mage/cards/c/CallInAProfessional.java @@ -22,7 +22,7 @@ public final class CallInAProfessional extends CardImpl { // Players can't gain life this turn. Damage can't be prevented this turn. Call In a Professional deals 3 damage to any target. this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DamageCantBePreventedEffect( - Duration.EndOfTurn, "Damage can't be prevented this turn" + Duration.EndOfTurn )); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/e/EverlastingTorment.java b/Mage.Sets/src/mage/cards/e/EverlastingTorment.java index 9df71fffd19..53b60350a30 100644 --- a/Mage.Sets/src/mage/cards/e/EverlastingTorment.java +++ b/Mage.Sets/src/mage/cards/e/EverlastingTorment.java @@ -29,7 +29,7 @@ public final class EverlastingTorment extends CardImpl { // Damage can't be prevented. this.addAbility(new SimpleStaticAbility(new DamageCantBePreventedEffect( - Duration.WhileOnBattlefield, "Damage can't be prevented" + Duration.WhileOnBattlefield ))); // All damage is dealt as though its source had wither. diff --git a/Mage.Sets/src/mage/cards/f/FearFireFoes.java b/Mage.Sets/src/mage/cards/f/FearFireFoes.java index 553b13d8aff..0ac6f7a9116 100644 --- a/Mage.Sets/src/mage/cards/f/FearFireFoes.java +++ b/Mage.Sets/src/mage/cards/f/FearFireFoes.java @@ -32,7 +32,7 @@ public final class FearFireFoes extends CardImpl { // Damage can't be prevented this turn. Fear, Fire, Foes! deals X damage to target creature and 1 damage to each other creature with the same controller. this.getSpellAbility().addEffect(new DamageCantBePreventedEffect( - Duration.EndOfTurn, "Damage can't be prevented this turn" + Duration.EndOfTurn )); this.getSpellAbility().addEffect(new DamageTargetEffect(ManacostVariableValue.REGULAR)); this.getSpellAbility().addEffect(new FearFireFoesEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FlaringPain.java b/Mage.Sets/src/mage/cards/f/FlaringPain.java index bbfac6f7119..e06d3e4c55c 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringPain.java +++ b/Mage.Sets/src/mage/cards/f/FlaringPain.java @@ -21,7 +21,7 @@ public final class FlaringPain extends CardImpl { // Damage can't be prevented this turn. - this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); + this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn)); // Flashback {R} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/i/InsultInjury.java b/Mage.Sets/src/mage/cards/i/InsultInjury.java index 3bbb8dc66df..6720fe3661c 100644 --- a/Mage.Sets/src/mage/cards/i/InsultInjury.java +++ b/Mage.Sets/src/mage/cards/i/InsultInjury.java @@ -32,7 +32,7 @@ public final class InsultInjury extends SplitCard { // Insult // Damage can't be prevented this turn. If a source you control would deal damage this turn it deals // double that damage instead. - getLeftHalfCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); + getLeftHalfCard().getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn)); getLeftHalfCard().getSpellAbility().addEffect(new InsultDoubleDamageEffect()); // to diff --git a/Mage.Sets/src/mage/cards/i/IsengardUnleashed.java b/Mage.Sets/src/mage/cards/i/IsengardUnleashed.java index 79d8a20ac62..28492b85a45 100644 --- a/Mage.Sets/src/mage/cards/i/IsengardUnleashed.java +++ b/Mage.Sets/src/mage/cards/i/IsengardUnleashed.java @@ -28,7 +28,7 @@ public final class IsengardUnleashed extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}{R}{R}"); // Damage can't be prevented this turn. If a source you control would deal damage this turn to an opponent or a permanent an opponent controls, it deals triple that damage instead. - this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); + this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new IsengardUnleashedTripleDamageEffect()); // Flashback {4}{R}{R}{R} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{R}{R}{R}"))); diff --git a/Mage.Sets/src/mage/cards/s/Skullcrack.java b/Mage.Sets/src/mage/cards/s/Skullcrack.java index 4686e6efaa6..6ee3920d242 100644 --- a/Mage.Sets/src/mage/cards/s/Skullcrack.java +++ b/Mage.Sets/src/mage/cards/s/Skullcrack.java @@ -22,7 +22,7 @@ public final class Skullcrack extends CardImpl { // Players can't gain life this turn. Damage can't be prevented this turn. Skullcrack deals 3 damage to target player. this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn, "Damage can't be prevented this turn")); + this.getSpellAbility().addEffect(new DamageCantBePreventedEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/w/WildSlash.java b/Mage.Sets/src/mage/cards/w/WildSlash.java index 288ff61a42a..b579cc54cdd 100644 --- a/Mage.Sets/src/mage/cards/w/WildSlash.java +++ b/Mage.Sets/src/mage/cards/w/WildSlash.java @@ -24,7 +24,7 @@ public final class WildSlash extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); // Ferocious If you control a creature with power 4 or greater, damage can't be prevented this turn. - ContinuousRuleModifyingEffect effect = new DamageCantBePreventedEffect(Duration.EndOfTurn, "damage can't be prevented this turn"); + ContinuousRuleModifyingEffect effect = new DamageCantBePreventedEffect(Duration.EndOfTurn); effect.setText("Ferocious — If you control a creature with power 4 or greater, damage can't be prevented this turn.
"); this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect(effect, new LockedInCondition(FerociousCondition.instance))); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java index 9f894641458..0cf28b7ce27 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java @@ -9,9 +9,9 @@ import mage.game.events.GameEvent; public class DamageCantBePreventedEffect extends ContinuousRuleModifyingEffectImpl { - public DamageCantBePreventedEffect(Duration duration, String staticText) { + public DamageCantBePreventedEffect(Duration duration) { super(duration, Outcome.Benefit); - this.staticText = staticText; + this.staticText = "damage can't be prevented" + (duration == Duration.EndOfTurn ? " this turn" : ""); } protected DamageCantBePreventedEffect(final DamageCantBePreventedEffect effect) {