diff --git a/Mage.Sets/src/mage/sets/fatereforged/CunningStrike.java b/Mage.Sets/src/mage/sets/fatereforged/CunningStrike.java index 414925bbb87..542aa73a0b6 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/CunningStrike.java +++ b/Mage.Sets/src/mage/sets/fatereforged/CunningStrike.java @@ -28,6 +28,7 @@ package mage.sets.fatereforged; import java.util.UUID; +import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -49,10 +50,9 @@ public class CunningStrike extends CardImpl { this.expansionSetCode = "FRF"; // Cunning Strike deals 2 damage to target creature and 2 damage to target player. - this.getSpellAbility().addEffect(new DamageTargetEffect(2)); + this.getSpellAbility().addEffect(new DamageTargetEffect(new StaticValue(2), true, "", true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - - Effect effect = new DamageTargetEffect(2); + Effect effect = new DamageTargetEffect(new StaticValue(2), true, "", true); effect.setTargetPointer(new SecondTargetPointer()); effect.setText("and 2 damage to target player"); this.getSpellAbility().addEffect(effect); diff --git a/Mage/src/mage/abilities/effects/common/DamageTargetEffect.java b/Mage/src/mage/abilities/effects/common/DamageTargetEffect.java index 9bd889e4685..017ba21128a 100644 --- a/Mage/src/mage/abilities/effects/common/DamageTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DamageTargetEffect.java @@ -50,6 +50,7 @@ public class DamageTargetEffect extends OneShotEffect { protected DynamicValue amount; protected boolean preventable; protected String targetDescription; + protected boolean useOnlyTargetPointer; public DamageTargetEffect(int amount) { this(new StaticValue(amount), true); @@ -72,10 +73,15 @@ public class DamageTargetEffect extends OneShotEffect { } public DamageTargetEffect(DynamicValue amount, boolean preventable, String targetDescription) { + this(amount, preventable, targetDescription, false); + } + + public DamageTargetEffect(DynamicValue amount, boolean preventable, String targetDescription, boolean useOnlyTargetPointer) { super(Outcome.Damage); this.amount = amount; this.preventable = preventable; this.targetDescription = targetDescription; + this.useOnlyTargetPointer = useOnlyTargetPointer; } public int getAmount() { @@ -95,6 +101,7 @@ public class DamageTargetEffect extends OneShotEffect { this.amount = effect.amount.copy(); this.preventable = effect.preventable; this.targetDescription = effect.targetDescription; + this.useOnlyTargetPointer = effect.useOnlyTargetPointer; } @Override @@ -104,7 +111,7 @@ public class DamageTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() > 1) { + if (!useOnlyTargetPointer && source.getTargets().size() > 1) { for (Target target : source.getTargets()) { for (UUID targetId : target.getTargets()) { Permanent permanent = game.getPermanent(targetId);