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

M15 Oracle changes.

Browse source 
See: http://magic.wizards.com/en/articles/archive/magic-2015-update-bulletin-2014-07-17
This commit is contained in:
emerald000 2014-08-11 00:44:03 -04:00
parent 7992e654ff
commit 58bdbb8c13
31 changed files with 153 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java
View file

@ -28,9 +28,6 @@
package mage.sets.alarareborn;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -39,7 +36,14 @@ import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -65,7 +69,7 @@ public class AvenMimeomancer extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it.
// At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature has base power and toughness 3/1 and has flying for as long as it has a feather counter on it.
Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FEATHER.createInstance()), TargetController.YOU, true);
ability.addTarget(new TargetCreaturePermanent());
ability.addEffect(new AvenEffect());
@ -121,7 +125,7 @@ class AvenEffect extends ContinuousEffectImpl {
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder();
sb.append("If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it");
sb.append("If you do, that creature has base power and toughness 3/1 and has flying for as long as it has a feather counter on it");
return sb.toString();
}
}

10
Mage.Sets/src/mage/sets/avacynrestored/ReforgeTheSoul.java
View file

@ -28,15 +28,15 @@
package mage.sets.avacynrestored;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.MiracleAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.game.Game;
import mage.players.Player;
@ -52,7 +52,7 @@ public class ReforgeTheSoul extends CardImpl {
this.color.setRed(true);
// Each player discards his or her hand and draws seven cards.
// Each player discards his or her hand, then draws seven cards.
this.getSpellAbility().addEffect(new ReforgeTheSoulEffect());
this.addAbility(new MiracleAbility(new ManaCostsImpl("{1}{R}")));
@ -72,7 +72,7 @@ class ReforgeTheSoulEffect extends OneShotEffect {
public ReforgeTheSoulEffect() {
super(Outcome.DrawCard);
this.staticText = "Each player discards his or her hand and draws seven cards";
this.staticText = "Each player discards his or her hand, then draws seven cards";
}
public ReforgeTheSoulEffect(final ReforgeTheSoulEffect effect) {

6
Mage.Sets/src/mage/sets/commander2013/DarksteelMutation.java
View file

@ -65,10 +65,10 @@ public class DarksteelMutation extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// Enchanted creature is a 0/1 Insect artifact creature with indestructible and loses all other abilities, card types, and creature types.
// Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new BecomesCreatureAttachedEffect(new DarksteelMutationInsectToken(),
"Enchanted creature is a 0/1 Insect artifact creature with indestructible and loses all other abilities, card types, and creature types",
"Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types.",
Duration.WhileOnBattlefield, true)));
}
@ -86,7 +86,7 @@ public class DarksteelMutation extends CardImpl {
class DarksteelMutationInsectToken extends Token {
public DarksteelMutationInsectToken() {
super("Insect", "0/1 Insect artifact creature with indestructible");
super("Insect", "Insect artifact creature with base power and toughness 0/1");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Insect");

20
Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java
View file

@ -28,13 +28,10 @@
package mage.sets.dragonsmaze;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continious.BecomesCreatureAllEffect;
import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect;
import mage.abilities.effects.common.continious.LoseAllAbilitiesAllEffect;
@ -42,6 +39,9 @@ import mage.abilities.effects.common.continious.LoseAllAbilitiesTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.OverloadAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
@ -67,9 +67,13 @@ public class Dragonshift extends CardImpl {
this.color.setRed(true);
this.color.setBlue(true);
// Until end of turn, target creature you control becomes a 4/4 blue and red Dragon, loses all abilities, and gains flying.
this.getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new DragonToken(), null, Duration.EndOfTurn));
// Until end of turn, target creature you control becomes a blue and red Dragon with base power and toughness 4/4, loses all abilities, and gains flying.
Effect effect = new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn);
effect.setText("");
this.getSpellAbility().addEffect(effect);
effect = new BecomesCreatureTargetEffect(new DragonToken(), null, Duration.EndOfTurn);
effect.setText("Until end of turn, target creature you control becomes a blue and red Dragon with base power and toughness 4/4, loses all abilities, and gains flying.");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
// Overload {3}{U}{U}{R}{R}
@ -90,7 +94,7 @@ public class Dragonshift extends CardImpl {
private class DragonToken extends Token {
public DragonToken() {
super("Dragon", "4/4 blue and red Dragon with flying");
super("Dragon", "blue and red Dragon with base power and toughness 4/4 and with flying");
cardType.add(CardType.CREATURE);
color.setBlue(true);
color.setRed(true);

21
Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java
View file

@ -28,10 +28,6 @@
package mage.sets.dragonsmaze;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.effects.Effect;
@ -39,6 +35,9 @@ import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect;
import mage.abilities.effects.common.continious.LoseAllAbilitiesTargetEffect;
import mage.cards.SplitCard;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.game.permanent.token.Token;
import mage.target.common.TargetCreatureOrPlayer;
import mage.target.common.TargetCreaturePermanent;
@ -57,16 +56,20 @@ public class TurnBurn extends SplitCard {
this.color.setRed(true);
// Turn
// Target creature loses all abilities and becomes a 0/1 red Weird until end of turn.
// Until end of turn, target creature loses all abilities and becomes a red Weird with base power and toughness 0/1.
getLeftHalfCard().getColor().setBlue(true);
getLeftHalfCard().getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn));
getLeftHalfCard().getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new WeirdToken(),null, Duration.EndOfTurn));
Effect effect = new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn);
effect.setText("Until end of turn, target creature loses all abilities");
getLeftHalfCard().getSpellAbility().addEffect(effect);
effect = new BecomesCreatureTargetEffect(new WeirdToken(), null, Duration.EndOfTurn);
effect.setText("and becomes a red Weird with base power and toughness 0/1");
getLeftHalfCard().getSpellAbility().addEffect(effect);
getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
// Burn
// Burn deals 2 damage to target creature or player.
getRightHalfCard().getColor().setRed(true);
Effect effect = new DamageTargetEffect(2);
effect = new DamageTargetEffect(2);
effect.setText("Burn deals 2 damage to target creature or player");
getRightHalfCard().getSpellAbility().addEffect(effect);
getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer());
@ -85,7 +88,7 @@ public class TurnBurn extends SplitCard {
private class WeirdToken extends Token {
private WeirdToken() {
super("Weird", "0/1 red Weird");
super("Weird", "a red Weird with base power and toughness 0/1");
cardType.add(CardType.CREATURE);
color = ObjectColor.RED;
subtype.add("Weird");

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

@ -55,7 +55,7 @@ public class BattlegateMimic extends CardImpl {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
private String rule = "Whenever you cast a spell that's both red and white, {this} becomes 4/2 and gains first strike until end of turn.";
private String rule = "Whenever you cast a spell that's both red and white, {this} has base power and toughness 4/2 and gains first strike until end of turn.";
public BattlegateMimic(UUID ownerId) {
super(ownerId, 133, "Battlegate Mimic", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R/W}");
@ -67,7 +67,7 @@ public class BattlegateMimic extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Whenever you cast a spell that's both red and white, Battlegate Mimic becomes 4/2 and gains first strike until end of turn.
// Whenever you cast a spell that's both red and white, Battlegate Mimic has base power and toughness 4/2 and gains first strike until end of turn.
Ability ability = new SpellCastControllerTriggeredAbility(new SetPowerToughnessSourceEffect(4, 2, Duration.EndOfTurn), filter, false, rule);
ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, false, true));
this.addAbility(ability);

16
Mage.Sets/src/mage/sets/eventide/FigureOfDestiny.java
View file

@ -68,28 +68,28 @@ public class FigureOfDestiny extends CardImpl {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// {RW}: Figure of Destiny becomes a 2/2 Kithkin Spirit.
// {RW}: Figure of Destiny becomes a Kithkin Spirit with base power and toughness 2/2.
this.addAbility(new SimpleActivatedAbility(
Zone.BATTLEFIELD,
new BecomesCreatureSourceEffect(new FigureOfDestiny.FigureOfDestinyToken1(), "", Duration.Custom),
new ManaCostsImpl("{R/W}")));
// {RW}{RW}{RW}: If Figure of Destiny is a Spirit, it becomes a 4/4 Kithkin Spirit Warrior.
// {RW}{RW}{RW}: If Figure of Destiny is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4.
this.addAbility(new SimpleActivatedAbility(
Zone.BATTLEFIELD,
new ConditionalContinousEffect(
new BecomesCreatureSourceEffect(new FigureOfDestiny.FigureOfDestinyToken2(), "", Duration.Custom),
new SourceMatchesFilterCondition(filter2),
"If Figure of Destiny is a Spirit, it becomes a 4/4 Kithkin Spirit Warrior",
"If {this} is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4",
true),
new ManaCostsImpl("{R/W}{R/W}{R/W}")
));
// {RW}{RW}{RW}{RW}{RW}{RW}: If Figure of Destiny is a Warrior, it becomes an 8/8 Kithkin Spirit Warrior Avatar with flying and first strike.
// {RW}{RW}{RW}{RW}{RW}{RW}: If Figure of Destiny is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike.
this.addAbility(new SimpleActivatedAbility(
Zone.BATTLEFIELD,
new ConditionalContinousEffect(
new BecomesCreatureSourceEffect(new FigureOfDestiny.FigureOfDestinyToken3(), "", Duration.Custom),
new SourceMatchesFilterCondition(filter3),
"If Figure of Destiny is a Warrior, it becomes an 8/8 Kithkin Spirit Warrior Avatar with flying and first strike",
"If {this} is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike",
true),
new ManaCostsImpl("{R/W}{R/W}{R/W}{R/W}{R/W}{R/W}")
));
@ -107,7 +107,7 @@ public class FigureOfDestiny extends CardImpl {
private class FigureOfDestinyToken1 extends Token {
public FigureOfDestinyToken1() {
super("Figure of Destiny", "2/2 Kithkin Spirit");
super("Figure of Destiny", "Kithkin Spirit with base power and toughness 2/2");
this.cardType.add(CardType.CREATURE);
this.subtype.add("Kithkin");
this.subtype.add("Spirit");
@ -122,7 +122,7 @@ public class FigureOfDestiny extends CardImpl {
private class FigureOfDestinyToken2 extends Token {
public FigureOfDestinyToken2() {
super("Figure of Destiny", "4/4 Kithkin Spirit Warrior");
super("Figure of Destiny", "Kithkin Spirit Warrior with base power and toughness 4/4");
this.cardType.add(CardType.CREATURE);
this.subtype.add("Kithkin");
this.subtype.add("Spirit");
@ -138,7 +138,7 @@ public class FigureOfDestiny extends CardImpl {
private class FigureOfDestinyToken3 extends Token {
public FigureOfDestinyToken3() {
super("Figure of Destiny", "8/8 Kithkin Spirit Warrior Avatar with flying and first strike");
super("Figure of Destiny", "Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike");
this.cardType.add(CardType.CREATURE);
this.subtype.add("Kithkin");
this.subtype.add("Spirit");

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

@ -56,7 +56,7 @@ public class NightskyMimic extends CardImpl {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
private String rule = "Whenever you cast a spell that's both white and black, {this} becomes 4/4 and gains flying until end of turn.";
private String rule = "Whenever you cast a spell that's both white and black, {this} has base power and toughness 4/4 until end of turn and gains flying until end of turn";
public NightskyMimic(UUID ownerId) {
super(ownerId, 91, "Nightsky Mimic", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W/B}");
@ -68,7 +68,7 @@ public class NightskyMimic extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Whenever you cast a spell that's both white and black, Nightsky Mimic becomes 4/4 and gains flying until end of turn.
// Whenever you cast a spell that's both white and black, Nightsky Mimic has base power and toughness 4/4 until end of turn and gains flying until end of turn.
Ability ability = new SpellCastControllerTriggeredAbility(new SetPowerToughnessSourceEffect(4, 4, Duration.EndOfTurn), filter, false, rule);
ability.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, false, true));
this.addAbility(ability);

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

@ -56,7 +56,7 @@ public class RiverfallMimic extends CardImpl {
filter.add(new ColorPredicate(ObjectColor.RED));
}
private String rule = "Whenever you cast a spell that's both blue and red, {this} becomes 3/3 and is unblockable until end of turn.";
private String rule = "Whenever you cast a spell that's both blue and red, {this} has base power and toughness 3/3 until end of turn and can't be blocked this turn.";
public RiverfallMimic(UUID ownerId) {
super(ownerId, 111, "Riverfall Mimic", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U/R}");
@ -68,7 +68,7 @@ public class RiverfallMimic extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Whenever you cast a spell that's both blue and red, Riverfall Mimic becomes 3/3 and is unblockable until end of turn.
// Whenever you cast a spell that's both blue and red, Riverfall Mimic has base power and toughness 3/3 until end of turn and can't be blocked this turn.
Ability ability = new SpellCastControllerTriggeredAbility(new SetPowerToughnessSourceEffect(3, 3, Duration.EndOfTurn), filter, false, rule);
ability.addEffect(new GainAbilitySourceEffect(new UnblockableAbility(), Duration.EndOfTurn, false, true));
this.addAbility(ability);

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

@ -56,7 +56,7 @@ public class ShorecrasherMimic extends CardImpl {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
private String rule = "Whenever you cast a spell that's both green and blue, {this} becomes 5/3 and gains trample until end of turn.";
private String rule = "Whenever you cast a spell that's both green and blue, {this} has base power and toughness 5/3 until end of turn and gains trample until end of turn";
public ShorecrasherMimic(UUID ownerId) {
super(ownerId, 159, "Shorecrasher Mimic", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G/U}");
@ -68,7 +68,7 @@ public class ShorecrasherMimic extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Whenever you cast a spell that's both green and blue, Shorecrasher Mimic becomes 5/3 and gains trample until end of turn.
// Whenever you cast a spell that's both green and blue, Shorecrasher Mimic has base power and toughness 5/3 until end of turn and gains trample until end of turn.
Ability ability = new SpellCastControllerTriggeredAbility(new SetPowerToughnessSourceEffect(5, 3, Duration.EndOfTurn), filter, false, rule);
ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, false, true));
this.addAbility(ability);

15
Mage.Sets/src/mage/sets/eventide/Snakeform.java
View file

@ -53,14 +53,19 @@ public class Snakeform extends CardImpl {
this.color.setBlue(true);
this.color.setGreen(true);
// Target creature loses all abilities and becomes a 1/1 green Snake until end of turn.
this.getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new SnakeToken(),null, Duration.EndOfTurn));
// Until end of turn, target creature loses all abilities
Effect effect = new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn);
effect.setText("Until end of turn, target creature loses all abilities");
this.getSpellAbility().addEffect(effect);
// and becomes a green Snake with base power and toughness 1/1.
effect = new BecomesCreatureTargetEffect(new SnakeToken(), null, Duration.EndOfTurn);
effect.setText("and becomes a green Snake with base power and toughness 1/1");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
// Draw a card.
Effect effect = new DrawCardSourceControllerEffect(1);
effect.setText("Draw a card.");
effect = new DrawCardSourceControllerEffect(1);
effect.setText("<br>Draw a card.");
this.getSpellAbility().addEffect(effect);
}

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

@ -56,7 +56,7 @@ public class WoodlurkerMimic extends CardImpl {
filter.add(new ColorPredicate(ObjectColor.GREEN));
}
private String rule = "Whenever you cast a spell that's both black and green, {this} becomes 4/5 and gains wither until end of turn.";
private String rule = "Whenever you cast a spell that's both black and green, {this} has base power and toughness 4/5 until end of turn and gains wither until end of turn.";
public WoodlurkerMimic(UUID ownerId) {
super(ownerId, 130, "Woodlurker Mimic", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B/G}");
@ -68,7 +68,7 @@ public class WoodlurkerMimic extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Whenever you cast a spell that's both black and green, Woodlurker Mimic becomes 4/5 and gains wither until end of turn.
// Whenever you cast a spell that's both black and green, Woodlurker Mimic has base power and toughness 4/5 until end of turn and gains wither until end of turn.
Ability ability = new SpellCastControllerTriggeredAbility(new SetPowerToughnessSourceEffect(4, 5, Duration.EndOfTurn), filter, false, rule);
ability.addEffect(new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.EndOfTurn, false, true));
this.addAbility(ability);

8
Mage.Sets/src/mage/sets/guildpact/GravenDominator.java
View file

@ -28,15 +28,15 @@
package mage.sets.guildpact;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.effects.common.continious.SetPowerToughnessAllEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.HauntAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
@ -63,7 +63,7 @@ public class GravenDominator extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Haunt
// When Graven Dominator enters the battlefield or the creature it haunts dies, each other creature becomes 1/1 until end of turn.
// When Graven Dominator enters the battlefield or the creature it haunts dies, each other creature has base power and toughness 1/1 until end of turn.
Ability ability = new HauntAbility(this, new SetPowerToughnessAllEffect(1,1, Duration.EndOfTurn, filter, true));
this.addAbility(ability);

8
Mage.Sets/src/mage/sets/limitedalpha/WheelOfFortune.java
View file

@ -28,6 +28,7 @@
package mage.sets.limitedalpha;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardAllEffect;
import mage.abilities.effects.common.discard.DiscardHandAllEffect;
import mage.cards.CardImpl;
@ -45,9 +46,12 @@ public class WheelOfFortune extends CardImpl {
this.color.setRed(true);
// Each player discards his or her hand and draws seven cards.
// Each player discards his or her hand,
this.getSpellAbility().addEffect(new DiscardHandAllEffect());
this.getSpellAbility().addEffect(new DrawCardAllEffect(7));
// then draws seven cards.
Effect effect = new DrawCardAllEffect(7);
effect.setText(", then draws seven cards");
this.getSpellAbility().addEffect(effect);
}
public WheelOfFortune(final WheelOfFortune card) {

6
Mage.Sets/src/mage/sets/lorwyn/Lignify.java
View file

@ -65,10 +65,10 @@ public class Lignify extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// Enchanted creature is a 0/4 Treefolk with no abilities.
// Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new BecomesCreatureAttachedEffect(new LignifyTreefolkToken(),
"Enchanted creature is a 0/4 Treefolk with no abilities",
"Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities",
Duration.WhileOnBattlefield, true)));
}
@ -86,7 +86,7 @@ public class Lignify extends CardImpl {
class LignifyTreefolkToken extends Token {
public LignifyTreefolkToken() {
super("Treefolk", "0/4 Treefolk with no abilities");
super("Treefolk", "a Treefolk with base power and toughness 0/4 with no abilities");
cardType.add(CardType.CREATURE);
subtype.add("Treefolk");
power = new MageInt(0);

14
Mage.Sets/src/mage/sets/magic2012/Skinshifter.java
View file

@ -28,10 +28,6 @@
package mage.sets.magic2012;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -41,6 +37,10 @@ import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.permanent.token.Token;
/**
@ -86,7 +86,7 @@ public class Skinshifter extends CardImpl {
private class RhinoToken extends Token {
public RhinoToken() {
super("Rhino", "4/4 Rhino with trample");
super("Rhino", "Rhino with base power and toughness 4/4 and gains trample");
this.cardType.add(CardType.CREATURE);
this.subtype.add("Rhino");
@ -100,7 +100,7 @@ public class Skinshifter extends CardImpl {
private class BirdToken extends Token {
public BirdToken() {
super("Bird", "2/2 Bird with flying");
super("Bird", "Bird with base power and toughness 2/2 and gains flying");
this.cardType.add(CardType.CREATURE);
this.subtype.add("Bird");
@ -114,7 +114,7 @@ public class Skinshifter extends CardImpl {
private class PlantToken extends Token {
public PlantToken() {
super("Plant", "0/8 Plant");
super("Plant", "Plant with base power and toughness 0/8");
this.cardType.add(CardType.CREATURE);
this.subtype.add("Plant");

12
Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java
View file

@ -28,10 +28,6 @@
package mage.sets.mirrodinbesieged;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.EntersBattlefieldAbility;
@ -44,6 +40,10 @@ import mage.abilities.effects.common.continious.AddCardTypeTargetEffect;
import mage.abilities.effects.common.continious.SetPowerToughnessTargetEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.counters.CounterType;
import mage.filter.FilterCard;
import mage.filter.common.FilterControlledPermanent;
@ -75,12 +75,12 @@ public class TezzeretAgentOfBolas extends CardImpl {
// +1: Look at the top five cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
this.addAbility(new LoyaltyAbility(new LookLibraryAndPickControllerEffect(5, 1, filter, true), 1));
// -1: Target artifact becomes a 5/5 artifact creature.
// -1: Target artifact becomes an artifact creature with base power and toughness 5/5.
Effect effect = new AddCardTypeTargetEffect(CardType.CREATURE, Duration.EndOfGame);
effect.setText("");
LoyaltyAbility ability1 = new LoyaltyAbility(effect, -1);
effect = new SetPowerToughnessTargetEffect(5,5, Duration.EndOfGame);
effect.setText("Target artifact becomes a 5/5 artifact creature");
effect.setText("Target artifact becomes an artifact creature with base power and toughness 5/5");
ability1.addEffect(effect);
ability1.addTarget(new TargetArtifactPermanent());
this.addAbility(ability1);

8
Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java
View file

@ -33,8 +33,8 @@ import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.continious.BoostSourceEffect;
import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -72,8 +72,10 @@ public class MarshFlitter extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// When Marsh Flitter enters the battlefield, put two 1/1 black Goblin Rogue creature tokens onto the battlefield.
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BlackGoblinRogueToken(), 2), false));
// Sacrifice a Goblin: Marsh Flitter becomes 3/3 until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(3, 3, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter)));
// Sacrifice a Goblin: Marsh Flitter has base power and toughness 3/3 until end of turn.
Effect effect = new SetPowerToughnessSourceEffect(3, 3, Duration.EndOfTurn);
effect.setText("{this} has base power and toughness 3/3 until end of turn");
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new SacrificeTargetCost(new TargetControlledPermanent(filter)));
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/morningtide/SensationGorger.java
View file

@ -54,10 +54,10 @@ public class SensationGorger extends CardImpl {
this.toughness = new MageInt(2);
// Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Sensation Gorger, you may reveal it.
// If you do, each player discards his or her hand and draws four cards.
// If you do, each player discards his or her hand, then draws four cards.
KinshipAbility ability = new KinshipAbility(new DiscardHandAllEffect());
Effect effect = new DrawCardAllEffect(4);
effect.setText("and draws four cards");
effect.setText(", then draws four cards");
ability.addKinshipEffect(effect);
this.addAbility(ability);
}

11
Mage.Sets/src/mage/sets/odyssey/TestamentOfFaith.java
View file

@ -60,7 +60,7 @@ public class TestamentOfFaith extends CardImpl {
this.color.setWhite(true);
// {X}: Testament of Faith becomes an X/X Wall creature with defender until end of turn. It's still an enchantment.
// {X}: Testament of Faith becomes an X/X Wall creature with defender in addition to its other types until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TestamentOfFaithBecomesCreatureSourceEffect(new TestamentOfFaithToken(), "enchantment", Duration.EndOfTurn), new VariableManaCost()));
}
@ -172,12 +172,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i
}
private void setText() {
if (type.length() > 0) {
staticText = duration.toString() + " {this} becomes a " + token.getDescription() + " that's still a " + this.type;
}
else {
staticText = duration.toString() + " {this} becomes a " + token.getDescription();
}
staticText = "{this} becomes an X/X Wall creature with defender in addition to its other types until end of turn";
}
@Override
@ -190,7 +185,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i
class TestamentOfFaithToken extends Token {
TestamentOfFaithToken() {
super("Wall", "a X/X Wall creature with defender");
super("Wall", "an X/X Wall creature with defender");
cardType.add(CardType.CREATURE);
this.subtype.add("Wall");
color = ObjectColor.WHITE;

10
Mage.Sets/src/mage/sets/planechase2012/InkfathomWitch.java
View file

@ -28,16 +28,16 @@
package mage.sets.planechase2012;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continious.SetPowerToughnessAllEffect;
import mage.abilities.keyword.FearAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.UnblockedPredicate;
@ -65,7 +65,7 @@ public class InkfathomWitch extends CardImpl {
// Fear
this.addAbility(FearAbility.getInstance());
// {2}{U}{B}: Each unblocked creature becomes 4/1 until end of turn.
// {2}{U}{B}: Each unblocked creature has base power and toughness 4/1 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessAllEffect(4, 1, Duration.EndOfTurn, filter, true), new ManaCostsImpl("{2}{U}{B}")));
}

12
Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java
View file

@ -28,15 +28,15 @@
package mage.sets.ravnika;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.filter.FilterSpell;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.game.permanent.token.Token;
@ -59,8 +59,10 @@ public class HalcyonGlaze extends CardImpl {
this.color.setBlue(true);
// Whenever you cast a creature spell, Halcyon Glaze becomes a 4/4 Illusion creature with flying until end of turn. It's still an enchantment.
this.addAbility(new SpellCastControllerTriggeredAbility(new BecomesCreatureSourceEffect(new HalcyonGlazeToken(), "enchantment", Duration.EndOfTurn), filter, false));
// Whenever you cast a creature spell, Halcyon Glaze becomes a 4/4 Illusion creature with flying in addition to its other types until end of turn.
Effect effect = new BecomesCreatureSourceEffect(new HalcyonGlazeToken(), "enchantment", Duration.EndOfTurn);
effect.setText("Whenever you cast a creature spell, {this} becomes a 4/4 Illusion creature with flying in addition to its other types until end of turn");
this.addAbility(new SpellCastControllerTriggeredAbility(effect, filter, false));
}
public HalcyonGlaze(final HalcyonGlaze card) {

7
Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java
View file

@ -29,16 +29,15 @@
package mage.sets.riseoftheeldrazi;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.continious.SetPowerToughnessTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.target.common.TargetControlledCreaturePermanent;
@ -56,6 +55,8 @@ public class Gigantomancer extends CardImpl {
this.color.setGreen(true);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
//{1}: Target creature you control has base power and toughness 7/7 until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessTargetEffect(7, 7, Duration.EndOfTurn), new GenericManaCost(1));
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);

2
Mage.Sets/src/mage/sets/shadowmoor/GodheadOfAwe.java
View file

@ -69,7 +69,7 @@ public class GodheadOfAwe extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Other creatures are 1/1.
// Other creatures have base power and toughness 1/1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
}

16
Mage.Sets/src/mage/sets/shardsofalara/TezzeretTheSeeker.java
View file

@ -27,6 +27,8 @@
*/
package mage.sets.shardsofalara;
import java.util.List;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.EntersBattlefieldAbility;
@ -38,7 +40,13 @@ import mage.abilities.effects.common.UntapTargetEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.Filter.ComparisonType;
import mage.filter.common.FilterArtifactCard;
@ -49,8 +57,6 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetArtifactPermanent;
import mage.target.common.TargetCardInLibrary;
import java.util.List;
import java.util.UUID;
/**
*
@ -72,7 +78,7 @@ public class TezzeretTheSeeker extends CardImpl {
this.addAbility(ability);
// -X: Search your library for an artifact card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library.
this.addAbility(new LoyaltyAbility(new TezzeretTheSeekerEffect2()));
// -5: Artifacts you control become 5/5 artifact creatures until end of turn.
// -5: Artifacts you control become artifact creatures with base power and toughness 5/5 until end of turn.
this.addAbility(new LoyaltyAbility(new TezzeretTheSeekerEffect3(), -5));
}
@ -137,7 +143,7 @@ class TezzeretTheSeekerEffect3 extends ContinuousEffectImpl {
public TezzeretTheSeekerEffect3() {
super(Duration.EndOfTurn, Outcome.BecomeCreature);
this.staticText = "Artifacts you control become 5/5 artifact creatures until end of turn";
this.staticText = "Artifacts you control become artifact creatures with base power and toughness 5/5 until end of turn";
}
public TezzeretTheSeekerEffect3(final TezzeretTheSeekerEffect3 effect) {

4
Mage.Sets/src/mage/sets/tempest/Humility.java
View file

@ -58,7 +58,7 @@ public class Humility extends CardImpl {
this.color.setWhite(true);
// All creatures lose all abilities and are 1/1.
// All creatures lose all abilities and have base power and toughness 1/1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HumilityEffect(Duration.WhileOnBattlefield)));
}
@ -77,7 +77,7 @@ class HumilityEffect extends ContinuousEffectImpl {
public HumilityEffect(Duration duration) {
super(duration, Outcome.LoseAbility);
staticText = "All creatures lose all abilities and are 1/1";
staticText = "All creatures lose all abilities and have base power and toughness 1/1";
}
public HumilityEffect(final HumilityEffect effect) {

13
Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java
View file

@ -28,17 +28,16 @@
package mage.sets.timespiral;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.keyword.SplitSecondAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.abilities.Ability;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.keyword.SplitSecondAbility;
import mage.cards.CardImpl;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -59,7 +58,7 @@ public class SuddenSpoiling extends CardImpl {
// Split second
this.addAbility(new SplitSecondAbility());
// Creatures target player controls become 0/2 and lose all abilities until end of turn.
// Until end of turn, creatures target player controls lose all abilities and have base power and toughness 0/2.
this.getSpellAbility().addEffect(new SuddenSpoilingEffect(Duration.EndOfTurn));
this.getSpellAbility().addTarget(new TargetPlayer());
@ -79,7 +78,7 @@ class SuddenSpoilingEffect extends ContinuousEffectImpl {
public SuddenSpoilingEffect(Duration duration) {
super(duration, Outcome.LoseAbility);
staticText = "Creatures target player controls become 0/2 and lose all abilities until end of turn";
staticText = "Until end of turn, creatures target player controls lose all abilities and have base power and toughness 0/2";
}
public SuddenSpoilingEffect(final SuddenSpoilingEffect effect) {

6
Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
View file

@ -79,13 +79,13 @@ public class Gigantiform extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// Enchanted creature is 8/8 and has trample.
// Enchanted creature has base power and toughness 8/8 and has trample.
this.addAbility(new GigantiformAbility());
// When Gigantiform enters the battlefield, if it was kicked, you may search your library for a card named Gigantiform, put it onto the battlefield, then shuffle your library.
this.addAbility(new ConditionalTriggeredAbility(
new EntersBattlefieldTriggeredAbility(new GigantiformEffect(), true),
KickedCondition.getInstance(),
"When Gigantiform enters the battlefield, if it was kicked, you may search your library for a card named Gigantiform, put it onto the battlefield, then shuffle your library."));
"When {this} enters the battlefield, if it was kicked, you may search your library for a card named Gigantiform, put it onto the battlefield, then shuffle your library."));
}
public Gigantiform(final Gigantiform card) {
@ -117,7 +117,7 @@ class GigantiformAbility extends StaticAbility {
@Override
public String getRule() {
return "Enchanted creature is 8/8 and has trample.";
return "Enchanted creature has base power and toughness 8/8 and has trample";
}
}

12
Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessAllEffect.java
View file

@ -30,15 +30,15 @@ package mage.abilities.effects.common.continious;
import java.util.Locale;
import java.util.UUID;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
@ -124,9 +124,9 @@ public class SetPowerToughnessAllEffect extends ContinuousEffectImpl {
StringBuilder sb = new StringBuilder();
sb.append(filter.getMessage());
if (filter.getMessage().toLowerCase(Locale.ENGLISH).startsWith("Each ")) {
sb.append(" becomes ");
sb.append(" has base power and toughness ");
} else {
sb.append(" become ");
sb.append(" have base power and toughness ");
}
sb.append(power).append("/").append(toughness);
if (!duration.toString().isEmpty()) {

2
Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessTargetEffect.java
View file

@ -91,7 +91,7 @@ public class SetPowerToughnessTargetEffect extends ContinuousEffectImpl {
return staticText;
}
StringBuilder sb = new StringBuilder();
sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" becomes ");
sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" has base power and toughness ");
sb.append(power).append("/").append(toughness).append(" ").append(duration.toString());
return sb.toString();
}

2
Mage/src/mage/abilities/keyword/ConvokeAbility.java
View file

@ -197,6 +197,6 @@ public class ConvokeAbility extends SimpleStaticAbility implements AdjustingSour
@Override
public String getRule() {
return "Convoke <i>(Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.)</i>";
return "Convoke <i>(Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)</i>";
}
}