github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fixes/changes to set cards.

Browse source
This commit is contained in:
LevelX2 2014-12-06 18:30:05 +01:00
parent 2fae97be63
commit 2faafbe370
19 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java
View file

@ -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);

4
Mage.Sets/src/mage/sets/apocalypse/Spiritmonger.java
View file

@ -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;

4
Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java
View file

@ -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);

1
Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java
View file

@ -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);

1
Mage.Sets/src/mage/sets/darkascension/ChaliceOfLife.java
View file

@ -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;

2
Mage.Sets/src/mage/sets/darkascension/ElbrusTheBindingBlade.java
View file

@ -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;

1
Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
View file

@ -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);

4
Mage.Sets/src/mage/sets/eventide/SwirlingSpriggan.java
View file

@ -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);
}

1
Mage.Sets/src/mage/sets/innistrad/Moonmist.java
View file

@ -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;

4
Mage.Sets/src/mage/sets/magic2011/Incite.java
View file

@ -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));
}

4
Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java
View file

@ -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);

4
Mage.Sets/src/mage/sets/odyssey/WildMongrel.java
View file

@ -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;

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java
View file

@ -64,13 +64,13 @@ public class GuulDrazAssassin extends LevelerCard {
this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}{B}")));
Abilities<Ability> abilities1 = new AbilitiesImpl<Ability>();
Abilities<Ability> 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<Ability> abilities2 = new AbilitiesImpl<Ability>();
Abilities<Ability> 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());

4
Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java
View file

@ -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));

4
Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java
View file

@ -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));

4
Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java
View file

@ -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.

4
Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java
View file

@ -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));

4
Mage.Sets/src/mage/sets/shadowmoor/PrismwakeMerrow.java
View file

@ -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);
}

4
Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java
View file

@ -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));