From cb91282f9efa189b02a603f6e3c4be7fc73f1173 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 10 Jul 2016 22:02:56 +0200 Subject: [PATCH] [EMN] Some fixes to Dark Salvation, Eldrich Moon, Make Mischief. --- Mage.Sets/src/mage/sets/EldritchMoon.java | 4 ++-- .../src/mage/sets/eldritchmoon/DarkSalvation.java | 12 +++++++++--- .../src/mage/sets/eldritchmoon/MakeMischief.java | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/EldritchMoon.java b/Mage.Sets/src/mage/sets/EldritchMoon.java index 43e1b95b1c4..73c89460c45 100644 --- a/Mage.Sets/src/mage/sets/EldritchMoon.java +++ b/Mage.Sets/src/mage/sets/EldritchMoon.java @@ -47,8 +47,8 @@ public class EldritchMoon extends ExpansionSet { super("Eldritch Moon", "EMN", "mage.sets.eldritchmoon", new GregorianCalendar(2016, 7, 26).getTime(), SetType.EXPANSION); this.blockName = "Shadows over Innistrad"; this.hasBoosters = true; - this.numBoosterLands = 1; - this.numBoosterCommon = 9; + this.numBoosterLands = 0; + this.numBoosterCommon = 10; this.numBoosterUncommon = 3; this.numBoosterRare = 1; this.ratioBoosterMythic = 8; diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/DarkSalvation.java b/Mage.Sets/src/mage/sets/eldritchmoon/DarkSalvation.java index 054f1bca076..0889c217b8b 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/DarkSalvation.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/DarkSalvation.java @@ -30,7 +30,7 @@ package mage.sets.eldritchmoon; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.dynamicvalue.common.GetXValue; +import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -43,7 +43,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ZombieToken; +import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; +import mage.target.targetpointer.SecondTargetPointer; /** * @@ -56,11 +58,15 @@ public class DarkSalvation extends CardImpl { this.expansionSetCode = "EMN"; // Target player puts X 2/2 black Zombie creature tokens onto the battlefield, then up to one target creature gets -1/-1 until end of turn for each Zombie that player controls. - this.getSpellAbility().addEffect(new CreateTokenTargetEffect(new ZombieToken(), new GetXValue())); + this.getSpellAbility().addTarget(new TargetPlayer()); + Effect effect = new CreateTokenTargetEffect(new ZombieToken(), new ManacostVariableValue()); + effect.setText("Target player puts X 2/2 black Zombie creature tokens onto the battlefield"); + this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 1, new FilterCreaturePermanent(), false)); DynamicValue value = new ZombiesControlledByTargetCreaturesControllerCount(); - Effect effect = new BoostTargetEffect(value, value, Duration.EndOfTurn, true); + effect = new BoostTargetEffect(value, value, Duration.EndOfTurn, true); + effect.setTargetPointer(new SecondTargetPointer()); effect.setText(", then up to one target creature gets -1/-1 until end of turn for each Zombie that player controls"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/MakeMischief.java b/Mage.Sets/src/mage/sets/eldritchmoon/MakeMischief.java index b6f56a80632..d4ad42d74d5 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/MakeMischief.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/MakeMischief.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.game.permanent.token.DevilToken; -import mage.target.TargetPlayer; +import mage.target.common.TargetCreatureOrPlayer; /** * @@ -49,7 +49,7 @@ public class MakeMischief extends CardImpl { // Make Mischief deals 1 damage to target creature or player. Put a 1/1 red Devil creature token onto the battlefield. // It has "When this creature dies, it deals 1 damage to target creature or player." this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer()); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new CreateTokenEffect(new DevilToken())); }