From 2faafbe37030d3cbdf387d4f4bbb865d95bcf537 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 6 Dec 2014 18:30:05 +0100 Subject: [PATCH] Some fixes/changes to set cards. --- Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java | 4 ++-- Mage.Sets/src/mage/sets/apocalypse/Spiritmonger.java | 4 ++-- .../src/mage/sets/championsofkamigawa/EightAndAHalfTails.java | 4 ++-- Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java | 1 + Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java | 1 + .../src/mage/sets/darkascension/ElbrusTheBindingBlade.java | 2 ++ Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java | 1 + Mage.Sets/src/mage/sets/eventide/SwirlingSpriggan.java | 4 ++-- Mage.Sets/src/mage/sets/innistrad/Moonmist.java | 1 + Mage.Sets/src/mage/sets/magic2011/Incite.java | 4 ++-- Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java | 4 ++-- Mage.Sets/src/mage/sets/odyssey/WildMongrel.java | 4 ++-- .../src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/PrismwakeMerrow.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java | 4 ++-- 19 files changed, 34 insertions(+), 28 deletions(-) diff --git a/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java b/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java index ec2afb1448..ac0e584e17 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java +++ b/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java @@ -30,7 +30,7 @@ package mage.sets.apocalypse; import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.Duration; @@ -56,7 +56,7 @@ public class IllusionReality extends SplitCard { // Illusion // Target spell or permanent becomes the color of your choice until end of turn. getLeftHalfCard().getColor().setBlue(true); - getLeftHalfCard().getSpellAbility().addEffect(new SetCardColorTargetEffect(Duration.EndOfTurn)); + getLeftHalfCard().getSpellAbility().addEffect(new BecomesColorTargetEffect(Duration.EndOfTurn)); Target target = new TargetSpellOrPermanent(); getLeftHalfCard().getSpellAbility().addTarget(target); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Spiritmonger.java b/Mage.Sets/src/mage/sets/apocalypse/Spiritmonger.java index 428cf13fc2..dc6f848723 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Spiritmonger.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Spiritmonger.java @@ -36,7 +36,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.RegenerateSourceEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; @@ -104,7 +104,7 @@ class SpiritmongerChangeColorEffect extends OneShotEffect { ChoiceColor colorChoice = new ChoiceColor(); if (player.choose(Outcome.Neutral, colorChoice, game)) { game.informPlayers(wildMongrel.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); - ContinuousEffect effect = new SetCardColorTargetEffect(colorChoice.getColor(), Duration.EndOfTurn, "is " + colorChoice.getChoice()); + ContinuousEffect effect = new BecomesColorTargetEffect(colorChoice.getColor(), Duration.EndOfTurn, "is " + colorChoice.getChoice()); effect.setTargetPointer(new FixedTarget(source.getSourceId())); game.addEffect(effect, source); return true; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java index 57193dd720..3ade3ede91 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -77,7 +77,7 @@ public class EightAndAHalfTails extends CardImpl { this.addAbility(ability); // {1}: Target spell or permanent becomes white until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SetCardColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn, "Target spell or permanent becomes white until end of turn"), new ManaCostsImpl("{1}")); + new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn, "Target spell or permanent becomes white until end of turn"), new ManaCostsImpl("{1}")); target = new TargetSpellOrPermanent(); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java b/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java index 435759c1ce..74081db258 100644 --- a/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java +++ b/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java @@ -124,6 +124,7 @@ class WidespreadPanicEffect extends OneShotEffect { if (shuffler != null) { if (shuffler.getHand().size() > 0) { TargetCardInHand target = new TargetCardInHand(); + target.setNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); shuffler.choose(Outcome.Detriment, target, source.getSourceId(), game); Card card = shuffler.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java index 357ba1091e..9acfe84553 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java @@ -94,6 +94,7 @@ class ChaliceOfLifeEffect extends OneShotEffect { // if you have at least 10 life more than your starting life total, transform Chalice of Life. if (player.getLife() >= game.getLife() + 10) { permanent.transform(game); + game.informPlayers(new StringBuilder(permanent.getName()).append(" transforms into ").append(permanent.getSecondCardFace().getName()).toString()); } } return false; diff --git a/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java b/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java index 370c393e9b..9d59752493 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java +++ b/Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java @@ -97,6 +97,8 @@ class ElbrusTheBindingBladeEffect extends OneShotEffect { if (attachedTo != null) { attachedTo.removeAttachment(equipment.getId(), game); equipment.transform(game); + game.informPlayers(new StringBuilder(equipment.getName()).append(" transforms into ").append(equipment.getSecondCardFace().getName()).toString()); + } } return false; diff --git a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java index 042ff23983..007b538237 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java +++ b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java @@ -139,6 +139,7 @@ class SoulSeizerEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null && permanent.canTransform()) { if (permanent.transform(game)) { + game.informPlayers(new StringBuilder(permanent.getName()).append(" transforms into ").append(permanent.getSecondCardFace().getName()).toString()); Permanent attachTo = game.getPermanent(targetPointer.getFirst(game, source)); if (attachTo != null) { return attachTo.addAttachment(source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/sets/eventide/SwirlingSpriggan.java b/Mage.Sets/src/mage/sets/eventide/SwirlingSpriggan.java index becc808169..f4ad0249f7 100644 --- a/Mage.Sets/src/mage/sets/eventide/SwirlingSpriggan.java +++ b/Mage.Sets/src/mage/sets/eventide/SwirlingSpriggan.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; import mage.constants.CardType; @@ -123,7 +123,7 @@ class ChangeColorOrColorsTargetEffect extends OneShotEffect { } } for (ObjectColor color : chosenColors) { - ContinuousEffect effect = new SetCardColorTargetEffect(color, Duration.EndOfTurn, "is " + color); + ContinuousEffect effect = new BecomesColorTargetEffect(color, Duration.EndOfTurn, "is " + color); effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); game.addEffect(effect, source); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Moonmist.java b/Mage.Sets/src/mage/sets/innistrad/Moonmist.java index 58386fa71b..10bd9f66a6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Moonmist.java +++ b/Mage.Sets/src/mage/sets/innistrad/Moonmist.java @@ -98,6 +98,7 @@ class MoonmistEffect extends OneShotEffect { for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (permanent.canTransform()) { permanent.transform(game); + game.informPlayers(new StringBuilder(permanent.getName()).append(" transforms into ").append(permanent.getSecondCardFace().getName()).toString()); } } return true; diff --git a/Mage.Sets/src/mage/sets/magic2011/Incite.java b/Mage.Sets/src/mage/sets/magic2011/Incite.java index dfe7c5f42e..bce5ab37e5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Incite.java +++ b/Mage.Sets/src/mage/sets/magic2011/Incite.java @@ -35,7 +35,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.combat.AttacksIfAbleTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +52,7 @@ public class Incite extends CardImpl { // Target creature becomes red until end of turn and attacks this turn if able. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn, "Target creature becomes red until end of turn")); + this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn, "Target creature becomes red until end of turn")); this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java index a214645c99..5e2db67d9d 100644 --- a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java +++ b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java @@ -38,7 +38,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.continious.AddCardTypeTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.DefenderAbility; @@ -80,7 +80,7 @@ public class XathridGorgon extends CardImpl { effect = new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.Custom); effect.setText("and becomes a colorless artifact in addition to its other types"); ability.addEffect(effect); - ability.addEffect(new SetCardColorTargetEffect(new ObjectColor(), Duration.Custom, "")); + ability.addEffect(new BecomesColorTargetEffect(new ObjectColor(), Duration.Custom, "")); ability.addEffect(new XathridGorgonCantActivateEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java b/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java index 0864ff6884..907cf29d69 100644 --- a/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java +++ b/Mage.Sets/src/mage/sets/odyssey/WildMongrel.java @@ -36,7 +36,7 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; import mage.constants.CardType; @@ -101,7 +101,7 @@ class ChangeColorEffect extends OneShotEffect { ChoiceColor colorChoice = new ChoiceColor(); if (player.choose(Outcome.Neutral, colorChoice, game)) { game.informPlayers(wildMongrel.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); - ContinuousEffect effect = new SetCardColorTargetEffect(colorChoice.getColor(), Duration.EndOfTurn, "is " + colorChoice.getChoice()); + ContinuousEffect effect = new BecomesColorTargetEffect(colorChoice.getColor(), Duration.EndOfTurn, "is " + colorChoice.getChoice()); effect.setTargetPointer(new FixedTarget(source.getSourceId())); game.addEffect(effect, source); return true; diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java index ab413234b7..31cfc72a6b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java @@ -64,13 +64,13 @@ public class GuulDrazAssassin extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{B}"))); - Abilities abilities1 = new AbilitiesImpl(); + Abilities abilities1 = new AbilitiesImpl<>(); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{B}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); abilities1.add(ability); - Abilities abilities2 = new AbilitiesImpl(); + Abilities abilities2 = new AbilitiesImpl<>(); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new ManaCostsImpl("{B}")); ability2.addTarget(new TargetCreaturePermanent()); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java index fe5cd6cefe..370a6fd276 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.constants.Duration; @@ -53,7 +53,7 @@ public class AphoticWisps extends CardImpl { this.color.setBlack(true); // Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLACK, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.BLACK, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java index 4e1e5544ca..994cacef0a 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.UntapTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +52,7 @@ public class CeruleanWisps extends CardImpl { this.color.setBlue(true); // Target creature becomes blue until end of turn. Untap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java index 31349e9cf8..53b01113d7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.constants.Duration; @@ -53,7 +53,7 @@ public class CrimsonWisps extends CardImpl { this.color.setRed(true); // Target creature becomes red and gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java index 7a07c77e52..6331ca702f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.TapTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +52,7 @@ public class NiveousWisps extends CardImpl { this.color.setWhite(true); // Target creature becomes white until end of turn. Tap that creature. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new TapTargetEffect()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PrismwakeMerrow.java b/Mage.Sets/src/mage/sets/shadowmoor/PrismwakeMerrow.java index 572d9cc5ce..1764c5b92f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PrismwakeMerrow.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PrismwakeMerrow.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.choices.ChoiceColor; @@ -126,7 +126,7 @@ class ChangeColorOrColorsTargetEffect extends OneShotEffect { } } for (ObjectColor color : chosenColors) { - ContinuousEffect effect = new SetCardColorTargetEffect(color, Duration.EndOfTurn, "is " + color); + ContinuousEffect effect = new BecomesColorTargetEffect(color, Duration.EndOfTurn, "is " + color); effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); game.addEffect(effect, source); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java index d4899d932b..f417c5c007 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; -import mage.abilities.effects.common.continious.SetCardColorTargetEffect; +import mage.abilities.effects.common.continious.BecomesColorTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +52,7 @@ public class ViridescentWisps extends CardImpl { this.color.setGreen(true); // Target creature becomes green and gets +1/+0 until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.GREEN, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BecomesColorTargetEffect(ObjectColor.GREEN, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));